splent-cli 1.8.0__tar.gz → 1.9.1__tar.gz

{splent_cli-1.8.0/src/splent_cli.egg-info → splent_cli-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.8.0
+Version: 1.9.1
 Summary: SPLENT-CLI is a CLI to be able to work on your development more easily.
 Author-email: DiversoLab <diversolab@us.es>
 Project-URL: Homepage, https://github.com/diverso-lab/splent_cli

{splent_cli-1.8.0 → splent_cli-1.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "splent_cli"
-version = "1.8.0"
+version = "1.9.1"
 description = "SPLENT-CLI is a CLI to be able to work on your development more easily."
 readme = "README.md"
 requires-python = ">=3.13"

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/commands/database/db_migrate.py

@@ -2,6 +2,7 @@ import os
 
 import click
 from flask_migrate import migrate as alembic_migrate
+from flask_migrate import revision as alembic_revision
 
 from splent_cli.utils.decorators import requires_db
 from splent_cli.services import context
@@ -54,14 +55,31 @@ def _is_empty_migration(path: str) -> bool:
 @click.option(
     "-m", "message", default=None, help="Migration message (defaults to feature name)."
 )
+@click.option(
+    "--empty",
+    is_flag=True,
+    help=(
+        "Generate a blank migration (no autogenerate) and keep it for manual "
+        "editing. Required for refinement features that add columns to a base "
+        "feature's table — Alembic cannot autodetect runtime-injected mixins."
+    ),
+)
 @context.requires_product
-def db_migrate(feature, message):
+def db_migrate(feature, message, empty):
     """
     Generate new migration files for features that have schema changes,
     then apply all pending migrations.
 
-    Empty migrations (no schema changes detected) are automatically removed.
+    Empty migrations (no schema changes detected) are automatically removed,
+    unless ``--empty`` is passed, in which case a blank migration is created
+    and kept so you can write ``upgrade()``/``downgrade()`` by hand.
     """
+    if empty and not feature:
+        click.echo(
+            click.style("❌ --empty requires a FEATURE argument.", fg="red")
+        )
+        raise SystemExit(1)
+
     if feature:
         dirs = {}
         mdir = MigrationManager.get_feature_migration_dir(feature)
@@ -108,7 +126,10 @@ def db_migrate(feature, message):
         alembic_logger.setLevel(logging.WARNING)
 
         try:
-            alembic_migrate(directory=mdir, message=message or feat)
+            if empty:
+                alembic_revision(directory=mdir, message=message or feat)
+            else:
+                alembic_migrate(directory=mdir, message=message or feat)
         except Exception as e:
             if os.getenv("SPLENT_DEBUG"):
                 click.secho(
@@ -119,6 +140,21 @@ def db_migrate(feature, message):
 
         after = _count_versions(mdir)
 
+        # A blank migration requested with --empty is intentional: keep it so the
+        # user can fill in upgrade()/downgrade() by hand (e.g. refinement columns).
+        if empty:
+            if after > before:
+                click.echo(
+                    click.style(
+                        f"  📝 {feat}: blank migration generated — "
+                        f"edit upgrade()/downgrade() and run 'splent db:upgrade'",
+                        fg="cyan",
+                    )
+                )
+            else:
+                click.echo(click.style(f"  ✔ {feat}: up to date", fg="green"))
+            continue
+
         # If a new file was generated, check if it's empty (no real schema changes)
         if after > before:
             versions_dir = os.path.join(mdir, "versions")

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/commands/feature/feature_release.py

@@ -237,10 +237,27 @@ def _extract_translations(translations_dir: Path) -> list[str]:
     return locales
 
 
+def _strip_docstrings_and_comments(text: str) -> str:
+    """Remove triple-quoted strings (docstrings) and ``#`` comments.
+
+    Signal inference scans for ``define_signal("...")`` / ``connect_signal("...")``
+    calls. The scaffolded ``signals.py`` ships *examples* of those calls inside a
+    module docstring; without stripping them the inferred contract would list
+    example signal names the feature never actually emits (e.g. ``item-created``),
+    causing spurious collisions in ``feature:xray --validate``.
+    """
+    # Drop triple-quoted blocks (both ''' and """).
+    text = re.sub(r'""".*?"""', "", text, flags=re.DOTALL)
+    text = re.sub(r"'''.*?'''", "", text, flags=re.DOTALL)
+    # Drop full-line and trailing comments.
+    text = re.sub(r"#.*", "", text)
+    return text
+
+
 def _extract_signals(signals_path: Path) -> tuple[list[str], list[str]]:
     if not signals_path.exists():
         return [], []
-    text = signals_path.read_text()
+    text = _strip_docstrings_and_comments(signals_path.read_text())
     provided = sorted(
         set(re.findall(r"""define_signal\s*\(\s*['"]([^'"]+)['"]""", text))
     )

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/commands/feature/feature_xray.py

@@ -478,16 +478,19 @@ def feature_xray(feature_ref, filter_cat, validate, full):
     if not bp_collisions:
         ok += 1
 
-    # 5. Commands: check for name collisions
-    all_commands: dict[str, list[str]] = {}
+    # 5. Commands: feature-contributed commands are namespaced under
+    # ``feature:<name> <cmd>``, so the same command name in two different
+    # features (e.g. the scaffold's example ``hello``) never actually collides.
+    # We only flag a real duplicate *within* a single feature.
+    cmd_collisions = {}
     for name, fdata in feature_data.items():
-        for cmd in fdata["contract"].get("provides", {}).get("commands", []):
-            all_commands.setdefault(cmd, []).append(name)
-
-    cmd_collisions = {c: fs for c, fs in all_commands.items() if len(fs) > 1}
+        cmds = fdata["contract"].get("provides", {}).get("commands", [])
+        dupes = {c for c in cmds if cmds.count(c) > 1}
+        for c in dupes:
+            cmd_collisions.setdefault(f"{name}:{c}", []).append(name)
     for cmd, features_list in cmd_collisions.items():
         click.secho(
-            f"  ❌ Command '{cmd}' — collision: {', '.join(features_list)}",
+            f"  ❌ Command '{cmd}' — duplicated within feature",
             fg="red",
         )
         fail += 1

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/commands/product/product_deploy.py

@@ -268,13 +268,17 @@ def product_deploy(down, ci):
             import time
 
             healthy = False
-            for attempt in range(15):
+            # The production web container is named ``<product>_web_deploy`` —
+            # NOT ``<product>_web`` (that is the dev container). A cold start runs
+            # migrations and compiles assets before gunicorn binds, so allow a
+            # generous window (~90s) before declaring the app unhealthy.
+            for attempt in range(45):
                 try:
                     result = subprocess.run(
                         [
                             "docker",
                             "exec",
-                            f"{product}_web",
+                            f"{product}_web_deploy",
                             "bash",
                             "-c",
                             "curl -s -o /dev/null -w '%{http_code}' http://localhost:5000/",

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/commands/product/product_env.py

@@ -172,7 +172,12 @@ def product_env(generate, merge, env_name, process_all):
             )
             raise SystemExit(1)
 
-        target_env = os.path.join(docker_dir, ".env")
+        # Each environment writes to its own file so a `--prod` merge never
+        # clobbers the development `.env` (which the dev containers read via
+        # env_file). dev → .env, prod → .env.deploy.
+        target_env = os.path.join(
+            docker_dir, ".env.deploy" if env_name == "prod" else ".env"
+        )
         if base_env != target_env:
             shutil.copyfile(base_env, target_env)
 

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/commands/spl/spl_add_feature.py

@@ -74,6 +74,31 @@ def _scan_feature_deps(
 ) -> set[str]:
     """Scan a feature's source for dependencies. Returns set of short_names."""
     deps = set()
+
+    # Refinement features declare the feature they refine in pyproject.toml
+    # ([tool.splent.refinement].refines). That is a hard dependency — the base
+    # feature must load first — so surface it as a constraint even when there is
+    # no Python import or FK between them.
+    pyproject_path = os.path.join(feature_path, "pyproject.toml")
+    if os.path.isfile(pyproject_path):
+        try:
+            import tomllib
+
+            with open(pyproject_path, "rb") as fh:
+                pydata = tomllib.load(fh)
+            refines = (
+                pydata.get("tool", {})
+                .get("splent", {})
+                .get("refinement", {})
+                .get("refines")
+            )
+            if refines and refines != feature_pkg and refines in all_packages:
+                short = pkg_to_short.get(refines)
+                if short:
+                    deps.add(short)
+        except Exception:
+            pass
+
     src_dir = os.path.join(feature_path, "src", "splent_io", feature_pkg)
     if not os.path.isdir(src_dir):
         return deps

{splent_cli-1.8.0 → splent_cli-1.9.1}/src/splent_cli/services/release.py

@@ -260,17 +260,39 @@ def build_and_upload_pypi(path: str):
         raise SystemExit(1)
 
     click.echo("  pypi     uploading...")
+
+    # Expand dist/* ourselves: subprocess runs without a shell, so a literal
+    # "dist/*" would be passed verbatim to twine and never match any file.
+    import glob
+
+    dist_files = sorted(glob.glob(os.path.join(path, "dist", "*")))
+    if not dist_files:
+        click.secho("  error: no built artifacts found in dist/", fg="red")
+        raise SystemExit(1)
+
+    # twine reads TWINE_USERNAME / TWINE_PASSWORD from the environment. The CLI
+    # loads them from the workspace .env (load_dotenv), so they are already in
+    # os.environ — pass it through explicitly. --non-interactive makes twine fail
+    # loudly instead of blocking on a credentials prompt; --skip-existing keeps
+    # re-runs idempotent (a half-uploaded release can be retried safely).
     try:
         subprocess.run(
-            [sys.executable, "-m", "twine", "upload", "dist/*"],
+            [
+                sys.executable,
+                "-m",
+                "twine",
+                "upload",
+                "--non-interactive",
+                "--skip-existing",
+                *dist_files,
+            ],
             env=os.environ.copy(),
             check=True,
             cwd=path,
-            capture_output=True,
         )
     except subprocess.CalledProcessError as e:
         click.secho(
-            f"  error: PyPI upload failed: {e.stderr.strip() if e.stderr else ''}",
+            f"  error: PyPI upload failed (exit {e.returncode}).",
             fg="red",
         )
         click.secho(

{splent_cli-1.8.0 → splent_cli-1.9.1/src/splent_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.8.0
+Version: 1.9.1
 Summary: SPLENT-CLI is a CLI to be able to work on your development more easily.
 Author-email: DiversoLab <diversolab@us.es>
 Project-URL: Homepage, https://github.com/diverso-lab/splent_cli