sdcmodeler 4.2.0__tar.gz → 4.3.0__tar.gz

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdcmodeler
-Version: 4.2.0
+Version: 4.3.0
 Summary: The modeler's client for SDCStudio: search the catalog, estimate, assemble and publish SDC4 data models, generate applications; a CLI and an MCP server over one client
 Author: Axius SDC, Inc.
 License-Expression: Apache-2.0
@@ -84,7 +84,9 @@ sdcmodeler models "patient"
 sdcmodeler model <ct_id>
 sdcmodeler artifact <ct_id> xsd --dir ./schemas
 sdcmodeler estimate tree.json --title "Vitals"
-sdcmodeler build tree.json --title "Vitals"
+sdcmodeler build tree.json --title "Vitals" --wait
+sdcmodeler job <job_ct_id>
+sdcmodeler package <ct_id> --dir ./packages
 sdcmodeler app <ct_id> --profile lightweight --dir ./apps
 sdcmodeler wallet
 ```
@@ -108,6 +110,7 @@ A JSON-RPC 2.0 stdio server, no SDK, the way sdcvalidator and sdcgovernance are
 | `estimate_model` | what a tree would reuse, mint and cost; returns `estimate_id` | no |
 | `build_model` | assemble, publish and generate (or `publish: false` for a draft); needs the `estimate_id` the person saw; refuses past the key's limit | yes |
 | `job_status` | one job by id: status, step, cost so far, the model's links | no |
+| `download_package` | a model's package ZIP with the key, including a model in a private project; builds a missing package first (free, once) unless `generate` is false | no |
 | `generate_app` | generate and download the application; needs `confirm_charge`; 1,500 credits the first time, free after | yes |
 | `wallet` | balance in credits and the key's policy | no |
 

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/README.md

@@ -58,7 +58,9 @@ sdcmodeler models "patient"
 sdcmodeler model <ct_id>
 sdcmodeler artifact <ct_id> xsd --dir ./schemas
 sdcmodeler estimate tree.json --title "Vitals"
-sdcmodeler build tree.json --title "Vitals"
+sdcmodeler build tree.json --title "Vitals" --wait
+sdcmodeler job <job_ct_id>
+sdcmodeler package <ct_id> --dir ./packages
 sdcmodeler app <ct_id> --profile lightweight --dir ./apps
 sdcmodeler wallet
 ```
@@ -82,6 +84,7 @@ A JSON-RPC 2.0 stdio server, no SDK, the way sdcvalidator and sdcgovernance are
 | `estimate_model` | what a tree would reuse, mint and cost; returns `estimate_id` | no |
 | `build_model` | assemble, publish and generate (or `publish: false` for a draft); needs the `estimate_id` the person saw; refuses past the key's limit | yes |
 | `job_status` | one job by id: status, step, cost so far, the model's links | no |
+| `download_package` | a model's package ZIP with the key, including a model in a private project; builds a missing package first (free, once) unless `generate` is false | no |
 | `generate_app` | generate and download the application; needs `confirm_charge`; 1,500 credits the first time, free after | yes |
 | `wallet` | balance in credits and the key's policy | no |
 

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sdcmodeler"
-version = "4.2.0"
+version = "4.3.0"
 description = "The modeler's client for SDCStudio: search the catalog, estimate, assemble and publish SDC4 data models, generate applications; a CLI and an MCP server over one client"
 license = "Apache-2.0"
 requires-python = ">=3.10"

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/src/sdcmodeler/__init__.py

@@ -17,7 +17,7 @@ servers: sdcvalidator validates, sdcgovernance governs, sdcreader reads,
 sdcmodeler models. It also names the concept SDCStudio already has: every user
 is a Modeler, and the Modeler's projects scope every call.
 """
-__version__ = "4.2.0"
+__version__ = "4.3.0"
 
 from sdcmodeler.client import (  # noqa: E402
     AssemblyRefused,

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/src/sdcmodeler/mcp_server.py

@@ -157,6 +157,25 @@ TOOLS: list[dict[str, Any]] = [
         ),
         "inputSchema": {"type": "object", "properties": {"job_ct_id": {"type": "string"}}, "required": ["job_ct_id"]},
     },
+    {
+        "name": "download_package",
+        "description": (
+            "Download a model's package (the ZIP: schema, XML template and JSON instance of the "
+            "Governed Data Record, JSON-LD, HTML, RDF, SHACL, GQL) into the server's output directory, "
+            "with this key: it works for a model in a private project, such as the one build_model "
+            "just made, where get_model and the public catalog do not. When the model is published "
+            "and its package not yet built, it builds it first (free, once; it needs the right to "
+            "publish the model); generate false only downloads. Free."
+        ),
+        "inputSchema": {
+            "type": "object",
+            "properties": {
+                "ct_id": {"type": "string"},
+                "generate": {"type": "boolean", "default": True},
+            },
+            "required": ["ct_id"],
+        },
+    },
     {
         "name": "generate_app",
         "description": (
@@ -290,6 +309,25 @@ def _handle_job_status(args: dict) -> Any:
     return get_client().job_status(_string(args, "job_ct_id", required=True))
 
 
+def _handle_download_package(args: dict) -> Any:
+    ct_id = _string(args, "ct_id", required=True)
+    generate = args.get("generate", True)
+    if not isinstance(generate, bool):
+        raise ValueError("`generate` must be a boolean.")
+    c = get_client()
+    built_now = False
+    try:
+        path = c.download_package(ct_id, _output_dir)
+    except SDCStudioError as exc:
+        # 404 until the package exists (and for a draft); a published model's package is built once, free.
+        if exc.status != 404 or not generate:
+            raise
+        c.generate_package(ct_id)
+        built_now = True
+        path = c.download_package(ct_id, _output_dir)
+    return {"path": str(path), "built_now": built_now}
+
+
 def _handle_generate_app(args: dict) -> Any:
     ct_id = _string(args, "ct_id", required=True)
     profile = _string(args, "profile", default="lightweight") or "lightweight"
@@ -316,6 +354,7 @@ TOOL_HANDLERS = {
     "estimate_model": _handle_estimate_model,
     "build_model": _handle_build_model,
     "job_status": _handle_job_status,
+    "download_package": _handle_download_package,
     "generate_app": _handle_generate_app,
     "wallet": _handle_wallet,
 }
@@ -364,8 +403,9 @@ def _handle_request(request: Any) -> dict | None:
                 "The modeler's client for SDCStudio. Search the public catalog first and reuse published "
                 "components; estimate before you build and show the person the cost; build only with the "
                 "estimate_id you showed; prefer the model package over the generated application when the "
-                "feature lives inside an existing application. A 402 means the person funds the wallet at "
-                f"{get_client().base_url}/app/wallet; never try to pay. "
+                "feature lives inside an existing application; fetch a model's package, including one you just built "
+                "in a private project, with download_package. A 402 means the person funds the wallet at "
+                f"{get_client().base_url}/app/settings?tab=wallet; never try to pay. "
                 + ("A key is configured, so building and downloading are available within its policy."
                    if has_key else "No key is configured: the catalog and estimates work; building needs SDCSTUDIO_API_KEY.")
             ),
@@ -388,7 +428,7 @@ def _handle_request(request: Any) -> dict | None:
         except InsufficientCredits as exc:
             return _tool_error(req_id, (
                 f"Insufficient credits: this needs {exc.estimated_cost_credits} credits and the wallet has "
-                f"{exc.balance_credits}. The person funds the wallet at {get_client().base_url}/app/wallet; stop here."
+                f"{exc.balance_credits}. The person funds the wallet at {get_client().base_url}/app/settings?tab=wallet; stop here."
             ))
         except KeyPolicyRefused as exc:
             return _tool_error(req_id, f"The API key refused this ({exc.error_type}): {exc}")

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/src/sdcmodeler/pricing.py

@@ -5,10 +5,10 @@ SDCStudio's prices (Terms of Service, section 6; ``docs/user-guides/wallet-billi
 1,000 credits per dollar; minting a component 100 credits; assembling a model
 500; downloading an application 1,500, once per user per model since 4.16.0;
 settling a record 1,000. The estimate below resolves an assembly tree the way
-the server does: a leaf with ``ct_id`` is reused and free, a leaf with ``label``
-and ``data_type`` is minted and billable. The server's own estimate endpoint,
-when it exists, confirms this; until then this is the number an agent shows
-the person before it builds.
+the server does (SDCStudio 4.17.5, one rule on every path): 500 for the model,
+which covers its root cluster; 100 for every other new cluster; 100 for every
+new component; anything with a ``ct_id`` is reused and free. With a key the
+server's estimate endpoint is used; this is the fallback without one.
 """
 from __future__ import annotations
 
@@ -39,6 +39,8 @@ def _walk(node: dict[str, Any], path: str, reuse: list, mint: list, problems: li
             continue
         if not name:
             problems.append(f"{path}: a cluster needs a label")
+        # A new cluster below the root is minted and billed like a component.
+        mint.append({"path": f"{path}/{name}", "label": name, "data_type": "Cluster"})
         _walk(cluster, f"{path}/{name}", reuse, mint, problems)
 
 
@@ -57,6 +59,7 @@ def estimate_tree(tree: dict[str, Any], title: str = "") -> dict[str, Any]:
     problems: list = []
     _walk(tree, tree.get("label", "root"), reuse, mint, problems)
     mint_credits = MINT_COMPONENT_CREDITS * len(mint)
+    title = (title or "").strip()   # the server hashes the title as its serializer trims it
     canonical = json.dumps({"title": title, "tree": tree}, sort_keys=True, separators=(",", ":"), default=str)
     return {
         "estimate_id": hashlib.sha256(canonical.encode("utf-8")).hexdigest()[:12],
@@ -67,5 +70,6 @@ def estimate_tree(tree: dict[str, Any], title: str = "") -> dict[str, Any]:
         "model_credits": ASSEMBLE_MODEL_CREDITS,
         "mint_credits": mint_credits,
         "total_credits": ASSEMBLE_MODEL_CREDITS + mint_credits,
-        "mode": "mixed" if mint else "reuse",
+        # The path assemble/ takes: a new component makes it mixed, a new cluster alone does not.
+        "mode": "mixed" if any(m["data_type"] != "Cluster" for m in mint) else "reuse",
     }

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/src/sdcmodeler.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdcmodeler
-Version: 4.2.0
+Version: 4.3.0
 Summary: The modeler's client for SDCStudio: search the catalog, estimate, assemble and publish SDC4 data models, generate applications; a CLI and an MCP server over one client
 Author: Axius SDC, Inc.
 License-Expression: Apache-2.0
@@ -84,7 +84,9 @@ sdcmodeler models "patient"
 sdcmodeler model <ct_id>
 sdcmodeler artifact <ct_id> xsd --dir ./schemas
 sdcmodeler estimate tree.json --title "Vitals"
-sdcmodeler build tree.json --title "Vitals"
+sdcmodeler build tree.json --title "Vitals" --wait
+sdcmodeler job <job_ct_id>
+sdcmodeler package <ct_id> --dir ./packages
 sdcmodeler app <ct_id> --profile lightweight --dir ./apps
 sdcmodeler wallet
 ```
@@ -108,6 +110,7 @@ A JSON-RPC 2.0 stdio server, no SDK, the way sdcvalidator and sdcgovernance are
 | `estimate_model` | what a tree would reuse, mint and cost; returns `estimate_id` | no |
 | `build_model` | assemble, publish and generate (or `publish: false` for a draft); needs the `estimate_id` the person saw; refuses past the key's limit | yes |
 | `job_status` | one job by id: status, step, cost so far, the model's links | no |
+| `download_package` | a model's package ZIP with the key, including a model in a private project; builds a missing package first (free, once) unless `generate` is false | no |
 | `generate_app` | generate and download the application; needs `confirm_charge`; 1,500 credits the first time, free after | yes |
 | `wallet` | balance in credits and the key's policy | no |
 

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/tests/test_mcp_server.py

@@ -42,7 +42,7 @@ def test_initialize_and_tools_list():
     assert r["result"]["protocolVersion"] == "2025-06-18"
     assert "wallet" in r["result"]["instructions"]
     tools = rpc("tools/list")["result"]["tools"]
-    assert [t["name"] for t in tools] == ["search_components", "list_models", "get_model", "estimate_model", "build_model", "job_status", "generate_app", "wallet"]
+    assert [t["name"] for t in tools] == ["search_components", "list_models", "get_model", "estimate_model", "build_model", "job_status", "download_package", "generate_app", "wallet"]
 
 
 def test_build_needs_the_estimate_the_person_saw(bound):
@@ -77,7 +77,7 @@ def test_a_402_names_the_wallet_page_and_stops(bound):
     bound.on("POST", "/api/v1/dmgen/assemble/", status=402, body={"error": "x", "estimated_cost_credits": 600, "balance_credits": 20})
     est, _ = call("estimate_model", {"title": "Vitals", "tree": TREE})
     _, err = call("build_model", {"estimate_id": est["estimate_id"], "title": "Vitals", "tree": TREE})
-    assert "600 credits" in err and f"{BASE}/app/wallet" in err
+    assert "600 credits" in err and f"{BASE}/app/settings?tab=wallet" in err
 
 
 def test_generate_app_needs_confirmation_and_reports_the_charge(bound, tmp_path):
@@ -114,3 +114,25 @@ def test_build_model_passes_the_flags_and_names_what_to_poll(bound):
     sent = json.loads([c for c in bound.calls if c.url.path.endswith("/assemble/")][-1].content)
     assert sent["generate"] is False and "publish" not in sent
     assert built["requested"] == {"publish": True, "generate": False} and "j9" in built["next"]
+
+
+def test_download_package_fetches_a_private_models_package_with_the_key(bound, tmp_path):
+    bound.on("GET", "/api/v1/dmgen/dms/m1/download_package/", body={"download_url": "https://storage.example/dm-m1.zip", "filename": "dm-m1.zip"})
+    bound.on("GET", "https://storage.example/dm-m1.zip", body=b"PK")
+    out, _ = call("download_package", {"ct_id": "m1"})
+    assert out == {"path": str(tmp_path / "dm-m1.zip"), "built_now": False} and (tmp_path / "dm-m1.zip").exists()
+    assert "authorization" not in bound.calls[-1].headers, "the storage pointer is followed without the key"
+
+
+def test_download_package_builds_a_missing_package_first_unless_told_not_to(bound, tmp_path):
+    bound.on("GET", "/api/v1/dmgen/dms/m2/download_package/", status=404, body={"error": "No package"})
+    _, err = call("download_package", {"ct_id": "m2", "generate": False})
+    assert err and "404" in err
+
+    def built(_request):
+        bound.on("GET", "/api/v1/dmgen/dms/m2/download_package/", body=b"PK", headers={"content-disposition": 'attachment; filename="dm-m2.zip"'})
+        return {"success": True}
+
+    bound.on("POST", "/api/v1/dmgen/dms/m2/generate/", body=built)
+    out, _ = call("download_package", {"ct_id": "m2"})
+    assert out["built_now"] is True and (tmp_path / "dm-m2.zip").exists()

{sdcmodeler-4.2.0 → sdcmodeler-4.3.0}/tests/test_pricing.py

@@ -13,9 +13,10 @@ TREE = {
 def test_reuse_is_free_and_mints_are_counted():
     e = estimate_tree(TREE, "Vitals")
     assert [r["ct_id"] for r in e["reuse"]] == ["abc123abc123abc123abc123", "def456def456def456def456"]
-    assert [m["label"] for m in e["mint"]] == ["Pulse", "Note"]
-    assert e["mint"][1]["path"] == "Vitals/Context/Note"
-    assert e["total_credits"] == ASSEMBLE_MODEL_CREDITS + 2 * MINT_COMPONENT_CREDITS
+    # The new nested cluster Context is minted too; the root cluster is the model's (SDCStudio 4.17.5).
+    assert [(m["label"], m["data_type"]) for m in e["mint"]] == [("Pulse", "XdCount"), ("Context", "Cluster"), ("Note", "XdString")]
+    assert e["mint"][2]["path"] == "Vitals/Context/Note"
+    assert e["total_credits"] == ASSEMBLE_MODEL_CREDITS + 3 * MINT_COMPONENT_CREDITS == 800
     assert e["mode"] == "mixed" and e["problems"] == []
 
 
@@ -31,3 +32,14 @@ def test_problems_are_named_not_hidden():
     e = estimate_tree({"label": "Root", "components": [{"label": "No type"}], "clusters": [{"components": []}]}, "t")
     assert len(e["problems"]) == 2 and "ct_id (reuse) or label and data_type (mint)" in e["problems"][0]
     assert e["mode"] == "reuse"
+
+
+def test_a_new_cluster_alone_is_billed_but_takes_the_reuse_path():
+    tree = {"label": "Root", "components": [{"ct_id": "a" * 24}],
+            "clusters": [{"label": "Group", "components": [{"ct_id": "b" * 24}], "clusters": []}]}
+    e = estimate_tree(tree, "Grouped")
+    assert (e["mode"], e["total_credits"]) == ("reuse", 600)
+
+
+def test_the_title_is_trimmed_before_hashing_as_the_server_does():
+    assert estimate_tree(TREE, "  Vitals ")["estimate_id"] == estimate_tree(TREE, "Vitals")["estimate_id"]