crypticorn 2.16.0__tar.gz → 2.17.0rc1__tar.gz

{crypticorn-2.16.0 → crypticorn-2.17.0rc1}/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
 
+## v2.17.0-rc.1 (2025-06-01)
+
+### Features
+
+- Add metrics router
+  ([`9b4a9bd`](https://github.com/crypticorn-ai/api-client/commit/9b4a9bd33e16d70d4338f7d458e2d405cb1d22dd))
+
+
 ## v2.16.0 (2025-05-31)
 
 ### Features

{crypticorn-2.16.0/crypticorn.egg-info → crypticorn-2.17.0rc1}/PKG-INFO

@@ -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 → crypticorn-2.17.0rc1}/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-2.17.0rc1/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-2.17.0rc1/crypticorn/common/middleware.py

@@ -0,0 +1,69 @@
+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=[
+            "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=["*"],
+    )
+    app.add_middleware(PrometheusMiddleware)
+
+
+@asynccontextmanager
+async def default_lifespan(app: FastAPI):
+    """Default lifespan for the applications.
+    This is used to configure the logging for the application.
+    To override this, pass a different lifespan to the FastAPI constructor or call this lifespan within a custom lifespan.
+    """
+    configure_logging()
+    yield

{crypticorn-2.16.0 → crypticorn-2.17.0rc1}/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-2.16.0 → crypticorn-2.17.0rc1}/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 → crypticorn-2.17.0rc1/crypticorn.egg-info}/PKG-INFO

@@ -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 → crypticorn-2.17.0rc1}/crypticorn.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ crypticorn/common/enums.py
 crypticorn/common/errors.py
 crypticorn/common/exceptions.py
 crypticorn/common/logging.py
+crypticorn/common/metrics.py
 crypticorn/common/middleware.py
 crypticorn/common/mixins.py
 crypticorn/common/openapi.py

{crypticorn-2.16.0 → crypticorn-2.17.0rc1}/crypticorn.egg-info/requires.txt

@@ -3,6 +3,7 @@ click<9.0.0,>=8.0.0
 psutil<8.0.0,>=7.0.0
 setuptools<81.0.0,>=80.0.0
 strenum
+prometheus-client<1.0.0,>=0.22.0
 urllib3<3.0.0,>=1.25.3
 python_dateutil<3.0.0,>=2.8.2
 aiohttp<4.0.0,>=3.8.4

{crypticorn-2.16.0 → crypticorn-2.17.0rc1}/pyproject.toml

@@ -5,7 +5,7 @@ readme = "README.md"
 license = "MIT"
 requires-python = ">=3.9"
 authors = [{name = "Crypticorn", email = "timon@crypticorn.com"}]
-version = "2.16.0"
+version = "2.17.0-rc.1"
 keywords = ["machine learning", "data science", "crypto", "modelling"]
 dynamic = ["dependencies", "optional-dependencies"]
 

{crypticorn-2.16.0 → crypticorn-2.17.0rc1}/requirements/main.txt

@@ -4,6 +4,7 @@ click >= 8.0.0, < 9.0.0
 psutil >= 7.0.0, < 8.0.0
 setuptools >= 80.0.0, < 81.0.0
 strenum # drop this once we drop python 3.10, StrEnum is available in stdlib (enum) in 3.11+
+prometheus-client >= 0.22.0, < 1.0.0
 
 # crypticorn/trade/requirements.txt
 urllib3 >= 1.25.3, < 3.0.0

crypticorn-2.16.0/crypticorn/common/middleware.py

@@ -1,28 +0,0 @@
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-from crypticorn.common.logging import configure_logging
-from contextlib import asynccontextmanager
-
-
-def add_cors_middleware(app: "FastAPI"):
-    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=["*"],
-    )
-
-
-@asynccontextmanager
-async def default_lifespan(app: FastAPI):
-    """Default lifespan for the applications.
-    This is used to configure the logging for the application.
-    To override this, pass a different lifespan to the FastAPI constructor or call this lifespan within a custom lifespan.
-    """
-    configure_logging()
-    yield