s3dgraphy 1.6.0.dev106__tar.gz → 1.6.0.dev107__tar.gz

{s3dgraphy-1.6.0.dev106/src/s3dgraphy.egg-info → s3dgraphy-1.6.0.dev107}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev106
+Version: 1.6.0.dev107
 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.dev106 → s3dgraphy-1.6.0.dev107}/pyproject.toml

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

{s3dgraphy-1.6.0.dev106 → s3dgraphy-1.6.0.dev107}/src/s3dgraphy/JSON_config/s3Dgraphy_node_datamodel.json

@@ -2235,11 +2235,11 @@
       },
       "valid_view_types": {
         "matrix": "The matrix, or a slice of one epoch",
-        "scene3d": "A 3D scene (Heriverse / ATON). The embed points at the graph's published scene id or at a RepresentationModel — the scene is a GRAPH-level thing, not an epoch's: has_linked_resource does not admit an EpochNode as source, so an epoch has no EM-legal way to hold geometry.",
+        "scene3d": "A 3D scene: space and time. The embed points at a RepresentationModelNodeGroup (a container), at a document that publishes models (has_representation_model), at an EpochNode, or at the graph — and the scene is a VIEW computed from the graph when it is drawn (the models present in that scope, with the active alternative of each container, and the proxies of its units), never geometry the referenced node carries: an epoch still cannot HOLD geometry (has_linked_resource does not admit an EpochNode as source), but what the graph says is present in it can be shown. The block's options may keep a camera (the framing) and a still for print. A single RepresentationModel is still accepted on read.",
         "us": "A stratigraphic unit with its certainty qualia",
         "rm": "A representation model (RM / RMDoc)",
-        "document": "A document or image (Shelf / IIIF)",
-        "source": "A source together with its criticism",
+        "document": "The document itself, shown: its image (IIIF or file), its PDF page, its text or its 3D models, with the citation under it",
+        "source": "A document's USE in this graph: the extractors that read it, what they yield (property -> unit), and the criticism of the source",
         "paradata": "The evidence chain: source -> extractor -> property",
         "map": "Geographic placement (OSM)",
         "timeline": "A temporal axis of the narrated epochs",

{s3dgraphy-1.6.0.dev106 → s3dgraphy-1.6.0.dev107}/src/s3dgraphy/__init__.py

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

{s3dgraphy-1.6.0.dev106 → s3dgraphy-1.6.0.dev107}/src/s3dgraphy/exporter/latex_exporter.py

@@ -535,6 +535,14 @@ def export_narrative_latex(graph: Any, narrative_id: str, *,
                 key = cite(target)
                 name = getattr(target, "name", "") or ref
                 lines.append(f"\\noindent {latex_escape(name)}~\\cite{{{key}}}.")
+                # MICRO-NARRATIVE-MODULI p.19 · a document SHOWS the thing: the
+                # picture the client handed (its image, the still of its
+                # models) goes under its citation, as a figure
+                fkey = f"{view_type}:{getattr(target, 'node_id', '')}"
+                if (figures or {}).get(fkey):
+                    lines.append("")
+                    lines.append(_figure(target, view_type, "", figure_file(
+                        view_type, getattr(target, "node_id", ""), figure_suffix)))
             else:
                 options = getattr(block, "options", None) or {}
                 extra = ""

{s3dgraphy-1.6.0.dev106 → s3dgraphy-1.6.0.dev107}/src/s3dgraphy/narrative/bake.py

@@ -606,6 +606,18 @@ def bake_narrative(graph: Any, narrative_id: str, *,
                 baked_chapter.blocks.append(block)
                 continue
 
+            if rendered and view_type in CITED_VIEW_TYPES:
+                # MICRO-NARRATIVE-MODULI p.19 (E.D., 13 Nov 2026) · a DOCUMENT
+                # shows the thing: the client's picture of it (the still of its
+                # models, a page) is the citation's image — the document stays
+                # cited, with its entry in the references.
+                entry = add_citation(target)
+                baked_chapter.blocks.append(BakedBlock(
+                    kind="citation", text=entry["title"], ref=str(ref),
+                    view_type=view_type, image=figure,
+                    meta={"citation": entry, "rendered_by": "client"}))
+                continue
+
             if rendered:
                 # Somebody rendered it: it is a figure like any other, and every
                 # renderer already knows how to place a `kind="image"`.

{s3dgraphy-1.6.0.dev106 → s3dgraphy-1.6.0.dev107/src/s3dgraphy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3dgraphy
-Version: 1.6.0.dev106
+Version: 1.6.0.dev107
 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.dev106 → s3dgraphy-1.6.0.dev107}/tests/test_narrative_figures.py

@@ -369,3 +369,35 @@ def test_every_renderer_survives_a_figure_dict_full_of_nothing():
     baked = bake_narrative(graph, "NARR", figures=noise)
     kinds = {b.kind for c in baked.chapters for b in c.blocks}
     assert "image" not in kinds, "…and an unmatched key shows nothing"
+
+
+# ── MICRO-NARRATIVE-MODULI p.19 · a document shows the thing, and stays cited ──
+
+def test_a_document_with_a_client_figure_is_a_CITATION_that_carries_it():
+    """E.D., 13 Nov 2026: «Documento = mostra il contenuto». The client hands
+    the document's picture (its image, the still of its models); the block
+    stays a citation — the reference list keeps the entry — and carries it."""
+    doc = study()
+    doc["graph"]["nodes"].append({"id": "D7", "name": "D.07", "node_type": "document",
+                                  "description": "Maison Carrée, plan", "data": {}})
+    doc["graph"]["nodes"][-2]["data"]["chapters"][0]["blocks"].append(
+        {"block_type": "embed", "ref": "D7", "view_type": "document"})
+    baked = bake_narrative(graph_of(doc), "NARR",
+                          figures={figure_key("document", "D7"): PNG})
+    block = next(b for c in baked.chapters for b in c.blocks if b.ref == "D7")
+    assert block.kind == "citation", block.kind
+    assert block.image is not None and block.image.data == PNG
+    assert block.meta.get("rendered_by") == "client"
+    assert block.meta["citation"] in baked.citations, "the document stays in the references"
+
+
+def test_latex_puts_a_documents_figure_under_its_citation():
+    from s3dgraphy.exporter.latex_exporter import export_narrative_latex
+    doc = study()
+    doc["graph"]["nodes"].append({"id": "D7", "name": "D.07", "node_type": "document",
+                                  "description": "Maison Carrée, plan", "data": {}})
+    doc["graph"]["nodes"][-2]["data"]["chapters"][0]["blocks"].append(
+        {"block_type": "embed", "ref": "D7", "view_type": "document"})
+    out = export_narrative_latex(graph_of(doc), "NARR", figures={figure_key("document", "D7"): PNG})
+    tex = out["tex"]
+    assert "\\cite{" in tex and figure_file("document", "D7") in tex