tina4-python 3.10.48__tar.gz → 3.10.54__tar.gz

{tina4_python-3.10.48 → tina4_python-3.10.54}/PKG-INFO

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

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/__init__.py

@@ -8,7 +8,14 @@ Tina4 Python v3.0 — Zero-dependency, lightweight web framework.
 
 One import, everything works.
 """
-__version__ = "3.10.48"
+__version__ = "3.10.54"
+
+# ── Route decorators ──
+from tina4_python.core.router import (  # noqa: E402, F401
+    get, post, put, patch, delete, any_method,
+    noauth, secured, cached, middleware, template,
+    Router,
+)
 
 # ── HTTP Constants ──
 from tina4_python.core.constants import (  # noqa: E402, F401
@@ -22,6 +29,9 @@ from tina4_python.core.constants import (  # noqa: E402, F401
     APPLICATION_OCTET, TEXT_HTML, TEXT_PLAIN, TEXT_CSV, TEXT_XML,
 )
 
+# ── Database ──
+from tina4_python.database import Database  # noqa: E402, F401
+
 # ── ORM ──
 from tina4_python.orm import (  # noqa: E402, F401
     ORM, orm_bind, Field,
@@ -31,6 +41,15 @@ from tina4_python.orm import (  # noqa: E402, F401
     has_many, has_one, belongs_to,  # relationship descriptors
 )
 
+# ── Auth ──
+from tina4_python.auth import Auth  # noqa: E402, F401
+
+# ── Queue ──
+from tina4_python.queue import Queue  # noqa: E402, F401
+
+# ── Template engine ──
+from tina4_python.frond import Frond  # noqa: E402, F401
+
 # ── Response Cache ──
 from tina4_python.cache import (  # noqa: E402, F401
     ResponseCache, cache_stats, clear_cache,
@@ -38,3 +57,6 @@ from tina4_python.cache import (  # noqa: E402, F401
 
 # ── DI Container ──
 from tina4_python.container import Container  # noqa: E402, F401
+
+# ── Server ──
+from tina4_python.core.server import run  # noqa: E402, F401

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/cli/__init__.py

@@ -156,7 +156,7 @@ Usage: tina4python <command> [options]
 
 Commands:
   init [dir]                    Scaffold a new project
-  serve [--port P] [--no-browser]  Start dev server (default: 0.0.0.0:7146)
+  serve [--port P] [--no-browser] [--no-reload]  Start dev server (default: 0.0.0.0:7146)
   migrate                      Run pending database migrations
   migrate:create <desc>         Create a new migration file
   migrate:rollback              Rollback last migration batch
@@ -202,6 +202,24 @@ def _init(args):
     for folder in folders:
         (target / folder).mkdir(parents=True, exist_ok=True)
 
+    # Copy framework public assets into the project so they're visible
+    framework_public = Path(__file__).parent.parent / "public"
+    project_public = target / "src" / "public"
+    assets_to_copy = [
+        "css/tina4.css",
+        "css/tina4.min.css",
+        "js/tina4.min.js",
+        "js/frond.min.js",
+        "images/tina4-logo-icon.webp",
+    ]
+    for asset in assets_to_copy:
+        src = framework_public / asset
+        dst = project_public / asset
+        dst.parent.mkdir(parents=True, exist_ok=True)
+        if src.exists() and not dst.exists():
+            import shutil
+            shutil.copy2(src, dst)
+
     # Copy frontend README
     frontend_readme = target / "frontend" / "README.md"
     if not frontend_readme.exists():
@@ -309,12 +327,15 @@ def _serve(args):
     if os.environ.get("TINA4_OPEN_BROWSER", "").lower() in ("false", "0", "no"):
         no_browser = True
 
+    # --no-reload flag
+    no_reload = "no-reload" in flags
+
     # Kill existing process on port
     port = cli_port or int(os.environ.get("PORT", os.environ.get("TINA4_PORT", "7146")))
     _kill_process_on_port(port)
 
     from tina4_python.core import run
-    run(host=cli_host, port=cli_port, no_browser=no_browser)
+    run(host=cli_host, port=cli_port, no_browser=no_browser, no_reload=no_reload)
 
 
 # ── Migrate ───────────────────────────────────────────────────────────

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/core/request.py

@@ -80,6 +80,21 @@ class Request:
         # Parse body
         req.body = _parse_body(body, req.content_type)
 
+        # Separate files from body for multipart uploads
+        if isinstance(req.body, dict) and "multipart/form-data" in req.content_type:
+            files = {}
+            fields = {}
+            for key, value in req.body.items():
+                if isinstance(value, dict) and "filename" in value:
+                    # Base64-encode file content for safe transport
+                    import base64
+                    value["content"] = base64.b64encode(value["content"]).decode()
+                    files[key] = value
+                else:
+                    fields[key] = value
+            req.files = files
+            req.body = fields
+
         return req
 
     def merge_route_params(self):

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/core/router.py

@@ -262,7 +262,7 @@ def _compile_pattern(path: str) -> tuple[re.Pattern, list[str]]:
     for i, segment in enumerate(segments):
         if segment == "*":
             # Wildcard: matches the rest of the path (greedy)
-            param_names.append("wildcard")
+            param_names.append("*")
             regex_parts.append("(.+)")
             break  # Nothing can follow a wildcard
         elif segment.startswith("{") and segment.endswith("}"):

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/core/server.py

@@ -9,6 +9,7 @@ import os
 import sys
 import signal
 import asyncio
+import contextvars
 import importlib
 import uuid
 from pathlib import Path
@@ -25,6 +26,9 @@ _cors = CorsMiddleware()
 _rate_limiter = RateLimiter()
 
 
+# ContextVar to signal that the current request is being served on the AI dev port
+_ai_port_ctx: contextvars.ContextVar[bool] = contextvars.ContextVar("_ai_port_ctx", default=False)
+
 # Track startup time
 _start_time: float = 0
 
@@ -640,6 +644,10 @@ def _init_session(request: Request) -> None:
         sess = Session()
         sess.start(sid_match)
         request.session = sess
+        # Probabilistic garbage collection (1% of requests)
+        import random
+        if random.randint(1, 100) == 1:
+            sess.gc()
     except Exception:
         pass  # Session module not available — session stays None
 
@@ -1218,7 +1226,7 @@ def resolve_config(cli_host: str | None = None, cli_port: int | None = None) ->
     return host, port
 
 
-def _print_banner(host: str, port: int, server_name: str = "asyncio"):
+def _print_banner(host: str, port: int, server_name: str = "asyncio", ai_port: int | None = None):
     """Print the Tina4 Slant ASCII banner to stdout (not through the logger)."""
     from tina4_python.dotenv import is_truthy
 
@@ -1230,6 +1238,8 @@ def _print_banner(host: str, port: int, server_name: str = "asyncio"):
     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 ""
+
     banner = f"""{color}
   ______ _             __ __
  /_  __/(_)___  ____ _/ // /
@@ -1242,12 +1252,12 @@ def _print_banner(host: str, port: int, server_name: str = "asyncio"):
   Server:    http://{display}:{port} ({server_name})
   Swagger:   http://localhost:{port}/swagger
   Dashboard: http://localhost:{port}/__dev
-  Debug:     {"ON" if is_debug else "OFF"} (Log level: {log_level})
+  Debug:     {"ON" if is_debug else "OFF"} (Log level: {log_level}){ai_port_line}
 """
     print(banner)
 
 
-def run(host: str | None = None, port: int | None = None, no_browser: bool = False):
+def run(host: str | None = None, port: int | None = None, no_browser: bool = False, no_reload: bool = False):
     """Start the Tina4 dev server.
 
     Discovers routes from src/, starts ASGI server, handles shutdown.
@@ -1256,11 +1266,15 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
         host: Bind address. Falls back to HOST env var, then 0.0.0.0.
         port: Bind port. Falls back to PORT env var, then 7146.
         no_browser: If True, do not open browser on startup.
+        no_reload: If True, disable the file watcher / live-reload.
     """
     import time
     global _start_time
     _start_time = time.time()
 
+    if no_reload:
+        os.environ["TINA4_NO_RELOAD"] = "true"
+
     # Ensure CWD is on sys.path so auto-discovered modules can be imported
     cwd = os.getcwd()
     if cwd not in sys.path:
@@ -1298,11 +1312,13 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
 
     # Start DevReload file watcher in debug mode
     if is_debug:
-        try:
-            from tina4_python.dev_reload import start as _start_dev_reload
-            _start_dev_reload(["src", "public"])
-        except Exception as e:
-            Log.error(f"DevReload: failed to start: {e}")
+        no_reload = os.environ.get("TINA4_NO_RELOAD", "").lower() in ("true", "1", "yes")
+        if not no_reload:
+            try:
+                from tina4_python.dev_reload import start as _start_dev_reload
+                _start_dev_reload(["src", "public"])
+            except Exception as e:
+                Log.error(f"DevReload: failed to start: {e}")
 
     prod = None
     if not is_debug:
@@ -1310,11 +1326,17 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
 
     server_name = prod[0] if prod else "asyncio"
 
+    # 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
+
     # Banner — printed directly to stdout, not through the logger
-    _print_banner(host, port, server_name)
+    _print_banner(host, port, server_name, ai_port=_ai_port)
 
     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)")
 
     # 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")
@@ -1383,6 +1405,11 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
             # Check for WebSocket upgrade before reading body
             _header_dict = {k.decode(): v.decode() for k, v in headers}
             if _header_dict.get("upgrade", "").lower() == "websocket":
+                if hasattr(writer, "_tina4_ai_port") and path == "/__dev_reload":
+                    writer.write(b"HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n")
+                    await writer.drain()
+                    writer.close()
+                    return
                 await _handle_dev_websocket(reader, writer, _header_dict, path)
                 return
 
@@ -1437,6 +1464,19 @@ 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
+        ai_server = None
+        if _ai_port:
+            try:
+                async def _handle_ai_connection(reader, writer):
+                    _ai_port_ctx.set(True)
+                    writer._tina4_ai_port = True
+                    await _handle_connection(reader, writer)
+
+                ai_server = await start_server(_handle_ai_connection, host, _ai_port)
+            except OSError:
+                Log.warning(f"AI port {_ai_port} in use — skipping")
+
         loop = asyncio.get_running_loop()
         for sig in (signal.SIGINT, signal.SIGTERM):
             try:
@@ -1445,6 +1485,9 @@ def run(host: str | None = None, port: int | None = None, no_browser: bool = Fal
                 pass  # Windows
 
         await shutdown.wait()
+        if ai_server:
+            ai_server.close()
+            await ai_server.wait_closed()
         server.close()
         await server.wait_closed()
         Log.info("Server stopped.")

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/adapter.py

@@ -33,8 +33,10 @@ class DatabaseResult:
 
     def to_paginate(self, page: int = 1, per_page: int = 20) -> dict:
         total_pages = max(1, -(-self.count // per_page))  # ceil division
+        start = (page - 1) * per_page
+        end = start + per_page
         return {
-            "data": self.records,
+            "data": self.records[start:end],
             "total": self.count,
             "page": page,
             "per_page": per_page,
@@ -210,21 +212,31 @@ class DatabaseResult:
         return columns
 
     def _fallback_column_info(self) -> list[dict]:
-        """Derive basic column info from record keys when no adapter is available."""
+        """Derive basic column info from record keys and values when no adapter is available."""
         if not self.records:
             return []
-        keys = list(self.records[0].keys()) if isinstance(self.records[0], dict) else []
-        return [
-            {
+        row = self.records[0] if isinstance(self.records[0], dict) else {}
+        result = []
+        for k, v in row.items():
+            if isinstance(v, int):
+                col_type = "INTEGER"
+            elif isinstance(v, float):
+                col_type = "REAL"
+            elif isinstance(v, bool):
+                col_type = "BOOLEAN"
+            elif v is None:
+                col_type = "TEXT"
+            else:
+                col_type = "TEXT"
+            result.append({
                 "name": k,
-                "type": "UNKNOWN",
+                "type": col_type,
                 "size": None,
                 "decimals": None,
                 "nullable": True,
-                "primary_key": False,
-            }
-            for k in keys
-        ]
+                "primary_key": k.lower() == "id",
+            })
+        return result
 
 
 class DatabaseAdapter:
@@ -285,7 +297,7 @@ class DatabaseAdapter:
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         """Execute a read query and return multiple rows."""
         raise NotImplementedError
 

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/connection.py

@@ -283,7 +283,7 @@ class Database:
         return adapter.execute_many(sql, params_list)
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         """Fetch rows with pagination."""
         if self._cache_enabled:
             key = self._cache_key(sql + f":L{limit}:S{offset}", params)

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/firebird.py

@@ -49,7 +49,7 @@ class FirebirdAdapter(DatabaseAdapter):
         host = parsed.hostname or "localhost"
         port = parsed.port or 3050
         # Firebird database path — decode URL-encoded characters
-        db_path = unquote(parsed.path.lstrip("/")) if parsed.path else ""
+        db_path = unquote(parsed.path[1:]) if parsed.path.startswith("/") else unquote(parsed.path)
         user = parsed.username or username or "SYSDBA"
         password = parsed.password or password or "masterkey"
         charset = kwargs.pop("charset", "UTF8")
@@ -138,7 +138,7 @@ class FirebirdAdapter(DatabaseAdapter):
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         sql = self._translate_sql(sql)
         cursor = self._conn.cursor()
 

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/mssql.py

@@ -102,7 +102,7 @@ class MSSQLAdapter(DatabaseAdapter):
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         sql = self._translate_sql(sql)
         cursor = self._conn.cursor(as_dict=True)
 

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/mysql.py

@@ -91,7 +91,7 @@ class MySQLAdapter(DatabaseAdapter):
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         sql = self._translate_sql(sql)
         cursor = self._conn.cursor(dictionary=True)
 

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/odbc.py

@@ -74,7 +74,7 @@ class ODBCAdapter(DatabaseAdapter):
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         # Count total
         count_sql = f"SELECT COUNT(*) FROM ({sql}) AS _t"
         cursor = self._conn.cursor()

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/postgres.py

@@ -100,7 +100,7 @@ class PostgreSQLAdapter(DatabaseAdapter):
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         import psycopg2.extras
 
         sql = self._translate_sql(sql)

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/database/sqlite.py

@@ -93,7 +93,7 @@ class SQLiteAdapter(DatabaseAdapter):
         )
 
     def fetch(self, sql: str, params: list = None,
-              limit: int = 20, offset: int = 0) -> DatabaseResult:
+              limit: int = 100, offset: int = 0) -> DatabaseResult:
         # Count total rows (without LIMIT/OFFSET)
         count_sql = f"SELECT COUNT(*) as cnt FROM ({sql})"
         try:

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/dev_admin/__init__.py

@@ -2447,8 +2447,10 @@ def render_dev_toolbar(method: str, path: str, matched_pattern: str,
     and a close button.
     """
     import sys
+    from tina4_python.core.server import _ai_port_ctx
     python_version = sys.version.split()[0]
     poll_interval_ms = int(os.environ.get("TINA4_DEV_POLL_INTERVAL", "3000"))
+    no_reload = os.environ.get("TINA4_NO_RELOAD", "").lower() in ("true", "1", "yes") or _ai_port_ctx.get()
 
     return f"""<div id="tina4-dev-toolbar" style="position:fixed;bottom:0;left:0;right:0;background:#333;color:#fff;font-family:monospace;font-size:12px;padding:6px 16px;z-index:99999;display:flex;align-items:center;gap:16px;">
     <span id="tina4-ver-btn" style="color:#3572A5;font-weight:bold;cursor:pointer;text-decoration:underline dotted;" onclick="tina4VersionModal()" title="Click to check for updates">Tina4 v{__version__}</span>
@@ -2472,7 +2474,7 @@ def render_dev_toolbar(method: str, path: str, matched_pattern: str,
     <span onclick="this.parentElement.style.display='none'" style="cursor:pointer;color:#888;margin-left:8px;">&#10005;</span>
 </div>
 <script>
-(function(){{
+{'(function(){})();' if no_reload else f"""(function(){{
     var _t4_mtime=0,_t4_css_exts=['.css','.scss'],_t4_debounce=null;
     var _t4_interval=parseInt('{poll_interval_ms}')||3000;
     function _t4_apply(d){{
@@ -2499,7 +2501,7 @@ def render_dev_toolbar(method: str, path: str, matched_pattern: str,
         }}).catch(function(){{}});
     }}
     setInterval(_t4_poll,_t4_interval);
-}})();
+}})();"""}
 function tina4VersionModal(){{
     var m=document.getElementById('tina4-ver-modal');
     if(m.style.display==='block'){{m.style.display='none';return;}}

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/frond/engine.py

@@ -118,6 +118,7 @@ _SET_RE = re.compile(r"set\s+(\w+)\s*=\s*(.+)")
 _INCLUDE_RE = re.compile(r'include\s+["\'](.+?)["\'](?:\s+with\s+(.+))?')
 _MACRO_RE = re.compile(r"macro\s+(\w+)\s*\(([^)]*)\)")
 _FROM_IMPORT_RE = re.compile(r'from\s+["\'](.+?)["\']\s+import\s+(.+)')
+_IMPORT_AS_RE = re.compile(r'import\s+["\'](.+?)["\']\s+as\s+(\w+)')
 _CACHE_RE = re.compile(r'cache\s+["\'](.+?)["\']\s*(\d+)?')
 _AUTOESCAPE_RE = re.compile(r"autoescape\s+(false|true)")
 _SPACELESS_RE = re.compile(r">\s+<")
@@ -1328,6 +1329,10 @@ class Frond:
                     self._handle_from_import(content, context)
                     i += 1
 
+                elif tag == "import":
+                    self._handle_import_as(content, context)
+                    i += 1
+
                 elif tag == "cache":
                     result, skip = self._handle_cache(tokens, i, context)
                     output.append(result)
@@ -1803,6 +1808,70 @@ class Frond:
                         continue
             i += 1
 
+    def _handle_import_as(self, content: str, context: dict):
+        """Handle {% import "file" as alias %}.
+
+        Loads ALL macros from the file and registers them as an object
+        with methods, so {{ alias.macro_name(args) }} works.
+        """
+        m = _IMPORT_AS_RE.match(content)
+        if not m:
+            return
+
+        filename = m.group(1)
+        alias = m.group(2)
+
+        # Load and tokenize the macro file
+        source = self._load(filename)
+        tokens = _tokenize(source)
+
+        # Collect all macro definitions
+        macros = {}
+        i = 0
+        while i < len(tokens):
+            ttype, raw = tokens[i]
+            if ttype == BLOCK:
+                tag_content, _, _ = _strip_tag(raw)
+                tag = tag_content.split()[0] if tag_content.split() else ""
+                if tag == "macro":
+                    macro_m = _MACRO_RE.match(tag_content)
+                    if macro_m:
+                        macro_name = macro_m.group(1)
+                        parsed_params = self._parse_macro_params(macro_m.group(2))
+
+                        body_tokens = []
+                        i += 1
+                        while i < len(tokens):
+                            if tokens[i][0] == BLOCK and "endmacro" in tokens[i][1]:
+                                i += 1
+                                break
+                            body_tokens.append(tokens[i])
+                            i += 1
+
+                        engine = self
+                        captured_body = list(body_tokens)
+                        captured_params = list(parsed_params)
+                        captured_context = dict(context)
+
+                        def make_fn(_params, _body, _ctx):
+                            def fn(*args):
+                                macro_ctx = dict(_ctx)
+                                for pi, (pname, pdefault) in enumerate(_params):
+                                    if pi < len(args):
+                                        macro_ctx[pname] = args[pi]
+                                    else:
+                                        macro_ctx[pname] = pdefault
+                                return SafeString(engine._render_tokens(list(_body), macro_ctx))
+                            return fn
+
+                        macros[macro_name] = make_fn(captured_params, captured_body, captured_context)
+                        continue
+            i += 1
+
+        # Create a namespace object so alias.macro_name() works
+        namespace = type("MacroNamespace", (), macros)()
+        context[alias] = namespace
+
     def _handle_cache(self, tokens: list, start: int, context: dict) -> tuple[str, int]:
         """Handle {% cache "key" ttl %}...{% endcache %}.
 

{tina4_python-3.10.48 → tina4_python-3.10.54}/tina4_python/orm/model.py

@@ -204,8 +204,18 @@ class ORM(metaclass=ORMMeta):
             return cls._db  # Direct Database instance
 
         if _database is None:
+            # Try auto-discovery from DATABASE_URL
+            import os
+            url = os.environ.get("DATABASE_URL")
+            if url:
+                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
             raise RuntimeError(
-                "No database bound. Call orm_bind(db) before using ORM models."
+                "No database bound. Call orm_bind(db) or set DATABASE_URL in .env"
             )
         return _database