splent-cli 1.22.0__tar.gz → 1.22.2__tar.gz

{splent_cli-1.22.0/src/splent_cli.egg-info → splent_cli-1.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.22.0
+Version: 1.22.2
 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.22.0 → splent_cli-1.22.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "splent_cli"
-version = "1.22.0"
+version = "1.22.2"
 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.22.0 → splent_cli-1.22.2}/src/splent_cli/commands/database/db_upgrade.py

@@ -168,8 +168,9 @@ def db_upgrade(feature):
     logging.getLogger("alembic").setLevel(logging.WARNING)
     logging.getLogger("alembic.runtime.migration").setLevel(logging.WARNING)
 
-    failures = []
-    for feat, mdir in dirs.items():
+    def _upgrade_one(feat: str, mdir: str) -> str | None:
+        """Run one feature's upgrade. Returns None on success, else the
+        message that explains the failure (printed only when final)."""
         try:
             logging.getLogger("alembic.runtime.migration").setLevel(logging.WARNING)
             with _collect_alembic_errors() as logged:
@@ -179,16 +180,9 @@ def db_upgrade(feature):
                     # flask_migrate swallows alembic's CommandError and calls
                     # sys.exit(1), so catching the exit is the only way to say
                     # anything at all instead of failing in silence.
-                    click.echo(
-                        click.style(
-                            _diagnose_upgrade_failure(
-                                app, feat, mdir, "; ".join(logged) or None
-                            ),
-                            fg="red",
-                        )
+                    return _diagnose_upgrade_failure(
+                        app, feat, mdir, "; ".join(logged) or None
                     )
-                    failures.append(feat)
-                    continue
             revision = MigrationManager.get_current_feature_revision(
                 feat, app.extensions["migrate"].db.engine
             )
@@ -208,17 +202,42 @@ def db_upgrade(feature):
                     name=name,
                     version=version,
                 )
+            return None
         except ImportError as e:
             if "models" in str(e):
                 # Feature has migrations/ dir but no models module — skip silently
-                continue
-            click.echo(click.style(f"  ❌ {feat}: {e}", fg="red"))
-            failures.append(feat)
+                return None
+            return f"  ❌ {feat}: {e}"
         except Exception as e:
-            click.echo(
-                click.style(_diagnose_upgrade_failure(app, feat, mdir, e), fg="red")
+            return _diagnose_upgrade_failure(app, feat, mdir, e)
+
+    # Features migrate one Alembic branch each, and a branch may create a
+    # foreign key onto a table another feature's branch creates (slider and
+    # partners reference media_item). The declaration order in pyproject is
+    # not a dependency order, so on a fresh database the first pass can fail
+    # for the dependents and succeed for their dependencies. Whatever failed
+    # is retried while a pass still makes progress; only what fails when
+    # nothing else can move is reported.
+    pending = dict(dirs)
+    failures: dict[str, str] = {}
+    while pending:
+        failures = {}
+        for feat, mdir in pending.items():
+            message = _upgrade_one(feat, mdir)
+            if message is not None:
+                failures[feat] = message
+        if not failures or len(failures) == len(pending):
+            break
+        click.echo(
+            click.style(
+                f"    retrying {', '.join(failures)} now that the rest has migrated",
+                dim=True,
             )
-            failures.append(feat)
+        )
+        pending = {feat: dirs[feat] for feat in failures}
+
+    for message in failures.values():
+        click.echo(click.style(message, fg="red"))
 
     if failures:
         raise click.ClickException(

{splent_cli-1.22.0 → splent_cli-1.22.2}/src/splent_cli/commands/product/product_deploy.py

@@ -14,6 +14,30 @@ from splent_cli.commands.product.product_build import (
 )
 from splent_cli.utils.proc import require_docker
 
+
+# Suffixes that mark a value nobody has to choose: a random string is the
+# right answer. TURNSTILE_SITE_KEY and friends end in _KEY too, but they are
+# issued by a third party, so only the generic secret words qualify.
+_GENERATED_SUFFIXES = ("_PASSWORD", "_SECRET", "_ROOT_PASSWORD")
+_DATABASE_DEFAULTS = {
+    "MARIADB_DATABASE": "{product}_db",
+    "MARIADB_USER": "{product}_db_user",
+    "MARIADB_TEST_DATABASE": "{product}_db_test",
+}
+
+
+def suggest_value(key: str, product: str) -> str | None:
+    """A default for a ``<SET>`` variable, or None when only the operator
+    knows the answer."""
+    import secrets
+
+    if key in _DATABASE_DEFAULTS:
+        return _DATABASE_DEFAULTS[key].format(product=product)
+    if key == "SECRET_KEY" or key.endswith(_GENERATED_SUFFIXES):
+        return secrets.token_urlsafe(24)
+    return None
+
+
 # Env vars whose value is a directory the running app writes to. Their contents
 # only survive a redeploy if a volume in the compose file mounts that exact
 # path, so product:deploy warns when one is set without a matching mount.
@@ -257,8 +281,18 @@ def product_deploy(down, ci):
                 else:
                     missing_vars.append(key)
             else:
+                # Offer an answer wherever one can be made up, so the ordinary
+                # deploy is Enter, Enter, Enter: random strings for anything
+                # that smells like a secret, the product's conventional names
+                # for the database. What only the operator knows (a mail
+                # host, a proxy address, an API key issued elsewhere) is
+                # asked without a default.
+                suggested = suggest_value(key, product)
                 new_value = click.prompt(
-                    f"  Value required for {key}", hide_input=False
+                    f"  Value required for {key}",
+                    default=suggested,
+                    show_default=suggested is not None,
+                    hide_input=False,
                 )
                 env_vars[key] = new_value
 
@@ -474,7 +508,7 @@ def product_deploy(down, ci):
                     "  deployed but app may not be healthy. Check logs with:",
                     fg="yellow",
                 )
-                click.echo(f"    docker logs {product}_web")
+                click.echo(f"    docker logs {product}_web_deploy")
         else:
             click.secho("  done.", fg="green")
     except subprocess.CalledProcessError as e:

{splent_cli-1.22.0 → splent_cli-1.22.2/src/splent_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.22.0
+Version: 1.22.2
 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