vibetuner 2.14.1__py3-none-any.whl → 2.26.9__py3-none-any.whl

vibetuner/cli/__init__.py

@@ -1,16 +1,20 @@
 # ABOUTME: Core CLI setup with AsyncTyper wrapper and base configuration
 # ABOUTME: Provides main CLI entry point and logging configuration
+import importlib.metadata
 import inspect
 from functools import partial, wraps
 from importlib import import_module
+from pathlib import Path
+from typing import Annotated
 
 import asyncer
 import typer
 from rich.console import Console
+from rich.table import Table
 
 from vibetuner.cli.run import run_app
 from vibetuner.cli.scaffold import scaffold_app
-from vibetuner.logging import LogLevel, setup_logging
+from vibetuner.logging import LogLevel, logger, setup_logging
 
 
 console = Console()
@@ -69,11 +73,69 @@ def callback(log_level: LogLevel | None = LOG_LEVEL_OPTION) -> None:
     setup_logging(level=log_level)
 
 
+@app.command()
+def version(
+    show_app: bool = typer.Option(
+        False,
+        "--app",
+        "-a",
+        help="Show app settings version even if not in a project directory",
+    ),
+) -> None:
+    """Show version information."""
+    try:
+        # Get vibetuner package version
+        vibetuner_version = importlib.metadata.version("vibetuner")
+    except importlib.metadata.PackageNotFoundError:
+        vibetuner_version = "unknown"
+
+    # Create table for nice display
+    table = Table(title="Version Information")
+    table.add_column("Component", style="cyan", no_wrap=True)
+    table.add_column("Version", style="green", no_wrap=True)
+
+    # Always show vibetuner package version
+    table.add_row("vibetuner package", vibetuner_version)
+
+    # Show app version if requested or if in a project
+    try:
+        from vibetuner.config import CoreConfiguration
+
+        settings = CoreConfiguration()
+        table.add_row(f"{settings.project.project_name} settings", settings.version)
+    except Exception:
+        if show_app:
+            table.add_row("app settings", "not in project directory")
+        # else: don't show app version if not in project and not requested
+
+    console.print(table)
+
+
+@app.command()
+def core_template_symlink(
+    target: Annotated[
+        Path,
+        typer.Argument(
+            help="Path where the 'core' symlink should be created or updated",
+        ),
+    ],
+) -> None:
+    """Create or update a 'core' symlink to the package templates directory."""
+    from vibetuner.paths import create_core_templates_symlink
+
+    create_core_templates_symlink(target)
+
+
 app.add_typer(run_app, name="run")
 app.add_typer(scaffold_app, name="scaffold")
 
 try:
     import_module("app.cli")
-except (ImportError, ModuleNotFoundError):
+except ModuleNotFoundError:
+    # Silent pass for missing app.cli module (expected in some projects)
     pass
-# Cache buster
+except ImportError as e:
+    # Log warning for any import error (including syntax errors, missing dependencies, etc.)
+    logger.warning(
+        f"Failed to import app.cli: {e}. User CLI commands will not be available."
+    )

vibetuner/cli/run.py

@@ -47,7 +47,7 @@ def dev(
 
         # Call streaq programmatically
         streaq_main(
-            worker_path="app.tasks.worker.worker",
+            worker_path="vibetuner.tasks.worker.worker",
             workers=1,
             reload=True,
             verbose=True,
@@ -123,7 +123,7 @@ def prod(
 
         # Call streaq programmatically
         streaq_main(
-            worker_path="app.tasks.worker.worker",
+            worker_path="vibetuner.tasks.worker.worker",
             workers=workers_count,
             reload=False,
             verbose=False,

vibetuner/config.py

@@ -17,6 +17,8 @@ from pydantic import (
 from pydantic_extra_types.language_code import LanguageAlpha2
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+from vibetuner.logging import logger
+
 from .paths import config_vars as config_vars_path
 from .versioning import version
 
@@ -32,12 +34,16 @@ def _load_project_config() -> "ProjectConfiguration":
         )
     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"
 
@@ -47,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"
 
@@ -90,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
 
@@ -130,4 +137,7 @@ class CoreConfiguration(BaseSettings):
     )
 
 
-settings = CoreConfiguration(project=_load_project_config())
+settings = CoreConfiguration()
+
+
+logger.info("Configuration loaded for project: {}", settings.project.project_name)

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

@@ -4,10 +4,12 @@ from fastapi import APIRouter, Depends as Depends, FastAPI, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 
+import vibetuner.frontend.lifespan as lifespan_module
 from vibetuner import paths
+from vibetuner.logging import logger
 
 from .deps import LangDep as LangDep, MagicCookieDep as MagicCookieDep
-from .lifespan import ctx, lifespan
+from .lifespan import ctx
 from .middleware import middlewares
 from .routes import auth, debug, health, language, meta, user
 from .templates import render_template
@@ -21,15 +23,35 @@ def register_router(router: APIRouter) -> None:
 
 
 try:
-    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]
+    import app.frontend.oauth as _app_oauth  # type: ignore[unresolved-import] # noqa: F401
+    import app.frontend.routes as _app_routes  # type: ignore[unresolved-import] # noqa: F401
 
     # Register OAuth routes after providers are registered
     from .routes.auth import register_oauth_routes
 
     register_oauth_routes()
-except (ImportError, ModuleNotFoundError):
+except ModuleNotFoundError:
+    # Silent pass for missing app.frontend.oauth or app.frontend.routes modules (expected in some projects)
     pass
+except ImportError as e:
+    # Log warning for any import error (including syntax errors, missing dependencies, etc.)
+    logger.warning(
+        f"Failed to import app.frontend.oauth or app.frontend.routes: {e}. OAuth and custom routes will not be available."
+    )
+
+try:
+    from app.frontend.middleware import (
+        middlewares as app_middlewares,  # type: ignore[unresolved-import]
+    )
+
+    middlewares.extend(app_middlewares)
+except ModuleNotFoundError:
+    pass
+except ImportError as e:
+    # Log warning for any import error (including syntax errors, missing dependencies, etc.)
+    logger.warning(
+        f"Failed to import app.frontend.middleware: {e}. Additional middlewares will not be available."
+    )
 
 
 dependencies: list[Any] = [
@@ -38,7 +60,7 @@ dependencies: list[Any] = [
 
 app = FastAPI(
     debug=ctx.DEBUG,
-    lifespan=lifespan,
+    lifespan=lifespan_module.lifespan,
     docs_url=None,
     redoc_url=None,
     openapi_url=None,

vibetuner/frontend/lifespan.py

@@ -1,26 +1,37 @@
 from contextlib import asynccontextmanager
+from typing import AsyncGenerator
 
 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) -> AsyncGenerator[None, None]:
+    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 ModuleNotFoundError:
+    # Silent pass for missing app.frontend.lifespan module (expected in some projects)
+    lifespan = base_lifespan
+except ImportError as e:
+    # Log warning for any import error (including syntax errors, missing dependencies, etc.)
+    logger.warning(f"Failed to import app.frontend.lifespan: {e}. Using base lifespan.")
+    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
 
 
@@ -126,7 +126,6 @@ class AuthBackend(AuthenticationBackend):
         return None
 
 
-# Until this line
 middlewares: list[Middleware] = [
     Middleware(TrustedHostMiddleware),
     Middleware(ForwardedProtocolMiddleware),
@@ -145,7 +144,4 @@ middlewares: list[Middleware] = [
     ),
     Middleware(AdjustLangCookieMiddleware),
     Middleware(AuthenticationMiddleware, backend=AuthBackend()),
-    # Add your middleware below this line
 ]
-
-# EOF

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/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/frontend/templates.py

@@ -7,7 +7,7 @@ from starlette.responses import HTMLResponse
 from starlette_babel import gettext_lazy as _, gettext_lazy as ngettext
 from starlette_babel.contrib.jinja import configure_jinja_env
 
-from vibetuner.context import Context
+from vibetuner.context import ctx as data_ctx
 from vibetuner.paths import frontend_templates
 from vibetuner.templates import render_static_template
 from vibetuner.time import age_in_timedelta
@@ -19,8 +19,6 @@ __all__ = [
     "render_static_template",
 ]
 
-data_ctx = Context()
-
 
 def timeago(dt):
     """Converts a datetime object to a human-readable string representing the time elapsed since the given datetime.

vibetuner/mongo.py

@@ -1,15 +1,30 @@
+from importlib import import_module
+
 from beanie import init_beanie
 from pymongo import AsyncMongoClient
 
-from .config import settings
-from .models.registry import get_all_models
+from vibetuner.config import settings
+from vibetuner.logging import logger
+from vibetuner.models.registry import get_all_models
 
 
 async def init_models() -> None:
     """Initialize MongoDB connection and register all Beanie models."""
 
+    # Try to import user models to trigger their registration
+    try:
+        import_module("app.models")
+    except ModuleNotFoundError:
+        # Silent pass for missing app.models module (expected in some projects)
+        pass
+    except ImportError as e:
+        # Log warning for any import error (including syntax errors, missing dependencies, etc.)
+        logger.warning(
+            f"Failed to import app.models: {e}. User models will not be registered."
+        )
+
     client: AsyncMongoClient = AsyncMongoClient(
-        host=str(settings.project.mongodb_url),
+        host=str(settings.mongodb_url),
         compressors=["zstd"],
     )
 

vibetuner/paths.py

@@ -5,6 +5,8 @@ from typing import Self
 from pydantic import computed_field, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+from vibetuner.logging import logger
+
 
 # Package-relative paths (for bundled templates in the vibetuner package)
 _package_files = files("vibetuner")
@@ -22,6 +24,35 @@ def _get_package_templates_path() -> Path:
         ) from None
 
 
+def create_core_templates_symlink(target: Path) -> None:
+    """Create or update a 'core' symlink pointing to the package templates directory."""
+
+    try:
+        source = _get_package_templates_path().resolve()
+    except RuntimeError as e:
+        logger.error(f"Cannot create symlink: {e}")
+        return
+
+    # Case 1: target does not exist → create symlink
+    if not target.exists():
+        target.symlink_to(source, target_is_directory=True)
+        logger.info(f"Created symlink '{target}' → '{source}'")
+        return
+
+    # Case 2: exists but is not a symlink → error
+    if not target.is_symlink():
+        logger.error(f"Cannot create symlink: '{target}' exists and is not a symlink.")
+        raise FileExistsError(
+            f"Cannot create symlink: '{target}' exists and is not a symlink."
+        )
+
+    # Case 3: is a symlink but points somewhere else → update it
+    if target.resolve() != source:
+        target.unlink()
+        target.symlink_to(source, target_is_directory=True)
+        logger.info(f"Updated symlink '{target}' → '{source}'")
+
+
 # Package templates always available
 package_templates = _get_package_templates_path()
 core_templates = package_templates  # Alias for backwards compatibility
@@ -158,10 +189,6 @@ class PathSettings(BaseSettings):
         paths.append(package_templates / "markdown")
         return paths
 
-    def set_root(self, project_root: Path) -> None:
-        """Explicitly set project root (overrides auto-detection)."""
-        self.root = project_root
-
     def to_template_path_list(self, path: Path) -> list[Path]:
         """Convert path to list with fallback."""
         return [path, path / self.fallback_path]
@@ -191,12 +218,6 @@ class PathSettings(BaseSettings):
 _settings = PathSettings()
 
 
-# Backwards-compatible module-level API
-def set_project_root(project_root: Path) -> None:
-    """Set the project root directory explicitly."""
-    _settings.set_root(project_root)
-
-
 def to_template_path_list(path: Path) -> list[Path]:
     """Convert path to list with fallback."""
     return _settings.to_template_path_list(path)

vibetuner/tasks/__init__.py

@@ -1,2 +0,0 @@
-# Import all your tasks here with (noqa: F401)
-# from . import x_tasks

vibetuner/tasks/lifespan.py

@@ -0,0 +1,28 @@
+from contextlib import asynccontextmanager
+from typing import AsyncGenerator
+
+from vibetuner.context import Context, ctx
+from vibetuner.logging import logger
+from vibetuner.mongo import init_models
+
+
+@asynccontextmanager
+async def base_lifespan() -> AsyncGenerator[Context, None]:
+    logger.info("Vibetuner task worker starting")
+
+    await init_models()
+
+    yield ctx
+
+    logger.info("Vibetuner task worker stopping")
+
+
+try:
+    from app.tasks.lifespan import lifespan  # ty: ignore
+except ModuleNotFoundError:
+    # Silent pass for missing app.tasks.lifespan module (expected in some projects)
+    lifespan = base_lifespan
+except ImportError as e:
+    # Log warning for any import error (including syntax errors, missing dependencies, etc.)
+    logger.warning(f"Failed to import app.tasks.lifespan: {e}. Using base lifespan.")
+    lifespan = base_lifespan

vibetuner/tasks/worker.py

@@ -1,11 +1,11 @@
 from streaq import Worker
 
 from vibetuner.config import settings
-from vibetuner.tasks.context import lifespan
+from vibetuner.tasks.lifespan import lifespan
 
 
 worker = Worker(
-    redis_url=str(settings.project.redis_url),
+    redis_url=str(settings.redis_url),
     queue_name=(
         settings.project.project_slug
         if not settings.debug
@@ -13,6 +13,3 @@ worker = Worker(
     ),
     lifespan=lifespan,
 )
-
-# Register tasks
-# use something like from . import task_module_name // noqa: E402, F401

vibetuner/templates/email/{default/magic_link.html.jinja → magic_link.html.jinja}

@@ -1,6 +1,6 @@
+{# djlint:off #}
 <html>
     <body>
-        <h2>Sign in to {{ project_name }}</h2>
         <p>Click the link below to sign in to your account:</p>
         <p>
             <a href="{{ login_url }}"
@@ -14,3 +14,4 @@
         <p>If you didn't request this, you can safely ignore this email.</p>
     </body>
 </html>
+{# djlint:on #}

vibetuner/templates/frontend/base/favicons.html.jinja

@@ -1 +1 @@
-<link rel="manifest" href="{{ url_for("site_webmanifest").path }}" />
+<link rel="manifest" href="{{ url_for('site_webmanifest').path }}" />

vibetuner/templates/frontend/base/skeleton.html.jinja

@@ -3,8 +3,8 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="description" content="{{ meta_description | default("") }}" />
-        <meta name="keywords" content="{{ meta_keywords | default("") }}" />
+        <meta name="description" content="{{ meta_description | default('') }}" />
+        <meta name="keywords" content="{{ meta_keywords | default('') }}" />
         <meta name="color-scheme" content="light" />
         <title>
             {% block title %}
@@ -17,6 +17,7 @@
         {% endif %}
         {% include "base/favicons.html.jinja" %}
         {% include "base/opengraph.html.jinja" %}
+
         {% block head %}
         {% endblock head %}
     </head>
@@ -26,6 +27,7 @@
         {% block header %}
             {% if not SKIP_HEADER %}
                 {% include "base/header.html.jinja" %}
+
             {% endif %}
         {% endblock header %}
         {% block body %}
@@ -33,6 +35,7 @@
         {% block footer %}
             {% if not SKIP_FOOTER %}
                 {% include "base/footer.html.jinja" %}
+
             {% endif %}
         {% endblock footer %}
         {% if DEBUG %}{{ hotreload.script(url_for('hot-reload') ) | safe }}{% endif %}

vibetuner/templates/frontend/debug/collections.html.jinja

@@ -1,4 +1,5 @@
 {% extends "base/skeleton.html.jinja" %}
+
 {% block title %}
     Database Collections Schema - Debug
 {% endblock title %}
@@ -99,5 +100,6 @@
         </div>
         <!-- Debug Navigation Footer -->
         {% include "debug/components/debug_nav.html.jinja" %}
+
     </div>
 {% endblock body %}

vibetuner/templates/frontend/debug/components/debug_nav.html.jinja

@@ -1,7 +1,7 @@
 <!-- Debug Navigation Component -->
 <nav class="mt-8 pt-6 border-t border-base-200">
     <div class="flex flex-wrap gap-4">
-        <a href="{{ url_for("debug_index") }}"
+        <a href="{{ url_for('debug_index') }}"
            class="btn btn-outline btn-primary gap-2">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2H5a2 2 0 00-2-2z">
@@ -11,7 +11,7 @@
             </svg>
             Debug Home
         </a>
-        <a href="{{ url_for("debug_info") }}"
+        <a href="{{ url_for('debug_info') }}"
            class="btn btn-outline btn-primary gap-2">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z">
@@ -19,7 +19,7 @@
             </svg>
             System Info
         </a>
-        <a href="{{ url_for("debug_collections") }}"
+        <a href="{{ url_for('debug_collections') }}"
            class="btn btn-outline btn-primary gap-2">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4">
@@ -27,7 +27,7 @@
             </svg>
             Collections
         </a>
-        <a href="{{ url_for("debug_users") }}"
+        <a href="{{ url_for('debug_users') }}"
            class="btn btn-outline btn-warning gap-2">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z">
@@ -35,7 +35,7 @@
             </svg>
             User Impersonation
         </a>
-        <a href="{{ url_for("debug_version") }}"
+        <a href="{{ url_for('debug_version') }}"
            class="btn btn-outline btn-primary gap-2">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 7h.01M7 3h5c.512 0 1.024.195 1.414.586l7 7a2 2 0 010 2.828l-7 7a2 2 0 01-2.828 0l-7-7A1.994 1.994 0 013 12V7a4 4 0 014-4z">
@@ -43,7 +43,7 @@
             </svg>
             Version
         </a>
-        <a href="{{ url_for("health_ping") }}"
+        <a href="{{ url_for('health_ping') }}"
            class="btn btn-outline btn-success gap-2">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z">