s3dgraphy 1.6.0.dev56__tar.gz → 1.6.0.dev57__tar.gz

{s3dgraphy-1.6.0.dev56/src/s3dgraphy.egg-info → s3dgraphy-1.6.0.dev57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev56
+Version: 1.6.0.dev57
 Summary: 3D Stratigraphic Graph Management Library for archaeological and heritage applications
 Author-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>
 Maintainer-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>

{s3dgraphy-1.6.0.dev56 → s3dgraphy-1.6.0.dev57}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "s3dgraphy"
-version = "1.6.0.dev56"
+version = "1.6.0.dev57"
 description = "3D Stratigraphic Graph Management Library for archaeological and heritage applications"
 readme = "README.md"
 requires-python = ">=3.9"

{s3dgraphy-1.6.0.dev56 → s3dgraphy-1.6.0.dev57}/src/s3dgraphy/JSON_config/em_visual_rules.json

@@ -1,6 +1,6 @@
 {
   "formal_language": "EM",
-  "version": "1.6.35",
+  "version": "1.6.36",
   "_note_material_vs_qualia_color": [
     "DUE COSE DIVERSE CHE SI CHIAMANO ENTRAMBE color. Non confonderle: e gia successo.",
     "1) QUI, in node_styles.<tipo>.style.material.rgba_color — il COLORE DEL MATERIALE BLENDER del proxy 3D, in float LINEARI. UNA sola chiave: `rgba_color`. Fino a S8 il file ne usava due (`color` sui 13 tipi stratigrafici, `rgba_color` sugli altri) e get_material_color() ne leggeva una sola, restituendo None per 21 tipi su 38; ora sono unificate e la vecchia `color` e letta solo come tolleranza verso file scritti prima. Un tipo che non diventa mai una mesh NON ha material affatto (i contenitori di gruppo, e da S7 i dieci nodi che rendono per icona): per loro get_material_color() torna None, ed e corretto.",
@@ -9,6 +9,7 @@
     "In breve: qui si decide di che colore DISEGNARE una US; li si registra di che colore ERA."
   ],
   "_changelog": {
+    "1.6.36": "THE RM IS BOUND TO THE EPOCH ONLY DIRECTLY (MICRO lo spazio 3D 2, Parte 0, E.D. 16 Oct 2026). threed_instances.representation_model loses `via_property`: an epoch reaches its model only by a direct has_representation_model, the one form the connections datamodel admits (a property is not a source of has_representation_model) and the only one in the data (the 99 RMs of Templu Mare v2). «×N» counts the epochs bound directly.",
     "1.6.35": "RM AND PROXY AMONG THE COMPUTED INSTANCES (MICRO lo spazio 3D, E.D. 11 Oct 2026). New block threed_instances: the proxy of a unit (geometry property → has_semantic_shape → SemanticShape) is drawn in the paradata group of the property, beside it; a representation model is drawn in the paradata group of each epoch that has it (has_representation_model, directly or through an epoch property), with the number of its epochs («×N»). A view: nothing in em.json or RDF. Read by s3dgraphy.paradata_view.threed_instances and units_without_3d.",
     "1.6.34": "THE AUTHOR AS AN INSTANCE (MICRO le entità spaziotemporali, decided by E.D. 10 Oct 2026: documents, authors and units are spatiotemporal entities, and an author «si istanzia come avviene con i documenti»). paradata_instances gains `authorship`: the author of a reader of the group (the extractor, or the combiner and the extractors it combines) reached by has_author, when the author is not itself a member of the group, is drawn inside the group as an INSTANCE of kind `author`, with the badge of the epoch where the author begins (has_first_epoch). Still a view: nothing is written in em.json or RDF. s3dgraphy.paradata_view.view_instances reads it.",
     "1.6.32": "THE GLYPHS OF THE 3D OBJECTS (MICRO «grafo reattivo», G9, 9 Oct 2026; drawings approved by E.D. on 6 Oct, APPROVATE.md). representation_model, representation_model_doc (the checkered picture seen three-quarters, with its frame's depth and a shadow on the ground: an image PLACED in 3D space) and representation_model_sf replace the three identical Font Awesome cubes of src/2D/ and join `2d_render_glyph_types.types`; proxy, tileset, container (the RM container, RepresentationModelNodeGroup) and the four versions version:gltf / version:mesh / version:tiles / version:scene are new files, resolved from the node's DATA by the new table `2d_render_glyph_types.data_glyphs` (keyed like dtc:<kind>; its rule is written in its _comment, measured on Templu Mare v2). All ten in the DTC frame (circle r 41.14, viewBox 87.12) with the 2×2 checker of the EMtools icons: the checker colours are `accent`, never recoloured; black `ink`, white `paper`, the grey of the picture's frame `ground`, the shadow `halo`. NEW in the layer format: `frame: true` marks the layers of the frame circle (its `paper` fill and its `ink` stroke), and the entry's `frameless_box` is the box of everything else — below 24 px a consumer may skip the frame and fit that box instead (docs/drawing-a-glyph.md §5). Additive: no existing glyph changed.",
@@ -6241,7 +6242,7 @@
     }
   },
   "threed_instances": {
-    "_comment": "1.6.35 (MICRO lo spazio 3D, E.D. 11 Oct 2026: «nel grafo, la presenza del 3D visibile accanto alle unità e alle epoche»). The representation models and the proxies join the computed instances, and like them they are a VIEW: nothing is written in em.json or RDF. PROXY: the property of type `geometry` of a unit reaches by `has_semantic_shape` the SemanticShape (the proxy, its glb a `proxy_model` resource by `has_linked_resource`); the view draws the shape in the paradata group of the property — its own `is_in_paradata_nodegroup`, else the group of its original owner (`has_paradata_nodegroup`) — BESIDE the property. RM: an epoch reaches its model by `has_representation_model`, directly or through one of its properties (both read; the data measured on 16 Oct 2026 carry only the direct edge); the view draws the model in the epoch's paradata group, and when the same model is in N epochs every instance carries N («×N»). With no group, `place` is the owner itself (the unit, the epoch). The reference implementation is s3dgraphy.paradata_view.threed_instances; units_without_3d answers which units have a proxy, a geometry without payload, or none.",
+    "_comment": "1.6.35 (MICRO lo spazio 3D, E.D. 11 Oct 2026: «nel grafo, la presenza del 3D visibile accanto alle unità e alle epoche»). The representation models and the proxies join the computed instances, and like them they are a VIEW: nothing is written in em.json or RDF. PROXY: the property of type `geometry` of a unit reaches by `has_semantic_shape` the SemanticShape (the proxy, its glb a `proxy_model` resource by `has_linked_resource`); the view draws the shape in the paradata group of the property — its own `is_in_paradata_nodegroup`, else the group of its original owner (`has_paradata_nodegroup`) — BESIDE the property. RM: an epoch reaches its model by a direct `has_representation_model` (1.6.36: the road through an epoch property is gone, the connections datamodel does not admit it); the view draws the model in the epoch's paradata group, and when the same model is in N epochs every instance carries N («×N»). With no group, `place` is the owner itself (the unit, the epoch). The reference implementation is s3dgraphy.paradata_view.threed_instances; units_without_3d answers which units have a proxy, a geometry without payload, or none.",
     "proxy": {
       "kind": "proxy",
       "owner_edge": "has_property",
@@ -6257,7 +6258,6 @@
       "kind": "rm",
       "holders": ["EpochNode"],
       "edge": "has_representation_model",
-      "via_property": "has_property",
       "masters": ["RepresentationModelNode", "RepresentationModelDocNode", "RepresentationModelSpecialFindNode"],
       "group_edge": "has_paradata_nodegroup",
       "count_word": "×{n}"

{s3dgraphy-1.6.0.dev56 → s3dgraphy-1.6.0.dev57}/src/s3dgraphy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.6.0.dev56"
+__version__ = "1.6.0.dev57"
 __datamodel_version__ = "1.5.5"  # s3Dgraphy connections datamodel version
 
 # s3Dgraphy/__init__.py

{s3dgraphy-1.6.0.dev56 → s3dgraphy-1.6.0.dev57}/src/s3dgraphy/paradata_view.py

@@ -372,17 +372,16 @@ def rm_instances(graph) -> List[Dict[str, Any]]:
     """The representation models of the epochs, as instances::
 
         {id, kind: "rm", master, node_type, name, owner, owner_kind: "epoch",
-         owner_name, via, group, place, epochs, count, count_label, removed}
+         owner_name, group, place, epochs, count, count_label, removed}
 
-    One per (model, epoch). ``via`` the epoch property the link passes
-    through (None when the epoch reaches the model directly); ``epochs`` every
+    One per (model, epoch), for a direct ``has_representation_model`` only
+    (1.6.36: the connections datamodel admits no other form); ``epochs`` every
     epoch the model is in, ``count`` how many, ``count_label`` the rule's word
     («×3») when there are more than one.
     """
     spec = dict(threed_rule().get("representation_model") or {})
     holders = spec.get("holders") or ["EpochNode"]
     edge = spec.get("edge") or "has_representation_model"
-    via_prop = spec.get("via_property") or "has_property"
     masters = spec.get("masters") or ["RepresentationModelNode", "RepresentationModelDocNode",
                                       "RepresentationModelSpecialFindNode"]
     word = spec.get("count_word") or "×{n}"
@@ -391,12 +390,7 @@ def rm_instances(graph) -> List[Dict[str, Any]]:
     for holder in graph.nodes:
         if _removed(holder) or _class_of(holder, holders) is None:
             continue
-        reached = [(rm, None) for rm in _out(graph, holder.node_id, edge)]
-        for pid in _out(graph, holder.node_id, via_prop):
-            prop = graph.find_node_by_id(pid)
-            if prop is not None and not _removed(prop):
-                reached += [(rm, pid) for rm in _out(graph, pid, edge)]
-        for rm_id, via in reached:
+        for rm_id in _out(graph, holder.node_id, edge):
             rm = graph.find_node_by_id(rm_id)
             if rm is None or _class_of(rm, masters) is None:
                 continue
@@ -405,7 +399,7 @@ def rm_instances(graph) -> List[Dict[str, Any]]:
                 continue
             if rm_id not in order:
                 order.append(rm_id)
-            mine.append({"owner": holder.node_id, "via": via})
+            mine.append({"owner": holder.node_id})
     out: List[Dict[str, Any]] = []
     for rm_id in order:
         rm = graph.find_node_by_id(rm_id)
@@ -413,7 +407,7 @@ def rm_instances(graph) -> List[Dict[str, Any]]:
         n = len(epochs)
         for x in links[rm_id]:
             epoch = graph.find_node_by_id(x["owner"])
-            group = _place(graph, x["owner"], x["via"], spec)
+            group = _place(graph, x["owner"], None, spec)
             place = group or x["owner"]
             out.append({
                 "id": threed_instance_id(rm_id, place), "kind": spec.get("kind") or "rm",
@@ -421,7 +415,7 @@ def rm_instances(graph) -> List[Dict[str, Any]]:
                 "name": getattr(rm, "name", rm_id),
                 "owner": x["owner"], "owner_kind": "epoch",
                 "owner_name": getattr(epoch, "name", x["owner"]),
-                "via": x["via"], "group": group, "place": place,
+                "group": group, "place": place,
                 "epochs": list(epochs), "count": n,
                 "count_label": word.format(n=n) if n > 1 else None,
                 "removed": _removed(rm)})

{s3dgraphy-1.6.0.dev56 → s3dgraphy-1.6.0.dev57/src/s3dgraphy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev56
+Version: 1.6.0.dev57
 Summary: 3D Stratigraphic Graph Management Library for archaeological and heritage applications
 Author-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>
 Maintainer-email: Emanuel Demetrescu <emanuel.demetrescu@cnr.it>

{s3dgraphy-1.6.0.dev56 → s3dgraphy-1.6.0.dev57}/tests/test_threed_instances.py

@@ -3,8 +3,8 @@
 
 The proxy of a unit is drawn in the paradata group of its geometry property,
 beside the property; a representation model in the paradata group of every epoch
-that has it — directly or through an epoch property — with the number of its
-epochs. A view: the graph is only read. ``units_without_3d`` says which units a
+bound to it directly (1.6.36: not through an epoch property) — with the number of
+its epochs. A view: the graph is only read. ``units_without_3d`` says which units a
 proxy can be given to.
 """
 
@@ -47,19 +47,12 @@ def _templum() -> Graph:
     g.add_edge("s4", "P4", "S4", "has_semantic_shape")
     # US 5: no geometry
     g.add_node(StratigraphicUnit("US5", name="US 5"))
-    # RM_A in three epochs (E1 direct, E2 direct, E3 through a property);
-    # RM_B in one
+    # RM_A in three epochs, RM_B in one, all bound directly
     g.add_node(RepresentationModelNode("RM_A", name="cella"))
     g.add_node(RepresentationModelNode("RM_B", name="pronao"))
     g.add_edge("r1", "E1", "RM_A", "has_representation_model")
     g.add_edge("r2", "E2", "RM_A", "has_representation_model")
-    g.add_node(PropertyNode("PE3", name="modello", value="RM_A"))
-    g.add_edge("hpe3", "E3", "PE3", "has_property")
-    g.add_edge("r3", "PE3", "RM_A", "has_representation_model")
-    # the connections datamodel does not let a property be the source of
-    # has_representation_model (add_edge degrades it to generic_connection):
-    # the rule still reads the form, as an em.json written by hand carries it
-    g.find_edge_by_id("r3").edge_type = "has_representation_model"
+    g.add_edge("r3", "E3", "RM_A", "has_representation_model")
     g.add_edge("r4", "E3", "RM_B", "has_representation_model")
     return g
 
@@ -98,11 +91,24 @@ def test_a_model_in_three_epochs_says_x3_in_each():
     assert {r["count"] for r in a.values()} == {3}
     assert {r["count_label"] for r in a.values()} == {"×3"}
     assert a["E1"]["group"] == "PD_E1" and a["E1"]["id"] == "RM_A##PD_E1"
-    assert a["E3"]["via"] == "PE3" and a["E1"]["via"] is None
     (b,) = [r for r in rms if r["master"] == "RM_B"]
     assert b["count"] == 1 and b["count_label"] is None and b["owner"] == "E3"
 
 
+def test_a_model_through_an_epoch_property_is_not_an_instance():
+    # 1.6.36: the connections datamodel does not let a property be the source
+    # of has_representation_model; an em.json written by hand with that form
+    # gives no instance (and no «×N»)
+    g = Graph(graph_id="by-hand")
+    g.add_node(EpochNode("E1", "I d.C.", 1, 100))
+    g.add_node(RepresentationModelNode("RM_C", name="podio"))
+    g.add_node(PropertyNode("PE1", name="modello", value="RM_C"))
+    g.add_edge("hpe1", "E1", "PE1", "has_property")
+    g.add_edge("rc", "PE1", "RM_C", "has_representation_model")
+    g.find_edge_by_id("rc").edge_type = "has_representation_model"
+    assert [r for r in api.threed_instances(g) if r["kind"] == "rm"] == []
+
+
 def test_units_without_3d():
     g = _templum()
     u = api.units_without_3d(g)
@@ -141,3 +147,4 @@ def test_the_rule_is_in_the_visual_rules():
     assert block["id"] == "{master}##{place}"
     assert block["proxy"]["shape_edge"] == "has_semantic_shape"
     assert block["representation_model"]["count_word"] == "×{n}"
+    assert "via_property" not in block["representation_model"]