vega-framework 0.1.20__py3-none-any.whl → 0.1.23__py3-none-any.whl

vega/cli/commands/generate.py

@@ -16,6 +16,7 @@ from vega.cli.templates import (
     render_sqlalchemy_model,
     render_cli_command,
     render_cli_command_simple,
+    render_template,
 )
 from vega.cli.scaffolds import create_fastapi_scaffold
 
@@ -69,6 +70,8 @@ def generate_component(
     name: str,
     project_path: str,
     implementation: str | None = None,
+    is_request: bool = False,
+    is_response: bool = False,
 ):
     """Generate a component in the Vega project"""
 
@@ -126,6 +129,8 @@ def generate_component(
         _generate_middleware(project_root, project_name, class_name, file_name)
     elif component_type == 'model':
         _generate_sqlalchemy_model(project_root, project_name, class_name, file_name)
+    elif component_type == 'webmodel':
+        _generate_web_models(project_root, project_name, name, is_request, is_response)
     elif component_type == 'command':
         _generate_command(project_root, project_name, name, implementation)
 
@@ -448,7 +453,98 @@ def _generate_router(project_root: Path, project_name: str, name: str) -> None:
     click.echo(f"   1. Create Pydantic models in presentation/web/models/{resource_file}_models.py")
     click.echo(f"   2. Implement domain interactors for {resource_name} operations")
     click.echo(f"   3. Replace in-memory storage with actual use cases")
-    click.echo(click.style(f"   (Router auto-discovered from web/routes/)", fg='dim'))
+    click.echo(click.style(f"   (Router auto-discovered from web/routes/)", fg='bright_black'))
+
+
+def _generate_web_models(project_root: Path, project_name: str, name: str, is_request: bool, is_response: bool) -> None:
+    """Generate Pydantic request or response model for FastAPI"""
+
+    # Check if web folder exists
+    web_path = project_root / "presentation" / "web"
+    if not web_path.exists():
+        click.echo(click.style("ERROR: Web module not found", fg='red'))
+        click.echo("   Model generation requires FastAPI web module")
+        click.echo("   Install it with: vega add web")
+        return
+
+    # Validate flags
+    if not is_request and not is_response:
+        click.echo(click.style("ERROR: Must specify either --request or --response", fg='red'))
+        click.echo("   Examples:")
+        click.echo("      vega generate webmodel CreateUserRequest --request")
+        click.echo("      vega generate webmodel UserResponse --response")
+        return
+
+    if is_request and is_response:
+        click.echo(click.style("ERROR: Cannot specify both --request and --response", fg='red'))
+        click.echo("   Use separate commands to generate both types")
+        return
+
+    # Ensure models directory exists
+    models_path = web_path / "models"
+    models_path.mkdir(exist_ok=True)
+
+    # Ensure __init__.py exists
+    init_file = models_path / "__init__.py"
+    if not init_file.exists():
+        init_file.write_text('"""Pydantic models for API validation"""\n')
+
+    # Convert name to PascalCase for class names
+    model_name = to_pascal_case(name)
+    model_file = to_snake_case(model_name)
+
+    # Determine model type
+    if is_request:
+        template_file = "request_model.py.j2"
+        description = "Request model for API validation"
+        model_type = "request"
+    else:
+        template_file = "response_model.py.j2"
+        description = "Response model for API data"
+        model_type = "response"
+
+    # Generate model file
+    file_path = models_path / f"{model_file}.py"
+
+    if file_path.exists():
+        # Append to existing file
+        click.echo(click.style(f"WARNING: {file_path.relative_to(project_root)} already exists", fg='yellow'))
+        click.echo(f"   Appending {model_name} to existing file...")
+
+        content = render_template(
+            template_file,
+            subfolder="web",
+            model_name=model_name,
+            description=description
+        )
+
+        # Remove imports from template since they're already in the file
+        lines = content.split('\n')
+        class_start = next((i for i, line in enumerate(lines) if line.startswith('class ')), 0)
+        content_to_append = '\n\n' + '\n'.join(lines[class_start:])
+
+        with file_path.open('a', encoding='utf-8') as f:
+            f.write(content_to_append)
+
+        click.echo(click.style("+ ", fg='green', bold=True) + f"Added {model_name} to {file_path.relative_to(project_root)}")
+    else:
+        # Create new file
+        content = render_template(
+            template_file,
+            subfolder="web",
+            model_name=model_name,
+            description=description
+        )
+        file_path.write_text(content, encoding='utf-8')
+
+        click.echo(click.style("+ ", fg='green', bold=True) + f"Created {file_path.relative_to(project_root)}")
+
+    # Instructions for next steps
+    click.echo(f"\nNext steps:")
+    click.echo(f"   1. Add fields to {model_name} in {file_path.relative_to(project_root)}")
+    click.echo(f"   2. Update the Config.json_schema_extra with example values")
+    click.echo(f"   3. Import in your router:")
+    click.echo(f"      from presentation.web.models.{model_file} import {model_name}")
 
 
 def _generate_middleware(project_root: Path, project_name: str, class_name: str, file_name: str) -> None:
@@ -804,6 +900,6 @@ def _generate_command(project_root: Path, project_name: str, name: str, is_async
     click.echo(f"\nNext steps:")
     click.echo(f"   1. Implement your command logic in {command_file.relative_to(project_root)}")
     click.echo(f"   2. Run your command: python main.py {command_name}")
-    click.echo(click.style(f"      (Commands are auto-discovered from cli/commands/)", fg='dim'))
+    click.echo(click.style(f"      (Commands are auto-discovered from cli/commands/)", fg='bright_black'))
     if with_interactor:
         click.echo(f"   3. Create interactor: vega generate interactor {interactor_name}")

vega/cli/main.py

@@ -56,12 +56,14 @@ def init(project_name, template, path):
 
 @cli.command()
 @click.argument('component_type', type=click.Choice([
-    'entity', 'repository', 'repo', 'service', 'interactor', 'mediator', 'router', 'middleware', 'model', 'command'
+    'entity', 'repository', 'repo', 'service', 'interactor', 'mediator', 'router', 'middleware', 'webmodel', 'model', 'command'
 ]))
 @click.argument('name')
 @click.option('--path', default='.', help='Project root path')
 @click.option('--impl', default=None, help='Generate infrastructure implementation for repository/service (e.g., memory, sql) or command type (async, sync)')
-def generate(component_type, name, path, impl):
+@click.option('--request', is_flag=True, help='Generate request model (for webmodel)')
+@click.option('--response', is_flag=True, help='Generate response model (for webmodel)')
+def generate(component_type, name, path, impl, request, response):
     """
     Generate a component in your Vega project.
 
@@ -74,6 +76,7 @@ def generate(component_type, name, path, impl):
         mediator    - Workflow (orchestrates use cases)
         router      - FastAPI router (requires web module)
         middleware  - FastAPI middleware (requires web module)
+        webmodel    - Pydantic request/response models (requires web module)
         model       - SQLAlchemy model (requires sqlalchemy module)
         command     - CLI command (async by default)
 
@@ -85,6 +88,8 @@ def generate(component_type, name, path, impl):
         vega generate mediator CheckoutFlow
         vega generate router Product
         vega generate middleware Logging
+        vega generate webmodel CreateUserRequest --request
+        vega generate webmodel UserResponse --response
         vega generate model User
         vega generate command CreateUser
         vega generate command ListUsers --impl sync
@@ -93,7 +98,7 @@ def generate(component_type, name, path, impl):
     if component_type == 'repo':
         component_type = 'repository'
 
-    generate_component(component_type, name, path, impl)
+    generate_component(component_type, name, path, impl, request, response)
 
 
 @cli.command()

vega/cli/templates/infrastructure/repository_impl.py.j2

@@ -1,8 +1,8 @@
 """{{ impl_class }} implementation"""
 from typing import List
 
-from ...domain.entities.{{ entity_file }} import {{ entity_name }}
-from ...domain.repositories.{{ interface_file_name }} import {{ interface_class_name }}
+from domain.entities.{{ entity_file }} import {{ entity_name }}
+from domain.repositories.{{ interface_file_name }} import {{ interface_class_name }}
 
 
 class {{ impl_class }}({{ interface_class_name }}):

vega/cli/templates/infrastructure/service_impl.py.j2

@@ -1,5 +1,5 @@
 """{{ impl_class }} implementation"""
-from ...domain.services.{{ interface_file_name }} import {{ interface_class_name }}
+from domain.services.{{ interface_file_name }} import {{ interface_class_name }}
 
 
 class {{ impl_class }}({{ interface_class_name }}):

vega/cli/templates/project/ARCHITECTURE.md.j2

@@ -342,6 +342,8 @@ The generator will interactively prompt for:
 - Whether to use interactors
 - Parameter types and validation
 
+Commands are **automatically discovered** from `presentation/cli/commands/` - no manual registration required.
+
 **FastAPI Routers** - HTTP API endpoints (requires web support):
 ```bash
 vega generate router User
@@ -349,6 +351,8 @@ vega generate router Product
 vega generate router Order
 ```
 
+Routers are **automatically discovered** from `presentation/web/routes/` - no manual registration required.
+
 **FastAPI Middleware** - Request/response processing (requires web support):
 ```bash
 vega generate middleware Logging
@@ -488,6 +492,77 @@ vega doctor
 
 For complete documentation, see the [README](README.md#cli-commands).
 
+## Auto-Discovery
+
+Vega Framework provides **automatic component discovery** for routers and commands, eliminating manual registration boilerplate.
+
+### How It Works
+
+The framework automatically scans specific directories and registers components at runtime:
+
+**CLI Commands Discovery:**
+- Location: `presentation/cli/commands/`
+- Discovers: All `click.Command` instances
+- Convention: Export commands in module files
+
+**Router Discovery:**
+- Location: `presentation/web/routes/`
+- Discovers: All `APIRouter` instances named `router`
+- Convention: Each file exports a `router = APIRouter()`
+
+### Usage Example
+
+**Creating a new router:**
+```bash
+vega generate router Product
+```
+
+This creates `presentation/web/routes/product.py`:
+```python
+from fastapi import APIRouter
+
+router = APIRouter()  # MUST be named 'router'
+
+@router.get("/")
+async def list_products():
+    return {"products": []}
+```
+
+The router is **automatically**:
+- ✅ Discovered by scanning the routes directory
+- ✅ Registered with prefix `/product`
+- ✅ Tagged as "Product"
+- ✅ Available at `/api/product`
+
+**No manual registration needed!**
+
+### Framework Implementation
+
+The discovery system is centralized in the framework:
+
+```python
+# In presentation/web/routes/__init__.py (auto-generated)
+from vega.discovery import discover_routers
+
+def get_api_router():
+    return discover_routers(__package__)
+```
+
+```python
+# In presentation/cli/commands/__init__.py (auto-generated)
+from vega.discovery import discover_commands
+
+def get_commands():
+    return discover_commands(__package__)
+```
+
+### Benefits
+
+- **Zero Boilerplate**: No need to manually import and register components
+- **Convention Over Configuration**: Follow naming conventions, get automatic registration
+- **Maintainability**: Add/remove components without touching configuration files
+- **Consistency**: Same pattern as dependency injection (`@bind`, `@injectable`)
+
 ## Dependency Injection
 
 Vega provides automatic dependency injection through decorators and a container.

vega/cli/templates/web/request_model.py.j2

@@ -0,0 +1,18 @@
+from pydantic import BaseModel, Field
+from typing import Optional
+
+
+class {{ model_name }}(BaseModel):
+    """{{ description }}"""
+    # Add your fields here
+    # Example:
+    # name: str = Field(..., min_length=1, max_length=100, description="Name field")
+    # email: str = Field(..., description="Email address")
+    # age: Optional[int] = Field(None, ge=0, description="Age field")
+
+    class Config:
+        json_schema_extra = {
+            "example": {
+                # Add example values here
+            }
+        }

vega/cli/templates/web/response_model.py.j2

@@ -0,0 +1,18 @@
+from pydantic import BaseModel, Field
+from typing import Optional
+
+
+class {{ model_name }}(BaseModel):
+    """{{ description }}"""
+    # Add your fields here
+    # Example:
+    # id: str = Field(..., description="Unique identifier")
+    # name: str = Field(..., description="Name field")
+    # created_at: str = Field(..., description="Creation timestamp")
+
+    class Config:
+        json_schema_extra = {
+            "example": {
+                # Add example values here
+            }
+        }

{vega_framework-0.1.20.dist-info → vega_framework-0.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vega-framework
-Version: 0.1.20
+Version: 0.1.23
 Summary: Enterprise-ready Python framework that enforces Clean Architecture for building maintainable and scalable applications.
 License: MIT
 License-File: LICENSE

{vega_framework-0.1.20.dist-info → vega_framework-0.1.23.dist-info}/RECORD

@@ -2,11 +2,11 @@ vega/__init__.py,sha256=A05RwOYXooAZUz3GnbJ--ofLXgtRZK9gaSmsLVRdGPY,1811
 vega/cli/__init__.py,sha256=NCzOOyhKHqLeN1r80ekhMfkQwBdAQXKcKiKoNwYPNiY,304
 vega/cli/commands/__init__.py,sha256=UH7MdYduBG_YoulgdiWkUCtcgGLzuYRGFzxaqoa0pyg,19
 vega/cli/commands/add.py,sha256=yiFXD4wb6gc_1nA-ofzt7VQKOaNbeMGNmJ-LQWG6Gh4,5110
-vega/cli/commands/generate.py,sha256=lOYvjTvZXSoAMJyKl5BDOOLIl0EfU7Za7FASufVRBL8,30748
+vega/cli/commands/generate.py,sha256=sR8d-0mgF9Aq0qy-QGAB_-JndCw82EpkwHcXQQxDMnM,34569
 vega/cli/commands/init.py,sha256=C_ye_hOIyaIUalSfXmLBE7QfSpHoZ_LTB-h2HPP6_R8,6064
 vega/cli/commands/migrate.py,sha256=00swKeVhmKr1_1VJhg3GpIMcJ6Jfgz5FUpmJoLf5qSQ,3805
 vega/cli/commands/update.py,sha256=0zRWkHvQwKGlJL9XF3bi--dThkFapyNOugL6AgGr6Ic,5897
-vega/cli/main.py,sha256=AhH560Fin6BDUXpVOJ2rVwt4e7cq2iqrF8XqDmaJjEI,4655
+vega/cli/main.py,sha256=_UEgiHj9OrNu-pqNrTQ6Fkp_fRBfs2wxU4n7JCMadyo,5072
 vega/cli/scaffolds/__init__.py,sha256=WFJf2H_4UWL89gDxX8PXKkTVSVOfw7hFfyaPWKokp1g,217
 vega/cli/scaffolds/fastapi.py,sha256=a_vZVSfMgyteRURFZAShbtjSRMOSM4YeEIKKvBtAOfo,3788
 vega/cli/scaffolds/sqlalchemy.py,sha256=il5JqiA8LSQKnNoOYfAFD82rdYx5l_ZsqsjHnplYohw,6164
@@ -21,12 +21,12 @@ vega/cli/templates/domain/mediator.py.j2,sha256=gdEDNscYaB3wOemaVrFr3qKVE5sTS5wR
 vega/cli/templates/domain/repository_interface.py.j2,sha256=oywc1Uvyx-bBrUveE-bMt4x4eO2LCf5EUbddPbNGXm8,579
 vega/cli/templates/domain/service_interface.py.j2,sha256=Pq-wwGvGbns9Z_2lqL8Xi2_G-MMU-0JjAuGW94H6mrE,330
 vega/cli/templates/infrastructure/model.py.j2,sha256=zNY4m7BZJeQhdu_bTFY6WIhizsYW4eJY6PS1DCs0vbE,796
-vega/cli/templates/infrastructure/repository_impl.py.j2,sha256=1x69Tj6lZB1aOQDuaiuFESVHzyFoRDaLbuI2-cFMjLY,494
-vega/cli/templates/infrastructure/service_impl.py.j2,sha256=AgP2oqMbbcd0ctVfiVyOWbHFXTf26Jr70CA20n-xgmI,379
+vega/cli/templates/infrastructure/repository_impl.py.j2,sha256=Rmip4Swh3wdJRioVOWKgJVQgl45Y9STu3M-oviaOrPM,488
+vega/cli/templates/infrastructure/service_impl.py.j2,sha256=JYCfPDOcdVd-x1Y0nSh7qoHLc2yEsDhEraS1YGm5iiQ,376
 vega/cli/templates/loader.py,sha256=cyt9ZOVLwBgv4ijPxoqR4JgFSbdkXCMzviHcq3fdv8Q,2712
 vega/cli/templates/project/.env.example,sha256=BqfRxYeOasgZMz4_B2kybu6areIy9dHCt5BJ6fa56ik,221
 vega/cli/templates/project/.gitignore,sha256=7JSDihCtBznd-QxQ4wUtHM9fnbYnbw6PK4Auh56ofAY,229
-vega/cli/templates/project/ARCHITECTURE.md.j2,sha256=P7NiaGDp3ekPP3Fn5mtlMUWf66qqAAFtZzcmYRXJKis,23737
+vega/cli/templates/project/ARCHITECTURE.md.j2,sha256=HunrJ_9LlPxd5-GONaJxjoLlw-XfjYaLpsVHFa72Yf4,25868
 vega/cli/templates/project/README.md.j2,sha256=Oea0AiDb_rm-GPsLFAPhYEpMmtHt_pqCRjrreymZj8Y,4601
 vega/cli/templates/project/config.py.j2,sha256=1Iva9JEz5ej_WmTbRVBvOfSBhYUKIzN88p6GYKR0m4s,866
 vega/cli/templates/project/main.py.j2,sha256=RfasD-JOYv8rjtZOapmh7YNybvtsdIGED7pzyRxNyAM,2733
@@ -44,6 +44,8 @@ vega/cli/templates/web/health_route.py.j2,sha256=iq30wENqti14j3JOfVqJNO4WAE2NiNY
 vega/cli/templates/web/main.py.j2,sha256=QKWFDUNeIESkmVrvUIcRQH0DXnMu5fRCH2uHp3u8Sws,312
 vega/cli/templates/web/middleware.py.j2,sha256=ild8nAdq45HGCiA-XVcWgmMBCfwIgORcZ7qsykmOclw,2165
 vega/cli/templates/web/models_init.py.j2,sha256=QdNOaZ6iMh3Tz7uut1VA3XUIivYD1SkHFmDHCfstqho,159
+vega/cli/templates/web/request_model.py.j2,sha256=sD91Gxgeelj6g3XV9QgqyfpAn86EdD4zVESD54B-eZU,527
+vega/cli/templates/web/response_model.py.j2,sha256=tDZoeMRb7OweACG77jAixJgOcx0Vv7HwirrjkanLQ2s,497
 vega/cli/templates/web/router.py.j2,sha256=5FgBYTcsdHH24Y9GtlsPWMllwygFO5aaCNCqNQGlhgc,4295
 vega/cli/templates/web/routes_init.py.j2,sha256=uyeuLGRZ-bDY-xefJ1eI9wU1kt9z7lwoVjw_nvY7Vk4,397
 vega/cli/templates/web/routes_init_autodiscovery.py.j2,sha256=jxvFGmWsmW1tMCeOoYfPi4l0U94YkUxcZm2VFsGgTsw,310
@@ -69,8 +71,8 @@ vega/patterns/repository.py,sha256=uYUyLs-O8OqW1Wb9ZqIo8UUcCjZ5UFuHors_F2iDg9A,1
 vega/patterns/service.py,sha256=buFRgJoeQtZQK22Upb4vh84c1elWKFXWBaB0X4RaruE,1374
 vega/settings/__init__.py,sha256=Eb8PMUyXAlCAQIcL2W8QhTTUHUbVlkAfXdpTUlADo1I,786
 vega/settings/base.py,sha256=bL45hyoa3t-hQOvur860eSo7O833sQMsXJJPwbTVbwE,1321
-vega_framework-0.1.20.dist-info/METADATA,sha256=55tVa3vZWtkdjxnH930s11xSkn1sbr5RwbAyYs9uUMI,12271
-vega_framework-0.1.20.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-vega_framework-0.1.20.dist-info/entry_points.txt,sha256=p3gyTmPYjNRLbuiKS-hG3ytWd-ssBweFy6VZ-F9FTNk,42
-vega_framework-0.1.20.dist-info/licenses/LICENSE,sha256=wlHh1MBTcs2kSQr99P30mZ61s7uh7Cp9Rk0YiJxots0,1084
-vega_framework-0.1.20.dist-info/RECORD,,
+vega_framework-0.1.23.dist-info/METADATA,sha256=BXMTa0Evjhiw7vC2JOIJDOPZQYWCisC02AZUDB-pRFc,12271
+vega_framework-0.1.23.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+vega_framework-0.1.23.dist-info/entry_points.txt,sha256=p3gyTmPYjNRLbuiKS-hG3ytWd-ssBweFy6VZ-F9FTNk,42
+vega_framework-0.1.23.dist-info/licenses/LICENSE,sha256=wlHh1MBTcs2kSQr99P30mZ61s7uh7Cp9Rk0YiJxots0,1084
+vega_framework-0.1.23.dist-info/RECORD,,