Merge branch 'feature/fastapi' into develop

Pipfile

@@ -8,6 +8,8 @@ paho-mqtt = "*"
 pydantic = "*"
 pyyaml = "*"
 logfmter = "*"
+fastapi = "*"
+uvicorn = "*"
 
 [dev-packages]
 black = "*"

promqtt/api.py

@@ -0,0 +1,15 @@
+"""FastAPI endpoint implementation"""
+
+from fastapi import FastAPI
+from fastapi.responses import PlainTextResponse
+
+from .app import prom_exp
+
+api = FastAPI()
+
+
+@api.get("/metrics")
+async def get_metrics() -> PlainTextResponse:
+    """Return the prometheus metrics data"""
+
+    return PlainTextResponse(prom_exp.render())

promqtt/app.py

@@ -0,0 +1,5 @@
+"""Application context objects"""
+
+from .promexp import PrometheusExporter
+
+prom_exp = PrometheusExporter()

promqtt/cfgmodel.py

@@ -5,10 +5,19 @@
 
 from pydantic import BaseModel, ConfigDict, Field, model_validator
 
-from .httpsrv.config import HttpServerConfig
 from .promexp.types import MetricTypeEnum
 
-# pylint: disable=too-few-public-methods
+# pylit: disable=too-few-public-methods
+
+
+class HttpServerConfig(BaseModel):
+    """HTTP server related settings"""
+
+    model_config = ConfigDict(extra="forbid")
+
+    interface: str = Field("0.0.0.0", description="Interface address to listen on")
+
+    port: int = Field(8086, description="Port number")
 
 
 class MqttModel(BaseModel):

promqtt/main.py

@@ -1,17 +1,19 @@
 """Application main implementation"""
 
-import json
 import logging
 import os
 import signal
 import sys
 from pathlib import Path
+from threading import Thread
 
+import uvicorn
 import yaml
-from logfmter import Logfmter
+from logfmter.formatter import Logfmter
 
+from .api import api
+from .app import prom_exp
 from .cfgmodel import MetricTypeEnum, PromqttConfig
-from .httpsrv import HttpServer, Route
 from .metadata import APPNAME, VERSION
 from .promexp import PrometheusExporter
 from .promqtt import MqttClient, MqttPrometheusBridge
@@ -77,7 +79,7 @@ def load_config(filename: Path) -> PromqttConfig:
     return cfg
 
 
-def main():
+def main() -> None:
     """Application main function"""
 
     # Set up logging
@@ -90,27 +92,24 @@ def main():
     signal.signal(signal.SIGTERM, sigterm_handler)
 
     # load configuration
-
     cfgfile = Path(os.environ.get("PROMQTT_CONFIG", "promqtt.yml"))
     cfg = load_config(cfgfile)
 
-    promexp = PrometheusExporter()
-    export_build_info(promexp, VERSION)
-
-    # Intialize and start the HTTP server
+    export_build_info(prom_exp, VERSION)
 
-    routes = [
-        Route("/metrics", "text/plain", promexp.render),
-        Route("/cfg", "application/json", lambda: json.dumps(cfg.dict(), indent=4)),
-    ]
+    tmc = MqttPrometheusBridge(prom_exp, cfg=cfg)
 
-    httpsrv = HttpServer(cfg=cfg.http, routes=routes)
-    httpsrv.start_server_thread()
+    mqttclient = MqttClient(prom_exp, cfg.mqtt, tmc)
+    thread = Thread(target=mqttclient.loop_forever, daemon=True)
+    thread.start()
 
-    tmc = MqttPrometheusBridge(promexp, cfg=cfg)
-
-    mqttclient = MqttClient(promexp, cfg.mqtt, tmc)
-    mqttclient.loop_forever()
+    uvicorn.run(
+        api,
+        host=cfg.http.interface,
+        port=cfg.http.port,
+        log_level="info",
+        log_config=None,
+    )
 
 
 if __name__ == "__main__":

promqtt/promqtt/mqttclt.py

@@ -5,10 +5,11 @@
 from typing import Any
 
 import paho.mqtt.client as mqtt
-from paho.mqtt.enums import CallbackAPIVersion
+from paho.mqtt.enums import CallbackAPIVersion, MQTTErrorCode
 
-from ..cfgmodel import MetricTypeEnum, MqttModel
+from ..cfgmodel import MqttModel
 from ..promexp import PrometheusExporter
+from ..promexp.types import MetricTypeEnum
 from .msg import Message
 
 logger = logging.getLogger(__name__)
@@ -75,7 +76,7 @@ def _on_connect(
         client: mqtt.Client,
         userdata: Any,
         flags: dict,
-        result: mqtt.MQTTErrorCode,
+        result: MQTTErrorCode,
     ) -> None:
         """Callback function called by the MQTT client to inform about establishing a
         connection to a broker."""
@@ -101,7 +102,7 @@ def _on_connect(
         )
 
     def _on_disconnect(
-        self, client: mqtt.Client, userdata: Any, result: mqtt.MQTTErrorCode
+        self, client: mqtt.Client, userdata: Any, result: MQTTErrorCode
     ) -> None:
         """Callback function called by the MQTT client when the connection to a broker
         is terminated."""