tina4-python 3.10.58__tar.gz → 3.10.60__tar.gz

{tina4_python-3.10.58 → tina4_python-3.10.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 3.10.58
+Version: 3.10.60
 Summary: Tina4 for Python — 54 built-in features, zero dependencies
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 License: MIT

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/HtmlElement.py

@@ -1,5 +1,5 @@
 """
-Tina4 - This is not a 4ramework.
+Tina4 - The Intelligent Native Application 4ramework.
 Programmatic HTML builder - avoids string concatenation.
 
 Usage:

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/Testing.py

@@ -1,4 +1,4 @@
-# Tina4 Python v3.0 — This is not a 4ramework.
+# Tina4 Python v3.0 — The Intelligent Native Application 4ramework.
 # Copyright 2007 - present Tina4
 # License: MIT https://opensource.org/licenses/MIT
 """

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/__init__.py

@@ -1,4 +1,4 @@
-# Tina4 Python v3.0 — This is not a 4ramework.
+# Tina4 Python v3.0 — The Intelligent Native Application 4ramework.
 # Copyright 2007 - present Tina4
 # License: MIT https://opensource.org/licenses/MIT
 """
@@ -8,7 +8,7 @@ Tina4 Python v3.0 — Zero-dependency, lightweight web framework.
 
 One import, everything works.
 """
-__version__ = "3.10.58"
+__version__ = "3.10.60"
 
 # ── Route decorators ──
 from tina4_python.core.router import (  # noqa: E402, F401

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/cli/__init__.py

@@ -137,6 +137,7 @@ def main():
         "build": _build,
         "ai": _ai,
         "generate": _generate,
+        "console": _console,
         "help": _help,
     }
 
@@ -166,6 +167,7 @@ Commands:
   test                          Run test suite
   build                         Build distributable package
   ai [--all]                    Install AI coding assistant context
+  console                       Start interactive REPL with framework loaded
 
 Generators:
   generate model <Name> [--fields "name:string,price:float"]
@@ -185,6 +187,56 @@ https://tina4.com
 """)
 
 
+# ── Console ───────────────────────────────────────────────────────────
+
+def _console(args=None):
+    """Start an interactive REPL with the framework loaded."""
+    import code
+    import os
+
+    # Load environment
+    from tina4_python.dotenv import load_env
+    load_env()
+
+    # Import everything the user needs
+    from tina4_python import get, post, put, patch, delete, Router, Database, ORM, Auth, Queue, Frond
+    from tina4_python.debug import Log
+    from tina4_python.api import Api
+    from tina4_python.core.events import on, emit
+
+    # Try to connect database from DATABASE_URL
+    db = None
+    db_url = os.environ.get("DATABASE_URL")
+    if db_url:
+        try:
+            db = Database(db_url)
+            print(f"  Database: {db_url}")
+        except Exception as e:
+            print(f"  Database: failed ({e})")
+
+    # Auto-discover routes
+    from tina4_python.core.server import _auto_discover
+    _auto_discover("src")
+    route_count = len(Router.get_routes())
+    print(f"  Routes: {route_count} discovered")
+
+    banner = (
+        "\n  Tina4 Python Console\n"
+        "  Type Python code. Framework is loaded.\n"
+        "  Available: db, Router, ORM, Database, Auth, Api, Log, Queue\n"
+        "  Exit: Ctrl+D or exit()\n"
+    )
+
+    local_vars = {
+        "db": db, "Database": Database, "ORM": ORM, "Router": Router,
+        "Auth": Auth, "Api": Api, "Log": Log, "Queue": Queue,
+        "Frond": Frond, "get": get, "post": post, "put": put,
+        "patch": patch, "delete": delete, "on": on, "emit": emit,
+    }
+
+    code.interact(banner=banner, local=local_vars)
+
+
 # ── Init ──────────────────────────────────────────────────────────────
 
 def _init(args):

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/core/router.py

@@ -79,22 +79,22 @@ class RouteGroup:
         self._middleware = middleware or []
 
     def get(self, path: str, handler, **options) -> RouteRef:
-        return self._router.add("GET", self._prefix + path, handler, middleware=self._middleware, **options)
+        return self._router.add("GET", path, handler, middleware=self._middleware, **options)
 
     def post(self, path: str, handler, **options) -> RouteRef:
-        return self._router.add("POST", self._prefix + path, handler, middleware=self._middleware, **options)
+        return self._router.add("POST", path, handler, middleware=self._middleware, **options)
 
     def put(self, path: str, handler, **options) -> RouteRef:
-        return self._router.add("PUT", self._prefix + path, handler, middleware=self._middleware, **options)
+        return self._router.add("PUT", path, handler, middleware=self._middleware, **options)
 
     def patch(self, path: str, handler, **options) -> RouteRef:
-        return self._router.add("PATCH", self._prefix + path, handler, middleware=self._middleware, **options)
+        return self._router.add("PATCH", path, handler, middleware=self._middleware, **options)
 
     def delete(self, path: str, handler, **options) -> RouteRef:
-        return self._router.add("DELETE", self._prefix + path, handler, middleware=self._middleware, **options)
+        return self._router.add("DELETE", path, handler, middleware=self._middleware, **options)
 
     def any(self, path: str, handler, **options) -> RouteRef:
-        return self._router.add("ANY", self._prefix + path, handler, middleware=self._middleware, **options)
+        return self._router.add("ANY", path, handler, middleware=self._middleware, **options)
 
     def group(self, prefix: str, callback, middleware=None):
         merged = list(self._middleware) + (middleware or [])

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/core/server.py

@@ -254,7 +254,7 @@ h1{{font-size:3rem;font-weight:700;margin-bottom:0.25rem;letter-spacing:-1px}}
 <div class="hero">
     <img src="/images/tina4-logo-icon.webp" class="logo" alt="Tina4">
     <h1>Tina4Python</h1>
-    <p class="tagline">This Is Now A 4Framework</p>
+    <p class="tagline">The Intelligent Native Application 4ramework</p>
     <div class="actions">
         <a href="https://tina4.com/python" class="btn" target="_blank">Website</a>
         <a href="/__dev" class="btn">Dev Admin</a>
@@ -1175,19 +1175,84 @@ def _find_production_server():
     return None
 
 
+def _kill_port(port: int) -> None:
+    """Kill whatever process is listening on *port*.
+
+    Uses lsof on macOS/Linux and netstat + taskkill on Windows.
+    Raises RuntimeError if the port cannot be freed.
+    """
+    import subprocess
+    import time
+
+    print(f"  Port {port} in use — killing existing process...")
+
+    if sys.platform == "win32":
+        # Find PID via netstat
+        try:
+            result = subprocess.run(
+                ["netstat", "-ano"],
+                capture_output=True, text=True, timeout=5
+            )
+            pid = None
+            for line in result.stdout.splitlines():
+                if f":{port}" in line and ("LISTENING" in line or "ESTABLISHED" in line):
+                    parts = line.split()
+                    if parts:
+                        pid = parts[-1]
+                        break
+            if pid and pid.isdigit():
+                subprocess.run(["taskkill", "/PID", pid, "/F"], timeout=5)
+        except Exception as e:
+            raise RuntimeError(f"Could not free port {port}: {e}") from e
+    else:
+        # macOS / Linux — use lsof
+        try:
+            result = subprocess.run(
+                ["lsof", "-ti", f":{port}"],
+                capture_output=True, text=True, timeout=5
+            )
+            pids = result.stdout.strip().splitlines()
+            if not pids:
+                return  # Nothing found — port may have freed itself
+            for pid_str in pids:
+                pid_str = pid_str.strip()
+                if pid_str.isdigit():
+                    os.kill(int(pid_str), signal.SIGTERM)
+        except FileNotFoundError:
+            # lsof not available — try fuser
+            try:
+                result = subprocess.run(
+                    ["fuser", f"{port}/tcp"],
+                    capture_output=True, text=True, timeout=5
+                )
+                for pid_str in result.stdout.split():
+                    if pid_str.isdigit():
+                        os.kill(int(pid_str), signal.SIGTERM)
+            except Exception as e:
+                raise RuntimeError(f"Could not free port {port}: {e}") from e
+        except Exception as e:
+            raise RuntimeError(f"Could not free port {port}: {e}") from e
+
+    # Give the OS a moment to reclaim the port
+    time.sleep(0.5)
+    print(f"  Port {port} freed")
+
+
 def _find_available_port(start: int, max_tries: int = 10) -> int:
-    """Try successive ports starting from *start*, return the first available."""
+    """Check if *start* is available; if not, kill the process on it and return *start*.
+
+    The auto-increment behaviour is intentionally removed — the server always
+    claims the requested port.  If killing fails a RuntimeError is raised.
+    """
     import socket
-    for offset in range(max_tries):
-        port = start + offset
-        try:
-            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            s.bind(("127.0.0.1", port))
-            s.close()
-            return port
-        except OSError:
-            continue
-    return start
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        s.bind(("127.0.0.1", start))
+        s.close()
+        return start
+    except OSError:
+        _kill_port(start)
+        return start
 
 
 def _open_browser(url: str):
@@ -1247,7 +1312,7 @@ def _print_banner(host: str, port: int, server_name: str = "asyncio", ai_port: i
  / /  / / / / / /_/ /__  __/
 /_/  /_/_/ /_/\\__,_/  /_/
 {reset}
-  Tina4 Python v{__version__} — This Is Now A 4Framework
+  Tina4 Python v{__version__} — The Intelligent Native Application 4ramework
 
   Server:    http://{display}:{port} ({server_name})
   Swagger:   http://localhost:{port}/swagger
@@ -1300,11 +1365,8 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
     # Resolve host/port (CLI arg > ENV > default)
     host, port = resolve_config(cli_host=host, cli_port=port)
 
-    # Auto-increment port if already in use
-    original_port = port
+    # Claim the requested port — kill whatever is on it if needed
     port = _find_available_port(port)
-    if port != original_port:
-        Log.info(f"Port {original_port} in use — using {port} instead")
 
     # Detect production server (unless TINA4_DEBUG is true)
     from tina4_python.dotenv import is_truthy

{tina4_python-3.10.58 → tina4_python-3.10.60}/tina4_python/dev_admin/metrics.py

@@ -495,7 +495,8 @@ def _count_halstead(node: ast.AST, stats: dict):
 def _has_matching_test(rel_path: str) -> bool:
     """Check if a source file has a matching test file.
 
-    Looks for tests/test_{module}.py or tests/test_{module_name}.py.
+    Looks for common test file patterns and also scans any test file
+    that imports the module by name.
     """
     p = Path(rel_path)
     module = p.stem  # e.g. "auth" from "tina4_python/auth/__init__.py"
@@ -506,8 +507,26 @@ def _has_matching_test(rel_path: str) -> bool:
         Path("tests") / f"test_{module}.py",
         Path("tests") / f"test_{module}s.py",
         Path("test") / f"test_{module}.py",
+        Path("spec") / f"test_{module}.py",
+        Path("tests") / f"{module}_test.py",
     ]
-    return any(tp.exists() for tp in test_patterns)
+    if any(tp.exists() for tp in test_patterns):
+        return True
+    # Grep-based: check if any test file imports this module
+    import re
+    import_patterns = [re.compile(rf'\bimport\s+{re.escape(module)}\b'),
+                       re.compile(rf'\bfrom\s+{re.escape(module)}\b')]
+    for test_dir in (Path("tests"), Path("test"), Path("spec")):
+        if not test_dir.is_dir():
+            continue
+        for test_file in test_dir.glob("*.py"):
+            try:
+                content = test_file.read_text(encoding="utf-8", errors="ignore")
+                if any(pat.search(content) for pat in import_patterns):
+                    return True
+            except OSError:
+                pass
+    return False
 
 
 def _maintainability_index(halstead_volume: float, avg_cc: float, loc: int) -> float: