diff --git a/docker/main/requirements-wheels.txt b/docker/main/requirements-wheels.txt index 5fb46a68f..7f67cb732 100644 --- a/docker/main/requirements-wheels.txt +++ b/docker/main/requirements-wheels.txt @@ -49,7 +49,4 @@ openai == 1.51.* # push notifications py-vapid == 1.9.* pywebpush == 2.0.* -# alpr -pyclipper == 1.3.* -shapely == 2.0.* prometheus-client == 0.21.* diff --git a/frigate/api/app.py b/frigate/api/app.py index 6fc9ba9e4..a8e4ac9d4 100644 --- a/frigate/api/app.py +++ b/frigate/api/app.py @@ -37,6 +37,9 @@ from frigate.util.services import ( ) from frigate.version import VERSION +from prometheus_client import generate_latest, CONTENT_TYPE_LATEST +from fastapi.responses import Response + logger = logging.getLogger(__name__) @@ -145,9 +148,9 @@ def config(request: Request): config["model"]["colormap"] = config_obj.model.colormap for detector_config in config["detectors"].values(): - detector_config["model"]["labelmap"] = ( - request.app.frigate_config.model.merged_labelmap - ) + detector_config["model"][ + "labelmap" + ] = request.app.frigate_config.model.merged_labelmap return JSONResponse(content=config) diff --git a/frigate/stats/emitter.py b/frigate/stats/emitter.py index 022e99213..d607e2a47 100644 --- a/frigate/stats/emitter.py +++ b/frigate/stats/emitter.py @@ -14,6 +14,8 @@ from frigate.const import FREQUENCY_STATS_POINTS from frigate.stats.prometheus import update_metrics from frigate.stats.util import stats_snapshot from frigate.types import StatsTrackingTypes +from frigate.stats.prometheus import update_metrics + logger = logging.getLogger(__name__) diff --git a/frigate/stats/prometheus.py b/frigate/stats/prometheus.py index a43c091e2..59d9f1080 100644 --- a/frigate/stats/prometheus.py +++ b/frigate/stats/prometheus.py @@ -1,12 +1,12 @@ -from typing import Dict - from prometheus_client import ( - CONTENT_TYPE_LATEST, Counter, Gauge, + Histogram, Info, generate_latest, + CONTENT_TYPE_LATEST, ) +from typing import Dict # System metrics SYSTEM_INFO = Info("frigate_system", "System information")