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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-authly
-Version: 0.1.6
+Version: 0.1.7
 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.6 → fastapi_authly-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi-authly"
-version = "0.1.6"
+version = "0.1.7"
 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.7}/src/fastapi_authly/__about__.py

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

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

@@ -105,7 +105,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 +116,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 +130,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 +186,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>

{fastapi_authly-0.1.6 → fastapi_authly-0.1.7}/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,