kvcommon 0.2.2__tar.gz → 0.2.4__tar.gz

{kvcommon-0.2.2 → kvcommon-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kvcommon
-Version: 0.2.2
+Version: 0.2.4
 Summary: Library of miscellaneous common python utils that aren't worthy of their own dedicated libs.
 Home-page: https://github.com/RAVoigt/kvcommon
 License: MIT
@@ -15,10 +15,14 @@ Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: flask
 Provides-Extra: k8s
 Provides-Extra: metrics
-Requires-Dist: flask (>=3.1.0,<4.0.0)
+Provides-Extra: traces
+Requires-Dist: flask (>=3.1.0,<4.0.0) ; extra == "flask"
 Requires-Dist: flask-apscheduler (>=1.13.1,<2.0.0) ; extra == "flask"
 Requires-Dist: flask-http-middleware (>=0.4.2,<0.5.0) ; extra == "flask"
 Requires-Dist: kubernetes (>=31.0.0,<32.0.0) ; extra == "k8s"
+Requires-Dist: opentelemetry-exporter-otlp ; extra == "traces"
+Requires-Dist: opentelemetry-instrumentation-flask ; extra == "traces"
+Requires-Dist: opentelemetry-instrumentation-logging ; extra == "traces"
 Requires-Dist: prometheus-client (>=0.20.0,<0.21.0) ; extra == "metrics"
 Requires-Dist: prometheus-flask-exporter (>=0.23.1,<0.24.0) ; extra == "metrics"
 Requires-Dist: toml (>=0.10.2,<0.11.0)

{kvcommon-0.2.2 → kvcommon-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kvcommon"
-version = "0.2.2"
+version = "0.2.4"
 description = "Library of miscellaneous common python utils that aren't worthy of their own dedicated libs."
 authors = ["Rob Voigt <code@ravoigt.com>"]
 readme = "README.md"
@@ -32,17 +32,21 @@ toml = "^0.10.2"
 # ==== Extras
 
 # Flask
-flask = {version = "^3.1.0", optional = true}
-flask-http-middleware = { version = "^0.4.2", optional = true}
-flask-apscheduler = { version = "^1.13.1", optional = true}
+flask = { version = "^3.1.0", optional = true }
+flask-http-middleware = { version = "^0.4.2", optional = true }
+flask-apscheduler = { version = "^1.13.1", optional = true }
 
 # K8s
-kubernetes = { version = "^31.0.0", optional = true}
+kubernetes = { version = "^31.0.0", optional = true }
 
 # Metrics
-prometheus-client = { version = "^0.20.0", optional = true}
-prometheus-flask-exporter = { version = "^0.23.1", optional = true}
+prometheus-client = { version = "^0.20.0", optional = true }
+prometheus-flask-exporter = { version = "^0.23.1", optional = true }
 
+# Traces
+opentelemetry-exporter-otlp = { version = "*", optional = true } # TODO
+opentelemetry-instrumentation-flask = { version = "*", optional = true } # TODO
+opentelemetry-instrumentation-logging = { version = "*", optional = true } # TODO
 
 [tool.poetry.dev-dependencies]
 black = "*"
@@ -56,6 +60,7 @@ pyfakefs = "*"
 
 
 [tool.poetry.extras]
-flask = ["flask-http-middleware", "flask-apscheduler"]
+flask = ["flask", "flask-http-middleware", "flask-apscheduler"]
 k8s = ["kubernetes"]
 metrics = ["prometheus-client", "prometheus-flask-exporter"]
+traces = ["opentelemetry-exporter-otlp", "opentelemetry-instrumentation-logging", "opentelemetry-instrumentation-flask"]

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/exceptions.py

@@ -12,3 +12,7 @@ class K8sException(KVCException):
 
 class InvalidDataException(K8sException):
     pass
+
+
+class KVCFlaskException(KVCException):
+    pass

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/flask/application.py

@@ -10,7 +10,7 @@ from flask_http_middleware import MiddlewareManager
 
 from kvcommon.logger import get_logger
 from flask_http_middleware import BaseHTTPMiddleware
-from kvcommon_flask.middleware import KVCFlaskMiddleware
+from kvcommon.flask.middleware import KVCFlaskMiddleware
 
 
 LOG = get_logger("needle-proxy")

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/flask/metrics/__init__.py

@@ -4,7 +4,7 @@ from .metrics import HTTP_RESPONSE_COUNT
 from .metrics import SERVER_REQUEST_SECONDS
 from .metrics import incr
 from .metrics import decr
-from .metrics import MetricsException
+from .metrics import FlaskMetricsException
 
 
 __all__ = [
@@ -14,5 +14,5 @@ __all__ = [
     "APP_INFO",
     "HTTP_RESPONSE_COUNT",
     "SERVER_REQUEST_SECONDS",
-    "MetricsException",
+    "FlaskMetricsException",
 ]

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/flask/metrics/metrics.py

@@ -4,10 +4,10 @@ from prometheus_client import Histogram
 from prometheus_client import Info
 from prometheus_client import Summary
 
-from kvcommon_flask.exceptions import KVCFlaskException
+from kvcommon.exceptions import KVCFlaskException
 
 
-class MetricsException(KVCFlaskException):
+class FlaskMetricsException(KVCFlaskException):
     pass
 
 

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/flask/middleware.py

@@ -8,8 +8,8 @@ from flask_http_middleware import BaseHTTPMiddleware
 from flask_http_middleware import MiddlewareManager
 
 from kvcommon.urls import urlparse_ignore_scheme
-from kvcommon_flask import metrics
-from kvcommon_flask.context import set_flask_context_local
+from kvcommon.flask import metrics
+from kvcommon.flask.context import set_flask_context_local
 from kvcommon import logger
 
 LOG = logger.get_logger("kvc-flask")

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/flask/responses.py

@@ -1,6 +1,6 @@
 from flask.wrappers import Response as Flask_Response
 
-from kvcommon_flask import metrics
+from kvcommon.flask import metrics
 
 
 class HTTPResponse(Flask_Response):
@@ -39,7 +39,7 @@ class HTTPResponse(Flask_Response):
 
     def inc_metrics(self):
         if self._metrics_emitted_doonce:
-            raise metrics.MetricsException(
+            raise metrics.FlaskMetricsException(
                 "An attempt to emit metrics from this HTTP Response has already been made."
             )
         self._metrics_emitted_doonce = True

{kvcommon-0.2.2 → kvcommon-0.2.4}/src/kvcommon/flask/scheduler.py

@@ -6,7 +6,7 @@ from apscheduler.events import EVENT_JOB_ERROR
 from apscheduler.events import EVENT_JOB_EXECUTED
 from apscheduler.events import EVENT_JOB_MISSED
 from apscheduler.events import JobExecutionEvent
-from kvcommon_flask import metrics
+from kvcommon.flask import metrics
 from kvcommon.logger import get_logger
 
 

kvcommon-0.2.2/src/kvcommon/flask/exceptions.py

@@ -1,5 +0,0 @@
-from kvcommon.exceptions import KVCException
-
-
-class KVCFlaskException(KVCException):
-    pass