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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-authly
-Version: 0.1.5
+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/
@@ -29,10 +29,10 @@ Requires-Dist: asyncpg>=0.31.0
 Requires-Dist: emails>=0.6.0
 Requires-Dist: fastapi>=0.100.0
 Requires-Dist: jinja2>=3.0.0
-Requires-Dist: jwt>=1.3.1
 Requires-Dist: passlib[bcrypt]>=1.7.4
 Requires-Dist: pydantic-settings>=2.1.0
 Requires-Dist: pydantic[email]>=2.0.0
+Requires-Dist: pyjwt>=2.12.1
 Requires-Dist: python-jose[cryptography]>=3.3.0
 Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: tortoise-orm[psycopg]>=0.25.3

{fastapi_authly-0.1.5 → fastapi_authly-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi-authly"
-version = "0.1.5"
+version = "0.1.7"
 description = "A modular authentication system for FastAPI with OAuth2, JWT, and password recovery"
 readme = "README.md"
 license = {text = "MIT"}
@@ -47,10 +47,10 @@ dependencies = [
     "passlib[bcrypt]>=1.7.4",
     "emails>=0.6.0",
     "jinja2>=3.0.0",
-    "jwt>=1.3.1",
     "tortoise-orm[psycopg]>=0.25.3",
     "uvicorn>=0.40.0",
     "asyncpg>=0.31.0",
+    "pyjwt>=2.12.1",
 ]
 
 [project.optional-dependencies]

{fastapi_authly-0.1.5 → fastapi_authly-0.1.7}/src/fastapi_authly/__about__.py

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

{fastapi_authly-0.1.5 → 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.5 → 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,

{fastapi_authly-0.1.5 → fastapi_authly-0.1.7}/uv.lock

@@ -643,17 +643,17 @@ wheels = [
 
 [[package]]
 name = "fastapi-authly"
-version = "0.1.4"
+version = "0.1.6"
 source = { editable = "." }
 dependencies = [
     { name = "asyncpg" },
     { name = "emails" },
     { name = "fastapi" },
     { name = "jinja2" },
-    { name = "jwt" },
     { name = "passlib", extra = ["bcrypt"] },
     { name = "pydantic", extra = ["email"] },
     { name = "pydantic-settings" },
+    { name = "pyjwt" },
     { name = "python-jose", extra = ["cryptography"] },
     { name = "python-multipart" },
     { name = "tortoise-orm", extra = ["psycopg"] },
@@ -691,12 +691,12 @@ requires-dist = [
     { name = "fastapi", specifier = ">=0.100.0" },
     { name = "httpx", marker = "extra == 'test'", specifier = ">=0.25.0" },
     { name = "jinja2", specifier = ">=3.0.0" },
-    { name = "jwt", specifier = ">=1.3.1" },
     { name = "mkdocs", marker = "extra == 'docs'", specifier = ">=1.5.0" },
     { name = "mkdocs-material", marker = "extra == 'docs'", specifier = ">=9.0.0" },
     { name = "passlib", extras = ["bcrypt"], specifier = ">=1.7.4" },
     { name = "pydantic", extras = ["email"], specifier = ">=2.0.0" },
     { name = "pydantic-settings", specifier = ">=2.1.0" },
+    { name = "pyjwt", specifier = ">=2.12.1" },
     { name = "pytest", marker = "extra == 'test'", specifier = ">=7.0.0" },
     { name = "pytest-asyncio", marker = "extra == 'test'", specifier = ">=0.21.0" },
     { name = "python-jose", extras = ["cryptography"], specifier = ">=3.3.0" },
@@ -864,18 +864,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" },
 ]
 
-[[package]]
-name = "jwt"
-version = "1.4.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "cryptography" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/7f/20/21254c9e601e6c29445d1e8854c2a81bdb554e07a82fb1f9846137a6965c/jwt-1.4.0.tar.gz", hash = "sha256:f6f789128ac247142c79ee10f3dba6e366ec4e77c9920d18c1592e28aa0a7952", size = 24911, upload-time = "2025-06-23T13:28:38.289Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b9/80/34e3fae850adb0b7b8b9b1cf02b2d975fcb68e0e8eb7d56d6b4fc23f7433/jwt-1.4.0-py3-none-any.whl", hash = "sha256:7560a7f1de4f90de94ac645ee0303ac60c95b9e08e058fb69f6c330f71d71b11", size = 18248, upload-time = "2025-06-23T13:28:37.012Z" },
-]
-
 [[package]]
 name = "lxml"
 version = "6.0.2"
@@ -1563,6 +1551,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" },
 ]
 
+[[package]]
+name = "pyjwt"
+version = "2.12.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c2/27/a3b6e5bf6ff856d2509292e95c8f57f0df7017cf5394921fc4e4ef40308a/pyjwt-2.12.1.tar.gz", hash = "sha256:c74a7a2adf861c04d002db713dd85f84beb242228e671280bf709d765b03672b", size = 102564, upload-time = "2026-03-13T19:27:37.25Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e5/7a/8dd906bd22e79e47397a61742927f6747fe93242ef86645ee9092e610244/pyjwt-2.12.1-py3-none-any.whl", hash = "sha256:28ca37c070cad8ba8cd9790cd940535d40274d22f80ab87f3ac6a713e6e8454c", size = 29726, upload-time = "2026-03-13T19:27:35.677Z" },
+]
+
 [[package]]
 name = "pymdown-extensions"
 version = "10.20"