vibetuner 2.7.0__py3-none-any.whl → 2.18.1__py3-none-any.whl

vibetuner/cli/__init__.py

@@ -9,7 +9,7 @@ import typer
 from rich.console import Console
 
 from vibetuner.cli.run import run_app
-from vibetuner.config import settings
+from vibetuner.cli.scaffold import scaffold_app
 from vibetuner.logging import LogLevel, setup_logging
 
 
@@ -43,7 +43,16 @@ class AsyncTyper(typer.Typer):
         return partial(self.maybe_run_async, decorator)
 
 
-app = AsyncTyper(help=f"{settings.project.project_name.title()} CLI")
+def _get_app_help():
+    try:
+        from vibetuner.config import settings
+
+        return f"{settings.project.project_name.title()} CLI"
+    except (RuntimeError, ImportError):
+        return "Vibetuner CLI"
+
+
+app = AsyncTyper(help=_get_app_help())
 
 LOG_LEVEL_OPTION = typer.Option(
     LogLevel.INFO,
@@ -61,8 +70,10 @@ def callback(log_level: LogLevel | None = LOG_LEVEL_OPTION) -> None:
 
 
 app.add_typer(run_app, name="run")
+app.add_typer(scaffold_app, name="scaffold")
 
 try:
     import_module("app.cli")
 except (ImportError, ModuleNotFoundError):
     pass
+# Cache buster

vibetuner/cli/run.py

@@ -70,7 +70,6 @@ def dev(
 
         # Define paths to watch for changes
         reload_paths = [
-            Path("src/vibetuner"),
             Path("src/app"),
             Path("templates/frontend"),
             Path("templates/email"),

vibetuner/cli/scaffold.py

@@ -0,0 +1,187 @@
+# ABOUTME: Scaffolding commands for creating new projects from the vibetuner template
+# ABOUTME: Uses Copier to generate FastAPI+MongoDB+HTMX projects with interactive prompts
+from pathlib import Path
+from typing import Annotated
+
+import copier
+import typer
+from rich.console import Console
+
+
+console = Console()
+
+scaffold_app = typer.Typer(
+    help="Create new projects from the vibetuner template", no_args_is_help=True
+)
+
+
+@scaffold_app.command(name="new")
+def new(
+    destination: Annotated[
+        Path,
+        typer.Argument(
+            help="Destination directory for the new project",
+            exists=False,
+        ),
+    ],
+    defaults: Annotated[
+        bool,
+        typer.Option(
+            "--defaults",
+            "-d",
+            help="Use default values for all prompts (non-interactive mode)",
+        ),
+    ] = False,
+    data: Annotated[
+        list[str] | None,
+        typer.Option(
+            "--data",
+            help="Override template variables in key=value format (can be used multiple times)",
+        ),
+    ] = None,
+    branch: Annotated[
+        str | None,
+        typer.Option(
+            "--branch",
+            "-b",
+            help="Use specific branch/tag from the vibetuner template repository",
+        ),
+    ] = None,
+) -> None:
+    """Create a new project from the vibetuner template.
+
+    Examples:
+
+        # Interactive mode (prompts for all values)
+        vibetuner scaffold new my-project
+
+        # Use defaults for all prompts
+        vibetuner scaffold new my-project --defaults
+
+        # Override specific values
+        vibetuner scaffold new my-project --data project_name="My App" --data python_version="3.13"
+
+        # Use specific branch for testing
+        vibetuner scaffold new my-project --branch fix/scaffold-command
+    """
+    # Use the official vibetuner template from GitHub
+    template_src = "gh:alltuner/vibetuner"
+    vcs_ref = branch or "main"  # Use specified branch or default to main
+
+    if branch:
+        console.print(
+            f"[dim]Using vibetuner template from GitHub ({branch} branch)[/dim]"
+        )
+    else:
+        console.print("[dim]Using vibetuner template from GitHub (main branch)[/dim]")
+
+    # Parse data overrides
+    data_dict = {}
+    if data:
+        for item in data:
+            if "=" not in item:
+                console.print(
+                    f"[red]Error: Invalid data format '{item}'. Expected key=value[/red]"
+                )
+                raise typer.Exit(code=1)
+            key, value = item.split("=", 1)
+            data_dict[key] = value
+
+    # When using defaults, provide sensible default values for required fields
+    if defaults:
+        default_values = {
+            "company_name": "Acme Corp",
+            "author_name": "Developer",
+            "author_email": "dev@example.com",
+            "supported_languages": [],
+        }
+        # Merge: user overrides take precedence over defaults
+        data_dict = {**default_values, **data_dict}
+
+    # Run copier
+    try:
+        console.print(f"\n[green]Creating new project in: {destination}[/green]\n")
+
+        copier.run_copy(
+            src_path=str(template_src),
+            dst_path=destination,
+            data=data_dict if data_dict else None,
+            defaults=defaults,
+            quiet=defaults,  # Suppress prompts when using defaults
+            unsafe=True,  # Allow running post-generation tasks
+            vcs_ref=vcs_ref,  # Use the specified branch or default to main
+        )
+
+        console.print("\n[green]✓ Project created successfully![/green]")
+        console.print("\nNext steps:")
+        console.print(f"  cd {destination}")
+        console.print("  just dev")
+
+    except Exception as e:
+        console.print(f"[red]Error creating project: {e}[/red]")
+        raise typer.Exit(code=1) from None
+
+
+@scaffold_app.command(name="update")
+def update(
+    path: Annotated[
+        Path | None,
+        typer.Argument(
+            help="Path to the project to update",
+        ),
+    ] = None,
+    skip_answered: Annotated[
+        bool,
+        typer.Option(
+            "--skip-answered",
+            "-s",
+            help="Skip questions that have already been answered",
+        ),
+    ] = True,
+) -> None:
+    """Update an existing project to the latest template version.
+
+    This will update the project's files to match the latest template version,
+    while preserving your answers to the original questions.
+
+    Examples:
+
+        # Update current directory
+        vibetuner scaffold update
+
+        # Update specific directory
+        vibetuner scaffold update /path/to/project
+
+        # Re-prompt for all questions
+        vibetuner scaffold update --no-skip-answered
+    """
+    if path is None:
+        path = Path.cwd()
+
+    if not path.exists():
+        console.print(f"[red]Error: Directory does not exist: {path}[/red]")
+        raise typer.Exit(code=1)
+
+    # Check if it's a copier project
+    answers_file = path / ".copier-answers.yml"
+    if not answers_file.exists():
+        console.print(
+            "[red]Error: Not a copier project (missing .copier-answers.yml)[/red]"
+        )
+        console.print(f"[yellow]Directory: {path}[/yellow]")
+        raise typer.Exit(code=1)
+
+    try:
+        console.print(f"\n[green]Updating project: {path}[/green]\n")
+
+        copier.run_update(
+            dst_path=path,
+            skip_answered=skip_answered,
+            unsafe=True,  # Allow running post-generation tasks
+        )
+
+        console.print("\n[green]✓ Project updated successfully![/green]")
+
+    except Exception as e:
+        console.print(f"[red]Error updating project: {e}[/red]")
+        raise typer.Exit(code=1) from None

vibetuner/config.py

@@ -17,22 +17,33 @@ from pydantic import (
 from pydantic_extra_types.language_code import LanguageAlpha2
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from vibetuner.paths import config_vars as config_vars_path
-from vibetuner.versioning import version
+from vibetuner.logging import logger
+
+from .paths import config_vars as config_vars_path
+from .versioning import version
 
 
 current_year: int = datetime.now().year
 
 
 def _load_project_config() -> "ProjectConfiguration":
+    if config_vars_path is None:
+        raise RuntimeError(
+            "Project root not detected. Cannot load project configuration. "
+            "Ensure you're running from within a project directory with .copier-answers.yml"
+        )
     if not config_vars_path.exists():
         return ProjectConfiguration()
-    return ProjectConfiguration(
-        **yaml.safe_load(config_vars_path.read_text(encoding="utf-8"))
-    )
+
+    yaml_data = yaml.safe_load(config_vars_path.read_text(encoding="utf-8"))
+    return ProjectConfiguration(**yaml_data)
 
 
 class ProjectConfiguration(BaseSettings):
+    @classmethod
+    def from_project_config(cls) -> "ProjectConfiguration":
+        return _load_project_config()
+
     project_slug: str = "default_project"
     project_name: str = "default_project"
 
@@ -42,9 +53,6 @@ class ProjectConfiguration(BaseSettings):
     supported_languages: set[LanguageAlpha2] | None = None
     default_language: LanguageAlpha2 = LanguageAlpha2("en")
 
-    mongodb_url: MongoDsn | None = None
-    redis_url: RedisDsn | None = None
-
     # AWS Parameters
     aws_default_region: str = "eu-central-1"
 
@@ -85,16 +93,20 @@ class ProjectConfiguration(BaseSettings):
         )
         return f"© {year_part}{f' {self.company_name}' if self.company_name else ''}"
 
-    model_config = SettingsConfigDict(extra="ignore")
+    model_config = SettingsConfigDict(case_sensitive=False, extra="ignore")
 
 
 class CoreConfiguration(BaseSettings):
-    project: ProjectConfiguration
+    project: ProjectConfiguration = ProjectConfiguration.from_project_config()
 
     debug: bool = False
     version: str = version
     session_key: SecretStr = SecretStr("ct-!secret-must-change-me")
 
+    # Database and Cache URLs
+    mongodb_url: MongoDsn = MongoDsn("mongodb://localhost:27017")
+    redis_url: RedisDsn = RedisDsn("redis://localhost:6379")
+
     aws_access_key_id: SecretStr | None = None
     aws_secret_access_key: SecretStr | None = None
 
@@ -125,4 +137,8 @@ class CoreConfiguration(BaseSettings):
     )
 
 
-settings = CoreConfiguration(project=_load_project_config())
+settings = CoreConfiguration()
+
+
+logger.info("Configuration loaded for project: {}", settings.project.project_name)
+logger.info("Configuration loaded for project: {}", settings.model_dump())

vibetuner/context.py

@@ -23,3 +23,6 @@ class Context(BaseModel):
     fqdn: str | None = settings.project.fqdn
 
     model_config = {"arbitrary_types_allowed": True}
+
+
+ctx = Context()

vibetuner/frontend/__init__.py

@@ -21,8 +21,13 @@ def register_router(router: APIRouter) -> None:
 
 
 try:
-    import app.frontend.oauth as _app_oauth  # noqa: F401
-    import app.frontend.routes as _app_routes  # noqa: F401
+    import app.frontend.oauth as _app_oauth  # noqa: F401  # type: ignore[unresolved-import]
+    import app.frontend.routes as _app_routes  # noqa: F401  # type: ignore[unresolved-import]
+
+    # Register OAuth routes after providers are registered
+    from .routes.auth import register_oauth_routes
+
+    register_oauth_routes()
 except (ImportError, ModuleNotFoundError):
     pass
 

vibetuner/frontend/lifespan.py

@@ -2,25 +2,30 @@ from contextlib import asynccontextmanager
 
 from fastapi import FastAPI
 
+from vibetuner.context import ctx
+from vibetuner.logging import logger
 from vibetuner.mongo import init_models
 
-from .context import ctx
 from .hotreload import hotreload
 
 
 @asynccontextmanager
-async def lifespan(app: FastAPI):
+async def base_lifespan(app: FastAPI):
+    logger.info("Vibetuner frontend starting")
     if ctx.DEBUG:
         await hotreload.startup()
 
     await init_models()
-    # Add below anything that should happen before startup
 
-    # Until here
     yield
 
-    # Add below anything that should happen before shutdown
-
-    # Until here
+    logger.info("Vibetuner frontend stopping")
     if ctx.DEBUG:
         await hotreload.shutdown()
+    logger.info("Vibetuner frontend stopped")
+
+
+try:
+    from app.frontend.lifespan import lifespan  # ty: ignore
+except ImportError:
+    lifespan = base_lifespan

vibetuner/frontend/middleware.py

@@ -13,12 +13,12 @@ from starlette_babel import (
     LocaleMiddleware,
     get_translator,
 )
-from starlette_htmx.middleware import HtmxMiddleware  # type: ignore[import-untyped]
+from starlette_htmx.middleware import HtmxMiddleware
 
 from vibetuner.config import settings
+from vibetuner.context import ctx
 from vibetuner.paths import locales as locales_path
 
-from .context import ctx
 from .oauth import WebUser
 
 
@@ -66,7 +66,7 @@ def user_preference_selector(conn: HTTPConnection) -> str | None:
 
 
 shared_translator = get_translator()
-if locales_path.exists() and locales_path.is_dir():
+if locales_path is not None and locales_path.exists() and locales_path.is_dir():
     # Load translations from the locales directory
     shared_translator.load_from_directories([locales_path])
 

vibetuner/frontend/routes/auth.py

@@ -135,16 +135,22 @@ async def email_verify(
     return next or get_homepage_url(request)
 
 
-for provider in get_oauth_providers():
-    router.get(
-        f"/provider/{provider}",
-        response_class=RedirectResponse,
-        name=f"auth_with_{provider}",
-        response_model=None,
-    )(_create_auth_handler(provider))
-
-    router.get(
-        f"/login/provider/{provider}",
-        name=f"login_with_{provider}",
-        response_model=None,
-    )(_create_auth_login_handler(provider))
+def register_oauth_routes() -> None:
+    """Register OAuth provider routes dynamically.
+
+    This must be called after OAuth providers are registered to ensure
+    routes are created for all configured providers.
+    """
+    for provider in get_oauth_providers():
+        router.get(
+            f"/provider/{provider}",
+            response_class=RedirectResponse,
+            name=f"auth_with_{provider}",
+            response_model=None,
+        )(_create_auth_handler(provider))
+
+        router.get(
+            f"/login/provider/{provider}",
+            name=f"login_with_{provider}",
+            response_model=None,
+        )(_create_auth_login_handler(provider))

vibetuner/frontend/routes/debug.py

@@ -10,10 +10,10 @@ from fastapi.responses import (
     RedirectResponse,
 )
 
+from vibetuner.context import ctx
 from vibetuner.models import UserModel
 from vibetuner.models.registry import get_all_models
 
-from ..context import ctx
 from ..deps import MAGIC_COOKIE_NAME
 from ..templates import render_template
 

vibetuner/frontend/routes/health.py

@@ -22,6 +22,10 @@ def health_ping():
 @router.get("/id")
 def health_instance_id():
     """Instance identification endpoint for distinguishing app instances"""
+    if root_path is None:
+        raise RuntimeError(
+            "Project root not detected. Cannot provide instance information."
+        )
     return {
         "app": settings.project.project_slug,
         "port": int(os.environ.get("PORT", 8000)),

vibetuner/frontend/routes/user.py

@@ -3,9 +3,9 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 from pydantic_extra_types.language_code import LanguageAlpha2
 from starlette.authentication import requires
 
+from vibetuner.context import ctx
 from vibetuner.models import UserModel
 
-from ..context import ctx
 from ..templates import render_template
 
 

vibetuner/mongo.py

@@ -9,7 +9,7 @@ async def init_models() -> None:
     """Initialize MongoDB connection and register all Beanie models."""
 
     client: AsyncMongoClient = AsyncMongoClient(
-        host=str(settings.project.mongodb_url),
+        host=str(settings.mongodb_url),
         compressors=["zstd"],
     )