yaafcli 2026.2.5.15101__tar.gz → 2026.2.6.24209__tar.gz

{yaafcli-2026.2.5.15101/yaafcli.egg-info → yaafcli-2026.2.6.24209}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaafcli
-Version: 2026.2.5.15101
+Version: 2026.2.6.24209
 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.5.15101 → yaafcli-2026.2.6.24209}/README.md

@@ -63,7 +63,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
 
@@ -75,7 +75,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:
@@ -115,7 +115,7 @@ service = Service()
 
 `consumers/api/hello/_service.py`
 ```python
-from yaaf.services import UsersService
+from consumers.api import UsersService
 
 
 class Service:
@@ -131,7 +131,7 @@ service = Service
 
 `consumers/api/hello/_server.py`
 ```python
-from consumers.services import HelloService
+from consumers.api import HelloService
 from yaaf import Request
 
 
@@ -155,7 +155,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.5.15101 → yaafcli-2026.2.6.24209}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yaafcli"
-version = "2026.02.05.015101"
+version = "2026.02.06.024209"
 description = "Minimal ASGI app scaffold"
 readme = "README.md"
 requires-python = ">=3.13"

{yaafcli-2026.2.5.15101 → yaafcli-2026.2.6.24209}/tests/test_app_integration.py

@@ -54,7 +54,7 @@ async def test_app_routes_and_params(tmp_path: Path) -> None:
     )
     _write_server(
         hello,
-        "from consumers.services import HelloService\n"
+        "from consumers.api import HelloService\n"
         "from yaaf import Request\n\n"
         "async def get(request: Request, service: HelloService):\n"
         "    return {'message': service.message(), 'path': request.path}\n",
@@ -69,7 +69,7 @@ async def test_app_routes_and_params(tmp_path: Path) -> None:
     )
     _write_server(
         dynamic,
-        "from consumers.services import NameService\n"
+        "from consumers.api import NameService\n"
         "from yaaf.types import Params\n\n"
         "async def get(params: Params, service: NameService):\n"
         "    return {'message': service.greet(params['name'])}\n",

yaafcli-2026.2.6.24209/tests/test_optional_service.py

@@ -0,0 +1,51 @@
+
+import pytest
+from pathlib import Path
+from yaaf.app import App
+
+class DummySend:
+    def __init__(self) -> None:
+        self.messages: list[dict] = []
+
+    async def __call__(self, message: dict) -> None:
+        self.messages.append(message)
+
+class DummyReceive:
+    def __init__(self) -> None:
+        self.sent = False
+
+    async def __call__(self) -> dict:
+        if self.sent:
+            return {"type": "http.request", "body": b"", "more_body": False}
+        self.sent = True
+        return {"type": "http.request", "body": b"", "more_body": False}
+
+@pytest.mark.asyncio
+async def test_route_without_service_file(tmp_path: Path) -> None:
+    # Setup a fresh consumer structure
+    base = tmp_path / "consumers" / "api" / "noservice"
+    base.mkdir(parents=True)
+    
+    # Only write _server.py, NO _service.py
+    (base / "_server.py").write_text(
+        "from yaaf import Request\n"
+        "async def get(request: Request):\n"
+        "    return {'message': 'ok without service'}\n"
+    )
+    (tmp_path / "consumers" / "api" / "__init__.py").write_text("# package\n")
+
+    app = App(consumers_dir=str(tmp_path / "consumers"))
+
+    send = DummySend()
+    scope = {
+        "type": "http",
+        "method": "GET",
+        "path": "/api/noservice",
+        "headers": [],
+    }
+    
+    await app(scope, DummyReceive(), send)
+    
+    # Expectation: Should fail (404) currently, but we want 200
+    assert send.messages[0]["status"] == 200
+    assert b"ok without service" in send.messages[1]["body"]

{yaafcli-2026.2.5.15101 → yaafcli-2026.2.6.24209}/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")

{yaafcli-2026.2.5.15101 → yaafcli-2026.2.6.24209}/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

{yaafcli-2026.2.5.15101 → yaafcli-2026.2.6.24209}/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.5.15101 → yaafcli-2026.2.6.24209/yaafcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaafcli
-Version: 2026.2.5.15101
+Version: 2026.2.6.24209
 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.5.15101 → yaafcli-2026.2.6.24209}/yaafcli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 tests/test_app_integration.py
 tests/test_di.py
 tests/test_loader.py
+tests/test_optional_service.py
 tests/test_responses.py
 yaaf/__init__.py
 yaaf/__main__.py