tina4-python 3.10.1__tar.gz → 3.10.3__tar.gz

{tina4_python-3.10.1 → tina4_python-3.10.3}/PKG-INFO

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

{tina4_python-3.10.1 → tina4_python-3.10.3}/pyproject.toml

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

{tina4_python-3.10.1 → tina4_python-3.10.3}/tina4_python/core/server.py

@@ -772,40 +772,98 @@ async def app(scope: dict, receive, send):
         request._route_params = params
         request.merge_route_params()
         try:
-            import inspect
-            _sig = inspect.signature(route["handler"])
-            _params = list(_sig.parameters.values())
-            _pcount = len(_params)
-
-            # Build args: inject path params by name, then request/response
-            _args = []
-            _remaining = []
-            for p in _params:
-                name = p.name
-                if name in params:
-                    _args.append(params[name])
-                else:
-                    _remaining.append(p)
-
-            # Append request/response for remaining positional params
-            if len(_remaining) == 0:
-                pass  # All params were path params
-            elif len(_remaining) == 1:
-                _ann = _remaining[0].annotation
-                if _ann is Request or (isinstance(_ann, str) and _ann in ("Request", "request")):
+            # ── Auth enforcement ────────────────────────────────────
+            _skip_handler = False
+            if route.get("auth_required"):
+                _auth_header = request.headers.get("authorization", "")
+                _api_key = os.environ.get("TINA4_API_KEY", os.environ.get("API_KEY", ""))
+                _auth_ok = False
+                if _auth_header:
+                    if _auth_header.startswith("Bearer "):
+                        _token = _auth_header[7:]
+                        # Check static API key first
+                        if _api_key and _token == _api_key:
+                            _auth_ok = True
+                        else:
+                            # Validate JWT token
+                            try:
+                                from tina4_python.auth import Auth
+                                if Auth.valid_token(_token):
+                                    _auth_ok = True
+                            except Exception:
+                                pass
+                if not _auth_ok:
+                    response.status(401).json({
+                        "error": "Unauthorized",
+                        "message": "Valid authorization token required",
+                        "status": 401,
+                    })
+                    _skip_handler = True
+
+            # ── Route middleware (before_* methods) ─────────────────
+            if not _skip_handler:
+                for _mw_cls in route.get("middleware", []):
+                    _mw_inst = _mw_cls() if isinstance(_mw_cls, type) else _mw_cls
+                    for _attr_name in dir(_mw_inst):
+                        if _attr_name.startswith("before_"):
+                            _mw_method = getattr(_mw_inst, _attr_name)
+                            if callable(_mw_method):
+                                _mw_result = _mw_method(request, response)
+                                if _mw_result is not None:
+                                    request, response = _mw_result
+                                    # If middleware returned an error status, skip handler
+                                    if response.status_code >= 400:
+                                        _skip_handler = True
+                                        break
+                    if _skip_handler:
+                        break
+
+            if not _skip_handler:
+                import inspect
+                _sig = inspect.signature(route["handler"])
+                _params = list(_sig.parameters.values())
+                _pcount = len(_params)
+
+                # Build args: inject path params by name, then request/response
+                _args = []
+                _remaining = []
+                for p in _params:
+                    name = p.name
+                    if name in params:
+                        _args.append(params[name])
+                    else:
+                        _remaining.append(p)
+
+                # Append request/response for remaining positional params
+                if len(_remaining) == 0:
+                    pass  # All params were path params
+                elif len(_remaining) == 1:
+                    _ann = _remaining[0].annotation
+                    if _ann is Request or (isinstance(_ann, str) and _ann in ("Request", "request")):
+                        _args.append(request)
+                    else:
+                        _args.append(response)
+                elif len(_remaining) >= 2:
                     _args.append(request)
-                else:
                     _args.append(response)
-            elif len(_remaining) >= 2:
-                _args.append(request)
-                _args.append(response)
 
-            if _pcount == 0:
-                result = await route["handler"]()
-            else:
-                result = await route["handler"](*_args)
-            if isinstance(result, Response):
-                response = result
+                if _pcount == 0:
+                    result = await route["handler"]()
+                else:
+                    result = await route["handler"](*_args)
+                if isinstance(result, Response):
+                    response = result
+
+            # ── Route middleware (after_* methods) ──────────────────
+            for _mw_cls in route.get("middleware", []):
+                _mw_inst = _mw_cls() if isinstance(_mw_cls, type) else _mw_cls
+                for _attr_name in dir(_mw_inst):
+                    if _attr_name.startswith("after_"):
+                        _mw_method = getattr(_mw_inst, _attr_name)
+                        if callable(_mw_method):
+                            _mw_result = _mw_method(request, response)
+                            if _mw_result is not None:
+                                request, response = _mw_result
         except Exception as e:
             Log.error(f"Route error: {e}", path=request.path)
             _write_broken(request, e)
@@ -1135,6 +1193,11 @@ def run(host: str | None = None, port: int | None = None):
     global _start_time
     _start_time = time.time()
 
+    # Ensure CWD is on sys.path so auto-discovered modules can be imported
+    cwd = os.getcwd()
+    if cwd not in sys.path:
+        sys.path.insert(0, cwd)
+
     # Load .env first so env vars are available for logger init
     from tina4_python.dotenv import load_env
     load_env()

{tina4_python-3.10.1 → tina4_python-3.10.3}/tina4_python/database/connection.py

@@ -36,12 +36,13 @@ class ConnectionPool:
     """
 
     def __init__(self, pool_size: int, factory: callable, connect_path: str,
-                 username: str = "", password: str = ""):
+                 username: str = "", password: str = "", **kwargs):
         self._pool_size = pool_size
         self._factory = factory
         self._connect_path = connect_path
         self._username = username
         self._password = password
+        self._connect_kwargs = kwargs
         self._adapters: list[DatabaseAdapter | None] = [None] * pool_size
         self._index = 0
         self._lock = threading.Lock()
@@ -50,7 +51,7 @@ class ConnectionPool:
         """Lazily create an adapter at the given index."""
         if self._adapters[idx] is None:
             adapter = self._factory()
-            adapter.connect(self._connect_path, username=self._username, password=self._password)
+            adapter.connect(self._connect_path, username=self._username, password=self._password, **self._connect_kwargs)
             self._adapters[idx] = adapter
         return self._adapters[idx]
 
@@ -130,12 +131,13 @@ class Database:
     operations to the adapter. This is what the rest of the framework uses.
     """
 
-    def __init__(self, url: str = None, username: str = "", password: str = "", pool: int = 0):
+    def __init__(self, url: str = None, username: str = "", password: str = "", pool: int = 0, **kwargs):
         self.url = url or os.environ.get("DATABASE_URL", "sqlite:///data/tina4.db")
         # Priority: constructor params > env vars > empty
         self.username = username or os.environ.get("DATABASE_USERNAME", "")
         self.password = password or os.environ.get("DATABASE_PASSWORD", "")
         self.pool_size = pool  # 0 = single connection, N>0 = N pooled connections
+        self._connect_kwargs = kwargs  # Extra kwargs passed through to adapter.connect()
 
         if self.pool_size > 0:
             # Pooled mode — create a ConnectionPool with lazy adapter creation
@@ -145,13 +147,14 @@ class Database:
                 connect_path=self._connection_path(),
                 username=self.username,
                 password=self.password,
+                **kwargs,
             )
             self._adapter: DatabaseAdapter | None = None
         else:
             # Single-connection mode — current behavior
             self._pool: ConnectionPool | None = None
             self._adapter: DatabaseAdapter = self._create_adapter()
-            self._adapter.connect(self._connection_path(), username=self.username, password=self.password)
+            self._adapter.connect(self._connection_path(), username=self.username, password=self.password, **kwargs)
 
         # Query cache — off by default, opt-in via TINA4_DB_CACHE=true
         from tina4_python.dotenv import is_truthy

{tina4_python-3.10.1 → tina4_python-3.10.3}/tina4_python/database/firebird.py

@@ -1,18 +1,32 @@
-# Tina4 Firebird Driver — Uses fdb (optional).
+# Tina4 Firebird Driver — Uses firebird-driver or fdb (optional).
 """
-Firebird adapter using fdb.
+Firebird adapter using firebird-driver (preferred) or fdb (fallback).
 
     db = Database("firebird://user:pass@localhost:3050/path/to/database.fdb")
 
-Requires: pip install fdb
+Requires: pip install firebird-driver  (or pip install fdb for legacy)
 """
 import re
 from urllib.parse import urlparse, unquote
 from tina4_python.database.adapter import DatabaseAdapter, DatabaseResult, SQLTranslator
 
+# Try modern firebird-driver first, fall back to legacy fdb
+_driver = None
+_driver_name = None
+try:
+    import firebird.driver as _driver
+    _driver_name = "firebird-driver"
+except ImportError:
+    try:
+        import fdb as _driver
+        _driver_name = "fdb"
+    except ImportError:
+        _driver = None
+        _driver_name = None
+
 
 class FirebirdAdapter(DatabaseAdapter):
-    """Firebird database driver using fdb."""
+    """Firebird database driver using firebird-driver or fdb."""
 
     def __init__(self):
         super().__init__()
@@ -25,12 +39,10 @@ class FirebirdAdapter(DatabaseAdapter):
         Connection string: firebird://user:pass@host:port/path/to/db.fdb
         Credentials priority: URL > username/password params > adapter defaults (SYSDBA/masterkey).
         """
-        try:
-            import fdb
-        except ImportError:
+        if _driver is None:
             raise ImportError(
-                "fdb is required for Firebird connections. "
-                "Install: pip install fdb"
+                "A Firebird driver is required. "
+                "Install: pip install firebird-driver  (or pip install fdb for legacy)"
             )
 
         parsed = urlparse(connection_string)
@@ -42,15 +54,27 @@ class FirebirdAdapter(DatabaseAdapter):
         password = parsed.password or password or "masterkey"
         charset = kwargs.pop("charset", "UTF8")
 
-        self._conn = fdb.connect(
-            host=host,
-            port=port,
-            database=db_path,
-            user=user,
-            password=password,
-            charset=charset,
-            **kwargs,
-        )
+        if _driver_name == "firebird-driver":
+            # Modern firebird-driver uses dsn format: host/port:path
+            dsn = f"{host}/{port}:{db_path}" if port != 3050 else f"{host}:{db_path}"
+            self._conn = _driver.connect(
+                dsn,
+                user=user,
+                password=password,
+                charset=charset,
+                **kwargs,
+            )
+        else:
+            # Legacy fdb
+            self._conn = _driver.connect(
+                host=host,
+                port=port,
+                database=db_path,
+                user=user,
+                password=password,
+                charset=charset,
+                **kwargs,
+            )
 
     def close(self):
         if self._conn:
@@ -94,7 +118,7 @@ class FirebirdAdapter(DatabaseAdapter):
                         desc = cursor.description
                         row = cursor.fetchone()
                         if row and desc:
-                            col_names = [d[0] for d in desc]
+                            col_names = [d[0].strip().lower() for d in desc]
                             records = [dict(zip(col_names, row))]
                 except Exception:
                     pass
@@ -133,7 +157,7 @@ class FirebirdAdapter(DatabaseAdapter):
         cursor.execute(paginated_sql, params or [])
 
         desc = cursor.description
-        col_names = [d[0] for d in desc] if desc else []
+        col_names = [d[0].strip().lower() for d in desc] if desc else []
         rows = [dict(zip(col_names, row)) for row in cursor.fetchall()]
 
         return DatabaseResult(records=rows, count=total, sql=sql, adapter=self)
@@ -146,7 +170,7 @@ class FirebirdAdapter(DatabaseAdapter):
         row = cursor.fetchone()
         if row is None:
             return None
-        col_names = [d[0] for d in desc] if desc else []
+        col_names = [d[0].strip().lower() for d in desc] if desc else []
         return dict(zip(col_names, row))
 
     def insert(self, table: str, data: dict) -> DatabaseResult:
@@ -204,7 +228,7 @@ class FirebirdAdapter(DatabaseAdapter):
             "ORDER BY RDB$RELATION_NAME",
             limit=10000,
         )
-        return [r["RDB$RELATION_NAME"].strip() for r in result.records]
+        return [r["rdb$relation_name"].strip() for r in result.records]
 
     def get_columns(self, table: str) -> list[dict]:
         sql = (
@@ -224,10 +248,10 @@ class FirebirdAdapter(DatabaseAdapter):
         }
         return [
             {
-                "name": r["RDB$FIELD_NAME"].strip() if r["RDB$FIELD_NAME"] else "",
-                "type": type_map.get(r.get("RDB$FIELD_TYPE"), str(r.get("RDB$FIELD_TYPE", ""))),
-                "nullable": r.get("RDB$NULL_FLAG") is None,
-                "default": r.get("RDB$DEFAULT_SOURCE"),
+                "name": r["rdb$field_name"].strip() if r["rdb$field_name"] else "",
+                "type": type_map.get(r.get("rdb$field_type"), str(r.get("rdb$field_type", ""))),
+                "nullable": r.get("rdb$null_flag") is None,
+                "default": r.get("rdb$default_source"),
                 "primary_key": False,
             }
             for r in result.records

{tina4_python-3.10.1 → tina4_python-3.10.3}/tina4_python/frond/engine.py

@@ -181,6 +181,60 @@ def _find_colon(expr: str) -> int:
 # ── Expression Evaluator ────────────────────────────────────────
 
 
+def _split_dotted(expr: str) -> list[str]:
+    """Split a dotted expression into parts, respecting quotes, parens, and brackets.
+
+    'user.t("auth.email")' → ['user', 't("auth.email")']
+    'items[0].name'        → ['items', '[0]', 'name']
+    'a.b.c'                → ['a', 'b', 'c']
+    """
+    parts = []
+    current = ""
+    in_q = None
+    paren_depth = 0
+    bracket_depth = 0
+    i = 0
+    while i < len(expr):
+        ch = expr[i]
+        if ch in ('"', "'") and paren_depth == 0 and bracket_depth == 0 and in_q is None:
+            in_q = ch
+            current += ch
+        elif ch == in_q:
+            in_q = None
+            current += ch
+        elif in_q:
+            current += ch
+        elif ch == "(":
+            paren_depth += 1
+            current += ch
+        elif ch == ")":
+            paren_depth -= 1
+            current += ch
+        elif ch == "[" and paren_depth == 0:
+            # Start of bracket access — save current part if any
+            if current:
+                parts.append(current)
+                current = ""
+            bracket_depth += 1
+            current += ch
+        elif ch == "]" and bracket_depth > 0:
+            bracket_depth -= 1
+            current += ch
+            if bracket_depth == 0:
+                parts.append(current)
+                current = ""
+        elif ch == "." and paren_depth == 0 and bracket_depth == 0:
+            if current:
+                parts.append(current)
+                current = ""
+        else:
+            current += ch
+        i += 1
+    if current:
+        parts.append(current)
+    return parts
+
+
 def _resolve(expr: str, context: dict):
     """Resolve a dotted expression against the context.
 
@@ -209,29 +263,59 @@ def _resolve(expr: str, context: dict):
     if expr in ("null", "none", "None"):
         return None
 
-    # Dotted path with bracket access
-    parts = re.split(r"\.|(\[[^\]]+\])", expr)
-    parts = [p for p in parts if p]
+    # Dotted path with bracket access — split respecting quotes and parens
+    parts = _split_dotted(expr)
 
     value = context
     for part in parts:
         if part.startswith("[") and part.endswith("]"):
             idx = part[1:-1].strip("'\"")
-            try:
-                idx = int(idx)
-            except ValueError:
-                pass
-            try:
-                value = value[idx]
-            except (KeyError, IndexError, TypeError):
-                return None
-        elif isinstance(value, dict):
-            value = value.get(part)
-        elif hasattr(value, part):
-            attr = getattr(value, part)
-            value = attr() if callable(attr) else attr
+            # Slice syntax: value[1:5], value[:10], value[3:]
+            if ":" in idx:
+                slice_parts = idx.split(":", 1)
+                s_start = int(slice_parts[0]) if slice_parts[0].strip() else None
+                s_end = int(slice_parts[1]) if slice_parts[1].strip() else None
+                try:
+                    value = value[s_start:s_end]
+                except (TypeError, IndexError):
+                    return None
+            else:
+                try:
+                    idx = int(idx)
+                except ValueError:
+                    pass
+                try:
+                    value = value[idx]
+                except (KeyError, IndexError, TypeError):
+                    return None
         else:
-            return None
+            # Check if this part is a method call: name(args)
+            call_match = re.match(r"^(\w+)\s*\((.*)?\)$", part, re.DOTALL)
+            if call_match:
+                method_name = call_match.group(1)
+                raw_args = call_match.group(2) or ""
+                # Resolve the callable from the current value
+                if isinstance(value, dict):
+                    fn = value.get(method_name)
+                elif hasattr(value, method_name):
+                    fn = getattr(value, method_name)
+                else:
+                    return None
+                if callable(fn):
+                    if raw_args.strip():
+                        args = [_eval_expr(a.strip(), context) for a in _split_args(raw_args)]
+                    else:
+                        args = []
+                    value = fn(*args)
+                else:
+                    return None
+            elif isinstance(value, dict):
+                value = value.get(part)
+            elif hasattr(value, part):
+                attr = getattr(value, part)
+                value = attr() if callable(attr) else attr
+            else:
+                return None
 
         if value is None:
             return None
@@ -239,6 +323,35 @@ def _resolve(expr: str, context: dict):
     return value
 
 
+def _split_args(raw: str) -> list[str]:
+    """Split comma-separated arguments respecting quotes and nested parens."""
+    parts = []
+    current = ""
+    in_q = None
+    depth = 0
+    for ch in raw:
+        if ch in ('"', "'") and not in_q:
+            in_q = ch
+            current += ch
+        elif ch == in_q:
+            in_q = None
+            current += ch
+        elif ch == "(" and not in_q:
+            depth += 1
+            current += ch
+        elif ch == ")" and not in_q:
+            depth -= 1
+            current += ch
+        elif ch == "," and not in_q and depth == 0:
+            parts.append(current.strip())
+            current = ""
+        else:
+            current += ch
+    if current.strip():
+        parts.append(current.strip())
+    return parts
+
+
 def _eval_expr(expr: str, context: dict):
     """Evaluate a full expression (with ~, ternary, ??, comparisons)."""
     expr = expr.strip()

{tina4_python-3.10.1 → tina4_python-3.10.3}/tina4_python/migration/runner.py

@@ -18,7 +18,11 @@ logger = logging.getLogger(__name__)
 
 
 def _ensure_tracking_table(db):
-    """Create the migration tracking table if it doesn't exist."""
+    """Create or upgrade the migration tracking table.
+
+    Handles v2→v3 upgrade: v2 tables have `description` but no `migration_id`.
+    When detected, adds the missing column and backfills from `description`.
+    """
     if not db.table_exists("tina4_migration"):
         db.execute("""
             CREATE TABLE tina4_migration (
@@ -31,15 +35,62 @@ def _ensure_tracking_table(db):
             )
         """)
         db.commit()
+        return
+
+    # Check if this is a v2 table (has description but no migration_id column)
+    try:
+        db.fetch_one("SELECT migration_id FROM tina4_migration WHERE 1=0")
+    except Exception:
+        # migration_id column doesn't exist — v2 schema, upgrade it
+        try:
+            db.execute("ALTER TABLE tina4_migration ADD migration_id TEXT")
+            db.commit()
+        except Exception:
+            pass  # Column may already exist on some engines
+
+        # Backfill migration_id from description (v2 used description as the identifier)
+        try:
+            db.execute("UPDATE tina4_migration SET migration_id = description WHERE migration_id IS NULL")
+            db.commit()
+        except Exception:
+            pass
+
+        # Add batch column if missing (v2 didn't have it)
+        try:
+            db.fetch_one("SELECT batch FROM tina4_migration WHERE 1=0")
+        except Exception:
+            try:
+                db.execute("ALTER TABLE tina4_migration ADD batch INTEGER DEFAULT 1")
+                db.commit()
+            except Exception:
+                pass
+
+        # Add executed_at column if missing
+        try:
+            db.fetch_one("SELECT executed_at FROM tina4_migration WHERE 1=0")
+        except Exception:
+            try:
+                db.execute("ALTER TABLE tina4_migration ADD executed_at TEXT DEFAULT ''")
+                db.commit()
+            except Exception:
+                pass
 
 
 def _get_executed(db) -> set[str]:
     """Get set of already-executed migration IDs."""
-    result = db.fetch(
-        "SELECT migration_id FROM tina4_migration WHERE passed = 1",
-        limit=10000,
-    )
-    return {row["migration_id"] for row in result.records}
+    try:
+        result = db.fetch(
+            "SELECT migration_id FROM tina4_migration WHERE passed = 1",
+            limit=10000,
+        )
+        return {row["migration_id"] for row in result.records if row.get("migration_id")}
+    except Exception:
+        # Fallback for v2 tables where migration_id may not exist yet
+        result = db.fetch(
+            "SELECT description FROM tina4_migration WHERE passed = 1",
+            limit=10000,
+        )
+        return {row["description"] for row in result.records if row.get("description")}
 
 
 def _get_next_batch(db) -> int: