splent-cli 1.43.0__tar.gz → 1.44.0__tar.gz

{splent_cli-1.43.0/src/splent_cli.egg-info → splent_cli-1.44.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.43.0
+Version: 1.44.0
 Summary: SPLENT-CLI is a CLI to be able to work on your development more easily.
 Author-email: DiversoLab <diversolab@us.es>
 License-Expression: LGPL-3.0-or-later

{splent_cli-1.43.0 → splent_cli-1.44.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "splent_cli"
-version = "1.43.0"
+version = "1.44.0"
 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.43.0 → splent_cli-1.44.0}/src/splent_cli/cli.py

@@ -5,10 +5,13 @@ import os
 import click
 from dotenv import load_dotenv
 
+from splent_cli.services import context
 from splent_cli.utils.command_loader import load_commands
 
 # From here on os.environ holds the workspace .env as well. What the shell
 # itself exported is splent_cli.SHELL_ENV, taken before this line ran.
+# Nothing exported is replaced, so a SPLENT_APP given to one command beats
+# the selection in the file (context.active_app has the whole rule).
 load_dotenv()
 
 
@@ -122,7 +125,7 @@ class SPLENTCLI(click.Group):
                 app = get_app()
                 with app.app_context():
                     self._own_cmds_cache = own_commands.collect(
-                        os.getenv("SPLENT_APP"), set(self.commands)
+                        context.active_app(), set(self.commands)
                     )
         except Exception as e:
             if debug:
@@ -170,7 +173,7 @@ class SPLENTCLI(click.Group):
         """
         from splent_cli.services import web_container
 
-        product = os.getenv("SPLENT_APP")
+        product = context.active_app()
         if not product or web_container.is_product_container():
             return
         if not web_container.running(web_container.name(product)):
@@ -196,6 +199,12 @@ class SPLENTCLI(click.Group):
             from splent_cli.utils.dynamic_imports import get_app
             from splent_cli.utils.db_utils import check_db_connection
 
+            # For another product than the selection the CLI's container stays
+            # on the selection's network (compose.attach_self_to_network), so
+            # what reaches this product's services runs where they are.
+            if context.is_override():
+                self._delegate_to_the_product(ctx)
+
             try:
                 app = get_app()
             except Exception as exc:
@@ -205,7 +214,7 @@ class SPLENTCLI(click.Group):
                 # Only then: where the app builds here, the command runs here
                 # with the tools the CLI image has (ruff formats migrations).
                 self._delegate_to_the_product(ctx)
-                product = os.getenv("SPLENT_APP", "The product")
+                product = context.active_app() or "The product"
                 raise click.ClickException(
                     f"{product}'s features need {missing}, which the product's "
                     "image installs and the CLI's does not.\n"

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/check/check_env.py

@@ -8,6 +8,7 @@ import sys
 import click
 import importlib.metadata
 
+from splent_cli.services import context
 from splent_cli.services.release_gate import pypi_credentials
 from splent_cli.utils import forge
 
@@ -61,7 +62,7 @@ def check_env():
         _warn(".env file not found in workspace")
 
     # SPLENT_APP
-    app = os.getenv("SPLENT_APP")
+    app = context.active_app(workspace)
     if app:
         app_path = os.path.join(workspace, app)
         if os.path.isdir(app_path):

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/clear/clear_uploads.py

@@ -99,7 +99,7 @@ def resolve_uploads_dir(app=None) -> str:
     product or its package, anything holding one of them, or a directory with
     code at its top.
     """
-    product = os.getenv("SPLENT_APP", "")
+    product = context.active_app() or ""
     if not product or product in (".", "..") or os.sep in product or "/" in product:
         raise UploadsDirError(f"'{product}' is not a valid product name.")
 
@@ -279,7 +279,7 @@ def clear_uploads(env_dev, env_prod, yes):
         click.echo(click.style("Cannot specify both --dev and --prod.", fg="red"))
         raise SystemExit(1)
     env = context.resolve_env(env_dev, env_prod)
-    _run_where_the_uploads_are(os.getenv("SPLENT_APP", ""), env, yes)
+    _run_where_the_uploads_are(context.active_app() or "", env, yes)
 
     try:
         uploads_dir = resolve_uploads_dir()

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/database/db_reset.py

@@ -199,7 +199,7 @@ def db_reset(feature_name, yes):
     """
     app = current_app
     product_path = PathUtils.get_app_base_dir()
-    product_name = os.getenv("SPLENT_APP", "")
+    product_name = context.active_app() or ""
 
     if feature_name:
         _reset_one_feature(app, feature_name, yes, product_path, product_name)

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/database/db_rollback.py

@@ -140,7 +140,7 @@ def _downgrade(directory: str, revision: str) -> None:
 def db_rollback(feature, steps, to_base, cascade):
     app = current_app
     product_path = PathUtils.get_app_base_dir()
-    product_name = os.getenv("SPLENT_APP", "")
+    product_name = context.active_app() or ""
 
     if to_base:
         source = click.get_current_context().get_parameter_source("steps")

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/database/db_seed.py

@@ -23,7 +23,7 @@ def _resolve_feature_order(features_raw: list[str]) -> list[str]:
     feature it refines (the refinement metadata the boot reads), with or
     without a UVL. Features with neither keep their declared order.
     """
-    splent_app = os.getenv("SPLENT_APP", "")
+    splent_app = context.active_app() or ""
     working_dir = os.getenv("WORKING_DIR", "/workspace")
     product_dir = os.path.join(working_dir, splent_app) if splent_app else ""
 
@@ -112,7 +112,7 @@ def _product_seeders(errors):
     They are always loaded, also when a single module is seeded, because
     their ``replaces`` decide which feature seeders may run at all.
     """
-    product = os.getenv("SPLENT_APP", "")
+    product = context.active_app()
     if not product:
         return []
     return _load_seeders(f"{product}.seeders", errors, label="product seeders")
@@ -154,7 +154,7 @@ def get_installed_seeders(specific_module=None):
     )
 
     targets = _module_names(specific_module) if specific_module else None
-    if targets and os.getenv("SPLENT_APP", "") in targets:
+    if targets and context.active_app() in targets:
         return product_seeders, errors
 
     seeders = []

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/database/db_upgrade.py

@@ -79,7 +79,7 @@ def _mark_without_migrations(
 
 def _resolve_product():
     """Return (product_path, product_name) from env."""
-    product = os.getenv("SPLENT_APP", "")
+    product = context.active_app() or ""
     product_path = PathUtils.get_app_base_dir()
     return product_path, product
 

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/doctor.py

@@ -19,6 +19,7 @@ from splent_cli.commands.check.check_product import check_product
 from splent_cli.commands.feature.feature_status import feature_status
 from splent_cli.commands.database.db_status import db_status
 from splent_cli.commands.product.product_containers import product_docker
+from splent_cli.services import context
 
 
 SECTIONS = [
@@ -74,7 +75,7 @@ def _check_workspace_precondition():
     elif not os.path.isdir(wd):
         problems.append(f"WORKING_DIR points to a missing directory: {wd}")
 
-    app = os.getenv("SPLENT_APP")
+    app = context.active_app(workspace)
     if not app:
         problems.append("SPLENT_APP is not set")
     elif not os.path.isdir(os.path.join(workspace, app)):

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/feature/feature_release.py

@@ -2572,7 +2572,7 @@ def _dry_run(
 
     tag = f"v{version.lstrip('v')}"
     git_state = release_dry_run.read_git_state(feature_path, tag)
-    product = os.getenv("SPLENT_APP") or None
+    product = context.active_app()
 
     rehearsal = release_dry_run.rehearse_feature_release(
         feature_path=feature_path,

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/feature/feature_rename.py

@@ -96,9 +96,8 @@ def feature_rename(old_name, new_name, namespace):
     # -----------------------------
     # Context
     # -----------------------------
-    splent_app = os.getenv(
-        "SPLENT_APP"
-    )  # optional — used to update pyproject.toml if set
+    # Optional: the active product's pyproject.toml is updated when there is one.
+    splent_app = context.active_app()
     pyproject_path = None
     features_list = []
     feature_is_active = False

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/feature/feature_test.py

@@ -243,13 +243,13 @@ def _is_prod_active(product: str | None = None) -> bool:
        ``export``), so a hand-edited ``SPLENT_ENV="prod"`` still counts
     3. SPLENT_ENV from the product's running web container
     """
-    product = product or os.getenv("SPLENT_APP", "")
+    product = product or context.active_app()
     if not product:
         return False
 
     if (
         _is_product_container()
-        and product == os.getenv("SPLENT_APP")
+        and product == context.active_app()
         and _is_prod(os.getenv("SPLENT_ENV"))
     ):
         return True
@@ -614,7 +614,7 @@ def feature_src_dirs(sources: list[tuple[str, Path]] = ()) -> list[str]:
     and the app then failed on a module only the pinned auth has.
     """
     workspace = context.workspace()
-    product = os.getenv("SPLENT_APP", "")
+    product = context.active_app()
     dirs: list[str] = []
     seen: set[str] = set()
     for name, root in sources:

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/product/product_commands.py

@@ -1,5 +1,3 @@
-import os
-
 import click
 from flask import current_app
 
@@ -66,7 +64,7 @@ def _own_commands():
     """The product's own commands, against the CLI's built-in names."""
     from splent_cli.cli import cli
 
-    return own_commands.collect(os.getenv("SPLENT_APP"), set(cli.commands))
+    return own_commands.collect(context.active_app(), set(cli.commands))
 
 
 @requires_app
@@ -80,7 +78,7 @@ def product_commands():
     product's own (product:<name>, from its commands module)."""
     registry = current_app.extensions.get("splent_feature_commands", {})
     own = _own_commands()
-    product = os.getenv("SPLENT_APP", "product")
+    product = context.active_app() or "product"
 
     if not registry and not own.commands and not own.shadowed and not own.error:
         click.echo()

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/product/product_create.py

@@ -130,8 +130,21 @@ def copy_raw_file(template_name, filename):
 @click.option(
     "--force", is_flag=True, help="Overwrite the product if it already exists."
 )
-@context.requires_detached
-def make_product(name, spl_name, spl_doi, features_file, force):
+@click.option(
+    "--no-select",
+    is_flag=True,
+    help="Leave the selection as it is: create the product while another one "
+    "is selected, and do not select the new one.",
+)
+def make_product(name, spl_name, spl_doi, features_file, force, no_select):
+    # Creating never selects. Without --no-select nothing may be selected,
+    # so a product is not created by mistake while working on another. With
+    # it the product is created while another one is selected, and that one
+    # stays selected: the workspace .env is never written here.
+    if not no_select:
+        context.refuse_active_app(
+            "Or pass --no-select to create it and leave the selection as it is."
+        )
     validate_product_name(name)
     workspace_path = context.workspace()
 

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/product/product_list.py

@@ -1,4 +1,3 @@
-import os
 import tomllib
 import click
 from pathlib import Path
@@ -30,7 +29,7 @@ def _product_info(product_dir: Path) -> dict | None:
 def product_list():
     """Lists all products found in the workspace, with their version and feature count."""
     workspace = context.workspace()
-    active = os.getenv("SPLENT_APP")
+    active = context.active_app()
 
     if not workspace.exists():
         click.secho(f"❌ Workspace not found: {workspace}", fg="red")

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/product/product_release.py

@@ -393,7 +393,6 @@ def _left_out_flags(channels) -> list[str]:
     is_flag=True,
     help="If PyPI's new-project limit is spent, wait for it however long it takes.",
 )
-@context.requires_product
 def product_release(
     version,
     product,
@@ -406,7 +405,7 @@ def product_release(
     wait,
 ):
     no_forge = release.no_forge_requested(no_forge, no_github)
-    product = product or os.getenv("SPLENT_APP")
+    product = product or context.active_app()
     if not product:
         click.secho("  error: no product specified and SPLENT_APP not set", fg="red")
         raise SystemExit(1)

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/product/product_test.py

@@ -179,7 +179,7 @@ def _run_own_tests(product, verbose) -> None:
     if product:
         # Everything below reads the product from SPLENT_APP, as the
         # container does, where the exec sets it.
-        os.environ["SPLENT_APP"] = product
+        context.use_app(product)
     product = context.require_app()
     if not web_container.is_product_container():
         argv = ["product:test", "--own-tests"] + (["-v"] if verbose else [])

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/uvl/uvl_utils.py

@@ -11,8 +11,8 @@ from pathlib import Path
 
 import click
 import tomllib
-from dotenv import dotenv_values
 
+from splent_cli.services import context
 from splent_cli.utils.feature_utils import read_features_from_data
 
 DEFAULT_UVLHUB_URL = "https://www.uvlhub.io"
@@ -40,16 +40,9 @@ def _discover_metamodels():
 
 
 def read_splent_app(workspace: str) -> str:
-    """Read SPLENT_APP from env var or workspace .env and validate the product directory exists."""
-    # Prefer environment variable (set by product:select or passed via -e)
-    app_name = os.getenv("SPLENT_APP")
-
-    # Fallback: read from .env file, parsed like every other .env reader
-    # (quotes, 'export ' and inline comments).
-    if not app_name:
-        env_path = os.path.join(workspace, ".env")
-        if os.path.exists(env_path):
-            app_name = (dotenv_values(env_path).get("SPLENT_APP") or "").strip()
+    """The active product (context.active_app, WORKSPACE's .env selecting
+    when the environment does not), checked to be a folder of WORKSPACE."""
+    app_name = context.active_app(workspace)
 
     if not app_name:
         raise click.ClickException(

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/commands/version.py

@@ -105,7 +105,7 @@ def version(as_json: bool) -> None:
     mean identical workspace states.
     """
     workspace = str(context.workspace())
-    app_name = os.getenv("SPLENT_APP")
+    app_name = context.active_app()
 
     cli_v = _workspace_pkg_version(workspace, "splent_cli") or "unknown"
     fw_v = _workspace_pkg_version(workspace, "splent_framework") or "unknown"

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/services/compose.py

@@ -9,6 +9,7 @@ from pathlib import Path
 
 import click
 
+from splent_cli.services import context
 from splent_cli.utils.feature_utils import normalize_namespace
 
 # Bounded wait for a docker probe that only reads state. Interactive and
@@ -224,8 +225,16 @@ def attach_self_to_network(name: str) -> bool:
     Silent and idempotent. False when there is nothing to attach (running on
     the host rather than in a container) or docker cannot be asked; either way
     the caller carries on and the real command reports the real problem.
+
+    False too, and nothing moves, for a command on another product than the
+    workspace's selection (``SPLENT_APP=other splent ...``). The CLI's
+    container is shared by every command of the workspace, and moving it
+    took the selected product's database away from whatever was running for
+    that product at the time, a release gate included. It stays on the
+    selection's network; the other product's commands that need its
+    services run in its web container (cli.py).
     """
-    if not os.path.exists("/.dockerenv"):
+    if not os.path.exists("/.dockerenv") or context.is_override():
         return False
 
     # A container's hostname is its own short id unless someone overrode it,

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/services/context.py

@@ -3,6 +3,7 @@ import os
 from pathlib import Path
 
 import click
+from dotenv import dotenv_values
 
 
 def workspace_in_reach() -> Path | None:
@@ -37,7 +38,7 @@ def require_app() -> str:
     name product:create would reject, so a product with an older name still
     works.
     """
-    product = os.getenv("SPLENT_APP")
+    product = active_app()
     if not product:
         click.secho("❌ SPLENT_APP not set.", fg="red")
         raise SystemExit(1)
@@ -56,9 +57,73 @@ def require_app() -> str:
     return product
 
 
-def active_app() -> str | None:
-    """Return SPLENT_APP or None if not set (no error)."""
-    return os.getenv("SPLENT_APP") or None
+def active_app(workspace_path: str | os.PathLike | None = None) -> str | None:
+    """The active product, or None in detached mode (no error).
+
+    One rule decides it, for every command:
+
+    1. The command's own option, where it has one (product:test --product,
+       product:release --product), which the command puts in the
+       environment for what it runs (:func:`use_app`).
+    2. SPLENT_APP in the process environment, an override for one command
+       that leaves the workspace's selection alone::
+
+           SPLENT_APP=other_product splent product:validate
+
+       Set but empty, it means no product, for that command alone.
+    3. The workspace-wide selection, SPLENT_APP in the workspace .env
+       (:func:`selected_app`), which product:select writes and every other
+       command, agent and release gate reads.
+
+    The environment carries the first two because the framework and every
+    subprocess read the product there too. cli.py loads the workspace .env
+    into it before any command runs, never over a variable the process
+    already has, so the third is usually there as well; it is read from the
+    file here for code the CLI's entry point has not loaded it for.
+    ``workspace_path`` is the workspace whose .env that is, WORKING_DIR's by
+    default.
+
+    Read the product here, never with os.getenv("SPLENT_APP"), so the rule
+    stays in one place.
+    """
+    if "SPLENT_APP" in os.environ:
+        return os.environ["SPLENT_APP"] or None
+    return selected_app(workspace_path)
+
+
+def selected_app(workspace_path: str | os.PathLike | None = None) -> str | None:
+    """The product the workspace .env selects, or None.
+
+    The selection product:select writes and product:deselect removes,
+    parsed like every other .env reader (quotes, ``export`` and inline
+    comments). Not the active product, which an override can change for one
+    command (:func:`active_app`).
+    """
+    root = Path(workspace_path) if workspace_path else workspace_in_reach()
+    env_file = root / ".env" if root else None
+    if env_file is None or not env_file.is_file():
+        return None
+    return (dotenv_values(env_file).get("SPLENT_APP") or "").strip() or None
+
+
+def is_override() -> bool:
+    """Whether this command works on another product than the workspace's
+    selection: an override, or a command's own option (:func:`active_app`).
+
+    False in a detached workspace, where there is no selection to keep.
+    """
+    selected = selected_app()
+    return selected is not None and active_app() != selected
+
+
+def use_app(product: str) -> None:
+    """Make PRODUCT the active product of this run: a command's own option.
+
+    Only this process's environment changes, which is where the framework
+    and every subprocess read the product. The workspace .env, the selection
+    every other command sees, is left as it is.
+    """
+    os.environ["SPLENT_APP"] = product
 
 
 def is_detached() -> bool:
@@ -155,7 +220,7 @@ def refuses_production(fn):
     def wrapper(*args, **kwargs):
         if normalize_env(os.getenv("SPLENT_ENV")) == "prod":
             name = click.get_current_context().info_name
-            app = os.getenv("SPLENT_APP") or "the product"
+            app = active_app() or "the product"
             click.secho(
                 f"  {name} refuses to run against production: {app} is "
                 "deployed, and this would change its database.",
@@ -192,14 +257,24 @@ def requires_detached(fn):
 
     @functools.wraps(fn)
     def wrapper(*args, **kwargs):
-        app = active_app()
-        if app:
-            click.secho(
-                f"  A product is currently selected: {app}\n"
-                f"  Run: splent product:deselect",
-                fg="red",
-            )
-            raise SystemExit(1)
+        refuse_active_app()
         return fn(*args, **kwargs)
 
     return wrapper
+
+
+def refuse_active_app(alternative: str | None = None) -> None:
+    """Exit when a product is active: the check of :func:`requires_detached`,
+    for a command with a flag that skips it (product:create --no-select).
+
+    ``alternative`` is one more line on what to do instead of deselecting.
+    """
+    app = active_app()
+    if app:
+        click.secho(
+            f"  A product is currently selected: {app}\n  Run: splent product:deselect",
+            fg="red",
+        )
+        if alternative:
+            click.secho(f"  {alternative}", fg="red")
+        raise SystemExit(1)

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/services/spl_store.py

@@ -56,6 +56,7 @@ from pathlib import Path
 
 import click
 
+from splent_cli.services import context
 from splent_cli.utils.io_utils import atomic_write
 
 WORKING_COPY_PREFIX = "splent_spl_"
@@ -607,8 +608,8 @@ def read_product_pin(workspace: str | os.PathLike, product: str) -> SplPin | Non
 
 
 def active_product_pin(workspace: str | os.PathLike) -> SplPin | None:
-    """The pin of the selected product, when one is selected."""
-    product = os.getenv("SPLENT_APP")
+    """The pin of the active product, when there is one."""
+    product = context.active_app()
     if not product:
         return None
     return read_product_pin(workspace, product)

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/utils/ci_workflow.py

@@ -75,7 +75,9 @@ def _workspace() -> Path | None:
 
 
 def _product() -> str | None:
-    product = os.getenv("SPLENT_APP", "").strip()
+    from splent_cli.services import context
+
+    product = (context.active_app() or "").strip()
     if not product or "/" in product or "\\" in product or product in (".", ".."):
         return None
     return product

{splent_cli-1.43.0 → splent_cli-1.44.0}/src/splent_cli/utils/dynamic_imports.py

@@ -27,6 +27,9 @@ load_dotenv()
 _app_instance = None
 _module_cache = None
 
+# The product of context.active_app, read where the framework reads it: the
+# app is built for the one in the environment, which load_dotenv() above has
+# just filled from the workspace .env unless the process already had one.
 module_name = os.getenv("SPLENT_APP")
 dotenv_path = None
 

{splent_cli-1.43.0 → splent_cli-1.44.0/src/splent_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.43.0
+Version: 1.44.0
 Summary: SPLENT-CLI is a CLI to be able to work on your development more easily.
 Author-email: DiversoLab <diversolab@us.es>
 License-Expression: LGPL-3.0-or-later