fastapi-authly 0.1.6__tar.gz → 0.1.8__tar.gz

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-authly
-Version: 0.1.6
+Version: 0.1.8
 Summary: A modular authentication system for FastAPI with OAuth2, JWT, and password recovery
 Project-URL: Homepage, https://github.com/yourusername/fastapi-auth-module
 Project-URL: Documentation, https://yourusername.github.io/fastapi-auth-module/

fastapi_authly-0.1.8/examples/chart_tools.py

@@ -0,0 +1,247 @@
+# -*- coding: utf-8 -*-
+"""
+LangGraph 图表生成工具
+
+提供三种精美图表的生成工具，供 LangGraph 智能体调用：
+- render_line_chart  折线图（趋势分析）
+- render_bar_chart   柱状图（对比分析）
+- render_pie_chart   饼图（占比分析）
+
+使用前提：
+  pip install fastapi-authly[charts] langgraph langchain-core
+
+使用方式：
+  1. 应用启动时调用 init_chart_driver() 初始化无头浏览器
+  2. 将 CHART_TOOLS 列表绑定到 LangGraph ToolNode 即可
+  3. 应用退出时调用 shutdown_chart_driver() 释放资源
+"""
+
+import json
+import os
+import tempfile
+import uuid
+from pathlib import Path
+from typing import Annotated, Any
+
+from langchain_core.tools import tool
+from fastapi_authly import (
+    get_driver,
+    build_option,
+    echarts_option_to_html,
+    engine_make_snapshot,
+)
+import base64
+
+# ──────────────────────────────────────────────
+# 全局 driver 管理
+# ──────────────────────────────────────────────
+
+_driver: Any = None
+
+# 图片输出目录，默认当前目录下的 chart_output/
+OUTPUT_DIR = Path(os.environ.get("CHART_OUTPUT_DIR", "chart_output"))
+
+
+def init_chart_driver(
+    output_dir: str | Path | None = None,
+    chrome_headless_path: str | Path | None = None,
+    chromedriver_path: str | Path | None = None,
+) -> None:
+    """
+    初始化全局无头浏览器 driver，应用启动时调用一次。
+
+    Args:
+        output_dir: 图片输出目录，默认 ./chart_output
+        chrome_headless_path: Chrome 可执行文件路径（不传则用包内默认）
+        chromedriver_path: ChromeDriver 路径（不传则用包内默认）
+    """
+    global _driver, OUTPUT_DIR
+    if output_dir is not None:
+        OUTPUT_DIR = Path(output_dir)
+    OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
+    _driver = get_driver(
+        chrome_headless_path=chrome_headless_path,
+        chromedriver_path=chromedriver_path,
+    )
+    print(f"[chart_tools] 无头浏览器已启动，图片输出目录：{OUTPUT_DIR.resolve()}")
+
+
+def shutdown_chart_driver() -> None:
+    """释放无头浏览器资源，应用退出时调用。"""
+    global _driver
+    if _driver is not None:
+        try:
+            _driver.quit()
+        except Exception:
+            pass
+        _driver = None
+        print("[chart_tools] 无头浏览器已关闭")
+
+
+def _get_driver() -> Any:
+    """获取 driver，若已崩溃则自动重建。"""
+    global _driver
+    if _driver is None:
+        raise RuntimeError(
+            "无头浏览器未初始化，请先调用 init_chart_driver()"
+        )
+    try:
+        _ = _driver.current_url  # 探活
+    except Exception:
+        print("[chart_tools] 无头浏览器已崩溃，正在重建...")
+        try:
+            _driver.quit()
+        except Exception:
+            pass
+        _driver = get_driver()
+    return _driver
+
+
+def _render(option: dict, output_name: str) -> str:
+    """通用渲染：将 option 渲染为 PNG，返回文件绝对路径。"""
+    driver = _get_driver()
+    html = echarts_option_to_html(option, width=800, height=500)
+    with tempfile.NamedTemporaryFile(
+        mode="w", suffix=".html", delete=False, encoding="utf-8"
+    ) as f:
+        f.write(html)
+        html_path = f.name
+    try:
+        raw = engine_make_snapshot(html_path, "png", driver=driver, delay=1.0)
+        b64 = raw.split(",", 1)[1] if "," in raw else raw
+        missing = 4 - len(b64) % 4
+        if missing != 4:
+            b64 += "=" * missing
+        data = base64.decodebytes(b64.encode())
+        out_path = OUTPUT_DIR / output_name
+        with open(out_path, "wb") as out:
+            out.write(data)
+        return str(out_path.resolve())
+    finally:
+        try:
+            os.unlink(html_path)
+        except Exception:
+            pass
+
+
+# ──────────────────────────────────────────────
+# LangGraph 工具定义
+# ──────────────────────────────────────────────
+
+@tool
+def render_line_chart(
+    title: Annotated[str, "图表标题，例如：近6个月投诉数量趋势"],
+    data_json: Annotated[
+        str,
+        "JSON 字符串，列表格式，每项包含 label（X轴标签）和 value（数值）。"
+        "例如：[{\"label\": \"2024-01\", \"value\": 30}, {\"label\": \"2024-02\", \"value\": 45}]",
+    ],
+    subtitle: Annotated[str, "图表副标题，可为空字符串"] = "",
+) -> str:
+    """
+    生成精美折线图（趋势分析），适用于时间序列、趋势对比等场景。
+    返回生成的 PNG 图片文件路径。
+    """
+    data = json.loads(data_json)
+    # 统一 key 名
+    normalized = [{"label": str(item.get("label", item.get("month_name", ""))),
+                   "value": item.get("value", item.get("count", 0))} for item in data]
+    option = build_option(
+        "line", title, normalized,
+        label_key="label", value_key="value", subtitle=subtitle,
+    )
+    filename = f"line_{uuid.uuid4().hex[:8]}.png"
+    path = _render(option, filename)
+    return f"折线图已生成：{path}"
+
+
+@tool
+def render_bar_chart(
+    title: Annotated[str, "图表标题，例如：各类型投诉数量对比"],
+    data_json: Annotated[
+        str,
+        "JSON 字符串，列表格式，每项包含 label（X轴标签）和 value（数值）。"
+        "例如：[{\"label\": \"食品安全\", \"value\": 120}, {\"label\": \"网络购物\", \"value\": 98}]",
+    ],
+    subtitle: Annotated[str, "图表副标题，可为空字符串"] = "",
+) -> str:
+    """
+    生成精美柱状图（对比分析），适用于分类数据的数量对比场景。
+    返回生成的 PNG 图片文件路径。
+    """
+    data = json.loads(data_json)
+    normalized = [{"label": str(item.get("label", item.get("month_name", ""))),
+                   "value": item.get("value", item.get("count", 0))} for item in data]
+    option = build_option(
+        "bar", title, normalized,
+        label_key="label", value_key="value", subtitle=subtitle,
+    )
+    filename = f"bar_{uuid.uuid4().hex[:8]}.png"
+    path = _render(option, filename)
+    return f"柱状图已生成：{path}"
+
+
+@tool
+def render_pie_chart(
+    title: Annotated[str, "图表标题，例如：投诉类型占比分布"],
+    data_json: Annotated[
+        str,
+        "JSON 字符串，列表格式，每项包含 label（类别名称）和 value（数值）。"
+        "例如：[{\"label\": \"食品安全\", \"value\": 35}, {\"label\": \"网络购物\", \"value\": 28}]",
+    ],
+    subtitle: Annotated[str, "图表副标题，可为空字符串"] = "",
+) -> str:
+    """
+    生成精美饼图（占比分析），适用于展示各类别在总量中的比例。
+    返回生成的 PNG 图片文件路径。
+    """
+    data = json.loads(data_json)
+    normalized = [{"label": str(item.get("label", item.get("month_name", ""))),
+                   "value": item.get("value", item.get("count", 0))} for item in data]
+    option = build_option(
+        "pie", title, normalized,
+        label_key="label", value_key="value", subtitle=subtitle,
+    )
+    filename = f"pie_{uuid.uuid4().hex[:8]}.png"
+    path = _render(option, filename)
+    return f"饼图已生成：{path}"
+
+
+# 导出工具列表，直接绑定到 ToolNode
+CHART_TOOLS = [render_line_chart, render_bar_chart, render_pie_chart]
+
+
+# ──────────────────────────────────────────────
+# 使用示例
+# ──────────────────────────────────────────────
+
+if __name__ == "__main__":
+    from langgraph.prebuilt import create_react_agent
+    from langchain_openai import ChatOpenAI  # 替换为你实际使用的 LLM
+
+    # 1. 启动无头浏览器
+    init_chart_driver(output_dir="./chart_output")
+
+    try:
+        # 2. 创建绑定了图表工具的智能体
+        llm = ChatOpenAI(model="gpt-4o", temperature=0)
+        agent = create_react_agent(llm, tools=CHART_TOOLS)
+
+        # 3. 调用智能体，让它自动选择图表类型并生成图片
+        result = agent.invoke({
+            "messages": [
+                {
+                    "role": "user",
+                    "content": (
+                        "请根据以下数据生成一张折线图和一张饼图：\n"
+                        "各月投诉数量：1月120件、2月98件、3月145件、4月200件、5月176件、6月210件\n"
+                        "投诉类型分布：食品安全35%、网络购物28%、电话骚扰18%、产品质量12%、其他7%"
+                    ),
+                }
+            ]
+        })
+        print(result["messages"][-1].content)
+
+    finally:
+        # 4. 退出时关闭浏览器
+        shutdown_chart_driver()

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi-authly"
-version = "0.1.6"
+version = "0.1.8"
 description = "A modular authentication system for FastAPI with OAuth2, JWT, and password recovery"
 readme = "README.md"
 license = {text = "MIT"}

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/src/fastapi_authly/__about__.py

@@ -1,3 +1,3 @@
 """Version information."""
 
-__version__ = "0.1.6"
+__version__ = "0.1.8"

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/src/fastapi_authly/auth.py

@@ -7,7 +7,7 @@ from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError
 from pydantic import EmailStr
 
-from .core.config import AuthConfig, AuthDependencyConfig, _config
+from .core.config.auth import AuthConfig, AuthDependencyConfig, _config
 from .core.security import BcryptPasswordHasher, JWTTokenService
 from .interfaces import Mailer, PasswordHasher, TokenService, UserRepository
 from .schemas.user import (

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/src/fastapi_authly/charts.py

@@ -60,6 +60,17 @@ COLORS = [
     "#ea7ccc",
 ]
 
+# 精美主题配色
+_THEME_COLORS = [
+    "#4E91FF", "#36CBCB", "#FAD337", "#F2637B", "#975FE4",
+    "#52C41A", "#FA8C16", "#1890FF", "#EB2F96", "#13C2C2",
+]
+
+_BACKGROUND_COLOR = "#ffffff"
+_TITLE_COLOR = "#1a1a2e"
+_AXIS_COLOR = "#8c8c8c"
+_SPLIT_LINE_COLOR = "#f0f0f0"
+
 
 def _get_selenium():
     """延迟导入 selenium，未安装时给出明确提示。"""
@@ -105,7 +116,7 @@ def engine_make_snapshot(
     file_type: str,
     *,
     pixel_ratio: int = 2,
-    delay: float = 2,
+    delay: float = 1,
     driver: Any = None,
     chrome_headless_path: str | Path | None = None,
     chromedriver_path: str | Path | None = None,
@@ -116,6 +127,7 @@ def engine_make_snapshot(
     """
     if delay < 0:
         raise ValueError("delay 不能为负数")
+    _external_driver = driver is not None
     if driver is None:
         driver = get_driver(
             chrome_headless_path=chrome_headless_path,
@@ -129,10 +141,33 @@ def engine_make_snapshot(
         html_path = "file://" + os.path.abspath(html_path)
     try:
         driver.get(html_path)
-        time.sleep(delay)
+        if delay > 0:
+            # 优先用 JS 轮询等待 ECharts 实例就绪（最多等 delay 秒），避免无谓的固定等待
+            _wait_js = """
+                var done = arguments[arguments.length - 1];
+                var deadline = Date.now() + %d;
+                function check() {
+                    var ele = document.querySelector('div[_echarts_instance_]');
+                    if (ele && echarts.getInstanceByDom(ele)) {
+                        done(true);
+                    } else if (Date.now() < deadline) {
+                        setTimeout(check, 50);
+                    } else {
+                        done(false);
+                    }
+                }
+                check();
+            """ % int(delay * 1000)
+            try:
+                driver.set_script_timeout(delay + 1)
+                driver.execute_async_script(_wait_js)
+            except Exception:
+                time.sleep(delay)
         return driver.execute_script(snapshot_js)
     finally:
-        driver.quit()
+        # 仅当 driver 由本函数内部创建时才 quit；外部传入的 driver 由调用方管理生命周期
+        if not _external_driver:
+            driver.quit()
 
 
 def echarts_option_to_html(
@@ -162,6 +197,11 @@ def echarts_option_to_html(
     var chartDom = document.getElementById("main");
     var myChart = echarts.init(chartDom);
     var option = {option_json};
+    // 强制关闭所有动画，确保截图时图表已完整渲染
+    if (option.animation === undefined) option.animation = false;
+    if (option.series) {{
+      option.series.forEach(function(s) {{ s.animation = false; }});
+    }}
     myChart.setOption(option);
   </script>
 </body>
@@ -255,65 +295,191 @@ def build_option(
     *,
     label_key: str = "month_name",
     value_key: str = "count",
+    subtitle: str = "",
 ) -> dict:
-    """根据类型 + 标题 + 数据构建 ECharts option（便捷封装，支持 line / bar / pie）。"""
+    """根据类型 + 标题 + 数据构建精美 ECharts option（支持 line / bar / pie）。"""
     labels = [item[label_key] for item in data]
     values = [item[value_key] for item in data]
     data_pair = [{"name": lb, "value": val} for lb, val in zip(labels, values)]
+
+    _base_title = {
+        "text": title,
+        "subtext": subtitle,
+        "left": "center",
+        "top": "4%",
+        "textStyle": {
+            "color": _TITLE_COLOR,
+            "fontSize": 18,
+            "fontWeight": "bold",
+            "fontFamily": "PingFang SC, Microsoft YaHei, sans-serif",
+        },
+        "subtextStyle": {"color": _AXIS_COLOR, "fontSize": 12},
+    }
+
     if chart_type == "line":
+        # 计算渐变色区域（用第一个主色）
+        main_color = _THEME_COLORS[0]
         return {
-            "title": {"text": title, "left": "center"},
-            "color": COLORS,
-            "toolbox": {"show": True, "feature": {"saveAsImage": {"show": True}}},
-            "grid": {"left": "10%", "right": "10%", "top": "18%", "bottom": "15%", "containLabel": True},
-            "xAxis": {"type": "category", "data": labels},
-            "yAxis": {"type": "value"},
+            "backgroundColor": _BACKGROUND_COLOR,
+            "color": _THEME_COLORS,
+            "title": _base_title,
+            "tooltip": {
+                "trigger": "axis",
+                "backgroundColor": "rgba(255,255,255,0.95)",
+                "borderColor": "#e8e8e8",
+                "borderWidth": 1,
+                "textStyle": {"color": _TITLE_COLOR, "fontSize": 13},
+                "axisPointer": {"type": "cross", "label": {"backgroundColor": main_color}},
+            },
+            "grid": {"left": "5%", "right": "5%", "top": "22%", "bottom": "12%", "containLabel": True},
+            "xAxis": {
+                "type": "category",
+                "data": labels,
+                "boundaryGap": False,
+                "axisLine": {"lineStyle": {"color": "#e0e0e0"}},
+                "axisTick": {"show": False},
+                "axisLabel": {"color": _AXIS_COLOR, "fontSize": 12},
+                "splitLine": {"show": False},
+            },
+            "yAxis": {
+                "type": "value",
+                "axisLine": {"show": False},
+                "axisTick": {"show": False},
+                "axisLabel": {"color": _AXIS_COLOR, "fontSize": 12},
+                "splitLine": {"lineStyle": {"color": _SPLIT_LINE_COLOR, "type": "dashed"}},
+            },
             "series": [
                 {
                     "type": "line",
                     "data": values,
-                    "smooth": True,
+                    "smooth": 0.4,
                     "symbol": "circle",
-                    "symbolSize": 8,
-                    "lineStyle": {"width": 2.5},
-                    "itemStyle": {"borderWidth": 2, "borderColor": "#fff"},
-                    "areaStyle": {"opacity": 0.15},
+                    "symbolSize": 7,
+                    "lineStyle": {"width": 3, "color": main_color},
+                    "itemStyle": {"color": main_color, "borderWidth": 2, "borderColor": "#fff"},
+                    "areaStyle": {
+                        "color": {
+                            "type": "linear",
+                            "x": 0, "y": 0, "x2": 0, "y2": 1,
+                            "colorStops": [
+                                {"offset": 0, "color": main_color + "55"},
+                                {"offset": 1, "color": main_color + "05"},
+                            ],
+                        }
+                    },
                 }
             ],
         }
+
     if chart_type == "bar":
         return {
-            "title": {"text": title, "left": "center"},
-            "color": COLORS,
-            "toolbox": {"show": True, "feature": {"saveAsImage": {"show": True}}},
-            "grid": {"left": "10%", "right": "10%", "top": "18%", "bottom": "15%", "containLabel": True},
-            "xAxis": {"type": "category", "data": labels},
-            "yAxis": {"type": "value"},
+            "backgroundColor": _BACKGROUND_COLOR,
+            "color": _THEME_COLORS,
+            "title": _base_title,
+            "tooltip": {
+                "trigger": "axis",
+                "backgroundColor": "rgba(255,255,255,0.95)",
+                "borderColor": "#e8e8e8",
+                "borderWidth": 1,
+                "textStyle": {"color": _TITLE_COLOR, "fontSize": 13},
+                "axisPointer": {"type": "shadow"},
+            },
+            "grid": {"left": "5%", "right": "5%", "top": "22%", "bottom": "12%", "containLabel": True},
+            "xAxis": {
+                "type": "category",
+                "data": labels,
+                "axisLine": {"lineStyle": {"color": "#e0e0e0"}},
+                "axisTick": {"show": False},
+                "axisLabel": {"color": _AXIS_COLOR, "fontSize": 12, "interval": 0, "rotate": 0},
+            },
+            "yAxis": {
+                "type": "value",
+                "axisLine": {"show": False},
+                "axisTick": {"show": False},
+                "axisLabel": {"color": _AXIS_COLOR, "fontSize": 12},
+                "splitLine": {"lineStyle": {"color": _SPLIT_LINE_COLOR, "type": "dashed"}},
+            },
             "series": [
                 {
                     "type": "bar",
-                    "data": values,
-                    "itemStyle": {"borderRadius": [6, 6, 0, 0], "borderWidth": 0},
+                    "data": [
+                        {
+                            "value": v,
+                            "itemStyle": {
+                                "color": {
+                                    "type": "linear",
+                                    "x": 0, "y": 0, "x2": 0, "y2": 1,
+                                    "colorStops": [
+                                        {"offset": 0, "color": _THEME_COLORS[i % len(_THEME_COLORS)]},
+                                        {"offset": 1, "color": _THEME_COLORS[i % len(_THEME_COLORS)] + "88"},
+                                    ],
+                                },
+                                "borderRadius": [6, 6, 0, 0],
+                            },
+                            "label": {
+                                "show": True,
+                                "position": "top",
+                                "color": _AXIS_COLOR,
+                                "fontSize": 12,
+                                "fontWeight": "bold",
+                            },
+                        }
+                        for i, v in enumerate(values)
+                    ],
+                    "barMaxWidth": 50,
                 }
             ],
         }
+
     if chart_type == "pie":
         return {
-            "title": {"text": title, "left": "center"},
-            "color": COLORS,
-            "toolbox": {"show": True, "feature": {"saveAsImage": {"show": True}}},
-            "legend": {"orient": "horizontal", "bottom": "5%", "type": "scroll"},
+            "backgroundColor": _BACKGROUND_COLOR,
+            "color": _THEME_COLORS,
+            "title": _base_title,
+            "tooltip": {
+                "trigger": "item",
+                "backgroundColor": "rgba(255,255,255,0.95)",
+                "borderColor": "#e8e8e8",
+                "borderWidth": 1,
+                "textStyle": {"color": _TITLE_COLOR, "fontSize": 13},
+                "formatter": "{b}<br/>数量：{c}<br/>占比：{d}%",
+            },
+            "legend": {
+                "orient": "horizontal",
+                "bottom": "3%",
+                "type": "scroll",
+                "textStyle": {"color": _AXIS_COLOR, "fontSize": 12},
+                "icon": "circle",
+                "itemWidth": 10,
+                "itemHeight": 10,
+            },
             "series": [
                 {
                     "type": "pie",
-                    "radius": ["40%", "70%"],
-                    "center": ["50%", "50%"],
+                    "radius": ["42%", "68%"],
+                    "center": ["50%", "52%"],
                     "data": data_pair,
-                    "itemStyle": {"borderRadius": 8, "borderWidth": 2, "borderColor": "#fff"},
-                    "label": {"formatter": "{b}: {c}", "position": "outside"},
+                    "itemStyle": {
+                        "borderRadius": 8,
+                        "borderWidth": 3,
+                        "borderColor": "#ffffff",
+                    },
+                    "label": {
+                        "show": True,
+                        "formatter": "{b}\n{d}%",
+                        "fontSize": 12,
+                        "color": _TITLE_COLOR,
+                        "lineHeight": 18,
+                    },
+                    "labelLine": {"length": 12, "length2": 8, "smooth": True},
+                    "emphasis": {
+                        "itemStyle": {"shadowBlur": 20, "shadowColor": "rgba(0,0,0,0.15)"},
+                        "scaleSize": 8,
+                    },
                 }
             ],
         }
+
     raise ValueError(f"不支持的图表类型: {chart_type}，仅支持 line / bar / pie")
 
 

fastapi_authly-0.1.8/src/fastapi_authly/core/config/__init__.py

@@ -0,0 +1,8 @@
+from .database import DatabaseConfig
+from .auth import AuthConfig, AuthDependencyConfig, JwtConfig
+__all__ = [
+    "DatabaseConfig",
+    "AuthConfig",
+    "JwtConfig",
+    "AuthDependencyConfig"
+]

fastapi_authly-0.1.6/src/fastapi_authly/core/config.py → fastapi_authly-0.1.8/src/fastapi_authly/core/config/auth.py

@@ -57,7 +57,7 @@ class AuthConfig(BaseSettings):
         env_prefix="AUTH_",
         extra="ignore",
     )
-    
+
     @model_validator(mode='after')
     def _ensure_jwt_is_config(self):
         """确保 jwt 字段始终是 JwtConfig 实例"""
@@ -66,7 +66,7 @@ class AuthConfig(BaseSettings):
         elif not isinstance(self.jwt, JwtConfig):
             self.jwt = JwtConfig()
         return self
-    
+
     def _ensure_jwt_config(self) -> JwtConfig:
         """确保 jwt 是 JwtConfig 实例，如果不是则转换"""
         if isinstance(self.jwt, dict):
@@ -74,26 +74,26 @@ class AuthConfig(BaseSettings):
         elif not isinstance(self.jwt, JwtConfig):
             self.jwt = JwtConfig()
         return self.jwt
-    
+
     # 属性访问器：直接访问 jwt 中的属性，兼容现有代码
     @property
     def secret_key(self) -> str:
         """JWT secret key"""
         jwt_config = self._ensure_jwt_config()
         return jwt_config.secret_key
-    
+
     @property
     def algorithm(self) -> str:
         """JWT algorithm"""
         jwt_config = self._ensure_jwt_config()
         return jwt_config.algorithm
-    
+
     @property
     def access_token_expire_minutes(self) -> Optional[int]:
         """Access token expiration in minutes (compatible with auth.py)"""
         jwt_config = self._ensure_jwt_config()
         return jwt_config.access_token_expires_minutes
-    
+
     @property
     def refresh_token_expire_days(self) -> int:
         """Refresh token expiration in days"""

fastapi_authly-0.1.8/src/fastapi_authly/core/config/base.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel, field_validator
+from typing import Any
+
+class BaseBackendModel(BaseModel):
+    @field_validator("*", mode="before")
+    @classmethod
+    def strip_strings(cls, value: Any) -> Any:
+        if isinstance(value, str):
+            return value.strip()
+        return value

fastapi_authly-0.1.8/src/fastapi_authly/core/config/database.py

@@ -0,0 +1,98 @@
+from typing import Optional
+from urllib.parse import quote_plus
+from pydantic import field_validator, model_validator
+from .base import BaseBackendModel
+
+
+class DatabaseConfig(BaseBackendModel):
+    engine: str
+    name: Optional[str] = None
+    host: Optional[str] = None
+    port: Optional[int] = None
+    username: Optional[str] = None
+    password: Optional[str] = None
+
+    @field_validator("engine", mode="before")
+    @classmethod
+    def normalize_engine(cls, value: str) -> str:
+        if not value:
+            raise ValueError("数据库配置错误：engine 不能为空")
+
+        engine = value.strip().lower()
+
+        aliases = {
+            "pg": "postgresql",
+            "pgsql": "postgresql",
+            "postgres": "postgresql",
+            "postgresql": "postgresql",
+            "mysql": "mysql",
+            "mongo": "mongodb",
+            "mongodb": "mongodb",
+            "sqlite": "sqlite",
+        }
+
+        if engine not in aliases:
+            raise ValueError(
+                "数据库配置错误：engine 仅支持 "
+                "postgresql/pgsql/pg、mysql、mongodb/mongo、sqlite"
+            )
+
+        return aliases[engine]
+
+    @field_validator("port")
+    @classmethod
+    def validate_port(cls, value: Optional[int]) -> Optional[int]:
+        if value is not None and not 1 <= value <= 65535:
+            raise ValueError("数据库配置错误：port 必须在 1 到 65535 之间")
+        return value
+
+    @model_validator(mode="after")
+    def validate_database_config(self):
+        if self.engine == "sqlite":
+            if not self.name:
+                raise ValueError(
+                    "SQLite 配置错误：name 不能为空，例如 ./data/app.db 或 :memory:"
+                )
+            return self
+
+        missing = []
+
+        if not self.host:
+            missing.append("host")
+        if not self.name:
+            missing.append("name")
+
+        if missing:
+            raise ValueError(
+                f"{self.engine} 配置错误：缺少必要字段 {', '.join(missing)}"
+            )
+
+        return self
+
+    @property
+    def database_url(self) -> str:
+        if self.engine == "sqlite":
+            return f"sqlite:///{self.name}"
+
+        default_ports = {
+            "postgresql": 5432,
+            "mysql": 3306,
+            "mongodb": 27017,
+        }
+
+        default_drivers = {
+            "postgresql": "postgresql+asyncpg",
+            "mysql": "mysql+asyncmy",
+            "mongodb": "mongodb",
+        }
+
+        port = self.port or default_ports[self.engine]
+        driver = default_drivers[self.engine]
+
+        auth = ""
+        if self.username:
+            username = quote_plus(self.username)
+            password = quote_plus(self.password or "")
+            auth = f"{username}:{password}@" if password else f"{username}@"
+
+        return f"{driver}://{auth}{self.host}:{port}/{self.name}"

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/src/fastapi_authly/deps.py

@@ -5,7 +5,7 @@ from fastapi.security.utils import get_authorization_scheme_param
 import jwt
 from jwt.exceptions import InvalidTokenError
 from pydantic import BaseModel, ValidationError
-from .core.config import _config
+from .core.config.auth import _config
 from .models.user import User
 
 

{fastapi_authly-0.1.6 → fastapi_authly-0.1.8}/src/fastapi_authly/docs.py

@@ -13,12 +13,12 @@ def get_static_dir() -> Path:
     """获取包内静态文件目录路径"""
     return Path(__file__).parent / "static"
 
+static_url = "/static"
 
 def setup_scalar_docs(
     app: FastAPI,
     *,
     docs_url: str = "/docs",
-    static_url: str = "/static",
     title: Optional[str] = None,
     openapi_url: Optional[str] = None,
     favicon_url: Optional[str] = None,