py-app-runner 0.7.0__tar.gz → 0.7.2__tar.gz

py_app_runner-0.7.2/.version

@@ -0,0 +1 @@
+0.7.2

{py_app_runner-0.7.0/src/py_app_runner.egg-info → py_app_runner-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py_app_runner
-Version: 0.7.0
+Version: 0.7.2
 Summary: Async service framework: Tornado HTTP/WS bridge, service loader, Redis WS connection manager
 Author-email: Gints Murans <gm@gm.lv>
 License-Expression: MIT
@@ -31,7 +31,7 @@ Requires-Dist: uvloop>=0.21.0
 Requires-Dist: msgspec>=0.19.0
 Requires-Dist: msgpack>=1.2.4
 Requires-Dist: tornado>=6.5.9
-Requires-Dist: database_wrapper[pgsql,redis,sqlite]==0.3.147
+Requires-Dist: database_wrapper[pgsql,redis,sqlite]==0.4.0
 Requires-Dist: psycopg>=3.2.0
 Requires-Dist: psycopg[pool]>=3.2.0
 Requires-Dist: redis>=4.5.4

{py_app_runner-0.7.0 → py_app_runner-0.7.2}/pyproject.toml

@@ -56,7 +56,7 @@ dependencies = [
     "tornado >= 6.5.9",
     # The extras pull the base package in, so one pin rather than three that must be kept
     # in lockstep. 0.3.146 is the first MIT release - 0.2.38 and earlier are GPL-3.0.
-    "database_wrapper[pgsql,redis,sqlite] == 0.3.147",
+    "database_wrapper[pgsql,redis,sqlite] == 0.4.0",
     # Used directly by py_app_runner.migrations, not only through database_wrapper, so the
     # floor is declared here rather than inherited. Matches database_wrapper_pgsql 0.3.146's
     # own psycopg[binary]/psycopg[pool] >= 3.2.0.

{py_app_runner-0.7.0 → py_app_runner-0.7.2}/src/py_app_runner/pybridge.py

@@ -1,8 +1,24 @@
+import sys
 from importlib import import_module
+from importlib.util import find_spec
 from typing import Any, Literal
 
 from py_app_runner.db_pools import DbPools
 
+_ENTRY_MODULES = ("_service", "_service_args", "_service_pybridge")
+
+
+def _module_exists(module_name: str) -> bool:
+    """Whether `module_name` can be imported, without executing it."""
+
+    if module_name in sys.modules:
+        return True
+
+    try:
+        return find_spec(module_name) is not None
+    except ModuleNotFoundError:
+        return False
+
 
 class PyBridge:
     services_placeholder: dict[str, Any]
@@ -27,15 +43,20 @@ class PyBridge:
             raise
 
     def _resolve(self, service_name: str, module: str) -> Any | Literal[False]:
-        """Project services win over built-ins, so a project can override `bridge` or
-        `migrations` by shipping its own `services.<name>.<module>`."""
+        """A project package with any entry module owns the service name outright, so a
+        built-in of the same name is never mixed in or imported. A project package without
+        one (`services/bridge` holding only routes) extends the built-in instead."""
 
-        for package in (f"services.{service_name}", f"py_app_runner.{service_name}"):
-            found = self._import_or_none(f"{package}.{module}")
-            if found is not None:
-                return found
+        project = f"services.{service_name}"
+        found = self._import_or_none(f"{project}.{module}")
+        if found is not None:
+            return found
 
-        return False
+        if any(_module_exists(f"{project}.{entry}") for entry in _ENTRY_MODULES):
+            return False
+
+        found = self._import_or_none(f"py_app_runner.{service_name}.{module}")
+        return found if found is not None else False
 
     def load_service(self, service_name: str) -> Any:
         service = self._resolve(service_name, "_service")

{py_app_runner-0.7.0 → py_app_runner-0.7.2/src/py_app_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py_app_runner
-Version: 0.7.0
+Version: 0.7.2
 Summary: Async service framework: Tornado HTTP/WS bridge, service loader, Redis WS connection manager
 Author-email: Gints Murans <gm@gm.lv>
 License-Expression: MIT
@@ -31,7 +31,7 @@ Requires-Dist: uvloop>=0.21.0
 Requires-Dist: msgspec>=0.19.0
 Requires-Dist: msgpack>=1.2.4
 Requires-Dist: tornado>=6.5.9
-Requires-Dist: database_wrapper[pgsql,redis,sqlite]==0.3.147
+Requires-Dist: database_wrapper[pgsql,redis,sqlite]==0.4.0
 Requires-Dist: psycopg>=3.2.0
 Requires-Dist: psycopg[pool]>=3.2.0
 Requires-Dist: redis>=4.5.4

{py_app_runner-0.7.0 → py_app_runner-0.7.2}/src/py_app_runner.egg-info/requires.txt

@@ -4,7 +4,7 @@ uvloop>=0.21.0
 msgspec>=0.19.0
 msgpack>=1.2.4
 tornado>=6.5.9
-database_wrapper[pgsql,redis,sqlite]==0.3.147
+database_wrapper[pgsql,redis,sqlite]==0.4.0
 psycopg>=3.2.0
 psycopg[pool]>=3.2.0
 redis>=4.5.4

{py_app_runner-0.7.0 → py_app_runner-0.7.2}/tests/test_pybridge.py

@@ -37,7 +37,10 @@ def test_project_service_wins_over_builtin(fake_modules):
     assert PyBridge().load_service_args("demo").origin == "project"
 
 
-def test_falls_back_to_builtin_when_project_module_absent(fake_modules):
+def test_falls_back_to_builtin_when_project_has_no_entry_module(fake_modules):
+    fake_modules("services")
+    fake_modules("services.demo")
+    fake_modules("services.demo.routes")
     fake_modules("py_app_runner.demo")
     builtin = fake_modules("py_app_runner.demo._service_args")
     builtin.origin = "builtin"
@@ -45,6 +48,27 @@ def test_falls_back_to_builtin_when_project_module_absent(fake_modules):
     assert PyBridge().load_service_args("demo").origin == "builtin"
 
 
+def test_project_service_shadows_builtin_of_the_same_name(fake_modules, monkeypatch):
+    """A project `services/cron` without a pybridge must not reach `py_app_runner.cron`,
+    whose package refuses to import without the `cron` extra."""
+
+    import py_app_runner.pybridge as pybridge_module
+
+    fake_modules("services")
+    fake_modules("services.demo")
+    fake_modules("services.demo._service_args")
+    real_import_module = pybridge_module.import_module
+
+    def fake_import_module(name: str, *args, **kwargs):
+        if name.startswith("py_app_runner.demo"):
+            raise ImportError("py_app_runner.demo requires an extra")
+        return real_import_module(name, *args, **kwargs)
+
+    monkeypatch.setattr(pybridge_module, "import_module", fake_import_module)
+
+    assert PyBridge().load_service_pybridge("demo") is False
+
+
 def test_returns_false_when_neither_leg_exists(fake_modules):
     assert PyBridge().load_service_args("nosuchservice") is False
 

py_app_runner-0.7.0/.version

@@ -1 +0,0 @@
-0.7.0