Skip to content

Commit

Permalink
chore: 升级到 sshared v0.21.0
Browse files Browse the repository at this point in the history
  • Loading branch information
FHU-yezi committed Jan 31, 2025
1 parent 9e03428 commit d7c191f
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 54 deletions.
6 changes: 3 additions & 3 deletions backend/api/v1/jpep/ftn_macket.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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],
)

Expand Down Expand Up @@ -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],
)

Expand Down
34 changes: 0 additions & 34 deletions backend/app.py

This file was deleted.

4 changes: 1 addition & 3 deletions backend/config.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
42 changes: 35 additions & 7 deletions backend/main.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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),
)
2 changes: 1 addition & 1 deletion backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion backend/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions backend/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d7c191f

Please sign in to comment.