pyarchinit-mini 2.4.6__tar.gz → 2.4.8__tar.gz

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8}/CHANGELOG.md

@@ -1,3 +1,39 @@
+## [2.4.8] - 2026-05-18
+
+### Fixed (IT)
+- `loadExistingData` (legacy loader) ora deduplica le relationship triple
+  `(from_us, to_us, relationship)` e suffissa gli ID Cytoscape che
+  collidono quando la stessa coppia compare con tipi diversi. Risolve
+  l'errore "Can not create second element with ID `edge_131_136`" che
+  abortiva l'intero forEach e lasciava il canvas senza archi.
+
+### Fixed (EN)
+- Legacy `loadExistingData` now deduplicates relationship triples and
+  suffixes colliding edge IDs. Fixes "second element with ID
+  edge_X_Y" errors that previously aborted edge loading.
+
+## [2.4.7] - 2026-05-18
+
+### Fixed (IT)
+- Editor swimlane carica anche gli edge da `us_relationships_table` (Spec 3-bis
+  ora unisce `us_table.rapporti` + tabella dedicata via EdgeRegistry). Risolve
+  "0 edges" su siti come Ravenna dove tutte le 1085+ relazioni stanno nella
+  tabella relationships e `rapporti` è vuoto.
+- Auto-fix sequence PostgreSQL al startup esteso a `periodizzazione_table`,
+  `period_table`, `us_relationships_table`, `harris_matrix_table`. Risolve
+  l'HTTP 500 "UniqueViolation periodizzazione_table_pkey" che bloccava il
+  Save Swimlane e di conseguenza l'export GraphML (il file scaricato era
+  vuoto perché la transazione era rollbacked).
+
+### Fixed (EN)
+- Swimlane editor now reads edges from `us_relationships_table` too, not
+  just `us_table.rapporti`. Fixes "0 edges" on sites where everything is
+  in the dedicated relationships table.
+- PostgreSQL sequence auto-sync extended to periodizzazione_table,
+  period_table, us_relationships_table, harris_matrix_table. Fixes the
+  HTTP 500 UniqueViolation that blocked Save Swimlane / GraphML export
+  on Adarte.
+
 ## [2.4.6] - 2026-05-18
 
 ### Fixed (IT)

{pyarchinit_mini-2.4.6/pyarchinit_mini.egg-info → pyarchinit_mini-2.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.4.6
+Version: 2.4.8
 Summary: Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer
 Home-page: https://github.com/enzococca/pyarchinit-mini
 Author: PyArchInit Team

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8}/pyarchinit_mini/__init__.py

@@ -23,7 +23,7 @@ Features:
 - Scalable and modular architecture
 """
 
-__version__ = "2.4.6"
+__version__ = "2.4.8"
 __author__ = "PyArchInit Team"
 __email__ = "enzo.ccc@gmail.com"
 

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8}/pyarchinit_mini/database/migrations/__init__.py

@@ -777,6 +777,11 @@ class DatabaseMigrations:
                             ('us_table', 'id_us', 'us_table_id_us_seq'),
                             ('inventario_materiali_table', 'id_invmat', 'inventario_materiali_table_id_invmat_seq'),
                             ('users', 'id', 'users_id_seq'),
+                            # Spec-3-bis & QGIS pyarchinit interop
+                            ('periodizzazione_table', 'id_perfas', 'periodizzazione_table_id_perfas_seq'),
+                            ('period_table', 'id_period', 'period_table_id_period_seq'),
+                            ('us_relationships_table', 'id_relationship', 'us_relationships_table_id_relationship_seq'),
+                            ('harris_matrix_table', 'id_matrix', 'harris_matrix_table_id_matrix_seq'),
                         ]:
                             try:
                                 max_id = session.execute(text(f'SELECT MAX({pk}) FROM {table}')).scalar() or 0

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8}/pyarchinit_mini/harris_swimlane/swimlane_state.py

@@ -179,8 +179,12 @@ class SwimlaneState:
                 classes="swimlane",
             ))
 
-        # Build edges from rapporti via EdgeRegistry
+        # Build edges from rapporti (legacy text) AND us_relationships_table
+        # (dedicated table — pyarchinit's primary store for relationships).
         edges = SwimlaneState._build_edges(us_rows, us_num_to_node_id)
+        edges.extend(SwimlaneState._build_edges_from_relationships_table(
+            session, site, us_num_to_node_id, existing=edges,
+        ))
 
         return EditorState(
             site=site,
@@ -269,6 +273,91 @@ class SwimlaneState:
 
         return edges
 
+    @staticmethod
+    def _build_edges_from_relationships_table(
+        session: Session, site: str, us_num_to_node_id: dict, *, existing
+    ) -> list[CytoscapeElement]:
+        """Read stratigraphic relationships from ``us_relationships_table``.
+
+        pyarchinit stores edges in a dedicated table (``us_from`` / ``us_to``
+        / ``relationship_type``) — for sites like Ravenna with 1000+
+        relationships, ``us_table.rapporti`` text is empty and everything
+        lives here. We translate ``relationship_type`` through the same
+        VocabProvider alias mapping used for ``rapporti`` tokens, and the
+        same dedupe / inverse-pair rules apply.
+        """
+        try:
+            from pyarchinit_mini.graphproj.edge_registry import EdgeRegistry
+            registry = EdgeRegistry()
+        except Exception:
+            return []
+
+        SYMMETRIC = {"has_same_time"}
+        INVERSE_PAIRS = {"overlies": "is_after", "is_after": "overlies"}
+
+        # Seed seen-set with edges already produced from rapporti so we don't
+        # duplicate the same relation across the two sources.
+        seen: set[tuple] = set()
+        for el in existing:
+            ename = el.data.get("label")
+            s = el.data.get("source")
+            t = el.data.get("target")
+            if not ename or not s or not t:
+                continue
+            if ename in SYMMETRIC:
+                seen.add((ename, tuple(sorted((s, t)))))
+            else:
+                seen.add((ename, s, t))
+
+        try:
+            rows = session.execute(text(
+                "SELECT us_from, us_to, relationship_type "
+                "FROM us_relationships_table WHERE sito = :sito"
+            ), {"sito": site}).fetchall()
+        except Exception:
+            return []
+
+        out: list[CytoscapeElement] = []
+        edge_counter = len(existing)
+
+        for r in rows:
+            us_from, us_to, rel_type = r[0], r[1], r[2]
+            if not rel_type:
+                continue
+            try:
+                u_from_int = int(us_from)
+                u_to_int = int(us_to)
+            except (ValueError, TypeError):
+                continue
+            source_id = us_num_to_node_id.get(u_from_int)
+            target_id = us_num_to_node_id.get(u_to_int)
+            if not source_id or not target_id:
+                continue
+
+            edge_name = registry.resolve_italian_alias(str(rel_type)) or rel_type
+
+            if edge_name in SYMMETRIC:
+                key = (edge_name, tuple(sorted((source_id, target_id))))
+            else:
+                key = (edge_name, source_id, target_id)
+            if key in seen:
+                continue
+            inverse_name = INVERSE_PAIRS.get(edge_name)
+            if inverse_name is not None:
+                inverse_key = (inverse_name, target_id, source_id)
+                if inverse_key in seen:
+                    continue
+            seen.add(key)
+
+            edge_counter += 1
+            out.append(CytoscapeElement(data={
+                "id": f"e{edge_counter}",
+                "source": source_id,
+                "target": target_id,
+                "label": edge_name,
+            }))
+        return out
+
     @staticmethod
     def save(session: Session, site: str, state: dict) -> SaveResult:
         """Apply pending_changes to DB. Transaction-wrapped.

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8}/pyarchinit_mini/web_interface/static/js/harris_creator_editor.js

@@ -752,41 +752,57 @@ function loadExistingData() {
             });
         });
 
-        // Add edges
+        // Add edges. pyarchinit may store multiple relationship rows between
+        // the same (from_us, to_us) pair (e.g. 'copre' + 'taglia'); Cytoscape
+        // requires unique element IDs, so we suffix collisions and dedupe
+        // the exact same triple. Without this guard the whole forEach aborted
+        // on the first duplicate and no edges were ever rendered.
+        const seenEdgeKeys = new Set();
+        let dupCounter = 0;
         relationships.forEach(relData => {
-            // Convert to strings for comparison (database may store as integers)
             const fromUsStr = String(relData.from_us);
             const toUsStr = String(relData.to_us);
 
             const sourceNode = cy.nodes().filter(n => String(n.data('us_number')) === fromUsStr).first();
             const targetNode = cy.nodes().filter(n => String(n.data('us_number')) === toUsStr).first();
 
-            if (sourceNode.length && targetNode.length) {
-                // Bilingual matching: support both Italian (symbol) and English (value) names
-                const relType = relationshipTypes.find(r =>
-                    r.symbol === relData.relationship || r.value === relData.relationship
-                ) || relationshipTypes[0];
-
-                // Determine edge category from the relationship name
-                const edgeCategory = getEdgeCategory(relData.relationship);
-
-                cy.add({
-                    group: 'edges',
-                    data: {
-                        id: `edge_${relData.from_us}_${relData.to_us}`,
-                        source: sourceNode.id(),
-                        target: targetNode.id(),
-                        label: relType.symbol,
-                        relationship: relData.relationship,
-                        relationshipType: relType.value,  // Store English value for saving
-                        edgeCategory: edgeCategory,
-                        style: relType.style,
-                        arrow: relType.arrow
-                    }
-                });
-            } else {
+            if (!sourceNode.length || !targetNode.length) {
                 console.warn('Could not find nodes for relationship:', relData);
+                return;
+            }
+
+            const relType = relationshipTypes.find(r =>
+                r.symbol === relData.relationship || r.value === relData.relationship
+            ) || relationshipTypes[0];
+            const edgeCategory = getEdgeCategory(relData.relationship);
+
+            // Triple key (from, to, type) deduplicates true repeats.
+            const tripleKey = `${fromUsStr}|${toUsStr}|${relData.relationship || ''}`;
+            if (seenEdgeKeys.has(tripleKey)) return;
+            seenEdgeKeys.add(tripleKey);
+
+            // Build a unique element ID; suffix collisions when (from,to) pair
+            // is reused with a different relationship type.
+            let edgeId = `edge_${relData.from_us}_${relData.to_us}`;
+            if (cy.getElementById(edgeId).length > 0) {
+                dupCounter += 1;
+                edgeId = `${edgeId}_${dupCounter}`;
             }
+
+            cy.add({
+                group: 'edges',
+                data: {
+                    id: edgeId,
+                    source: sourceNode.id(),
+                    target: targetNode.id(),
+                    label: relType.symbol,
+                    relationship: relData.relationship,
+                    relationshipType: relType.value,
+                    edgeCategory: edgeCategory,
+                    style: relType.style,
+                    arrow: relType.arrow
+                }
+            });
         });
 
         // Apply automatic layout

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8/pyarchinit_mini.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.4.6
+Version: 2.4.8
 Summary: Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer
 Home-page: https://github.com/enzococca/pyarchinit-mini
 Author: PyArchInit Team

{pyarchinit_mini-2.4.6 → pyarchinit_mini-2.4.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyarchinit-mini"
-version = "2.4.6"
+version = "2.4.8"
 description = "Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer"
 readme = "README.md"
 license = {text = "GPL-2.0"}