paststack 0.1.2__tar.gz → 0.1.4__tar.gz

{paststack-0.1.2 → paststack-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paststack
-Version: 0.1.2
+Version: 0.1.4
 Summary: Opinionated CLI to generate production-ready FastAPI boilerplate with typing and linting.
 License-Expression: MIT
 Project-URL: Repository, https://github.com/initd-fr/paststack
@@ -25,7 +25,7 @@ pip install -U paststack
 paststack
 ```
 
-Si le terminal intégré **VS Code** n’affiche pas les questions, utilise **Terminal.app** / **iTerm**, ou : `python -m paststack` (même venv).
+Les questions passent par **click** (terminal classique, VS Code, Cursor). Pour l’UI **questionary** à la place : `PASTSTACK_USE_QUESTIONARY=1 paststack`.
 
 ## Develop
 

{paststack-0.1.2 → paststack-0.1.4}/README.md

@@ -9,7 +9,7 @@ pip install -U paststack
 paststack
 ```
 
-Si le terminal intégré **VS Code** n’affiche pas les questions, utilise **Terminal.app** / **iTerm**, ou : `python -m paststack` (même venv).
+Les questions passent par **click** (terminal classique, VS Code, Cursor). Pour l’UI **questionary** à la place : `PASTSTACK_USE_QUESTIONARY=1 paststack`.
 
 ## Develop
 

paststack-0.1.4/paststack/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.4"

{paststack-0.1.2 → paststack-0.1.4}/paststack/cli.py

@@ -6,7 +6,6 @@ from pathlib import Path
 from shutil import copyfile, which
 
 import click
-import questionary
 from rich.progress import (
     BarColumn,
     Progress,
@@ -17,7 +16,7 @@ from rich.progress import (
 
 from paststack.banner import display_banner
 from paststack.models import Database, Orm, Project
-from paststack.prompts import ask_questions, show_summary
+from paststack.prompts import ask_questions, confirm, show_summary
 
 TEMPLATES_ROOT = Path(__file__).resolve().parent / "templates"
 BASE = TEMPLATES_ROOT / "base"
@@ -154,7 +153,7 @@ def main() -> None:
         while True:
             project = ask_questions()
             show_summary(project)
-            if questionary.confirm("Proceed with project setup ?").unsafe_ask():
+            if confirm("Proceed with project setup ?", default=True):
                 break
         setup_project(project)
     except KeyboardInterrupt:
@@ -327,21 +326,21 @@ def setup_project(project: Project) -> None:
         copyfile(env_example, env_dest)
         click.echo("Fichier .env créé à partir de .env.example.")
 
-    start_uvicorn = project.run_install and questionary.confirm(
+    start_uvicorn = project.run_install and confirm(
         "Démarrer l’API maintenant (uvicorn --reload) ?",
         default=True,
-    ).unsafe_ask()
+    )
 
     if start_uvicorn and project.database == Database.POSTGRES:
-        if questionary.confirm(
+        if confirm(
             "Lancer PostgreSQL avec Docker (`docker compose up -d`) ?",
             default=True,
-        ).unsafe_ask():
+        ):
             if not _docker_compose_up_postgres(main_directory):
-                start_uvicorn = questionary.confirm(
+                start_uvicorn = confirm(
                     "Lancer uvicorn quand même ? (l’API échouera si Postgres n’est pas joignable.)",
                     default=False,
-                ).unsafe_ask()
+                )
             else:
                 time.sleep(2)
         else:
@@ -352,10 +351,10 @@ def setup_project(project: Project) -> None:
                     fg="yellow",
                 )
             )
-            start_uvicorn = questionary.confirm(
+            start_uvicorn = confirm(
                 "Lancer uvicorn quand même ?",
                 default=False,
-            ).unsafe_ask()
+            )
 
     if start_uvicorn:
         click.echo(

paststack-0.1.4/paststack/prompts.py

@@ -0,0 +1,180 @@
+import os
+
+import click
+import questionary
+
+from paststack.models import Database, Orm, Project
+
+
+def use_simple_prompts() -> bool:
+    """Par défaut : prompts `click` (fiables partout, dont terminal intégré VS Code / Cursor).
+
+    Questionary (prompt_toolkit) uniquement si tu choisis explicitement :
+    `PASTSTACK_USE_QUESTIONARY=1 paststack`
+    """
+    if os.environ.get("PASTSTACK_USE_QUESTIONARY", "").strip().lower() in ("1", "true", "yes", "on"):
+        return False
+    return True
+
+
+def confirm(message: str, default: bool = False) -> bool:
+    if use_simple_prompts():
+        return click.confirm(message, default=default)
+    out = questionary.confirm(message, default=default).unsafe_ask()
+    return bool(out)
+
+
+def _pick_choice(label: str, values: list[str], *, default_value: str) -> str:
+    click.echo(f"\n{label}")
+    default_idx = values.index(default_value) + 1 if default_value in values else 1
+    for i, v in enumerate(values, start=1):
+        mark = "*" if i == default_idx else " "
+        click.echo(f"  [{i}]{mark} {v}")
+    choice = click.prompt(
+        "Numéro",
+        type=click.IntRange(1, len(values)),
+        default=default_idx,
+        show_default=True,
+    )
+    return values[int(choice) - 1]
+
+
+def _ask_questions_click() -> Project:
+    click.echo(click.style("(saisie clavier — Entrée = défaut à chaque question)", fg="dim"))
+    project_name = click.prompt("Project name", default="my_fastapi_app", show_default=True)
+    raw_allowed_origins = click.prompt(
+        "Allowed origins (CORS), séparés par des virgules [vide = désactivé]",
+        default="",
+        show_default=False,
+    )
+    allowed_origins = [o.strip() for o in raw_allowed_origins.split(",") if o.strip()]
+
+    db_values = [e.value for e in Database]
+    raw_database = _pick_choice("Base de données", db_values, default_value="none")
+
+    raw_orm = "none"
+    if raw_database != "none":
+        orm_values = [e.value for e in Orm]
+        raw_orm = _pick_choice(
+            "Couche données (sqlmodel = ORM + Pydantic, none = driver seul)",
+            orm_values,
+            default_value="sqlmodel",
+        )
+
+    rate_limiting = click.confirm("Activer le rate limiting ?", default=False)
+    run_install = click.confirm("Lancer l’installation (uv sync) après la génération ?", default=True)
+    git = click.confirm("Initialiser un dépôt git dans le nouveau projet ?", default=True)
+    git_z = False
+    if git:
+        git_z = click.confirm(
+            "Lancer git z init (git-z) ? — https://github.com/ejpcmac/git-z",
+            default=False,
+        )
+
+    return Project(
+        project_name=project_name,
+        package_manager="uv",
+        use_typing=True,
+        use_ruff=True,
+        enable_cors=bool(allowed_origins),
+        allowed_origins=allowed_origins,
+        database=Database(raw_database),
+        orm=Orm(raw_orm),
+        rate_limiting=rate_limiting,
+        config=True,
+        git=git,
+        git_z=git_z,
+        run_install=run_install,
+    )
+
+
+def _ask_questions_questionary() -> Project:
+    project_name = questionary.text(
+        "Project name",
+        default="my_fastapi_app",
+    ).unsafe_ask()
+
+    raw_allowed_origins: str = questionary.text(
+        "Allowed origins (CORS) [comma-separated, empty = disabled]",
+        default="",
+    ).unsafe_ask()
+
+    allowed_origins: list[str] = [
+        origin.strip() for origin in raw_allowed_origins.split(",") if origin.strip()
+    ]
+
+    raw_database: str = questionary.select(
+        "Database",
+        choices=[e.value for e in Database],
+        default="none",
+    ).unsafe_ask()
+
+    raw_orm: str = "none"
+    if raw_database != "none":
+        raw_orm = questionary.select(
+            "Data layer (SQLModel = ORM + Pydantic, none = driver only)",
+            choices=[e.value for e in Orm],
+            default="sqlmodel",
+        ).unsafe_ask()
+
+    rate_limiting: bool = questionary.confirm(
+        "Enable rate limiting",
+        default=False,
+    ).unsafe_ask()
+
+    run_install: bool = questionary.confirm(
+        "Run install after setup",
+        default=True,
+    ).unsafe_ask()
+
+    git: bool = questionary.confirm(
+        "Initialize git repository in the new project?",
+        default=True,
+    ).unsafe_ask()
+
+    git_z: bool = False
+    if git:
+        git_z = questionary.confirm(
+            "Run git z init (git-z commit wizard)? Requires git-z — https://github.com/ejpcmac/git-z",
+            default=False,
+        ).unsafe_ask()
+
+    return Project(
+        project_name=project_name or "my_fastapi_app",
+        package_manager="uv",
+        use_typing=True,
+        use_ruff=True,
+        enable_cors=bool(allowed_origins),
+        allowed_origins=allowed_origins,
+        database=Database(raw_database or "none"),
+        orm=Orm(raw_orm or "none"),
+        rate_limiting=bool(rate_limiting),
+        config=True,
+        git=bool(git),
+        git_z=bool(git_z),
+        run_install=bool(run_install),
+    )
+
+
+def ask_questions() -> Project:
+    if use_simple_prompts():
+        return _ask_questions_click()
+    return _ask_questions_questionary()
+
+
+def show_summary(project: Project) -> None:
+    click.echo()
+    click.echo(f"Project : {project.project_name}")
+    click.echo(f"Package Manager : {project.package_manager}")
+
+    click.echo(f"CORS enabled : {'yes' if project.enable_cors else 'no'}")
+    if project.enable_cors:
+        click.echo(f"Allowed origins : {project.allowed_origins}")
+
+    click.echo(f"Database : {project.database.value}")
+    click.echo(f"ORM : {project.orm.value}")
+    click.echo(f"Rate limiting : {'yes' if project.rate_limiting else 'no'}")
+    click.echo(f"Run install : {'yes' if project.run_install else 'no'}")
+    click.echo(f"Git init : {'yes' if project.git else 'no'}")
+    click.echo(f"git-z init : {'yes' if project.git_z else 'no'}")
+    click.echo()

{paststack-0.1.2 → paststack-0.1.4}/paststack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paststack
-Version: 0.1.2
+Version: 0.1.4
 Summary: Opinionated CLI to generate production-ready FastAPI boilerplate with typing and linting.
 License-Expression: MIT
 Project-URL: Repository, https://github.com/initd-fr/paststack
@@ -25,7 +25,7 @@ pip install -U paststack
 paststack
 ```
 
-Si le terminal intégré **VS Code** n’affiche pas les questions, utilise **Terminal.app** / **iTerm**, ou : `python -m paststack` (même venv).
+Les questions passent par **click** (terminal classique, VS Code, Cursor). Pour l’UI **questionary** à la place : `PASTSTACK_USE_QUESTIONARY=1 paststack`.
 
 ## Develop
 

{paststack-0.1.2 → paststack-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "paststack"
-version = "0.1.2"
+version = "0.1.4"
 description = "Opinionated CLI to generate production-ready FastAPI boilerplate with typing and linting."
 readme = "README.md"
 license = "MIT"

{paststack-0.1.2 → paststack-0.1.4}/tests/test_cli_generation.py

@@ -34,10 +34,7 @@ def no_subprocess(monkeypatch: pytest.MonkeyPatch) -> None:
 
 @pytest.fixture
 def no_server_prompt(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.setattr(
-        "paststack.cli.questionary.confirm",
-        _stub_confirm,
-    )
+    monkeypatch.setattr("paststack.cli.confirm", lambda *_a, **_k: False)
 
 
 def test_combination_count_matches_iter() -> None:

paststack-0.1.2/paststack/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.2"

paststack-0.1.2/paststack/prompts.py

@@ -1,92 +0,0 @@
-import click
-import questionary
-
-from paststack.models import Database, Orm, Project
-
-
-def ask_questions() -> Project:
-    project_name = questionary.text(
-        "Project name",
-        default="my_fastapi_app",
-    ).unsafe_ask()
-
-    raw_allowed_origins: str = questionary.text(
-        "Allowed origins (CORS) [comma-separated, empty = disabled]",
-        default="",
-    ).unsafe_ask()
-
-    allowed_origins: list[str] = [
-        origin.strip() for origin in raw_allowed_origins.split(",") if origin.strip()
-    ]
-
-    raw_database: str = questionary.select(
-        "Database",
-        choices=[e.value for e in Database],
-        default="none",
-    ).unsafe_ask()
-
-    raw_orm: str = "none"
-    if raw_database != "none":
-        raw_orm = questionary.select(
-            "Data layer (SQLModel = ORM + Pydantic, none = driver only)",
-            choices=[e.value for e in Orm],
-            default="sqlmodel",
-        ).unsafe_ask()
-
-    rate_limiting: bool = questionary.confirm(
-        "Enable rate limiting",
-        default=False,
-    ).unsafe_ask()
-
-    run_install: bool = questionary.confirm(
-        "Run install after setup",
-        default=True,
-    ).unsafe_ask()
-
-    git: bool = questionary.confirm(
-        "Initialize git repository in the new project?",
-        default=True,
-    ).unsafe_ask()
-
-    git_z: bool = False
-    if git:
-        git_z = questionary.confirm(
-            "Run git z init (git-z commit wizard)? Requires git-z — https://github.com/ejpcmac/git-z",
-            default=False,
-        ).unsafe_ask()
-
-    project = Project(
-        project_name=project_name,
-        package_manager="uv",
-        use_typing=True,
-        use_ruff=True,
-        enable_cors=bool(allowed_origins),
-        allowed_origins=allowed_origins,
-        database=Database(raw_database),
-        orm=Orm(raw_orm),
-        rate_limiting=rate_limiting,
-        config=True,
-        git=git,
-        git_z=git_z,
-        run_install=run_install,
-    )
-
-    return project
-
-
-def show_summary(project: Project) -> None:
-    click.echo()
-    click.echo(f"Project : {project.project_name}")
-    click.echo(f"Package Manager : {project.package_manager}")
-
-    click.echo(f"CORS enabled : {'yes' if project.enable_cors else 'no'}")
-    if project.enable_cors:
-        click.echo(f"Allowed origins : {project.allowed_origins}")
-
-    click.echo(f"Database : {project.database.value}")
-    click.echo(f"ORM : {project.orm.value}")
-    click.echo(f"Rate limiting : {'yes' if project.rate_limiting else 'no'}")
-    click.echo(f"Run install : {'yes' if project.run_install else 'no'}")
-    click.echo(f"Git init : {'yes' if project.git else 'no'}")
-    click.echo(f"git-z init : {'yes' if project.git_z else 'no'}")
-    click.echo()