chore: 升级到 sshared v0.21.0

Author: FHU-yezi

backend/api/v1/jpep/ftn_macket.py

@@ -8,7 +8,7 @@
 from litestar import Response, Router, get
 from litestar.params import Parameter
 from msgspec import Struct, field
-from sshared.time import get_datetime_before_now, parse_td_str
+from sshared.time import get_past_datetime_from_now, parse_td_str
 from sspeedup.api.litestar import (
     RESPONSE_STRUCT_CONFIG,
     generate_response_spec,
@@ -130,7 +130,7 @@ async def get_price_history_handler(
 ) -> Response:
     history = await FTNMacketRecord.get_price_history(
         type=type_.upper(),  # type: ignore
-        start_time=get_datetime_before_now(parse_td_str(range)),
+        start_time=get_past_datetime_from_now(parse_td_str(range)),
         resolution=RESOLUTION_MAPPING[resolution],
     )
 
@@ -163,7 +163,7 @@ async def get_amount_history_handler(
 ) -> Response:
     history = await FTNMacketRecord.get_amount_history(
         type=type_.upper(),  # type: ignore
-        start_time=get_datetime_before_now(parse_td_str(range)),
+        start_time=get_past_datetime_from_now(parse_td_str(range)),
         resolution=RESOLUTION_MAPPING[resolution],
     )
 

backend/app.py

@@ -31,10 +31,8 @@
 [uvicorn]
     host = "localhost"
     port = 8902
-    log_level = "warning"
+    mode = "PROD"
     workers = 1
-    reload = false
-    access_log = false
 
 [word_split_access_key]
     access_key_id = ""

backend/config.example.toml

@@ -1,8 +1,14 @@
 import logging
 from asyncio import run as asyncio_run
 
+from litestar import Litestar
+from litestar.openapi import OpenAPIConfig, OpenAPIController
+from litestar.openapi.spec import Server
+from sshared.api.uvicorn import get_uvicorn_params_from_config
+from sspeedup.api.litestar import EXCEPTION_HANDLERS
 from uvicorn import run as uvicorn_run
 
+from api import API_ROUTER
 from models import init_db
 from utils.config import CONFIG
 from utils.log import logger
@@ -11,17 +17,39 @@
 logging.getLogger("httpcore").setLevel(logging.CRITICAL)
 
 
+class CustomOpenAPIController(OpenAPIController):
+    path = "/docs"
+    swagger_ui_version = "5.17.14"
+    swagger_css_url = (
+        "https://cdn.jsdelivr.net/npm/[email protected]/swagger-ui.css"
+    )
+    swagger_ui_bundle_js_url = (
+        "https://cdn.jsdelivr.net/npm/[email protected]/swagger-ui-bundle.js"
+    )
+    swagger_ui_standalone_preset_js_url = "https://cdn.jsdelivr.net/npm/[email protected]/swagger-ui-standalone-preset.js"
+    favicon_url = "https://tools.sscreator.com/favicon-vector.svg"
+
+
+app = Litestar(
+    route_handlers=[API_ROUTER],
+    exception_handlers=EXCEPTION_HANDLERS,
+    openapi_config=OpenAPIConfig(
+        openapi_controller=CustomOpenAPIController,
+        title="JTools API",
+        version="v1.0.0",
+        servers=[Server(description="主端点", url="/api")],
+        use_handler_docstrings=True,
+        root_schema_site="swagger",
+        enabled_endpoints={"swagger", "openapi.json"},
+    ),
+)
+
 if __name__ == "__main__":
     asyncio_run(init_db())
     logger.debug("初始化数据库成功")
 
     logger.info("启动 API 服务")
     uvicorn_run(
-        app="app:app",
-        host=CONFIG.uvicorn.host,
-        port=CONFIG.uvicorn.port,
-        log_level=CONFIG.uvicorn.log_level,
-        workers=CONFIG.uvicorn.workers,
-        reload=CONFIG.uvicorn.reload,
-        access_log=CONFIG.uvicorn.access_log,
+        app="main:app",
+        **get_uvicorn_params_from_config(CONFIG.uvicorn),
     )

backend/main.py

@@ -9,7 +9,7 @@ dependencies = [
     "httptools>=0.6.0",
     "jkit>=3.0.0b2",
     "psycopg[binary]>=3.2.0",
-    "sshared[config, postgres]>=0.18.0",
+    "sshared[config, postgres]>=0.21.0",
     "sspeedup[api-litestar]>=0.25.0",
     "uvicorn>=0.32.0",
     "uvloop>=0.21.0",

backend/pyproject.toml

@@ -36,7 +36,7 @@ rich-click==1.8.5
 ruff==0.9.2
 six==1.16.0
 sniffio==1.3.1
-sshared==0.19.1
+sshared==0.21.0
 sspeedup==0.25.1
 tomli==2.2.1
 typing-extensions==4.12.2

backend/requirements-dev.txt

@@ -33,7 +33,7 @@ rich==13.9.4
 rich-click==1.8.5
 six==1.16.0
 sniffio==1.3.1
-sshared==0.19.1
+sshared==0.21.0
 sspeedup==0.25.1
 tomli==2.2.1
 typing-extensions==4.12.2