Merge pull request #4 from TimChild/update-for-clerk-backend-2

Update for clerk backend 2

Author: TimChild

README.md

@@ -1,4 +1,4 @@
-![Test Status](https://github.com/TimChild/reflex-clerk-api/actions/workflows/ci.yml/badge.svg?branch=v0.3.0)
+![Test Status](https://github.com/TimChild/reflex-clerk-api/actions/workflows/ci.yml/badge.svg?branch=v0.3.1)
 ![PyPi publish Status](https://github.com/TimChild/reflex-clerk-api/actions/workflows/publish.yml/badge.svg)
 ![Demo Deploy Status](https://github.com/TimChild/reflex-clerk-api/actions/workflows/deploy.yml/badge.svg)
 

Taskfile.yml

@@ -2,6 +2,9 @@ version: "3"
 
 dotenv: [".env"]
 
+vars:
+  INIT_PATH: "custom_components/reflex_clerk_api/__init__.py"
+
 tasks:
   install:
     cmds:
@@ -23,6 +26,7 @@ tasks:
       - task: lint
       - task: typecheck
     cmds:
+      - uv sync --dev
       - uv run playwright install chromium
       - uv run pytest
 
@@ -37,19 +41,19 @@ tasks:
   bump-patch:
     dir: "{{.TASKFILE_DIR}}"
     cmds:
-      - uv run scripts/bump-version.py patch pyproject.toml README.md
+      - uv run scripts/bump-version.py patch {{.INIT_PATH}} README.md
       - uv lock
 
   bump-minor:
     dir: "{{.TASKFILE_DIR}}"
     cmds:
-      - uv run scripts/bump-version.py minor pyproject.toml README.md
+      - uv run scripts/bump-version.py minor {{.INIT_PATH}} README.md
       - uv lock
 
   bump-major:
     dir: "{{.TASKFILE_DIR}}"
     cmds:
-      - uv run scripts/bump-version.py major pyproject.toml README.md
+      - uv run scripts/bump-version.py major {{.INIT_PATH}} README.md
       - uv lock
 
   publish:

clerk_api_demo/clerk_api_demo/clerk_api_demo.py

@@ -75,7 +75,11 @@ async def do_something_on_log_in_or_out(self) -> EventType | None:
 
 def demo_page_header_and_description() -> rx.Component:
     return rx.vstack(
-        rx.heading("reflex-clerk-api demo", size="9"),
+        rx.hstack(
+            rx.heading("reflex-clerk-api demo", size="9"),
+            rx.text(clerk.__version__),
+            align="baseline",
+        ),
         rx.heading(
             "Custom",
             rx.link(rx.code("reflex"), href="https://reflex.dev"),

custom_components/reflex_clerk_api/__init__.py

@@ -1,3 +1,5 @@
+__version__ = "0.3.1"
+
 from .authentication_components import sign_in, sign_up
 from .clerk_provider import (
     ClerkState,

custom_components/reflex_clerk_api/clerk_provider.py

@@ -210,7 +210,7 @@ async def _get_jwk_keys(self) -> dict[str, Any]:
         """
         if self._jwk_keys:
             return self._jwk_keys
-        jwks = await self.client.jwks.get_async()
+        jwks = await self.client.jwks.get_jwks_async()
         assert jwks is not None
         assert jwks.keys is not None
         keys = jwks.model_dump()["keys"]

pyproject.toml

@@ -4,17 +4,17 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "reflex-clerk-api"
-version = "0.3.0"
 description = "Reflex custom component wrapping @clerk/clerk-react and integrating the clerk-backend-api"
 readme = "README.md"
 license = { text = "Apache-2.0" }
 requires-python = ">=3.10"
 authors = [{ name = "Tim Child", email = "[email protected]" }]
 keywords = ["reflex","reflex-custom-components", "clerk", "clerk-backend-api"]
+dynamic = ["version"]
 
 dependencies = [
     "authlib>=1.5.1,<2.0.0",
-    "clerk-backend-api>=1.8.0,<2.0.0",
+    "clerk-backend-api>=2.0.0,<3.0.0",
     "reflex>=0.7.2,<0.8.0",
 ]
 
@@ -41,6 +41,9 @@ dev = ["build", "twine"]
 [tool.setuptools.packages.find]
 where = ["custom_components"]
 
+[tool.setuptools.dynamic]
+version = {attr = "reflex_clerk_api.__version__"}
+
 [tool.pytest.ini_options]
 # addopts = "--headed"
 

scripts/bump-version.py

@@ -1,19 +1,19 @@
+import re
 import sys
 from pathlib import Path
 from typing import Literal
 
 import semver
-import tomlkit
 
 LITERAL_PART = Literal["major", "minor", "patch"]
 
 
-def get_version_from_pyproject_toml(file_path: Path) -> str:
-    with file_path.open("r") as file:
-        data = tomlkit.parse(file.read())
-    version = data["project"]["version"]  # pyright: ignore[reportIndexIssue]
-    assert isinstance(version, str)
-    return version
+def get_version_from_init(init_path: Path) -> str:
+    with init_path.open("r") as file:
+        data = file.readline()
+    match = re.search(r'^__version__ = "(.*)"', data)
+    assert match is not None
+    return match.group(1)
 
 
 def bump_version(version: str, part: LITERAL_PART) -> str:
@@ -26,12 +26,15 @@ def bump_version(version: str, part: LITERAL_PART) -> str:
             return semver.bump_patch(version)
 
 
-def update_toml_project_version(file_path: Path, new_version: str) -> None:
-    with file_path.open("r") as file:
-        data = tomlkit.parse(file.read())
-    data["project"]["version"] = new_version  # pyright: ignore[reportIndexIssue]
-    with file_path.open("w") as file:
-        file.write(tomlkit.dumps(data))
+def update_init_version(init_path: Path, new_version: str) -> None:
+    with init_path.open("r") as file:
+        lines = file.readlines()
+
+    # Update the first line with the new version
+    lines[0] = f'__version__ = "{new_version}"\n'
+
+    with init_path.open("w") as file:
+        file.writelines(lines)
 
 
 def update_readme_badge(readme_path: Path, new_version: str) -> None:
@@ -48,23 +51,23 @@ def update_readme_badge(readme_path: Path, new_version: str) -> None:
         file.writelines(lines)
 
 
-def main(part: LITERAL_PART, pyproject_path: Path, readme_path: Path) -> None:
-    current_version = get_version_from_pyproject_toml(pyproject_path)
+def main(part: LITERAL_PART, init_path: Path, readme_path: Path) -> None:
+    current_version = get_version_from_init(init_path)
     new_version = bump_version(current_version, part)
-    update_toml_project_version(pyproject_path, new_version)
+    update_init_version(init_path, new_version)
     update_readme_badge(readme_path, new_version)
     print(f"Successfully bumped from {current_version} to {new_version}")  # noqa: T201
 
 
 if __name__ == "__main__":
     if len(sys.argv) != 4:
         raise ValueError(
-            "Usage: bump-version.py <major|minor|patch> <pyproject.toml-path> <readme-path>"
+            "Usage: bump-version.py <major|minor|patch> <package.__init__.py-path> <readme-path>"
         )
     part = sys.argv[1]
     assert part in ("major", "minor", "patch")
-    pyproject_path = Path(sys.argv[2])
-    assert pyproject_path.exists()
+    init_path = Path(sys.argv[2])
+    assert init_path.exists()
     readme_path = Path(sys.argv[3])
     assert readme_path.exists()
-    main(part, pyproject_path, readme_path)
+    main(part, init_path, readme_path)

scripts/get-version.py

@@ -1,23 +1,22 @@
-"""Reads the version from the pyproject.toml file and returns to stdout."""
+"""Reads the version from the __init__.py file and returns to stdout."""
 
+import re
 import sys
 from pathlib import Path
 
-import tomlkit
 
-
-def get_version_from_pyproject_toml(file_path: Path) -> str:
-    with file_path.open("r") as file:
-        data = tomlkit.parse(file.read())
-    version = data["project"]["version"]  # pyright: ignore[reportIndexIssue]
-    assert isinstance(version, str)
-    return version
+def get_version_from_init(init_path: Path) -> str:
+    with init_path.open("r") as file:
+        data = file.readline()
+    match = re.search(r'^__version__ = "(.*)"', data)
+    assert match is not None
+    return match.group(1)
 
 
 if __name__ == "__main__":
     args = sys.argv
     if len(args) != 2:
-        raise ValueError("Usage: get-version.py <pyproject.toml-path>")
+        raise ValueError("Usage: get-version.py <package.__init__.py")
     path = Path(args[1])
     assert path.exists()
-    print(get_version_from_pyproject_toml(path))  # noqa: T201
+    print(get_version_from_init(path))  # noqa: T201