fenrir-framework 2.3.2__tar.gz → 2.3.3__tar.gz

{fenrir_framework-2.3.2/fenrir_framework.egg-info → fenrir_framework-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fenrir-framework
-Version: 2.3.2
+Version: 2.3.3
 Summary: A hybrid Python web framework combining Flask, FastAPI, Bottle, Falcon, and Sanic
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{fenrir_framework-2.3.2 → fenrir_framework-2.3.3}/fenrir/__init__.py

@@ -68,7 +68,7 @@ from fenrir.sessions import (
 # Re-export Annotated for convenient use with param markers
 from fenrir.compat import Annotated
 
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 __all__ = [
     # Core app
     "Fenrir",

{fenrir_framework-2.3.2 → fenrir_framework-2.3.3}/fenrir/app.py

@@ -90,7 +90,7 @@ class Fenrir:
         self,
         import_name: str = None,
         title: str = "Fenrir API",
-        version: str = "2.3.2",
+        version: str = "2.3.3",
         template_folder: str = "templates",
         renderer: Any = None,
         docs_url: str = "/docs",
@@ -809,18 +809,44 @@ class Fenrir:
         return JSONResponse({"detail": "Internal Server Error"}, status=500)
 
     # Server runner using Asteri
-    def run(self, host: str = "127.0.0.1", port: int = 8000, workers: int = 1, **kwargs):
-        """Run the Fenrir app locally using Asteri v2.2.2 ASGI worker."""
+    def run(self, host: str = "127.0.0.1", port: int = 8000, workers: int = 1, app_path: str = None, **kwargs):
+        """Run the Fenrir app locally using Asteri ASGI worker.
+        
+        Args:
+            host: Host address to bind to
+            port: Port to listen on
+            workers: Number of worker processes
+            app_path: Import path for the app (e.g. 'demo_app:app'). 
+                      If None, auto-detects from caller's module.
+        """
         from asteri.arbiter import Arbiter
         from asteri.workers.asgi import ASGIWorker
         
-        # Store our application instance globally so Asteri's worker process can import it
-        global _active_app
-        _active_app = self
+        if app_path is None:
+            # Auto-detect: find the caller's module and variable name
+            try:
+                frame = sys._getframe(1)
+                caller_file = frame.f_globals.get("__file__")
+                caller_var = frame.f_locals.get("app")
+                if caller_file and caller_var is self:
+                    import importlib
+                    mod_name = frame.f_globals.get("__name__")
+                    if mod_name and mod_name != "__main__":
+                        app_path = f"{mod_name}:app"
+                    else:
+                        mod_path = os.path.splitext(os.path.relpath(caller_file))[0].replace(os.sep, ".")
+                        app_path = f"{mod_path}:app"
+            except Exception:
+                pass
+        
+        if app_path is None:
+            raise RuntimeError(
+                "Could not auto-detect app_path. Pass it explicitly: "
+                "app.run(app_path='myapp:app')"
+            )
         
-        # Tell Asteri to load 'fenrir.app:_active_app'
         arbiter = Arbiter(
-            app_path="fenrir.app:_active_app",
+            app_path=app_path,
             worker_class=ASGIWorker,
             num_workers=workers,
             binds=[f"{host}:{port}"],

{fenrir_framework-2.3.2 → fenrir_framework-2.3.3}/fenrir/cli.py

@@ -153,35 +153,22 @@ def cmd_run(args):
     
     # Print our beautiful blue banner
     print_banner(app.title)
+    print(f"\033[94mStarting Fenrir App '{app.title}' v{app.version}...\033[0m")
     
-    # Check if watchdog is installed
-    has_watchdog = False
-    if reload_mode:
-        try:
-            import watchdog
-            has_watchdog = True
-        except ImportError:
-            has_watchdog = False
-            
-    if reload_mode and not has_watchdog:
-        def serve():
-            app_to_serve = load_app(args.target)
-            print(f"\033[94mStarting Fenrir App '{app_to_serve.title}' v{app_to_serve.version}...\033[0m")
-            app_to_serve.run(
-                host=args.host,
-                port=args.port,
-                workers=args.workers,
-                reload=False,
-            )
-        run_with_reloader(serve)
-    else:
-        print(f"\033[94mStarting Fenrir App '{app.title}' v{app.version}...\033[0m")
-        app.run(
-            host=args.host,
-            port=args.port,
-            workers=args.workers,
+    try:
+        from asteri.arbiter import Arbiter
+        from asteri.workers.asgi import ASGIWorker
+        
+        arbiter = Arbiter(
+            app_path=args.target,
+            worker_class=ASGIWorker,
+            num_workers=args.workers,
+            binds=[f"{args.host}:{args.port}"],
             reload=reload_mode,
         )
+        arbiter.start()
+    except KeyboardInterrupt:
+        pass
 
 
 def cmd_routes(args):
@@ -375,7 +362,7 @@ def cmd_new(args):
 import os
 import sys
 
-app = Fenrir(title="My Fenrir Application", version="2.3.2")
+app = Fenrir(title="My Fenrir Application", version="2.3.3")
 
 @app.get("/")
 async def home():
@@ -682,7 +669,7 @@ if __name__ == "__main__":
             </div>
             <div class="info-item">
                 <span class="info-label">Framework Engine</span>
-                <span class="info-value">Fenrir v2.3.2</span>
+                <span class="info-value">Fenrir v2.3.3</span>
             </div>
         </div>
 

{fenrir_framework-2.3.2 → fenrir_framework-2.3.3/fenrir_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fenrir-framework
-Version: 2.3.2
+Version: 2.3.3
 Summary: A hybrid Python web framework combining Flask, FastAPI, Bottle, Falcon, and Sanic
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{fenrir_framework-2.3.2 → fenrir_framework-2.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fenrir-framework"
-version = "2.3.2"
+version = "2.3.3"
 description = "A hybrid Python web framework combining Flask, FastAPI, Bottle, Falcon, and Sanic"
 readme = "README.md"
 requires-python = ">=3.8"

{fenrir_framework-2.3.2 → fenrir_framework-2.3.3}/tests/test_cli.py

@@ -74,16 +74,12 @@ def test_cli_shell(mock_load_app):
 
 def test_cli_run(mock_load_app):
     app = MockApp()
+    mock_arbiter = mock.MagicMock()
     with mock.patch("fenrir.cli.load_app", return_value=app):
-        with mock.patch.object(app, "run") as mock_run:
+        with mock.patch("asteri.arbiter.Arbiter", return_value=mock_arbiter):
             with mock.patch("sys.argv", ["fenrir", "run", "mock_module:app", "-p", "8888", "--dev"]):
                 main()
-                mock_run.assert_called_once_with(
-                    host="127.0.0.1",
-                    port=8888,
-                    workers=1,
-                    reload=True
-                )
+                mock_arbiter.start.assert_called_once()
 
 
 def test_cli_bench(mock_load_app):