aegis-stack 0.8.1__tar.gz → 0.9.0__tar.gz

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aegis-stack
-Version: 0.8.1
+Version: 0.9.0
 Summary: A production-ready FastAPI platform with modular components and a built-in control plane. Try: uvx aegis-stack init my-project
 Project-URL: Homepage, https://aegis-stack.io
 Project-URL: Documentation, https://docs.aegis-stack.io/
@@ -26,12 +26,13 @@ Classifier: Topic :: Software Development :: Code Generators
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: <3.15,>=3.11
-Requires-Dist: copier<9.16,>=9.11.2
+Requires-Dist: copier<9.15,>=9.11.2
 Requires-Dist: filelock>=3.20.1
 Requires-Dist: packaging>=24.0
 Requires-Dist: pillow>=12.2.0
+Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0.0
-Requires-Dist: typer==0.26.7
+Requires-Dist: typer==0.26.8
 Requires-Dist: urllib3>=2.7.0
 Provides-Extra: dev
 Requires-Dist: aegis-plugin-test; extra == 'dev'
@@ -129,7 +130,7 @@ uvx aegis-stack init full-app --services auth,payment,comms --components worker,
 | **[CLI](https://docs.aegis-stack.io/cli-reference/)** | Typer, first-class system interface | ![Always](https://img.shields.io/badge/-always_on-2ea043) |
 | **[Frontend](https://docs.aegis-stack.io/components/frontend/)** | Flet, ships with the Overseer system dashboard | ![Always](https://img.shields.io/badge/-always_on-2ea043) |
 | **[Cache](https://docs.aegis-stack.io/components/)** | Redis for caching, sessions, pub/sub | ![Optional](https://img.shields.io/badge/-optional-blue) |
-| **[Database](https://docs.aegis-stack.io/components/database/)** | Postgres or SQLite + SQLModel ORM | ![Optional](https://img.shields.io/badge/-optional-blue) |
+| **[Database](https://docs.aegis-stack.io/components/database/)** | Postgres (self-hosted or Neon serverless) or SQLite + SQLModel ORM | ![Optional](https://img.shields.io/badge/-optional-blue) |
 | **[Inference](https://docs.aegis-stack.io/components/)** | Local AI models via Ollama | ![Optional](https://img.shields.io/badge/-optional-blue) |
 | **[Ingress](https://docs.aegis-stack.io/components/ingress/)** | Traefik v3 reverse proxy with TLS | ![Optional](https://img.shields.io/badge/-optional-blue) |
 | **[Observability](https://docs.aegis-stack.io/components/observability/)** | Pydantic Logfire tracing + metrics + logging | ![Optional](https://img.shields.io/badge/-optional-blue) |
@@ -168,7 +169,7 @@ Aegis Stack is the orchestration layer. Services and components wire into best-i
 <td align="center" width="16.66%"><a href="https://github.com"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/integrations/github-dark.svg"><img src="docs/images/integrations/github.svg" loading="lazy" style="height:32px;width:auto" alt="GitHub" title="GitHub: OAuth provider" /></picture></a></td>
 <td align="center" width="16.66%"><a href="https://www.google.com"><img src="docs/images/integrations/google.svg" loading="lazy" style="height:32px;width:auto" alt="Google" title="Google: AI provider and OAuth" /></a></td>
 <td align="center" width="16.66%"><a href="https://www.langchain.com"><img src="docs/images/integrations/langchain.png" loading="lazy" style="height:32px;width:auto" alt="LangChain" title="LangChain: AI provider abstraction" /></a></td>
-<td align="center" width="16.66%"><a href="https://neon.tech"><img src="docs/images/integrations/neon.svg" loading="lazy" style="height:32px;width:auto" alt="Neon" title="Neon: Serverless Postgres (planned)" /></a></td>
+<td align="center" width="16.66%"><a href="https://neon.tech"><img src="docs/images/integrations/neon.svg" loading="lazy" style="height:32px;width:auto" alt="Neon" title="Neon: Serverless Postgres, database provider" /></a></td>
 <td align="center" width="16.66%"><a href="https://ollama.com"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/integrations/ollama-dark.svg"><img src="docs/images/integrations/ollama.svg" loading="lazy" style="height:32px;width:auto" alt="Ollama" title="Ollama: Local LLM runtime" /></picture></a></td>
 <td align="center" width="16.66%"><a href="https://plausible.io"><img src="docs/images/integrations/plausibleanalytics.svg" loading="lazy" style="height:32px;width:auto" alt="Plausible" title="Plausible: Analytics source for Insights service" /></a></td>
 </tr>

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/README.md

@@ -71,7 +71,7 @@ uvx aegis-stack init full-app --services auth,payment,comms --components worker,
 | **[CLI](https://docs.aegis-stack.io/cli-reference/)** | Typer, first-class system interface | ![Always](https://img.shields.io/badge/-always_on-2ea043) |
 | **[Frontend](https://docs.aegis-stack.io/components/frontend/)** | Flet, ships with the Overseer system dashboard | ![Always](https://img.shields.io/badge/-always_on-2ea043) |
 | **[Cache](https://docs.aegis-stack.io/components/)** | Redis for caching, sessions, pub/sub | ![Optional](https://img.shields.io/badge/-optional-blue) |
-| **[Database](https://docs.aegis-stack.io/components/database/)** | Postgres or SQLite + SQLModel ORM | ![Optional](https://img.shields.io/badge/-optional-blue) |
+| **[Database](https://docs.aegis-stack.io/components/database/)** | Postgres (self-hosted or Neon serverless) or SQLite + SQLModel ORM | ![Optional](https://img.shields.io/badge/-optional-blue) |
 | **[Inference](https://docs.aegis-stack.io/components/)** | Local AI models via Ollama | ![Optional](https://img.shields.io/badge/-optional-blue) |
 | **[Ingress](https://docs.aegis-stack.io/components/ingress/)** | Traefik v3 reverse proxy with TLS | ![Optional](https://img.shields.io/badge/-optional-blue) |
 | **[Observability](https://docs.aegis-stack.io/components/observability/)** | Pydantic Logfire tracing + metrics + logging | ![Optional](https://img.shields.io/badge/-optional-blue) |
@@ -110,7 +110,7 @@ Aegis Stack is the orchestration layer. Services and components wire into best-i
 <td align="center" width="16.66%"><a href="https://github.com"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/integrations/github-dark.svg"><img src="docs/images/integrations/github.svg" loading="lazy" style="height:32px;width:auto" alt="GitHub" title="GitHub: OAuth provider" /></picture></a></td>
 <td align="center" width="16.66%"><a href="https://www.google.com"><img src="docs/images/integrations/google.svg" loading="lazy" style="height:32px;width:auto" alt="Google" title="Google: AI provider and OAuth" /></a></td>
 <td align="center" width="16.66%"><a href="https://www.langchain.com"><img src="docs/images/integrations/langchain.png" loading="lazy" style="height:32px;width:auto" alt="LangChain" title="LangChain: AI provider abstraction" /></a></td>
-<td align="center" width="16.66%"><a href="https://neon.tech"><img src="docs/images/integrations/neon.svg" loading="lazy" style="height:32px;width:auto" alt="Neon" title="Neon: Serverless Postgres (planned)" /></a></td>
+<td align="center" width="16.66%"><a href="https://neon.tech"><img src="docs/images/integrations/neon.svg" loading="lazy" style="height:32px;width:auto" alt="Neon" title="Neon: Serverless Postgres, database provider" /></a></td>
 <td align="center" width="16.66%"><a href="https://ollama.com"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/images/integrations/ollama-dark.svg"><img src="docs/images/integrations/ollama.svg" loading="lazy" style="height:32px;width:auto" alt="Ollama" title="Ollama: Local LLM runtime" /></picture></a></td>
 <td align="center" width="16.66%"><a href="https://plausible.io"><img src="docs/images/integrations/plausibleanalytics.svg" loading="lazy" style="height:32px;width:auto" alt="Plausible" title="Plausible: Analytics source for Insights service" /></a></td>
 </tr>

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/__init__.py

@@ -2,4 +2,4 @@
 Aegis Stack CLI - Component generation and project management tools.
 """
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/cli/guided.py

@@ -49,6 +49,7 @@ from rich.text import Text
 from ..constants import (
     DOCS_BASE_URL,
     AIProviders,
+    PostgresProviders,
     StorageBackends,
     WorkerBackends,
 )
@@ -489,7 +490,7 @@ class GuidedSelectionUI:
             )
         ].value
 
-    def choose_database_engine(self, context: str) -> str:
+    def choose_database_engine(self, context: str) -> tuple[str, str | None]:
         choices = [
             _Choice(
                 StorageBackends.SQLITE,
@@ -505,7 +506,7 @@ class GuidedSelectionUI:
                 _g("choice.db.postgres", "Production-grade, pooled connections."),
             ),
         ]
-        return choices[
+        engine = choices[
             self._select(
                 _g(
                     "prompt.database_engine",
@@ -516,6 +517,41 @@ class GuidedSelectionUI:
                 crumb="amend",
             )
         ].value
+        if engine == StorageBackends.POSTGRES:
+            return engine, self._choose_postgres_provider(context)
+        return engine, None
+
+    def _choose_postgres_provider(self, context: str) -> str:
+        """ONE screen for the PostgreSQL host: local container vs Neon (vs ...)."""
+        choices = [
+            _Choice(
+                PostgresProviders.CONTAINER,
+                "Local container",
+                _g(
+                    "choice.db_provider.container",
+                    "Local postgres:16 container, dev and prod.",
+                ),
+            ),
+            _Choice(
+                PostgresProviders.NEON,
+                "Neon",
+                _g(
+                    "choice.db_provider.neon",
+                    "Serverless Postgres: cloud in prod, local container in dev.",
+                ),
+            ),
+        ]
+        return choices[
+            self._select(
+                _g(
+                    "prompt.postgres_provider",
+                    "PostgreSQL host for {context}",
+                    context=context,
+                ),
+                choices,
+                crumb="amend",
+            )
+        ].value
 
     def configure_auth(self, service_name: str) -> str:
         choices = [

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/cli/interactive.py

@@ -22,6 +22,7 @@ from ..constants import (
     ComponentNames,
     Messages,
     OllamaMode,
+    PostgresProviders,
     StorageBackends,
     WorkerBackends,
 )
@@ -132,9 +133,67 @@ def get_database_engine_selection() -> str | None:
 
 
 def clear_database_engine_selection() -> None:
-    """Clear stored database engine selection (useful for testing)."""
-    global _database_engine_selection
+    """Clear the stored database engine and its PostgreSQL host (useful for testing).
+
+    The host is a sub-property of the engine, so clearing the engine must also
+    clear the host or a stale provider could be reused after the engine resets.
+    """
+    global _database_engine_selection, _postgres_provider_selection
     _database_engine_selection = None
+    _postgres_provider_selection = None
+
+
+# Global variable to store the PostgreSQL host (provider) selection. Neon is a
+# provider of the postgres engine, not a separate engine, so it lives alongside
+# the engine choice rather than inside it.
+_postgres_provider_selection: str | None = None
+
+
+def select_postgres_provider(context: str = "Database") -> str:
+    """Interactive PostgreSQL host selection (local container vs Neon, ...).
+
+    Only meaningful once the engine is postgres. Memoized like the engine so a
+    project resolves one host. Returns a ``PostgresProviders`` value.
+    """
+    global _postgres_provider_selection
+
+    if _postgres_provider_selection is not None:
+        return _postgres_provider_selection
+
+    choices = [
+        questionary.Choice(
+            title=t("interactive.db_provider_container"),
+            value=PostgresProviders.CONTAINER,
+        ),
+        questionary.Choice(
+            title=t("interactive.db_provider_neon"),
+            value=PostgresProviders.NEON,
+        ),
+    ]
+
+    result = questionary.select(
+        t("interactive.db_provider_select"),
+        choices=choices,
+        default=PostgresProviders.CONTAINER,
+        style=brand.questionary_style(),
+    ).ask()
+
+    if result is None:
+        raise typer.Abort()
+
+    _postgres_provider_selection = result
+    return result
+
+
+def get_postgres_provider_selection() -> str | None:
+    """Get the current PostgreSQL host (provider) selection."""
+    return _postgres_provider_selection
+
+
+def clear_postgres_provider_selection() -> None:
+    """Clear stored PostgreSQL host selection (useful for testing)."""
+    global _postgres_provider_selection
+    _postgres_provider_selection = None
 
 
 def select_worker_backend() -> str:
@@ -210,6 +269,10 @@ class ProjectSelection:
     services: list[str] = field(default_factory=list)
     scheduler_backend: str = StorageBackends.MEMORY
     database_engine: str | None = None
+    # PostgreSQL host, only meaningful when database_engine is postgres. Neon is
+    # a provider of the postgres engine, encoded into the component bracket
+    # (``database[neon]``) for downstream generation.
+    postgres_provider: str = PostgresProviders.CONTAINER
     database_added_by_scheduler: bool = False
 
 
@@ -240,7 +303,7 @@ class SelectionUI(Protocol):
 
     def choose_worker_backend(self) -> str: ...
 
-    def choose_database_engine(self, context: str) -> str: ...
+    def choose_database_engine(self, context: str) -> tuple[str, str | None]: ...
 
     def choose_scheduler_backend(self) -> str: ...
 
@@ -288,8 +351,11 @@ class TyperSelectionUI:
     def choose_worker_backend(self) -> str:
         return select_worker_backend()
 
-    def choose_database_engine(self, context: str) -> str:
-        return select_database_engine(context=context)
+    def choose_database_engine(self, context: str) -> tuple[str, str | None]:
+        engine = select_database_engine(context=context)
+        if engine == StorageBackends.POSTGRES:
+            return engine, select_postgres_provider(context=context)
+        return engine, None
 
     def choose_scheduler_backend(self) -> str:
         # Quick-mode shape preserved exactly: the persistence yes/no, then
@@ -383,6 +449,15 @@ def _step_database(
         return
 
     state.components.append(ComponentNames.DATABASE)
+
+    # Engine, then (for postgres) the host: SQLite / PostgreSQL, and when
+    # PostgreSQL, a local container vs Neon. Only postgres pins the engine onto
+    # state; SQLite stays the implicit default (plain ``database``).
+    engine, provider = ui.choose_database_engine(context="Database")
+    if engine == StorageBackends.POSTGRES:
+        state.database_engine = StorageBackends.POSTGRES
+        state.postgres_provider = provider or PostgresProviders.CONTAINER
+
     if ComponentNames.SCHEDULER in state.components:
         ui.echo(f"\n{t('interactive.bonus_backup')}")
         ui.success(t("interactive.backup_desc"))
@@ -442,9 +517,16 @@ def run_project_selection(ui: SelectionUI) -> ProjectSelection:
     # and downstream resolution.
     if ComponentNames.DATABASE in state.components and state.database_engine:
         db_index = state.components.index(ComponentNames.DATABASE)
-        state.components[db_index] = (
-            f"{ComponentNames.DATABASE}[{state.database_engine}]"
-        )
+        # Neon is a postgres provider: encode it as database[neon] so the
+        # generator normalizes it back to engine=postgres + provider=neon.
+        if (
+            state.database_engine == StorageBackends.POSTGRES
+            and state.postgres_provider == PostgresProviders.NEON
+        ):
+            token = PostgresProviders.NEON
+        else:
+            token = state.database_engine
+        state.components[db_index] = f"{ComponentNames.DATABASE}[{token}]"
     if (
         ComponentNames.SCHEDULER in state.components
         and state.scheduler_backend != StorageBackends.MEMORY
@@ -547,7 +629,11 @@ def _project_database_engine(state: ProjectSelection) -> str | None:
     for comp in state.components:
         base, _, rest = comp.partition("[")
         if base == ComponentNames.DATABASE:
-            return rest.rstrip("]") if rest else StorageBackends.SQLITE
+            engine = rest.rstrip("]") if rest else StorageBackends.SQLITE
+            # Neon is a postgres provider; engine-flavored reuse sees postgres.
+            if engine == PostgresProviders.NEON:
+                return StorageBackends.POSTGRES
+            return engine
     return None
 
 
@@ -806,6 +892,7 @@ def clear_all_ai_selections() -> None:
     clear_skip_llm_sync_selection()
     clear_ollama_mode_selection()
     clear_database_engine_selection()
+    clear_postgres_provider_selection()
     clear_auth_level_selection()
 
 

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/constants.py

@@ -38,6 +38,23 @@ class StorageBackends:
     POSTGRES = "postgres"
 
 
+class PostgresProviders:
+    """Provider/host for a PostgreSQL database engine.
+
+    Neon is not a separate engine, it is a place to run Postgres. ``container``
+    runs a local postgres:16 service (dev and prod); ``neon`` targets Neon
+    serverless Postgres (cloud) in production while still using the local
+    container for development.
+    """
+
+    CONTAINER = "container"
+    NEON = "neon"
+
+    ALL = [CONTAINER, NEON]
+
+    DEFAULT = CONTAINER
+
+
 class WorkerBackends:
     """Worker backend options for task processing."""
 
@@ -177,6 +194,7 @@ class AnswerKeys:
     SCHEDULER_WITH_PERSISTENCE = "scheduler_with_persistence"
     WORKER_BACKEND = "worker_backend"
     DATABASE_ENGINE = "database_engine"
+    POSTGRES_PROVIDER = "postgres_provider"
     AI_FRAMEWORK = "ai_framework"
     AI_PROVIDERS = "ai_providers"
     AI_BACKEND = "ai_backend"

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/core/copier_manager.py

@@ -30,6 +30,7 @@ from ..constants import (
     AuthLevels,
     OllamaMode,
     PaymentProviders,
+    PostgresProviders,
     StorageBackends,
     WorkerBackends,
 )
@@ -126,6 +127,9 @@ def generate_with_copier(
         AnswerKeys.DATABASE_ENGINE: template_context.get(
             AnswerKeys.DATABASE_ENGINE, StorageBackends.SQLITE
         ),
+        AnswerKeys.POSTGRES_PROVIDER: template_context.get(
+            AnswerKeys.POSTGRES_PROVIDER, PostgresProviders.CONTAINER
+        ),
         AnswerKeys.CACHE: False,  # Default to no
         AnswerKeys.INGRESS: template_context.get(AnswerKeys.INGRESS, "no") == "yes",
         AnswerKeys.OBSERVABILITY: template_context.get(AnswerKeys.OBSERVABILITY, "no")

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/core/template_cleanup.py

@@ -12,6 +12,8 @@ import time
 from dataclasses import dataclass, field
 from pathlib import Path
 
+import yaml
+
 from ..constants import AnswerKeys
 from .verbosity import verbose_print
 
@@ -78,6 +80,72 @@ class SyncResult:
     conflicts: list[str] = field(default_factory=list)
     """Files with merge conflict markers that need manual resolution."""
 
+    answers_backfilled: list[str] = field(default_factory=list)
+    """Answer keys added to .copier-answers.yml because the target template
+    version introduced them (e.g. ``postgres_provider`` in 0.9.0)."""
+
+
+def _reconcile_new_answer_keys(project_path: Path, new_rendered_dir: Path) -> list[str]:
+    """Backfill answer keys the target template records but the project lacks.
+
+    aegis preserves the project's existing ``.copier-answers.yml`` across an
+    update — copier's own answer write-back is unreliable for
+    ``{{ project_slug }}``-wrapped projects, so we sync files ourselves. A
+    consequence is that a question ADDED in the target version (e.g.
+    ``postgres_provider`` in 0.9.0) never lands in the project's answers file,
+    even though copier rendered it with its default. The freshly rendered
+    template (``new_rendered_dir``, produced from the real template source at
+    the target ref — GitHub in production) carries the authoritative value, so
+    copy any non-private key that's absent from the project's answers. Without
+    this, downstream steps (``_advance_copier_tracking``, the next
+    ``aegis update``, ``aegis add``) silently re-default the missing question
+    and never gate on the user's real configuration.
+
+    Private (``_``-prefixed) keys are owned by copier tracking and skipped.
+    Backfilling is best-effort: on a read/parse/write failure or a
+    non-mapping answers file (both files are normally copier-rendered
+    mappings, but one may be hand-edited or corrupt), warn and return ``[]``
+    rather than aborting the update.
+    """
+    project_answers_file = project_path / AnswerKeys.ANSWERS_FILENAME
+    new_answers_file = new_rendered_dir / AnswerKeys.ANSWERS_FILENAME
+    if not project_answers_file.exists() or not new_answers_file.exists():
+        return []
+
+    try:
+        project_answers = yaml.safe_load(project_answers_file.read_text())
+        new_answers = yaml.safe_load(new_answers_file.read_text())
+    except (OSError, yaml.YAMLError, ValueError) as e:
+        # ValueError covers UnicodeDecodeError from a non-UTF-8 file.
+        verbose_print(f"   Warning: Could not read answers for backfill: {e}")
+        return []
+
+    # An empty file parses to None; a list/scalar to a non-dict. Either way
+    # there's nothing to reconcile against — don't crash on ``.items()``.
+    project_answers = project_answers or {}
+    if not isinstance(project_answers, dict) or not isinstance(new_answers, dict):
+        return []
+
+    added: list[str] = []
+    for key, value in new_answers.items():
+        if key.startswith("_"):
+            continue
+        if key not in project_answers:
+            project_answers[key] = value
+            added.append(key)
+
+    if added:
+        try:
+            project_answers_file.write_text(
+                yaml.safe_dump(
+                    project_answers, default_flow_style=False, sort_keys=False
+                )
+            )
+        except OSError as e:
+            verbose_print(f"   Warning: Could not write backfilled answers: {e}")
+            return []
+    return added
+
 
 def cleanup_nested_project_directory(
     project_path: Path,
@@ -321,6 +389,15 @@ def sync_template_changes(
             except OSError as e:
                 verbose_print(f"   Warning: Could not sync {relative}: {e}")
 
+        # Backfill answer keys the target version added (the answers file
+        # itself is skipped by the content sync above). Must run inside the
+        # temp-dir block while the rendered answers file still exists.
+        result.answers_backfilled = _reconcile_new_answer_keys(
+            project_path, new_rendered_dir
+        )
+        for key in result.answers_backfilled:
+            verbose_print(f"   Backfilled new answer: {key}")
+
     return result
 
 
@@ -416,18 +493,22 @@ def _three_way_merge(
             project_file.write_bytes(merge.stdout)
             result.synced.append(str(relative))
             verbose_print(f"   Merged: {relative}")
-        elif merge.returncode == 1:
-            # Conflicts exist — write merged output with conflict markers
-            # directly into the file, just like git merge does
+        elif 1 <= merge.returncode <= 127:
+            # git merge-file exits with the NUMBER of conflicts (truncated
+            # to 127), not a boolean — write merged output with conflict
+            # markers directly into the file, just like git merge does
             project_file.write_bytes(merge.stdout)
             result.conflicts.append(str(relative))
             verbose_print(f"   Conflict (needs manual review): {relative}")
         else:
-            # merge-file failed entirely — fall back to overwrite
-            new_content = new_file.read_bytes()
-            project_file.write_bytes(new_content)
-            result.synced.append(str(relative))
-            verbose_print(f"   Synced (merge failed, overwrote): {relative}")
+            # Anything else (git's -1/255 error exit, or a negative signal
+            # death) means merge-file itself failed and stdout is unreliable.
+            # Never overwrite the user's file on error — keep it and surface
+            # it for manual review, matching merge_three_way_text semantics.
+            result.conflicts.append(str(relative))
+            verbose_print(
+                f"   Merge error (kept user's version, needs manual review): {relative}"
+            )
     except OSError as e:
         verbose_print(f"   Warning: Could not sync {relative}: {e}")
 

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/core/template_generator.py

@@ -18,6 +18,7 @@ from ..constants import (
     ComponentNames,
     OllamaMode,
     PaymentProviders,
+    PostgresProviders,
     StorageBackends,
     WorkerBackends,
 )
@@ -83,6 +84,15 @@ class TemplateGenerator:
                 if self.database_engine:
                     break
 
+        # Neon is a Postgres *provider*, not a separate engine: database[neon]
+        # normalizes to engine=postgres + provider=neon so every postgres template
+        # path (and dependent services keying off database_engine) is reused. The
+        # provider only layers on connection handling and the prod compose shape.
+        self.postgres_provider = PostgresProviders.CONTAINER
+        if self.database_engine == PostgresProviders.NEON:
+            self.database_engine = StorageBackends.POSTGRES
+            self.postgres_provider = PostgresProviders.NEON
+
         # Extract scheduler backend from scheduler[backend] format or use passed param
         # If scheduler[backend] syntax is used, it overrides the passed parameter
         for component in self.components:
@@ -211,6 +221,8 @@ class TemplateGenerator:
             else "no",
             # Database engine selection (sqlite or postgres)
             "database_engine": self.database_engine or StorageBackends.SQLITE,
+            # Postgres provider (container vs neon); ignored for sqlite engines
+            AnswerKeys.POSTGRES_PROVIDER: self.postgres_provider,
             # Scheduler backend selection
             AnswerKeys.SCHEDULER_BACKEND: self.scheduler_backend,
             # Worker backend selection

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/i18n/locales/de.py

@@ -100,6 +100,13 @@ MESSAGES: dict[str, str] = {
         "PostgreSQL – Produktionsreif, Multi-Container-Unterstützung"
     ),
     "interactive.db_reuse": "Nutze zuvor gewählte Datenbank: {engine}",
+    "interactive.db_provider_select": "PostgreSQL-Host auswählen:",
+    "interactive.db_provider_container": (
+        "Lokaler Container - postgres:16 in Docker (Dev und Prod)"
+    ),
+    "interactive.db_provider_neon": (
+        "Neon - serverloses Postgres (Cloud in Prod, lokaler Container in Dev)"
+    ),
     # ── Interactive: worker backend ────────────────────────────────────
     "interactive.worker_label": "Worker Backend:",
     "interactive.worker_select": "Worker Backend wählen:",
@@ -1017,6 +1024,7 @@ MESSAGES: dict[str, str] = {
     "guided.prompt.worker_backend": "Worker-Backend auswählen",
     "guided.prompt.scheduler_backend": "Scheduler-Persistenz: Job-Verlauf über Neustarts hinweg behalten?",
     "guided.prompt.database_engine": "Datenbank-Engine für {context}",
+    "guided.prompt.postgres_provider": "PostgreSQL-Host für {context}",
     "guided.prompt.auth_level": "Authentifizierungsstufe",
     "guided.prompt.ai_framework": "AI-Framework",
     "guided.prompt.ai_providers": "AI-Anbieter: beliebige zum Einbinden auswählen",
@@ -1093,6 +1101,10 @@ MESSAGES: dict[str, str] = {
     "guided.choice.worker.taskiq": "Async-nativ mit Brokern pro Queue und Redis-Streams-Transport mit Bestätigungen.",
     "guided.choice.db.sqlite": "Konfigurationsfreie Dateidatenbank. Ideal für die Entwicklung.",
     "guided.choice.db.postgres": "Produktionstauglich mit Connection-Pooling.",
+    "guided.choice.db_provider.container": "Lokaler postgres:16-Container, Dev und Prod.",
+    "guided.choice.db_provider.neon": (
+        "Serverloses Postgres: Cloud in Prod, lokaler Container in Dev."
+    ),
     "guided.choice.auth.basic": "E-Mail und Passwort mit JWT-Sitzungen.",
     "guided.choice.auth.rbac": "Fügt Rollen und Berechtigungen hinzu.",
     "guided.choice.auth.org": "Mandantenfähige Organisationen.",

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/i18n/locales/en.py

@@ -102,6 +102,14 @@ MESSAGES: dict[str, str] = {
         "PostgreSQL - Production-ready, multi-container support"
     ),
     "interactive.db_reuse": "Using previously selected database: {engine}",
+    # ── Interactive: PostgreSQL host (provider) ────────────────────────
+    "interactive.db_provider_select": "Select PostgreSQL host:",
+    "interactive.db_provider_container": (
+        "Local container - postgres:16 in Docker (dev and prod)"
+    ),
+    "interactive.db_provider_neon": (
+        "Neon - serverless Postgres (cloud in prod, local container in dev)"
+    ),
     # ── Interactive: worker backend ────────────────────────────────────
     "interactive.worker_label": "Worker Backend:",
     "interactive.worker_select": "Select worker backend:",
@@ -1120,6 +1128,7 @@ MESSAGES: dict[str, str] = {
     "guided.prompt.worker_backend": "Pick a worker backend",
     "guided.prompt.scheduler_backend": "Scheduler persistence: keep job history across restarts?",
     "guided.prompt.database_engine": "Database engine for {context}",
+    "guided.prompt.postgres_provider": "PostgreSQL host for {context}",
     "guided.prompt.auth_level": "Authentication level",
     "guided.prompt.ai_framework": "AI framework",
     "guided.prompt.ai_providers": "AI providers: pick any to wire in",
@@ -1196,6 +1205,10 @@ MESSAGES: dict[str, str] = {
     "guided.choice.worker.taskiq": "Async-native with per-queue brokers and Redis Streams transport with acknowledgements.",
     "guided.choice.db.sqlite": "Zero-config file database. Great for development.",
     "guided.choice.db.postgres": "Production-grade, pooled connections.",
+    "guided.choice.db_provider.container": "Local postgres:16 container, dev and prod.",
+    "guided.choice.db_provider.neon": (
+        "Serverless Postgres: cloud in prod, local container in dev."
+    ),
     "guided.choice.auth.basic": "Email and password with JWT sessions.",
     "guided.choice.auth.rbac": "Adds roles and permissions.",
     "guided.choice.auth.org": "Multi-tenant organizations.",

{aegis_stack-0.8.1 → aegis_stack-0.9.0}/aegis/i18n/locales/es.py

@@ -102,6 +102,13 @@ MESSAGES: dict[str, str] = {
         "PostgreSQL - Listo para producción, soporte multi-contenedor"
     ),
     "interactive.db_reuse": "Usando base de datos previamente seleccionada: {engine}",
+    "interactive.db_provider_select": "Selecciona el host de PostgreSQL:",
+    "interactive.db_provider_container": (
+        "Contenedor local - postgres:16 en Docker (dev y prod)"
+    ),
+    "interactive.db_provider_neon": (
+        "Neon - Postgres serverless (cloud en prod, contenedor local en dev)"
+    ),
     # ── Interactive: worker backend ────────────────────────────────────
     "interactive.worker_label": "Backend de Worker:",
     "interactive.worker_select": "Selecciona backend de worker:",
@@ -1019,6 +1026,7 @@ MESSAGES: dict[str, str] = {
     "guided.prompt.worker_backend": "Elige un backend de worker",
     "guided.prompt.scheduler_backend": "Persistencia del programador: ¿conservar el historial de tareas entre reinicios?",
     "guided.prompt.database_engine": "Motor de base de datos para {context}",
+    "guided.prompt.postgres_provider": "Host de PostgreSQL para {context}",
     "guided.prompt.auth_level": "Nivel de autenticación",
     "guided.prompt.ai_framework": "Framework de IA",
     "guided.prompt.ai_providers": "Proveedores de IA: elige los que quieras integrar",
@@ -1095,6 +1103,10 @@ MESSAGES: dict[str, str] = {
     "guided.choice.worker.taskiq": "Asíncrono nativo, con brokers por cola y transporte Redis Streams con confirmaciones.",
     "guided.choice.db.sqlite": "Base de datos en archivo sin configuración. Estupenda para desarrollo.",
     "guided.choice.db.postgres": "De nivel de producción, con conexiones agrupadas.",
+    "guided.choice.db_provider.container": "Contenedor postgres:16 local, dev y prod.",
+    "guided.choice.db_provider.neon": (
+        "Postgres serverless: cloud en prod, contenedor local en dev."
+    ),
     "guided.choice.auth.basic": "Correo y contraseña con sesiones JWT.",
     "guided.choice.auth.rbac": "Añade roles y permisos.",
     "guided.choice.auth.org": "Organizaciones multiinquilino.",