crypticorn 2.16.0__py3-none-any.whl → 2.17.0rc1__py3-none-any.whl

crypticorn/common/__init__.py

@@ -13,5 +13,7 @@ from crypticorn.common.ansi_colors import *
 from crypticorn.common.middleware import *
 from crypticorn.common.warnings import *
 from crypticorn.common.openapi import *
+from crypticorn.common.metrics import *
 from crypticorn.common.router.status_router import router as status_router
 from crypticorn.common.router.admin_router import router as admin_router
+

crypticorn/common/metrics.py

@@ -0,0 +1,20 @@
+# metrics/registry.py
+from prometheus_client import (
+    Counter, Gauge, Histogram, Summary, CollectorRegistry
+)
+
+registry = CollectorRegistry()
+
+http_requests_total = Counter(
+    "http_requests_total",
+    "Total HTTP requests",
+    ["method", "endpoint", "status_code"],
+    registry=registry
+)
+
+http_request_duration_seconds = Histogram(
+    "http_request_duration_seconds",
+    "HTTP request duration in seconds",
+    ["endpoint"],
+    registry=registry
+)

crypticorn/common/middleware.py

@@ -1,10 +1,50 @@
+import time
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.requests import Request
 from crypticorn.common.logging import configure_logging
 from contextlib import asynccontextmanager
+from typing_extensions import deprecated
+import warnings
+from crypticorn.common.warnings import CrypticornDeprecatedSince217
+from crypticorn.common.metrics import http_requests_total, http_request_duration_seconds
 
+class PrometheusMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request, call_next):
+        start = time.perf_counter()
+        response = await call_next(request)
+        duration = time.perf_counter() - start
 
+        http_requests_total.labels(
+            method=request.method,
+            endpoint=request.url.path,
+            status_code=response.status_code
+        ).inc()
+
+        http_request_duration_seconds.labels(
+            endpoint=request.url.path
+        ).observe(duration)
+
+        return response
+
+
+@deprecated("Use add_middleware instead", category=None)
 def add_cors_middleware(app: "FastAPI"):
+    warnings.warn("add_cors_middleware is deprecated. Use add_middleware instead.", CrypticornDeprecatedSince217)
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=[
+            "http://localhost:5173",  # vite dev server
+            "http://localhost:4173",  # vite preview server
+        ],
+        allow_origin_regex="^https://([a-zA-Z0-9-]+.)*crypticorn.(dev|com)/?$",  # matches (multiple or no) subdomains of crypticorn.dev and crypticorn.com
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+
+def add_middleware(app: "FastAPI"):
     app.add_middleware(
         CORSMiddleware,
         allow_origins=[
@@ -16,6 +56,7 @@ def add_cors_middleware(app: "FastAPI"):
         allow_methods=["*"],
         allow_headers=["*"],
     )
+    app.add_middleware(PrometheusMiddleware)
 
 
 @asynccontextmanager

crypticorn/common/router/admin_router.py

@@ -11,10 +11,12 @@ import threading
 import time
 import psutil
 import re
-from fastapi import APIRouter, Query
+import logging
 from typing import Literal
+from fastapi import APIRouter, Query, Response
+from prometheus_client import generate_latest, CONTENT_TYPE_LATEST
 from crypticorn.common.logging import LogLevel
-import logging
+from crypticorn.common.metrics import registry
 
 router = APIRouter(tags=["Admin"], prefix="/admin")
 
@@ -104,3 +106,11 @@ def list_installed_packages(
         or any(re.match(pattern, dist.metadata["Name"]) for pattern in include)
     }
     return dict(sorted(packages.items()))
+
+
+@router.get("/metrics", operation_id="getMetrics")
+def metrics():
+    """
+    Get Prometheus metrics for the application. Returns plain text.
+    """
+    return Response(generate_latest(registry), media_type=CONTENT_TYPE_LATEST)

crypticorn/common/warnings.py

@@ -62,6 +62,12 @@ class CrypticornDeprecatedSince215(CrypticornDeprecationWarning):
     def __init__(self, message: str, *args: object) -> None:
         super().__init__(message, *args, since=(2, 15), expected_removal=(3, 0))
 
+class CrypticornDeprecatedSince217(CrypticornDeprecationWarning):
+    """A specific `CrypticornDeprecationWarning` subclass defining functionality deprecated since Crypticorn 2.17."""
+
+    def __init__(self, message: str, *args: object) -> None:
+        super().__init__(message, *args, since=(2, 17), expected_removal=(3, 0))
+
 
 class CrypticornExperimentalWarning(Warning):
     """A Crypticorn specific experimental functionality warning.

{crypticorn-2.16.0.dist-info → crypticorn-2.17.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.16.0
+Version: 2.17.0rc1
 Summary: Maximise Your Crypto Trading Profits with Machine Learning
 Author-email: Crypticorn <timon@crypticorn.com>
 License-Expression: MIT
@@ -25,6 +25,7 @@ Requires-Dist: click<9.0.0,>=8.0.0
 Requires-Dist: psutil<8.0.0,>=7.0.0
 Requires-Dist: setuptools<81.0.0,>=80.0.0
 Requires-Dist: strenum
+Requires-Dist: prometheus-client<1.0.0,>=0.22.0
 Requires-Dist: urllib3<3.0.0,>=1.25.3
 Requires-Dist: python_dateutil<3.0.0,>=2.8.2
 Requires-Dist: aiohttp<4.0.0,>=3.8.4

{crypticorn-2.16.0.dist-info → crypticorn-2.17.0rc1.dist-info}/RECORD

@@ -65,7 +65,7 @@ crypticorn/cli/templates/auth.py,sha256=i27-Ts-Eiyv6_WRshOp7NV5OYUNbw2-kiN5Ll0k2
 crypticorn/cli/templates/dependabot.yml,sha256=ct5ieB8KAV1KLzoYKUNm6dZ9wKG_P_JQHgRjZUfT54w,861
 crypticorn/cli/templates/merge-env.sh,sha256=BNPrDTihII0yG2gehBkWwWj0GqHmb6xwmrAgwFpl8dA,554
 crypticorn/cli/templates/ruff.yml,sha256=gWicFFTzC4nToSmRkIIGipos8CZ447YG0kebBCJhtJE,319
-crypticorn/common/__init__.py,sha256=DXEuUU_kaLBSBcvpiFie_ROuK5XEZuTMIfsg-BZE0iE,752
+crypticorn/common/__init__.py,sha256=Now08P5NDnIUQ2WWZ4MUo066FV58x7oOK95jpFT-kj8,793
 crypticorn/common/ansi_colors.py,sha256=-tMlUTE8NI7TPv7uj0kGRe-SI2hGaUNPKBFI_dfiZy0,1392
 crypticorn/common/auth.py,sha256=b7jhR8k7bQFfgokI_Eqji0MpfiyD4EhCoddefUSqs6Y,9925
 crypticorn/common/decorators.py,sha256=t5Y3vSJ-gt0n2vOYYjYN0dtzNXvZxrJs2SEItpzG8oo,1127
@@ -73,15 +73,16 @@ crypticorn/common/enums.py,sha256=x-2xe0NUI8kB6DNg9GLjqAjYOsFAGwP-jdM1YgIt9AI,13
 crypticorn/common/errors.py,sha256=qPCYpmxw0uZNmQw9RYj9vUsg-_R5aRn7fYE8qxTAnyA,30129
 crypticorn/common/exceptions.py,sha256=4oT58wcL9zQuqYU8op_36uZ1Kzt7JRCccu-o_usgqtU,6392
 crypticorn/common/logging.py,sha256=n-qaYreRNFVAFRUd91hzYoaTExNLysd9cgEXm-v6eJY,4440
-crypticorn/common/middleware.py,sha256=O7XiXPimNYUhF9QTv6yFUTVlb91-SK-3CfTrWMNP6Ck,1011
+crypticorn/common/metrics.py,sha256=UDiWu9-B0BvePsCpcrN1EqxNRWxf_TimyUL8YfwJRco,461
+crypticorn/common/middleware.py,sha256=nclyrDEBF2Ypw7CTYYCU_PXDkmtWnQOt-hknBEYIf-4,2573
 crypticorn/common/mixins.py,sha256=l7XQrBISaee6fDZXy96k0HnQ18XYocjTUXlNpVxhaOY,2206
 crypticorn/common/openapi.py,sha256=D8bCpCVVzYQptHrJ7SYOgCxI3R_d0cjW9KMOBq-x0xk,279
 crypticorn/common/pagination.py,sha256=eD4S8t-NHECWYCFTu3taeDv07_AzPBbopoKSZRBSiCM,2621
 crypticorn/common/scopes.py,sha256=ZreqkW_XshlyLJjciAfaIFmcy4HO6RnCsbbkjCw-fxc,2900
 crypticorn/common/urls.py,sha256=v23H2gevTNZ6HMRXDPiuc8znBbNdNqj0JTAdm5Hhms8,1223
 crypticorn/common/utils.py,sha256=LcWudhcjZtULg87yYghh5muTYdHvk3UmkEAXmX7xgLk,3073
-crypticorn/common/warnings.py,sha256=YU7JKIJpVAoBlqCXaaP61t7jzLibB1G0yjQ1NHUJ6xU,2755
-crypticorn/common/router/admin_router.py,sha256=x81s1gxhH7nLf7txqAIjVxrNgQmXsA1YG7g9v9KJwHA,3740
+crypticorn/common/warnings.py,sha256=gg7_vqb30P91JWQfy3x8Ee9VrYUKuy6aEkeGuL6Mp7M,3083
+crypticorn/common/router/admin_router.py,sha256=BcA-zRL5Nb5saSoGFgWEuYtPOKM8PJ60KLY3yiD5S2E,4094
 crypticorn/common/router/status_router.py,sha256=NpLaCF2a1jApo95iolKzzUKuyHbpf4Xwc0sM7dxQ9DE,873
 crypticorn/hive/__init__.py,sha256=hRfTlEzEql4msytdUC_04vfaHzVKG5CGZle1M-9QFgY,81
 crypticorn/hive/main.py,sha256=bSOY2PBi4VV_mvN1c0FQAI-En28f8HnmoZDm3g9X6lU,3103
@@ -279,9 +280,9 @@ crypticorn/trade/client/models/strategy_update.py,sha256=f7UsKSlNardj5h6uqHYbacj
 crypticorn/trade/client/models/tpsl.py,sha256=iuHwBxHaUdtJn7NhcTE6Skzv4nmoSF8jEnf7_bTglwk,3730
 crypticorn/trade/client/models/tpsl_create.py,sha256=nX4i2BGWv5rmu3SLgRngfvEMFOWa3CIy0G3fyoxI-e4,3351
 crypticorn/trade/client/models/trading_action_type.py,sha256=BysUEOl85zs79EA2zOcDN1EExcpQdABaJ4Jz08_z8VU,857
-crypticorn-2.16.0.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
-crypticorn-2.16.0.dist-info/METADATA,sha256=nNS1g853y575ebtgifCqxjGYtwmi1tkBp2g_IcmC450,9993
-crypticorn-2.16.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crypticorn-2.16.0.dist-info/entry_points.txt,sha256=d_xHsGvUTebPveVUK0SrpDFQ5ZRSjlI7lNCc11sn2PM,59
-crypticorn-2.16.0.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
-crypticorn-2.16.0.dist-info/RECORD,,
+crypticorn-2.17.0rc1.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
+crypticorn-2.17.0rc1.dist-info/METADATA,sha256=LQz-vbKaperW4olSKyppd4LKSLEsGRfg95STN9vjv58,10044
+crypticorn-2.17.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crypticorn-2.17.0rc1.dist-info/entry_points.txt,sha256=d_xHsGvUTebPveVUK0SrpDFQ5ZRSjlI7lNCc11sn2PM,59
+crypticorn-2.17.0rc1.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
+crypticorn-2.17.0rc1.dist-info/RECORD,,