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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.7.0
+Version: 1.8.0
 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
@@ -10,6 +10,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click==8.1.8
 Requires-Dist: packaging>=24.0
+Requires-Dist: requests>=2.31.0
 Provides-Extra: dev
 Requires-Dist: setuptools==80.3.1; extra == "dev"
 Requires-Dist: pytest==8.3.4; extra == "dev"

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "splent_cli"
-version = "1.7.0"
+version = "1.8.0"
 description = "SPLENT-CLI is a CLI to be able to work on your development more easily."
 readme = "README.md"
 requires-python = ">=3.13"
@@ -14,6 +14,7 @@ license-files = ["LICENSE"]
 dependencies = [
     "click==8.1.8",
     "packaging>=24.0",
+    "requests>=2.31.0",
 ]
 
 [project.optional-dependencies]

{splent_cli-1.7.0 → splent_cli-1.8.0}/src/splent_cli/commands/check/check_pyproject.py

@@ -9,7 +9,6 @@ import click
 import tomllib
 
 from splent_cli.services import context
-from splent_cli.utils.feature_utils import read_features_from_data
 
 
 def _find_missing_pkgs(deps: list) -> list:
@@ -88,29 +87,69 @@ def check_pyproject():
         _ok(f"All {len(deps)} dependencies satisfied")
 
     # Features
-    features = read_features_from_data(data)
-    _ok(f"{len(features)} features declared in [tool.splent.features]")
-
     splent = data.get("tool", {}).get("splent", {})
+    base_feats = splent.get("features", [])
     dev_feats = splent.get("features_dev", [])
     prod_feats = splent.get("features_prod", [])
+
+    _ok(f"{len(base_feats)} features in [tool.splent].features")
     if dev_feats:
         _ok(f"{len(dev_feats)} dev-only features")
     if prod_feats:
         _ok(f"{len(prod_feats)} prod-only features")
 
-    # UVL
-    uvl_cfg = splent.get("uvl", {})
-    uvl_file = uvl_cfg.get("file")
-    if uvl_file:
-        app_path = os.path.join(workspace, product)
-        uvl_path = os.path.join(app_path, "uvl", uvl_file)
-        if os.path.exists(uvl_path):
-            _ok(f"UVL file found: uvl/{uvl_file}")
+    # Check for duplicates across feature lists
+    def _bare_name(entry):
+        name = entry.split("/")[-1] if "/" in entry else entry
+        return name.split("@")[0]
+
+    all_entries = base_feats + dev_feats + prod_feats
+    seen_names = {}
+    for entry in all_entries:
+        bare = _bare_name(entry)
+        seen_names.setdefault(bare, []).append(entry)
+
+    for bare, entries in seen_names.items():
+        if len(entries) > 1:
+            short = bare.replace("splent_feature_", "")
+            _fail(f"Duplicate feature '{short}': {', '.join(entries)}")
+
+    # Check for inconsistent namespaces
+    namespaces = set()
+    for entry in all_entries:
+        if "/" in entry:
+            ns = entry.split("/")[0]
+            namespaces.add(ns)
+    if len(namespaces) > 1:
+        _warn(
+            f"Inconsistent namespaces: {', '.join(sorted(namespaces))} — use one format consistently"
+        )
+
+    # SPL / UVL
+    spl_name = splent.get("spl")
+    if spl_name:
+        uvl_path = os.path.join(
+            workspace, "splent_catalog", spl_name, f"{spl_name}.uvl"
+        )
+        if os.path.isfile(uvl_path):
+            _ok(f"SPL catalog: {spl_name} (UVL found)")
         else:
-            _fail(f"UVL file not found: uvl/{uvl_file}")
+            _fail(
+                f"SPL catalog: {spl_name} — UVL not found at splent_catalog/{spl_name}/{spl_name}.uvl"
+            )
     else:
-        _warn("No UVL file configured")
+        # Legacy fallback
+        uvl_cfg = splent.get("uvl", {})
+        uvl_file = uvl_cfg.get("file")
+        if uvl_file:
+            app_path = os.path.join(workspace, product)
+            uvl_path = os.path.join(app_path, "uvl", uvl_file)
+            if os.path.exists(uvl_path):
+                _ok(f"UVL file found: uvl/{uvl_file} (legacy)")
+            else:
+                _fail(f"UVL file not found: uvl/{uvl_file}")
+        else:
+            _warn("No SPL configured — set [tool.splent].spl in pyproject.toml")
 
     click.echo()
     if fail:

{splent_cli-1.7.0 → splent_cli-1.8.0}/src/splent_cli/commands/export/export_puml.py

@@ -149,8 +149,8 @@ def _parse_models(models_path: str) -> list[dict]:
     text = "\n".join(joined_lines)
 
     classes = []
-    # Split by class definition
-    class_blocks = re.split(r"^(class \w+\(.*?\):)", text, flags=re.MULTILINE)
+    # Split by class definition (with or without parentheses for mixins)
+    class_blocks = re.split(r"^(class \w+(?:\(.*?\))?:)", text, flags=re.MULTILINE)
 
     i = 1
     while i < len(class_blocks):
@@ -158,7 +158,7 @@ def _parse_models(models_path: str) -> list[dict]:
         body = class_blocks[i + 1] if i + 1 < len(class_blocks) else ""
         i += 2
 
-        class_m = re.match(r"class (\w+)\(", header)
+        class_m = re.match(r"class (\w+)", header)
         if not class_m:
             continue
         class_name = class_m.group(1)
@@ -213,8 +213,11 @@ def _parse_models(models_path: str) -> list[dict]:
             if rel_m:
                 rel_name = rel_m.group(1)
                 rel_args = rel_m.group(2)
-                target_m = re.match(r"(\w+)", rel_args)
-                target = target_m.group(1) if target_m else "?"
+                # Target can be unquoted (User) or quoted ("User" / 'User')
+                target_m = re.match(r"""[\"']?(\w+)[\"']?""", rel_args)
+                target = target_m.group(1) if target_m else None
+                if not target:
+                    continue
                 uselist = "uselist=False" not in rel_args
                 relationships.append(
                     {
@@ -668,11 +671,16 @@ def _render_exports(
         )
     except subprocess.CalledProcessError as e:
         click.secho("❌ PlantUML failed to render diagram.", fg="red")
-        if os.getenv("SPLENT_DEBUG"):
-            stderr = e.stderr
-            if isinstance(stderr, bytes):
-                stderr = stderr.decode(errors="replace")
-            click.secho(stderr[:500], fg="bright_black")
+        stderr = e.stderr
+        if isinstance(stderr, bytes):
+            stderr = stderr.decode(errors="replace")
+        if stderr:
+            click.secho(stderr.strip(), fg="bright_black")
+        stdout = e.stdout
+        if isinstance(stdout, bytes):
+            stdout = stdout.decode(errors="replace")
+        if stdout:
+            click.secho(stdout.strip(), fg="bright_black")
         return
 
     try:
@@ -780,21 +788,41 @@ def export_puml(
     product = context.require_app()
     product_dir = os.path.join(workspace, product)
 
-    # Read UVL
-    try:
-        uvl_cfg = PyprojectReader.for_product(product_dir).uvl_config
-    except (FileNotFoundError, RuntimeError) as e:
-        click.secho(f"❌ Cannot read pyproject.toml: {e}", fg="red")
-        raise SystemExit(1)
-
-    uvl_file = uvl_cfg.get("file")
-    if not uvl_file:
-        click.secho("❌ No UVL file configured in [tool.splent.uvl].", fg="red")
-        raise SystemExit(1)
-
-    uvl_path = os.path.join(product_dir, "uvl", uvl_file)
-    if not os.path.isfile(uvl_path):
-        click.secho(f"❌ UVL file not found: {uvl_path}", fg="red")
+    # Read UVL — try SPL catalog first, fall back to legacy [tool.splent.uvl]
+    import tomllib
+
+    uvl_path = None
+    pyproject_path = os.path.join(product_dir, "pyproject.toml")
+    if os.path.isfile(pyproject_path):
+        with open(pyproject_path, "rb") as f:
+            pydata = tomllib.load(f)
+        spl_name = pydata.get("tool", {}).get("splent", {}).get("spl")
+        if spl_name:
+            candidate = os.path.join(
+                workspace, "splent_catalog", spl_name, f"{spl_name}.uvl"
+            )
+            if os.path.isfile(candidate):
+                uvl_path = candidate
+
+    # Legacy fallback: [tool.splent.uvl].file
+    if not uvl_path:
+        try:
+            uvl_cfg = PyprojectReader.for_product(product_dir).uvl_config
+            uvl_file = uvl_cfg.get("file")
+            if uvl_file:
+                candidate = os.path.join(product_dir, "uvl", uvl_file)
+                if os.path.isfile(candidate):
+                    uvl_path = candidate
+        except (FileNotFoundError, RuntimeError):
+            pass
+
+    if not uvl_path:
+        click.secho(
+            "❌ No UVL file found.\n"
+            "   Set [tool.splent].spl in pyproject.toml (SPL catalog)\n"
+            "   or [tool.splent.uvl].file (legacy).",
+            fg="red",
+        )
         raise SystemExit(1)
 
     click.echo(f"📖 Reading UVL model: {uvl_path}")
@@ -848,6 +876,53 @@ def export_puml(
                     if parsed:
                         all_models[package] = parsed
                     break
+        # Apply refinement mixins: merge mixin attributes into target models
+        for package, fpath in feature_paths.items():
+            pyproject_path = os.path.join(fpath, "pyproject.toml")
+            if not os.path.isfile(pyproject_path):
+                continue
+            import tomllib as _tomllib
+
+            with open(pyproject_path, "rb") as f:
+                feat_data = _tomllib.load(f)
+            extends = (
+                feat_data.get("tool", {})
+                .get("splent", {})
+                .get("refinement", {})
+                .get("extends", {})
+                .get("models", [])
+            )
+            if not extends:
+                continue
+            # Parse the mixin's models.py
+            mixin_models = []
+            src_root = os.path.join(fpath, "src")
+            if os.path.isdir(src_root):
+                for org_dir in os.listdir(src_root):
+                    mpath = os.path.join(src_root, org_dir, package, "models.py")
+                    if os.path.isfile(mpath):
+                        mixin_models = _parse_models(mpath)
+                        break
+            # Merge each mixin into its target model
+            for ext in extends:
+                target_name = ext.get("target")
+                mixin_name = ext.get("mixin")
+                if not target_name or not mixin_name:
+                    continue
+                # Find the mixin class in parsed mixin_models
+                mixin_cls = next(
+                    (m for m in mixin_models if m["name"] == mixin_name), None
+                )
+                if not mixin_cls:
+                    continue
+                # Find the target model across all parsed features
+                for feat_models in all_models.values():
+                    for model in feat_models:
+                        if model["name"] == target_name:
+                            model["attributes"].extend(mixin_cls["attributes"])
+                            model["methods"].extend(mixin_cls["methods"])
+                            break
+
         click.echo(
             f"📋 Parsed models from {len(all_models)}/{len(feature_paths)} features."
         )

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

@@ -273,14 +273,24 @@ def _scan_dependencies(
                 if f"splent_feature_{short_name}" != own_feature_name:
                     required_features.add(short_name)
 
-        for var in re.findall(
-            r"""os\.(?:getenv|environ\.get)\s*\(\s*['"]([A-Z][A-Z0-9_]+)['"]""", text
-        ):
-            env_vars.add(var)
-        for var in re.findall(
-            r"""os\.environ\s*\[\s*['"]([A-Z][A-Z0-9_]+)['"]""", text
-        ):
-            env_vars.add(var)
+        for line in text.splitlines():
+            stripped = line.lstrip()
+            # Skip comments and docstrings
+            if (
+                stripped.startswith("#")
+                or stripped.startswith('"""')
+                or stripped.startswith("'''")
+            ):
+                continue
+            for var in re.findall(
+                r"""os\.(?:getenv|environ\.get)\s*\(\s*['"]([A-Z][A-Z0-9_]+)['"]""",
+                stripped,
+            ):
+                env_vars.add(var)
+            for var in re.findall(
+                r"""os\.environ\s*\[\s*['"]([A-Z][A-Z0-9_]+)['"]""", stripped
+            ):
+                env_vars.add(var)
 
     return sorted(required_features), sorted(env_vars)
 
@@ -330,12 +340,14 @@ def write_contract(pyproject_path: str, contract: dict, feature_name: str) -> No
     text = path.read_text()
 
     existing_description = f"{feature_name} feature"
+    existing_env = None
     try:
         data = tomllib.loads(text)
         splent_contract = data.get("tool", {}).get("splent", {}).get("contract", {})
         desc = splent_contract.get("description")
         if desc:
             existing_description = desc
+        existing_env = splent_contract.get("env")
     except Exception:
         pass
 
@@ -373,7 +385,8 @@ def write_contract(pyproject_path: str, contract: dict, feature_name: str) -> No
         "# Do not edit manually — re-run `splent feature:contract --write` to refresh.\n"
         "[tool.splent.contract]\n"
         f'description = "{existing_description}"\n'
-        "\n"
+        + (f'env = "{existing_env}"\n' if existing_env else "")
+        + "\n"
         "[tool.splent.contract.provides]\n"
         f"routes     = {_toml_list(contract['routes'])}\n"
         f"blueprints = {_toml_list(contract['blueprints'])}\n"

{splent_cli-1.7.0 → splent_cli-1.8.0}/src/splent_cli/commands/product/product_containers.py

@@ -235,10 +235,10 @@ def product_docker(env_dev, env_prod):
                 seen.add(key)
                 unique.append((label, port, kind))
 
-        http_services = [(l, p) for l, p, k in unique if k == "http"]
-        tcp_services = [(l, p) for l, p, k in unique if k == "tcp"]
+        http_services = [(lbl, p) for lbl, p, k in unique if k == "http"]
+        tcp_services = [(lbl, p) for lbl, p, k in unique if k == "tcp"]
         all_services = http_services + tcp_services
-        label_width = max((len(l) for l, _ in all_services), default=20) + 2
+        label_width = max((len(lbl) for lbl, _ in all_services), default=20) + 2
 
         if http_services:
             click.secho("  Accessible services:", bold=True)

{splent_cli-1.7.0 → splent_cli-1.8.0}/src/splent_cli/services/preflight.py

@@ -106,6 +106,56 @@ def run_preflight(*, interactive: bool = True, build_mode: bool = False) -> bool
 
     failed = False
 
+    # Phase 0: pyproject sanity (duplicates, namespaces, SPL)
+    splent_cfg = data.get("tool", {}).get("splent", {})
+    base_feats = splent_cfg.get("features", [])
+    dev_feats = splent_cfg.get("features_dev", [])
+    prod_feats = splent_cfg.get("features_prod", [])
+
+    all_entries = base_feats + dev_feats + prod_feats
+    seen = {}
+    for entry in all_entries:
+        bare = (
+            entry.split("/")[-1].split("@")[0] if "/" in entry else entry.split("@")[0]
+        )
+        seen.setdefault(bare, []).append(entry)
+
+    duplicates = {k: v for k, v in seen.items() if len(v) > 1}
+    if duplicates:
+        if interactive:
+            for bare, entries in duplicates.items():
+                short = bare.replace("splent_feature_", "")
+                click.secho(
+                    f"  pyproject duplicate '{short}': {', '.join(entries)}", fg="red"
+                )
+        failed = True
+    else:
+        namespaces = set()
+        for entry in all_entries:
+            if "/" in entry:
+                namespaces.add(entry.split("/")[0])
+        if len(namespaces) > 1:
+            if interactive:
+                click.secho(
+                    f"  pyproject inconsistent namespaces: {', '.join(sorted(namespaces))}",
+                    fg="yellow",
+                )
+
+    spl_name = splent_cfg.get("spl")
+    if spl_name:
+        uvl_check = os.path.join(
+            workspace, "splent_catalog", spl_name, f"{spl_name}.uvl"
+        )
+        if not os.path.isfile(uvl_check):
+            if interactive:
+                click.secho(
+                    f"  pyproject SPL '{spl_name}' — UVL not found in catalog", fg="red"
+                )
+            failed = True
+
+    if failed:
+        return False
+
     # Phase 1: SAT
     try:
         sat_ok, selected, _, _ = _run_sat_check(workspace, app_name, data, None, False)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splent_cli
-Version: 1.7.0
+Version: 1.8.0
 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
@@ -10,6 +10,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click==8.1.8
 Requires-Dist: packaging>=24.0
+Requires-Dist: requests>=2.31.0
 Provides-Extra: dev
 Requires-Dist: setuptools==80.3.1; extra == "dev"
 Requires-Dist: pytest==8.3.4; extra == "dev"

{splent_cli-1.7.0 → splent_cli-1.8.0}/src/splent_cli.egg-info/requires.txt

@@ -1,5 +1,6 @@
 click==8.1.8
 packaging>=24.0
+requests>=2.31.0
 
 [dev]
 setuptools==80.3.1