crypticorn 2.8.0rc7__py3-none-any.whl → 2.8.1__py3-none-any.whl

crypticorn/__init__.py

@@ -8,7 +8,7 @@ You can find the full Changelog [below](#changelog).
 
 from crypticorn.common.logging import configure_logging
 
-configure_logging("crypticorn")
+configure_logging()
 
 from crypticorn.client import ApiClient
 

crypticorn/cli/init.py

@@ -1,7 +1,7 @@
 import click
 from pathlib import Path
 import subprocess
-import importlib.resources as pkg_resources
+import importlib.resources
 import crypticorn.cli.templates as templates
 
 
@@ -19,7 +19,7 @@ def get_git_root() -> Path:
 
 def copy_template(template_name: str, target_path: Path):
     """Copy a template file to the target path."""
-    with pkg_resources.files(templates).joinpath(template_name).open(
+    with importlib.resources.files(templates).joinpath(template_name).open(
         "r"
     ) as template_file:
         content = template_file.read()

crypticorn/common/exceptions.py

@@ -6,8 +6,9 @@ from fastapi.exceptions import RequestValidationError, ResponseValidationError
 from fastapi.responses import JSONResponse
 from crypticorn.common import ApiError, ApiErrorIdentifier, ApiErrorType, ApiErrorLevel
 import logging
+import json
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("crypticorn")
 
 
 class ExceptionType(StrEnum):
@@ -99,7 +100,7 @@ async def general_handler(request: Request, exc: Exception) -> JSONResponse:
         status_code=body.enrich().status_code,
         content=HTTPException(content=body).detail,
     )
-    logger.error(f"Response validation error: {res}")
+    logger.error(f"Response validation error: {json.loads(res.__dict__.get('body'))}")
     return res
 
 
@@ -112,7 +113,7 @@ async def request_validation_handler(
         status_code=body.enrich().status_code,
         content=HTTPException(content=body).detail,
     )
-    logger.error(f"Response validation error: {res}")
+    logger.error(f"Response validation error: {json.loads(res.__dict__.get('body'))}")
     return res
 
 
@@ -125,7 +126,7 @@ async def response_validation_handler(
         status_code=body.enrich().status_code,
         content=HTTPException(content=body).detail,
     )
-    logger.error(f"Response validation error: {res}")
+    logger.error(f"Response validation error: {json.loads(res.__dict__.get('body'))}")
     return res
 
 

crypticorn/common/logging.py

@@ -51,7 +51,6 @@ _LOGFORMAT = (
     f"%(levelcolor)s%(levelname)s{C.RESET} - "
     f"%(message)s"
 )
-_PLAIN_LOGFORMAT = "%(asctime)s - " "%(name)s - " "%(levelname)s - " "%(message)s"
 _DATEFMT = "%Y-%m-%d %H:%M:%S.%f:"
 
 
@@ -71,7 +70,7 @@ class CustomFormatter(logging.Formatter):
 
 
 def configure_logging(
-    name: str,
+    name: str = None,
     fmt: str = _LOGFORMAT,
     datefmt: str = _DATEFMT,
     stdout_level: int = logging.INFO,
@@ -81,9 +80,16 @@ def configure_logging(
 ) -> None:
     """Configures the logging for the application.
     Run this function as early as possible in the application (for example using the `lifespan` parameter in FastAPI).
-    Then use can use the default `logging.getLogger(__name__)` method to get the logger.
+    Then use can use the default `logging.getLogger(__name__)` method to get the logger (or <name> if you set the name parameter).
+    :param name: The name of the logger. If not provided, the root logger will be used. Use a name if you use multiple loggers in the same application.
+    :param fmt: The format of the log message.
+    :param datefmt: The date format of the log message.
+    :param stdout_level: The level of the log message to be printed to the console.
+    :param file_level: The level of the log message to be written to the file. Only used if `log_file` is provided.
+    :param log_file: The file to write the log messages to.
+    :param filters: A list of filters to apply to the log handlers.
     """
-    logger = logging.getLogger(name)
+    logger = logging.getLogger(name) if name else logging.getLogger()
 
     if logger.handlers:  # clear existing handlers to avoid duplicates
         logger.handlers.clear()
@@ -110,6 +116,9 @@ def configure_logging(
             file_handler.addFilter(filter)
         logger.addHandler(file_handler)
 
+    if name:
+        logger.propagate = False
+
 
 def disable_logging():
     """Disable logging for the crypticorn logger."""

crypticorn/common/middleware.py

@@ -11,7 +11,7 @@ def add_cors_middleware(app: "FastAPI"):
             "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_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=["*"],
@@ -23,6 +23,5 @@ async def default_lifespan(app: FastAPI):
     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(__name__)  # for the consuming app
-    logger = logging.getLogger(__name__)
+    configure_logging()
     yield

crypticorn/common/router/admin_router.py

@@ -6,7 +6,7 @@ ONLY ALLOW ACCESS TO THIS ROUTER WITH ADMIN SCOPES.
 """
 
 import os
-import pkg_resources
+import importlib.metadata
 import threading
 import time
 import psutil
@@ -20,10 +20,10 @@ router = APIRouter(tags=["Admin"], prefix="/admin")
 START_TIME = time.time()
 
 
-@router.get("/log-level", status_code=200, operation_id="getLogLevel")
+@router.get("/log-level", status_code=200, operation_id="getLogLevel", deprecated=True)
 async def get_logging_level() -> LogLevel:
     """
-    Get the log level of the server logger.
+    Get the log level of the server logger. Will be removed in a future release.
     """
     return LogLevel.get_name(logging.getLogger().level)
 
@@ -39,7 +39,7 @@ def get_uptime(type: Literal["seconds", "human"] = "seconds") -> str:
 
 
 @router.get("/memory", operation_id="getMemoryUsage", status_code=200)
-def get_memory_usage() -> int:
+def get_memory_usage() -> float:
     """
     Resident Set Size (RSS) in MB — the actual memory used by the process in RAM.
     Represents the physical memory footprint. Important for monitoring real usage.
@@ -90,11 +90,9 @@ def list_installed_packages(
     )
 ) -> list:
     """Return a list of installed packages and versions."""
-    return sorted(
-        [
-            {dist.project_name: dist.version}
-            for dist in pkg_resources.working_set
-            if include is None or dist.project_name in include
-        ],
-        key=lambda x: next(iter(x)),
-    )
+    packages = {
+        dist.metadata["Name"]: dist.version
+        for dist in importlib.metadata.distributions()
+        if include is None or dist.metadata["Name"] in include
+    }
+    return dict(sorted(packages.items()))

crypticorn/common/router/status_router.py

@@ -1,12 +1,12 @@
 from datetime import datetime
 from typing import Literal
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 
 router = APIRouter(tags=["Status"], prefix="")
 
 
 @router.get("/", operation_id="ping")
-async def ping() -> str:
+async def ping(request: Request) -> dict:
     """
     Returns 'OK' if the API is running.
     """

crypticorn/hive/utils.py

@@ -3,8 +3,7 @@ import os
 import tqdm
 import logging
 
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
+logger = logging.getLogger("crypticorn")
 
 
 async def download_file(

crypticorn/klines/client/__init__.py

@@ -17,6 +17,7 @@ Do not edit the class manually.
 __version__ = "1.0.0"
 
 # import apis into sdk package
+from crypticorn.klines.client.api.admin_api import AdminApi
 from crypticorn.klines.client.api.change_in_timeframe_api import ChangeInTimeframeApi
 from crypticorn.klines.client.api.funding_rates_api import FundingRatesApi
 from crypticorn.klines.client.api.ohlcv_data_api import OHLCVDataApi
@@ -36,10 +37,17 @@ from crypticorn.klines.client.exceptions import ApiAttributeError
 from crypticorn.klines.client.exceptions import ApiException
 
 # import models into sdk package
+from crypticorn.klines.client.models.api_error_identifier import ApiErrorIdentifier
+from crypticorn.klines.client.models.api_error_level import ApiErrorLevel
+from crypticorn.klines.client.models.api_error_type import ApiErrorType
 from crypticorn.klines.client.models.change_in_timeframe import ChangeInTimeframe
 from crypticorn.klines.client.models.exception_detail import ExceptionDetail
 from crypticorn.klines.client.models.funding_rate import FundingRate
-from crypticorn.klines.client.models.ohlcv_history import OHLCVHistory
+from crypticorn.klines.client.models.funding_rate_response import FundingRateResponse
+from crypticorn.klines.client.models.internal_exchange import InternalExchange
+from crypticorn.klines.client.models.log_level import LogLevel
+from crypticorn.klines.client.models.market_type import MarketType
+from crypticorn.klines.client.models.ohlcv import OHLCV
 from crypticorn.klines.client.models.resolution import Resolution
 from crypticorn.klines.client.models.search_symbol import SearchSymbol
 from crypticorn.klines.client.models.sort_direction import SortDirection

crypticorn/klines/client/api/__init__.py

@@ -1,6 +1,7 @@
 # flake8: noqa
 
 # import apis into api package
+from crypticorn.klines.client.api.admin_api import AdminApi
 from crypticorn.klines.client.api.change_in_timeframe_api import ChangeInTimeframeApi
 from crypticorn.klines.client.api.funding_rates_api import FundingRatesApi
 from crypticorn.klines.client.api.ohlcv_data_api import OHLCVDataApi