Merge branch 'master' into feature/spool_revisions

spoolman/database/database.py

@@ -1,5 +1,4 @@
 """SQLAlchemy database setup."""
-
 import datetime
 import logging
 import shutil
@@ -14,6 +13,7 @@ from sqlalchemy import URL
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker, create_async_engine
 
 from spoolman import env
+from spoolman.prometheus.metrics import filament_metrics, spool_metrics
 
 logger = logging.getLogger(__name__)
 
@@ -183,6 +183,15 @@ async def _backup_task() -> Optional[Path]:
     return __db.backup_and_rotate(env.get_backups_dir(), num_backups=5)
 
 
+async def _metrics() -> None:
+    """Create some useful prometheus metrics."""
+    logger.debug("Start metrics collection")
+    async for session in get_db_session():
+        await filament_metrics(session)
+        await spool_metrics(session)
+    logger.debug("End metrics collection")
+
+
 def schedule_tasks(scheduler: Scheduler) -> None:
     """Schedule tasks to be executed by the provided scheduler.
 
@@ -191,6 +200,10 @@ def schedule_tasks(scheduler: Scheduler) -> None:
     """
     if __db is None:
         raise RuntimeError("DB is not setup.")
+    if env.is_metrics_enabled():
+        logger.info("Scheduling automatic metric collection.")
+        # Run every minute, may be needs specify timer
+        scheduler.minutely(datetime.time(second=0), _metrics)
     if not env.is_automatic_backup_enabled():
         return
     if "sqlite" in __db.connection_url.drivername:

spoolman/env.py

@@ -380,3 +380,21 @@ def is_data_dir_mounted() -> bool:
     mounts = subprocess.run("mount", check=True, stdout=subprocess.PIPE, text=True)  # noqa: S603, S607
     data_dir = str(get_data_dir().resolve())
     return any(data_dir in line for line in mounts.stdout.splitlines())
+
+
+def is_metrics_enabled() -> bool:
+    """Get whether collect prometheus metrics at database is enabled.
+
+        Returns False if no environment variable was set for collect metrics.
+
+    Returns:
+        bool: Whether collect metrics is enabled.
+    """
+    metrics_enabled = os.getenv("SPOOLMAN_METRICS_ENABLED", "FALSE").upper()
+    if metrics_enabled in {"FALSE", "0"}:
+        return False
+    if metrics_enabled in {"TRUE", "1"}:
+        return True
+    raise ValueError(
+        f"Failed to parse SPOOLMAN_METRICS_ENABLED variable: Unknown metrics enabled '{metrics_enabled}'.",
+    )

spoolman/main.py

@@ -1,5 +1,4 @@
 """Main entrypoint to the server."""
-
 import logging
 import subprocess
 from logging.handlers import TimedRotatingFileHandler
@@ -9,12 +8,15 @@ import uvicorn
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.middleware.gzip import GZipMiddleware
+from fastapi.responses import PlainTextResponse
+from prometheus_client import generate_latest
 from scheduler.asyncio.scheduler import Scheduler
 
 from spoolman import env
 from spoolman.api.v1.router import app as v1_app
 from spoolman.client import SinglePageApplication
 from spoolman.database import database
+from spoolman.prometheus.metrics import registry
 
 # Define a console logger
 console_handler = logging.StreamHandler()
@@ -37,7 +39,23 @@ app = FastAPI(
 )
 app.add_middleware(GZipMiddleware)
 app.mount("/api/v1", v1_app)
-app.mount("/", app=SinglePageApplication(directory="client/dist"), name="client")
+
+
+# WA for prometheus /metrics bind with SinglePageApp at root
+@app.get(
+    "/metrics",
+    response_class=PlainTextResponse,
+    name="Get metrics for prometheus",
+    description=(
+        "Get app metrics for prometheusIf enabled SPOOLMAN_METRICS_ENABLED returned metrics by Spools and Filaments"
+    ),
+)
+def get_metrics() -> bytes:
+    """Return prometheus metrics."""
+    return generate_latest(registry)
+
+
+app.mount("", app=SinglePageApplication(directory="client/dist"))
 
 
 # Allow all origins if in debug mode

spoolman/prometheus/metrics.py

@@ -0,0 +1,86 @@
+"""Prometheus metrics collectors."""
+import logging
+from typing import Callable
+
+import sqlalchemy
+from prometheus_client import REGISTRY, Gauge, make_asgi_app
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import contains_eager
+
+from spoolman.database import models
+
+registry = REGISTRY
+
+PREFIX = "spoolman"
+
+SPOOL_PRICE = Gauge("%s_spool_price" % PREFIX, "Total Spool price", ["spool_id", "filament_id"])
+SPOOL_USED_WEIGHT = Gauge("%s_spool_weight_used" % PREFIX, "Spool Used Weight", ["spool_id", "filament_id"])
+FILAMENT_INFO = Gauge(
+    "%s_filament_info" % PREFIX,
+    "Filament information",
+    ["filament_id", "vendor", "name", "material", "color"],
+)
+FILAMENT_DENSITY = Gauge("%s_filament_density" % PREFIX, "Density of filament", ["filament_id"])
+FILAMENT_DIAMETER = Gauge("%s_filament_diameter" % PREFIX, "Diameter of filament", ["filament_id"])
+FILAMENT_WEIGHT = Gauge("%s_filament_weight" % PREFIX, "Net weight of filament", ["filament_id"])
+
+logger = logging.getLogger(__name__)
+
+
+def make_metrics_app() -> Callable:
+    """Start ASGI prometheus app with global registry."""
+    logger.info("Start metrics app")
+    return make_asgi_app(registry=registry)
+
+
+metrics_app = make_asgi_app()
+
+
+async def spool_metrics(db: AsyncSession) -> None:
+    """Get metrics by Spools from DB and write to prometheus.
+
+    Args:
+        db: async db session
+    """
+    stmt = sqlalchemy.select(models.Spool).where(
+        sqlalchemy.or_(
+            models.Spool.archived.is_(False),
+            models.Spool.archived.is_(None),
+        ),
+    )
+    rows = await db.execute(stmt)
+    result = list(rows.unique().scalars().all())
+    for row in result:
+        if row.price is not None:
+            SPOOL_PRICE.labels(str(row.id), str(row.filament_id)).set(row.price)
+        SPOOL_USED_WEIGHT.labels(str(row.id), str(row.filament_id)).set(row.used_weight)
+
+
+async def filament_metrics(db: AsyncSession) -> None:
+    """Get metrics and info by Filaments from DB and write to prometheus.
+
+    Args:
+        db: async db session
+    """
+    stmt = (
+        sqlalchemy.select(models.Filament)
+        .options(contains_eager(models.Filament.vendor))
+        .join(models.Filament.vendor, isouter=True)
+    )
+    rows = await db.execute(stmt)
+    result = list(rows.unique().scalars().all())
+    for row in result:
+        vendor_name = "-"
+        if row.vendor is not None:
+            vendor_name = row.vendor.name
+        FILAMENT_INFO.labels(
+            str(row.id),
+            vendor_name,
+            row.name,
+            row.material,
+            row.color_hex,
+        ).set(1)
+        FILAMENT_DENSITY.labels(str(row.id)).set(row.density)
+        FILAMENT_DIAMETER.labels(str(row.id)).set(row.diameter)
+        if row.weight is not None:
+            FILAMENT_WEIGHT.labels(str(row.id)).set(row.weight)