tina4-python 3.10.55__tar.gz → 3.10.59__tar.gz

{tina4_python-3.10.55 → tina4_python-3.10.59}/PKG-INFO

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

{tina4_python-3.10.55 → tina4_python-3.10.59}/tina4_python/__init__.py

@@ -8,7 +8,7 @@ Tina4 Python v3.0 — Zero-dependency, lightweight web framework.
 
 One import, everything works.
 """
-__version__ = "3.10.55"
+__version__ = "3.10.59"
 
 # ── Route decorators ──
 from tina4_python.core.router import (  # noqa: E402, F401

{tina4_python-3.10.55 → tina4_python-3.10.59}/tina4_python/core/server.py

@@ -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):
@@ -1238,7 +1303,7 @@ def _print_banner(host: str, port: int, server_name: str = "asyncio", ai_port: i
     color = "\033[34m" if sys.stdout.isatty() else ""
     reset = "\033[0m" if sys.stdout.isatty() else ""
 
-    ai_port_line = f"\n  AI Port:   http://{display}:{ai_port} (no-reload)" if ai_port else ""
+    ai_port_line = f"\n  Test Port: http://{display}:{ai_port} (stable — no hot-reload)" if ai_port else ""
 
     banner = f"""{color}
   ______ _             __ __
@@ -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
@@ -1328,7 +1390,7 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
 
     # Determine AI dev port (port+1) when debug is on and not suppressed
     _no_ai_port = os.environ.get("TINA4_NO_AI_PORT", "").lower() in ("true", "1", "yes")
-    _ai_port = (port + 1) if (is_debug and not _no_ai_port) else None
+    _ai_port = (port + 1000) if (is_debug and not _no_ai_port) else None
 
     # Banner — printed directly to stdout, not through the logger
     _print_banner(host, port, server_name, ai_port=_ai_port)
@@ -1336,7 +1398,7 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
     display = "localhost" if host in ("0.0.0.0", "::") else host
     Log.info(f"Server started http://{display}:{port} ({server_name})")
     if _ai_port:
-        Log.info(f"AI dev port: http://{display}:{_ai_port} (no-reload)")
+        Log.info(f"Test port: http://{display}:{_ai_port} (stable — no hot-reload)")
 
     # Open browser after a short delay (unless --no-browser)
     _skip_browser = no_browser or os.environ.get("TINA4_NO_BROWSER", "").lower() in ("true", "1", "yes")
@@ -1464,7 +1526,7 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
 
         server = await start_server(_handle_connection, host, port)
 
-        # AI dev port (port + 1) — no-reload, no live-reload WebSocket
+        # Test port (port + 1000) — stable, no live-reload WebSocket
         ai_server = None
         if _ai_port:
             try:

{tina4_python-3.10.55 → tina4_python-3.10.59}/tina4_python/orm/model.py

@@ -211,9 +211,9 @@ class ORM(metaclass=ORMMeta):
                 from tina4_python.database import Database
                 username = os.environ.get("DATABASE_USERNAME", "")
                 password = os.environ.get("DATABASE_PASSWORD", "")
-                global _database
-                _database = Database(url, username, password)
-                return _database
+                db = Database(url, username, password)
+                orm_bind(db)
+                return db
             raise RuntimeError(
                 "No database bound. Call orm_bind(db) or set DATABASE_URL in .env"
             )