yaafcli 2026.2.4.180929__py3-none-any.whl → 2026.2.6.22353__py3-none-any.whl

yaaf/cli.py

@@ -23,7 +23,7 @@ def main() -> None:
     serve_parser.add_argument("--consumers-dir", default="consumers")
     serve_parser.set_defaults(command="serve")
 
-    gen_parser = subparsers.add_parser("gen-services", help="Generate consumers/services.py")
+    gen_parser = subparsers.add_parser("gen-services", help="Generate consumers/api/__init__.py")
     gen_parser.add_argument("--consumers-dir", default="consumers")
     gen_parser.add_argument("--output", default=None)
     gen_parser.set_defaults(command="gen-services")

yaaf/di.py

@@ -29,9 +29,22 @@ class ServiceRegistry:
         """Resolve a service by type annotation."""
         if isinstance(annotation, str):
             return self.by_alias.get(annotation)
-        if annotation and annotation in self.by_type:
-            return self.by_type[annotation]
         if annotation is not None:
+            # Direct type match
+            if annotation in self.by_type:
+                return self.by_type[annotation]
+            
+            # Check for protocol/base class relationships
+            for registered_type, instance in self.by_type.items():
+                try:
+                    # Check if registered type is a subclass of the annotation
+                    if issubclass(registered_type, annotation):
+                        return instance
+                except (TypeError, AttributeError):
+                    # Handle cases where issubclass fails (e.g., for Protocol types)
+                    pass
+            
+            # Try to resolve by name as fallback
             alias = getattr(annotation, "__name__", "")
             if alias and alias in self.by_alias:
                 return self.by_alias[alias]

yaaf/gen_services.py

@@ -1,4 +1,4 @@
-"""Generate a consumers/services.py typing module from filesystem routes."""
+"""Generate a consumers/api/__init__.py typing module from filesystem routes."""
 
 from __future__ import annotations
 
@@ -14,7 +14,9 @@ def _is_identifier(segment: str) -> bool:
 
 
 def _camel_case(parts: Iterable[str]) -> str:
-    return "".join(part[:1].upper() + part[1:] for part in parts if part)
+    return "".join(
+        sub[:1].upper() + sub[1:] for part in parts if part for sub in part.split("_") if sub
+    )
 
 
 def _strip_dynamic(segment: str) -> str:
@@ -32,9 +34,11 @@ def _service_alias(route_parts: list[str]) -> str:
 
 def generate_services(consumers_dir: str = "consumers", output_path: str | None = None) -> Path:
     base = Path(consumers_dir)
-    out_path = Path(output_path) if output_path else base / "services.py"
+    out_path = Path(output_path) if output_path else base / "api" / "__init__.py"
 
     if not base.exists():
+        if not out_path.parent.exists():
+            out_path.parent.mkdir(parents=True, exist_ok=True)
         out_path.write_text(HEADER + "\n__all__ = []\n")
         return out_path
 
@@ -76,5 +80,7 @@ def generate_services(consumers_dir: str = "consumers", output_path: str | None
     if dynamic_aliases:
         lines.append("\n# Dynamic routes use Protocol stubs (invalid import paths).\n")
 
+    if not out_path.parent.exists():
+        out_path.parent.mkdir(parents=True, exist_ok=True)
     out_path.write_text("".join(lines))
     return out_path

yaaf/loader.py

@@ -72,7 +72,7 @@ def discover_routes(consumers_dir: str) -> tuple[list[RouteTarget], ServiceRegis
     service_aliases: dict[Path, list[str]] = {}
 
     for root, _dirs, files in os.walk(base):
-        if "_server.py" not in files or "_service.py" not in files:
+        if "_server.py" not in files:
             continue
 
         root_path = Path(root)
@@ -90,7 +90,8 @@ def discover_routes(consumers_dir: str) -> tuple[list[RouteTarget], ServiceRegis
             aliases.append(route_parts[-1])
         service_aliases[root_path] = [alias for alias in aliases if alias]
 
-        service_modules[root_path] = _load_module(root_path / "_service.py", "service")
+        if "_service.py" in files:
+            service_modules[root_path] = _load_module(root_path / "_service.py", "service")
         server_modules[root_path] = _load_module(root_path / "_server.py", "server")
 
     registry = ServiceRegistry(by_type={}, by_alias={})

{yaafcli-2026.2.4.180929.dist-info → yaafcli-2026.2.6.22353.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaafcli
-Version: 2026.2.4.180929
+Version: 2026.2.6.22353
 Summary: Minimal ASGI app scaffold
 License: MIT License
         
@@ -105,7 +105,7 @@ In `_server.py`, export functions named after HTTP methods (lowercase): `get`, `
 Example `_server.py`:
 
 ```python
-from consumers.services import HelloService
+from consumers.api import HelloService
 from yaaf import Request
 from yaaf.types import Params
 
@@ -117,7 +117,7 @@ async def get(request: Request, service: HelloService, params: Params):
 In `_service.py`, expose a module-level `service` instance (or a callable like `Service` or `get_service`). Services are registered and can be injected into other services or handlers:
 
 ```python
-from consumers.services import UsersService
+from consumers.api import UsersService
 
 
 class Service:
@@ -157,7 +157,7 @@ service = Service()
 
 `consumers/api/hello/_service.py`
 ```python
-from yaaf.services import UsersService
+from consumers.api import UsersService
 
 
 class Service:
@@ -173,7 +173,7 @@ service = Service
 
 `consumers/api/hello/_server.py`
 ```python
-from consumers.services import HelloService
+from consumers.api import HelloService
 from yaaf import Request
 
 
@@ -197,7 +197,7 @@ python scripts/bump_version.py
 
 ## Service Type Generation
 
-Every `yaaf` command regenerates `consumers/services.py` for type-checking. You can also run it explicitly:
+Every `yaaf` command regenerates `consumers/api/__init__.py` for type-checking. You can also run it explicitly:
 
 ```bash
 yaaf gen-services

yaafcli-2026.2.6.22353.dist-info/RECORD

@@ -0,0 +1,16 @@
+yaaf/__init__.py,sha256=mH1F6chTA4kRIaYK-yA1E7pBMOyReKi3rbrMiqKTxUY,602
+yaaf/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
+yaaf/app.py,sha256=7YrPl2_OZ-8NUy1RvUEBAbSntcqlP_in-2TLrKmGooE,3339
+yaaf/cli.py,sha256=I8KlridkkikWwOO2BPwbqXoATP_RXZ0aHtCE26wMnao,1676
+yaaf/di.py,sha256=yoyTuL0Vc4MmGj_71M04JpLAzqBRREniZk1f2opEuEE,3039
+yaaf/gen_services.py,sha256=f7OHHhvoPtcD_09p08Lf6i_N0KkM7wlrUsDOaoCHckg,3127
+yaaf/loader.py,sha256=q8BV5kAeYCtX5sBRy7KYy9CfPShlJyfrv2TfjT18Zu0,7224
+yaaf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+yaaf/responses.py,sha256=iXZ0vDYfGO-BEUBBsobCR4JfWLRx8zhwYD9taQ8Sat4,2616
+yaaf/types.py,sha256=BAD3Wkjqi4NKxNz2bT1xggPx0jU5Sz_hOvsHXmGszig,1262
+yaafcli-2026.2.6.22353.dist-info/licenses/LICENSE,sha256=ESYyLizI0WWtxMeS7rGVcX3ivMezm-HOd5WdeOh-9oU,1056
+yaafcli-2026.2.6.22353.dist-info/METADATA,sha256=ef4rWld98zs5mlfFT3ygcEygxIwlIhsRh4hTmRufAcg,6236
+yaafcli-2026.2.6.22353.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+yaafcli-2026.2.6.22353.dist-info/entry_points.txt,sha256=dh9ijq3gnFIr46RFjPjGR48PHQMUxwHopj3b9JipCRQ,39
+yaafcli-2026.2.6.22353.dist-info/top_level.txt,sha256=6WqEmcTdZROTeK4-7HzkB5h9JMBgs51otonH6vnjcAc,5
+yaafcli-2026.2.6.22353.dist-info/RECORD,,

yaafcli-2026.2.4.180929.dist-info/RECORD

@@ -1,16 +0,0 @@
-yaaf/__init__.py,sha256=mH1F6chTA4kRIaYK-yA1E7pBMOyReKi3rbrMiqKTxUY,602
-yaaf/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
-yaaf/app.py,sha256=7YrPl2_OZ-8NUy1RvUEBAbSntcqlP_in-2TLrKmGooE,3339
-yaaf/cli.py,sha256=X8YmeozhWjNtbEiyg_wTK75f_d-5LPKYkQmkU6v8dm0,1672
-yaaf/di.py,sha256=ZrGNBswJT4a3shYLgqd6hhqWii1UmiVmZ93B-G2sHWE,2448
-yaaf/gen_services.py,sha256=Gov7IlSLMG5Oo8RoRGHCbxHSsb_qecoh7IBZPWZKEe8,2869
-yaaf/loader.py,sha256=OzN2J5xl_sWGyNEaPz2LcuSEGfRPWHAGAs7QoK2JUdY,7215
-yaaf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-yaaf/responses.py,sha256=iXZ0vDYfGO-BEUBBsobCR4JfWLRx8zhwYD9taQ8Sat4,2616
-yaaf/types.py,sha256=BAD3Wkjqi4NKxNz2bT1xggPx0jU5Sz_hOvsHXmGszig,1262
-yaafcli-2026.2.4.180929.dist-info/licenses/LICENSE,sha256=ESYyLizI0WWtxMeS7rGVcX3ivMezm-HOd5WdeOh-9oU,1056
-yaafcli-2026.2.4.180929.dist-info/METADATA,sha256=weCYQZBxNrbDD9H7gKcP0nGkBW2F84DN3aIiwpQ43iQ,6248
-yaafcli-2026.2.4.180929.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-yaafcli-2026.2.4.180929.dist-info/entry_points.txt,sha256=dh9ijq3gnFIr46RFjPjGR48PHQMUxwHopj3b9JipCRQ,39
-yaafcli-2026.2.4.180929.dist-info/top_level.txt,sha256=6WqEmcTdZROTeK4-7HzkB5h9JMBgs51otonH6vnjcAc,5
-yaafcli-2026.2.4.180929.dist-info/RECORD,,