PyObservability 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

pyobservability/config/enums.py

@@ -4,3 +4,8 @@ from enum import StrEnum
 class APIEndpoints(StrEnum):
     root = "/"
     ws = "/ws"
+
+
+class Log(StrEnum):
+    file = "file"
+    stdout = "stdout"

pyobservability/config/settings.py

@@ -9,8 +9,24 @@ from pydantic import BaseModel, Field, FilePath, HttpUrl, PositiveInt
 from pydantic.aliases import AliasChoices
 from pydantic_settings import BaseSettings
 
-
-def detailed_log_config() -> Dict[str, Any]:
+from pyobservability.config import enums
+
+
+def detailed_log_config(filename: str | None = None, debug: bool = False) -> Dict[str, Any]:
+    if filename:
+        log_handler = {
+            "class": "logging.FileHandler",
+            "formatter": "default",
+            "filename": filename,
+            "mode": "a",
+        }
+    else:
+        log_handler = {
+            "class": "logging.StreamHandler",
+            "formatter": "default",
+            "stream": "ext://sys.stdout",
+        }
+    level = "DEBUG" if debug else "INFO"
     return {
         "version": 1,
         "disable_existing_loggers": False,
@@ -20,19 +36,13 @@ def detailed_log_config() -> Dict[str, Any]:
                 "datefmt": "%b-%d-%Y %I:%M:%S %p",
             }
         },
-        "handlers": {
-            "default": {
-                "class": "logging.StreamHandler",
-                "formatter": "default",
-                "stream": "ext://sys.stdout",
-            }
-        },
+        "handlers": {"default": log_handler},
         "loggers": {
-            "uvicorn": {"handlers": ["default"], "level": "INFO"},
-            "uvicorn.error": {"handlers": ["default"], "level": "INFO", "propagate": False},
-            "uvicorn.access": {"handlers": ["default"], "level": "INFO", "propagate": False},
+            "uvicorn": {"handlers": ["default"], "level": level},
+            "uvicorn.error": {"handlers": ["default"], "level": level, "propagate": False},
+            "uvicorn.access": {"handlers": ["default"], "level": level, "propagate": False},
         },
-        "root": {"handlers": ["default"], "level": "INFO"},
+        "root": {"handlers": ["default"], "level": level},
     }
 
 
@@ -89,6 +99,8 @@ class EnvConfig(PydanticEnvConfig):
     targets: List[MonitorTarget] = Field(..., validation_alias=alias_choices("TARGETS"))
     interval: PositiveInt = Field(3, validation_alias=alias_choices("INTERVAL"))
 
+    log: enums.Log | None = None
+    debug: bool = False
     log_config: Dict[str, Any] | FilePath | None = None
 
     username: str | None = Field(None, validation_alias=alias_choices("USERNAME"))

pyobservability/main.py

@@ -1,6 +1,8 @@
 import logging
+import os
 import pathlib
 import warnings
+from datetime import datetime
 
 import uiauth
 import uvicorn
@@ -44,6 +46,7 @@ def include_routes():
             app=PyObservability,
             username=settings.env.username,
             password=settings.env.password,
+            custom_logger=LOGGER,
             params=[
                 uiauth.Parameters(
                     path=enums.APIEndpoints.root,
@@ -85,6 +88,14 @@ def start(**kwargs):
         port=settings.env.port,
         app=PyObservability,
     )
+    if log := settings.env.log:
+        if log == enums.Log.stdout:
+            uvicorn_args["log_config"] = settings.detailed_log_config(debug=settings.env.debug)
+        else:
+            log_file = datetime.now().strftime(os.path.join("logs", "pyobservability_%d-%m-%Y.log"))
+            os.makedirs("logs", exist_ok=True)
+            uvicorn_args["log_config"] = settings.detailed_log_config(filename=log_file, debug=settings.env.debug)
+    # log_config will take precedence if both log and log_config are set
     if settings.env.log_config:
         uvicorn_args["log_config"] = (
             settings.env.log_config if isinstance(settings.env.log_config, dict) else str(settings.env.log_config)

pyobservability/version.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"

{pyobservability-1.0.0.dist-info → pyobservability-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyObservability
-Version: 1.0.0
+Version: 1.0.1
 Summary: Lightweight OS-agnostic observability UI for PyNinja
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License
@@ -33,7 +33,7 @@ Project-URL: Release Notes, https://github.com/thevickypedia/PyObservability/blo
 Keywords: PyObservability,observability,system-monitor,PyNinja
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux

pyobservability-1.0.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+pyobservability/__init__.py,sha256=rr4udGMbbNPl3yo7l8R3FUUVVahBtYVaW6vSWWgXlv0,2617
+pyobservability/main.py,sha256=CI6qfOxpwIykrQXu0hYdgD16foo33IqlNHjJCtrSynA,3592
+pyobservability/monitor.py,sha256=4Xd8k7gcOmHM-WvQpgFiDVGtzMu_RpFPZXPPoz4GoA4,6224
+pyobservability/transport.py,sha256=FyzJAMZPn7JUZIGgxnSw3on1K6T4ciZE1EuGdAcxt_w,2188
+pyobservability/version.py,sha256=d4QHYmS_30j0hPN8NmNPnQ_Z0TphDRbu4MtQj9cT9e8,22
+pyobservability/config/enums.py,sha256=jXDtyM1_nDKgq_8gVeZULEC5EEYBzqmZWd25qsIs64I,148
+pyobservability/config/settings.py,sha256=C2sK9VRfDBsHm8xP0PTMFAdm7K3ySwiQ0vn6Vh6wAM4,5233
+pyobservability/static/app.js,sha256=6hjFy2jt4ndYJUI1DZT08CpuxHyWj9iSAZ2vxaTqH2A,20664
+pyobservability/static/styles.css,sha256=dnYSXNeXd6Ohu4h8sJCO87vzPbkYcw9XVGGwB8IJbxw,4703
+pyobservability/templates/index.html,sha256=2aQdb0QlDY5Hboev-_lJPlpnGxiC6h3fp0FlvL72S9k,5227
+pyobservability-1.0.1.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-1.0.1.dist-info/METADATA,sha256=U5yMXMcpC5NVaAy2Urkt45KED7rGmSNukgMBHqsFPtg,6834
+pyobservability-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyobservability-1.0.1.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
+pyobservability-1.0.1.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-1.0.1.dist-info/RECORD,,

pyobservability-1.0.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-pyobservability/__init__.py,sha256=rr4udGMbbNPl3yo7l8R3FUUVVahBtYVaW6vSWWgXlv0,2617
-pyobservability/main.py,sha256=Ty0bS7ZWyKXuo-xuKoFQESvT-B-19W04d_Nk0KveNtg,3004
-pyobservability/monitor.py,sha256=4Xd8k7gcOmHM-WvQpgFiDVGtzMu_RpFPZXPPoz4GoA4,6224
-pyobservability/transport.py,sha256=FyzJAMZPn7JUZIGgxnSw3on1K6T4ciZE1EuGdAcxt_w,2188
-pyobservability/version.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
-pyobservability/config/enums.py,sha256=iMIOpa8LYSszkPIYBhupX--KrEXVTTsBurinpAxLvMA,86
-pyobservability/config/settings.py,sha256=BjTZnkGS1pZKbN3Fq_5HQX8C6oEjWn_gVJLXcZZ6EWE,4853
-pyobservability/static/app.js,sha256=6hjFy2jt4ndYJUI1DZT08CpuxHyWj9iSAZ2vxaTqH2A,20664
-pyobservability/static/styles.css,sha256=dnYSXNeXd6Ohu4h8sJCO87vzPbkYcw9XVGGwB8IJbxw,4703
-pyobservability/templates/index.html,sha256=2aQdb0QlDY5Hboev-_lJPlpnGxiC6h3fp0FlvL72S9k,5227
-pyobservability-1.0.0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
-pyobservability-1.0.0.dist-info/METADATA,sha256=4Wj2FH4KYhsDbEntXxnMginYE9QR9AluZyYLMHvwhbg,6822
-pyobservability-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyobservability-1.0.0.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
-pyobservability-1.0.0.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
-pyobservability-1.0.0.dist-info/RECORD,,