shellsmith 0.2.0__tar.gz → 0.2.1__tar.gz

{shellsmith-0.2.0/src/shellsmith.egg-info → shellsmith-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shellsmith
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python toolkit and CLI for managing Asset Administration Shells
 Author-email: Peter Stein <peterstein@dfki.de>
 License: MIT License

{shellsmith-0.2.0 → shellsmith-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shellsmith"
-version = "0.2.0"
+version = "0.2.1"
 description = "A Python toolkit and CLI for managing Asset Administration Shells"
 authors = [{ name = "Peter Stein", email = "peterstein@dfki.de" }]
 license = { file = "LICENSE" }

{shellsmith-0.2.0 → shellsmith-0.2.1}/src/shellsmith/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 from .crud.shells import (  # noqa: F401
     delete_shell,

{shellsmith-0.2.0 → shellsmith-0.2.1}/src/shellsmith/cli/commands/info.py

@@ -17,21 +17,25 @@ def print_unreferenced_submodels():
         print("⚠️ Unreferenced Submodels:")
         for submodel_id in submodel_ids:
             submodel = shellsmith.get_submodel(submodel_id)
-            id_short = submodel["idShort"]
+            id_short = submodel.get("idShort", "<no idShort>")
             print(f"- {id_short} ({submodel_id})")
 
 
 def print_shells_tree():
     shells = shellsmith.get_shells()
     for shell in shells:
-        print(f"{shell['idShort']}: {shell['id']}")
+        shell_id = shell['id']
+        shell_id_short = shell.get('idShort', "<no idShort>")
+        print(f"{shell_id_short}: {shell_id}")
 
-        submodels = services.get_shell_submodels(shell["id"])
+        submodels = services.get_shell_submodels(shell_id)
 
         for i, submodel in enumerate(submodels):
             is_last = i == len(submodels) - 1
             prefix = "└──" if is_last else "├──"
-            print(f"{prefix} {submodel['idShort']}: {submodel['id']}")
+            submodel_id = submodel['id']
+            submodel_id_short = submodel.get('idShort', "<no idShort>")
+            print(f"{prefix} {submodel_id}: {submodel_id_short}")
 
 
 def print_dangling_submodel_refs():
@@ -42,6 +46,7 @@ def print_dangling_submodel_refs():
         print("⚠️ Dangling Submodel References:")
         for shell_id, submodel_ids in dangling.items():
             shell = shellsmith.get_shell(shell_id)
-            print(f"- {shell['idShort']}: {shell_id}")
+            shell_id_short = shell.get('idShort', "<no idShort>")
+            print(f"- {shell_id_short}: {shell_id}")
             for submodel_id in submodel_ids:
                 print(f"  └── {submodel_id}")

{shellsmith-0.2.0 → shellsmith-0.2.1/src/shellsmith.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shellsmith
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python toolkit and CLI for managing Asset Administration Shells
 Author-email: Peter Stein <peterstein@dfki.de>
 License: MIT License

{shellsmith-0.2.0 → shellsmith-0.2.1}/tests/test_neo4j.py

@@ -3,16 +3,17 @@ import time
 
 import pytest
 
-from shellsmith import neo4j
-from shellsmith.upload import upload_aas_folder
-
 if not os.getenv("SHELLSMITH_NEO4J_ENABLED"):
     pytest.skip(
         reason="Skipping Neo4j tests. Set SHELLSMITH_NEO4J_ENABLED=1 to enable.",
         allow_module_level=True,
     )
 
-GRAPH_READY_TIMEOUT = 15  # seconds
+from shellsmith import neo4j, services
+from shellsmith.upload import upload_aas_folder
+
+
+GRAPH_READY_TIMEOUT = 45  # seconds
 EXPECTED_NODE_COUNT = 39
 EXPECTED_SUBMODEL_ELEMENT_COUNT = 17  # or whatever your total is
 
@@ -20,31 +21,40 @@ EXPECTED_SUBMODEL_ELEMENT_COUNT = 17  # or whatever your total is
 def wait_for_graph_node_count(
     expected_count: int = EXPECTED_NODE_COUNT,
     timeout: int = GRAPH_READY_TIMEOUT,
-) -> bool:
+) -> (bool, int):
     query = "MATCH (n) RETURN count(n) AS count"
     start = time.time()
 
+    last_count = 0
+
     while True:
         try:
             with neo4j.get_driver().session() as session:
                 result = session.run(query)
                 record = result.single()
-                if record and record["count"] == expected_count:
-                    return True
+                count = record["count"]
+                last_count = count
+                if record and count == expected_count:
+                    return True, last_count
         except Exception:  # noqa
             pass  # wait and retry
 
         if time.time() - start > timeout:
-            return False
+            return False, last_count
 
         time.sleep(0.5)
 
 
 def test_wait_for_graph():
-    neo4j.detach_delete_all()
-    assert wait_for_graph_node_count(0), "Graph was not fully destructed within timeout"
+    # neo4j.detach_delete_all()
+    services.delete_all_shells()
+    services.delete_all_submodels()
+    success, count = wait_for_graph_node_count(0)
+    assert success, f"Graph was not fully destructed within timeout: {count}"
+
     upload_aas_folder("aas")
-    assert wait_for_graph_node_count(39), "Graph was not fully built within timeout"
+    success, count = wait_for_graph_node_count(39)
+    assert success, f"Graph was not fully built within timeout: {count}"
     time.sleep(1)