tina4-python 3.10.38__tar.gz → 3.10.39__tar.gz

{tina4_python-3.10.38 → tina4_python-3.10.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 3.10.38
+Version: 3.10.39
 Summary: Tina4 Python v3 — Zero-dependency, lightweight web framework
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 License: MIT

{tina4_python-3.10.38 → tina4_python-3.10.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "3.10.38"
+version = "3.10.39"
 description = "Tina4 Python v3 — Zero-dependency, lightweight web framework"
 authors = [
     {name = "Andre van Zuydam", email = "andrevanzuydam@gmail.com"}

{tina4_python-3.10.38 → tina4_python-3.10.39}/tina4_python/auth/__init__.py

@@ -14,7 +14,7 @@ No PyJWT, no cryptography package.
     payload = auth.valid_token(token)
 
     hashed = Auth.hash_password("secret123")
-    Auth.check_password(hashed, "secret123")  # True
+    Auth.check_password("secret123", hashed)  # True
 """
 import os
 import hmac
@@ -152,6 +152,25 @@ class Auth:
         auth = cls(secret=secret, expires_in=expires_in)
         return auth.refresh_token(token)
 
+    @classmethod
+    def authenticate_request_static(cls, headers: dict) -> dict | None:
+        """Extract and validate auth from request headers without instantiating Auth.
+
+        Reads SECRET from env. Checks: Bearer JWT, Bearer API key, Basic auth.
+        Returns payload dict on success, None on failure.
+        """
+        secret = os.environ.get("SECRET", "tina4-default-secret")
+        auth = cls(secret=secret)
+        return auth.authenticate_request(headers)
+
+    @staticmethod
+    def validate_api_key_static(provided: str, expected: str = None) -> bool:
+        """Validate an API key without instantiating Auth.
+
+        Alias for validate_api_key (already a staticmethod).
+        """
+        return Auth.validate_api_key(provided, expected)
+
     # ── Password Hashing ──────────────────────────────────────────
 
     @staticmethod
@@ -164,7 +183,7 @@ class Auth:
         return f"pbkdf2_sha256${iterations}${salt}${dk.hex()}"
 
     @staticmethod
-    def check_password(hashed: str, password: str) -> bool:
+    def check_password(password: str, hashed: str) -> bool:
         """Verify a password against its PBKDF2 hash."""
         try:
             parts = hashed.split("$")
@@ -183,9 +202,18 @@ class Auth:
     # ── API Key Auth ──────────────────────────────────────────────
 
     @staticmethod
-    def validate_api_key(provided: str) -> bool:
-        """Check a Bearer token against the TINA4_API_KEY env var (falls back to API_KEY)."""
-        expected = os.environ.get("TINA4_API_KEY", os.environ.get("API_KEY", ""))
+    def validate_api_key(provided: str, expected: str = None) -> bool:
+        """Check an API key against an expected value.
+
+        Args:
+            provided: The API key provided in the request.
+            expected: The expected API key. If None, reads from
+                      TINA4_API_KEY env var (falls back to API_KEY).
+
+        Returns: True if the provided key matches.
+        """
+        if expected is None:
+            expected = os.environ.get("TINA4_API_KEY", os.environ.get("API_KEY", ""))
         if not expected:
             return False
         return hmac.compare_digest(provided, expected)
@@ -255,4 +283,17 @@ def refresh_token(token: str, expires_in: int = 60) -> str | None:
     return Auth.refresh_token_static(token, expires_in=expires_in)
 
 
-__all__ = ["Auth", "get_token", "valid_token", "get_payload", "refresh_token"]
+def authenticate_request(headers: dict) -> dict | None:
+    """Validate auth from request headers — reads SECRET from env."""
+    return Auth.authenticate_request_static(headers)
+
+
+def validate_api_key(provided: str, expected: str = None) -> bool:
+    """Validate an API key. Shortcut for Auth.validate_api_key()."""
+    return Auth.validate_api_key(provided, expected)
+
+
+__all__ = [
+    "Auth", "get_token", "valid_token", "get_payload", "refresh_token",
+    "authenticate_request", "validate_api_key",
+]

{tina4_python-3.10.38 → tina4_python-3.10.39}/tina4_python/cli/__init__.py

@@ -363,7 +363,7 @@ def _routes(args):
         importlib.import_module("app")
 
     from tina4_python.core.router import Router
-    routes = Router.all()
+    routes = Router.get_routes()
     if not routes:
         print("No routes registered.")
         return

{tina4_python-3.10.38 → tina4_python-3.10.39}/tina4_python/core/router.py

@@ -231,8 +231,13 @@ class Router:
         return None, {}
 
     @staticmethod
-    def all() -> list[dict]:
-        """Return all registered routes (for CLI listing and Swagger)."""
+    def get_routes() -> list[dict]:
+        """Return all registered routes."""
+        return _routes
+
+    @staticmethod
+    def list_routes() -> list[dict]:
+        """Return all registered routes (debug-friendly)."""
         return _routes
 
     @staticmethod

{tina4_python-3.10.38 → tina4_python-3.10.39}/tina4_python/core/server.py

@@ -757,7 +757,7 @@ async def app(scope: dict, receive, send):
             # Serve OpenAPI spec JSON from all registered routes
             from tina4_python.swagger import Swagger as _SwaggerGen
             _swagger = _SwaggerGen()
-            _spec = _swagger.generate(Router.all())
+            _spec = _swagger.generate(Router.get_routes())
             response.json(_spec)
             _cors.apply(request, response)
             headers = response.build_headers("")
@@ -929,7 +929,7 @@ async def app(scope: dict, receive, send):
                 matched_pattern = route["path"] if route else "-"
                 toolbar = render_dev_toolbar(
                     request.method, request.path, matched_pattern,
-                    request_id, len(Router.all()),
+                    request_id, len(Router.get_routes()),
                 ).encode()
                 content = response.content
                 # Inject before </body> if present, else append
@@ -1216,7 +1216,7 @@ def run(host: str | None = None, port: int | None = None):
 
     # Auto-discover routes
     _auto_discover("src")
-    route_count = len(Router.all())
+    route_count = len(Router.get_routes())
     Log.info(f"Discovered {route_count} routes")
 
     # Resolve host/port (CLI arg > ENV > default)

{tina4_python-3.10.38 → tina4_python-3.10.39}/tina4_python/dev_admin/__init__.py

@@ -309,7 +309,7 @@ async def _api_routes(request, response):
     try:
         from tina4_python.core.router import Router
         internal_prefixes = ("/__dev", "/health", "/swagger")
-        routes = Router.all()
+        routes = Router.get_routes()
         result = []
         for r in routes:
             path = r.get("path", "")
@@ -926,7 +926,7 @@ async def _api_tool(request, response):
         "test": [sys.executable, "-m", "pytest", "tests/", "-q", "--tb=short"],
         "routes": [sys.executable, "-c",
                    "from tina4_python.core.router import Router; "
-                   "[print(f\"{r['method']:7} {r['path']}\") for r in Router.all()]"],
+                   "[print(f\"{r['method']:7} {r['path']}\") for r in Router.get_routes()]"],
         "migrate": [sys.executable, "-c",
                     "from tina4_python.cli import _migrate; _migrate([])"],
         "seed": [sys.executable, "-c",

{tina4_python-3.10.38 → tina4_python-3.10.39}/tina4_python/orm/model.py

@@ -318,7 +318,7 @@ class ORM(metaclass=ORMMeta):
     # ── Finders ─────────────────────────────────────────────────
 
     @classmethod
-    def find(cls, pk_value, include: list[str] = None):
+    def find_by_id(cls, pk_value, include: list[str] = None):
         """Find a single record by primary key. Returns instance or None.
 
         Args:
@@ -342,10 +342,20 @@ class ORM(metaclass=ORMMeta):
             cls._eager_load([instance], include)
         return instance
 
+    @classmethod
+    def find(cls, pk_value, include: list[str] = None):
+        """Alias for find_by_id()."""
+        return cls.find_by_id(pk_value, include)
+
+    @classmethod
+    def load(cls, pk_value, include: list[str] = None):
+        """Alias for find_by_id()."""
+        return cls.find_by_id(pk_value, include)
+
     @classmethod
     def find_or_fail(cls, pk_value):
         """Find by primary key or raise ValueError."""
-        result = cls.find(pk_value)
+        result = cls.find_by_id(pk_value)
         if result is None:
             raise ValueError(f"{cls.__name__} with {cls._get_pk()}={pk_value} not found")
         return result