deriva-cli 0.8.4__tar.gz → 0.8.6__tar.gz

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva-cli
-Version: 0.8.4
+Version: 0.8.6
 Summary: Deriva is a research project aimed at enabling digital architects by automating the derivation of enterprise architecture models. Deriva uses dual knowledge graphs, heuristics and LLM's.
 Keywords: archimate,enterprise-architecture,code-analysis,llm,grafeo,fastapi
 Author: S. T. Grond

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/deriva/services/config.py

@@ -713,9 +713,35 @@ def setting_default(key: str) -> str | None:
     """The value that applies while a setting is not set (None when nothing does)."""
     if key == "excluded_directories":
         return json.dumps(DEFAULT_EXCLUDED_DIRECTORIES)
+    if key == GRAPH_VIEW_NODES_SETTING:
+        return str(DEFAULT_GRAPH_VIEW_NODES)
     return None
 
 
+# How many graph nodes the studio's graph views sample (the model is always shown whole); more shows more of the graph
+# and draws slower. A display setting: it changes no extraction or derivation result.
+GRAPH_VIEW_NODES_SETTING = "graph_view_nodes"
+DEFAULT_GRAPH_VIEW_NODES = 300
+GRAPH_VIEW_NODES_RANGE = (50, 5000)
+
+
+def _parse_graph_view_nodes(raw: str) -> int:
+    low, high = GRAPH_VIEW_NODES_RANGE
+    text = raw.strip()
+    if not text.isdigit() or not low <= int(text) <= high:
+        raise ValueError(f"graph_view_nodes must be a whole number from {low} to {high}, not {raw!r}")
+    return int(text)
+
+
+def get_graph_view_nodes(engine: Any) -> int:
+    """The graph views' node count: the graph_view_nodes setting, or 300 while it is not set (or not a valid count)."""
+    raw = get_setting(engine, GRAPH_VIEW_NODES_SETTING)
+    try:
+        return DEFAULT_GRAPH_VIEW_NODES if raw is None else _parse_graph_view_nodes(raw)
+    except ValueError:
+        return DEFAULT_GRAPH_VIEW_NODES
+
+
 def get_excluded_directories(engine: Any) -> list[str]:
     """Directory names skipped (with their contents) by every repository walk.
 
@@ -752,6 +778,8 @@ def set_setting(engine: Any, key: str, value: str) -> None:
     """Set a system setting (upsert); settings read as structured values are validated first."""
     if key == "excluded_directories":
         _parse_excluded_directories(value)
+    if key == GRAPH_VIEW_NODES_SETTING:
+        value = str(_parse_graph_view_nodes(value))
     existing = get_setting(engine, key)
     if existing is not None:
         engine.execute(

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/deriva/services/derivation.py

@@ -1411,6 +1411,12 @@ def _run_prep_step(
 # =============================================================================
 
 
+def _model_totals(archimate_manager: ArchimateManager) -> str:
+    """The closing summary: what the model holds, counted as the studio's model stats count it. The step counters
+    miss what refine steps add and delete (graph relationships, duplicates), so they stay in ``stats`` only."""
+    return f"{len(archimate_manager.get_elements())} elements, {len(archimate_manager.get_relationships())} relationships in the model"
+
+
 def run_derivation(
     engine: Any,
     graph_manager: GraphManager,
@@ -1501,6 +1507,8 @@ def run_derivation(
         total_steps += len(gen_configs)
     if "refine" in phases:
         total_steps += len(refine_configs)
+    if relationship_pass:
+        total_steps += 1
 
     # Start progress tracking
     if progress:
@@ -1905,7 +1913,7 @@ def run_derivation(
 
     # Complete progress tracking
     if progress:
-        msg = f"Derivation complete: {stats['elements_created']} elements, {stats['relationships_created']} relationships"
+        msg = f"Derivation complete: {_model_totals(archimate_manager)}"
         if stats.get("elements_disabled", 0) > 0:
             msg += f", {stats['elements_disabled']} disabled"
         progress.complete_phase(msg)
@@ -1992,6 +2000,9 @@ def run_derivation_iter(
             stats=stats,
         )
         return
+    # The deferred relationship pass is a step of its own (it runs when the model has elements)
+    if defer_relationships:
+        total_steps += 1
 
     current_step = 0
 
@@ -2332,7 +2343,7 @@ def run_derivation_iter(
                 )
 
     # Yield final completion
-    final_message = f"{stats['elements_created']} elements, {stats['relationships_created']} relationships"
+    final_message = _model_totals(archimate_manager)
     if stats.get("elements_disabled", 0) > 0:
         final_message += f", {stats['elements_disabled']} disabled"
     if errors:

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/deriva/services/ontology.py

@@ -57,7 +57,8 @@ def intermediate_ontology(session: Any) -> dict[str, Any]:
     for label in sorted(set(classes) | set(counts), key=lambda name: (order.get(node_group(name), len(order)), name)):
         rows = run(f"MATCH (n:Graph:`{label}`) RETURN n LIMIT 1", None) if counts[label] else []
         sample = {k: _short(v) for k, v in rows[0]["n"].items() if not k.startswith("_")} if rows else {}
-        pattern = re.compile(rf":`?(Graph:)?{re.escape(label)}\b")
+        # A query reads a type by matching it (n:Graph:Label) or by testing its labels ("Label" IN labels(n))
+        pattern = re.compile(rf":`?(Graph:)?{re.escape(label)}\b|[\"']{re.escape(label)}[\"']\s+IN\s+labels\(")
         producers = sorted(writers.get(label) or ({label} if label in steps else set()))
         node_types.append(
             {

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/deriva/services/session.py

@@ -1349,6 +1349,12 @@ class PipelineSession:
         assert self._engine is not None
         return config.get_active_config_versions(self._engine, include_disabled=include_disabled)
 
+    def graph_view_nodes(self) -> int:
+        """How many graph nodes the studio's graph views sample (the graph_view_nodes setting, 300 until set)."""
+        self._ensure_connected()
+        assert self._engine is not None
+        return config.get_graph_view_nodes(self._engine)
+
     def get_setting(self, key: str) -> str | None:
         """Get a system setting value (None when not set)."""
         self._ensure_connected()

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deriva-cli"
-version = "0.8.4"
+version = "0.8.6"
 description = "Deriva is a research project aimed at enabling digital architects by automating the derivation of enterprise architecture models. Deriva uses dual knowledge graphs, heuristics and LLM's."
 readme = "packages/README-deriva-cli.md"
 requires-python = ">=3.14"

{deriva_cli-0.8.4 → deriva_cli-0.8.6}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "deriva-cli"
-version = "0.8.4"
+version = "0.8.6"
 description = "Deriva is a research project aimed at enabling digital architects by automating the derivation of enterprise architecture models. Deriva uses dual knowledge graphs, heuristics and LLM's."
 # The PyPI page; README.md is the repository's own
 readme = "packages/README-deriva-cli.md"