pyarchinit-mini 2.4.3__tar.gz → 2.4.4__tar.gz

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/CHANGELOG.md

@@ -1,3 +1,45 @@
+## [2.4.4] - 2026-05-18
+
+### Fixed (IT)
+- Nodi US dell'editor swimlane ora hanno `data.color` (risolto via
+  `VocabProvider.get_visual_style().fill_color`). Stop ai warning Cytoscape
+  "no mapping for property background-color with data field color".
+- Edge stratigrafici deduplicati: `_build_edges` ora ignora le coppie
+  doppie `(source, target, edge_name)` e tratta gli inversi `overlies` /
+  `is_after` come la stessa relazione (un solo arco invece di due).
+- Editor lancia un layout `dagre` dopo `cy.add()` + `cy.fit()`, così gli US
+  si distribuiscono dentro le row e gli archi diventano visibili.
+
+### Added (IT)
+- Modelli SQLAlchemy `US`, `InventarioMateriali`, `Periodizzazione` ora
+  definiscono la colonna `node_uuid = Column(String(36))`. Un DB nuovo
+  creato via `Base.metadata.create_all()` nasce con la colonna corretta.
+- `DatabaseMigrations.migrate_all_tables()` chiama automaticamente le 3
+  migration di Spec 1 (`_2026_05_node_uuid_schema`, `_node_uuid_backfill`,
+  `_vocab_alignment`) idempotentemente. Conseguenza: i DB esistenti
+  (SQLite o PostgreSQL) vengono aggiornati al primo avvio del web —
+  nessun bisogno di lanciare manualmente `pyarchinit-mini-migrate-vocab`.
+
+### Fixed (EN)
+- US nodes in the swimlane editor now carry `data.color`, resolved through
+  `VocabProvider.get_visual_style().fill_color`. Eliminates Cytoscape
+  warnings about missing color mapping.
+- Stratigraphic edges deduplicated: `_build_edges` ignores duplicate
+  `(source, target, edge_name)` triples and treats `overlies` / `is_after`
+  inverse pairs as the same edge (one arrow, not two).
+- Editor runs a `dagre` layout after `cy.add()` plus a `cy.fit()` so US
+  children spread inside their swimlane row and edges become visible.
+
+### Added (EN)
+- SQLAlchemy models `US`, `InventarioMateriali`, `Periodizzazione` now
+  declare `node_uuid = Column(String(36))`. New DBs created via
+  `Base.metadata.create_all()` have the column from the start.
+- `DatabaseMigrations.migrate_all_tables()` now invokes the 3 Spec 1
+  migrations (`node_uuid_schema`, `node_uuid_backfill`, `vocab_alignment`)
+  idempotently. Existing SQLite or PostgreSQL DBs get auto-upgraded on
+  the first web startup — no need to run `pyarchinit-mini-migrate-vocab`
+  by hand.
+
 ## [2.4.3] - 2026-05-18
 
 ### Fixed (IT)

{pyarchinit_mini-2.4.3/pyarchinit_mini.egg-info → pyarchinit_mini-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.4.3
+Version: 2.4.4
 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.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/__init__.py

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

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/database/migrations/__init__.py

@@ -803,6 +803,14 @@ class DatabaseMigrations:
             except Exception as e:
                 logger.warning(f"TMA thesaurus trigger failed: {e}")
 
+            # Spec 1 (node_uuid + vocab alignment) — auto-applied so fresh
+            # installs and upgraded existing DBs both get the swimlane editor
+            # working without a manual `pyarchinit-mini-migrate-vocab` step.
+            try:
+                total_migrations += self._migrate_spec1_node_uuid_and_vocab()
+            except Exception as e:
+                logger.warning(f"Spec 1 node_uuid/vocab migration failed: {e}")
+
             logger.info(f"All migrations completed. Total migrations applied: {total_migrations}")
             return total_migrations
 
@@ -810,6 +818,37 @@ class DatabaseMigrations:
             logger.error(f"Error during database migrations: {e}")
             raise
 
+    def _migrate_spec1_node_uuid_and_vocab(self) -> int:
+        """Apply Spec 1 migrations idempotently: node_uuid schema, backfill,
+        vocab alignment (USVA/USVB→USVs, USVC→USVn). Each underlying script
+        is a no-op when nothing needs changing, so this is safe to call on
+        every startup."""
+        import importlib
+
+        pkg = "pyarchinit_mini.database.migrations"
+        scripts = [
+            f"{pkg}._2026_05_node_uuid_schema",
+            f"{pkg}._2026_05_node_uuid_backfill",
+            f"{pkg}._2026_05_vocab_alignment",
+        ]
+        url = str(self.connection.engine.url)
+        applied = 0
+        for mod_path in scripts:
+            try:
+                mod = importlib.import_module(mod_path)
+                report = mod.run(url, dry_run=False)
+                status = getattr(report, "status", "ok")
+                if status == "ok":
+                    rows = getattr(report, "rows_updated", None)
+                    tables = getattr(report, "tables_changed", None)
+                    mappings = getattr(report, "mappings", None)
+                    if rows or tables or mappings:
+                        applied += 1
+                        logger.info(f"{mod_path}: {tables or rows or mappings}")
+            except Exception as e:
+                logger.warning(f"{mod_path} failed: {e}")
+        return applied
+
     def get_table_info(self, table_name: str) -> Dict[str, Any]:
         """Get information about a table structure"""
         try:

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/harris_swimlane/swimlane_state.py

@@ -52,6 +52,27 @@ class SwimlaneState:
         provider = RowProvider(session, site)
         rows = provider.list_rows()
 
+        # Resolve unit_type → fill_color via VocabProvider once per request so
+        # the editor's `'background-color': data(color)` style renders properly.
+        try:
+            from pyarchinit_mini.vocab.provider import VocabProvider
+            _vocab = VocabProvider.instance()
+            _color_cache: dict[str, str] = {}
+
+            def _color_for(ut: str) -> str:
+                if ut in _color_cache:
+                    return _color_cache[ut]
+                try:
+                    style = _vocab.get_visual_style(ut)
+                    c = getattr(style, "fill_color", None) or "#CCCCCC"
+                except Exception:
+                    c = "#CCCCCC"
+                _color_cache[ut] = c
+                return c
+        except Exception:
+            def _color_for(ut: str) -> str:
+                return "#CCCCCC"
+
         # Load US records for site
         us_rows = session.execute(text(
             "SELECT id_us, sito, area, us, unita_tipo, rapporti, node_uuid, "
@@ -89,6 +110,7 @@ class SwimlaneState:
                     "label": f"{unita_tipo}{us_num}",
                     "parent": parent_row_id,
                     "unit_type": unita_tipo,
+                    "color": _color_for(unita_tipo),
                     "period": periodo,
                     "phase": fase,
                     "us": us_num,
@@ -124,15 +146,33 @@ class SwimlaneState:
 
     @staticmethod
     def _build_edges(us_rows, us_num_to_node_id: dict) -> list[CytoscapeElement]:
-        """Parse rapporti for each US via EdgeRegistry (Spec 1)."""
+        """Parse rapporti for each US via EdgeRegistry, deduplicating canonical
+        triples ``(source, target, edge_name)``.
+
+        pyarchinit stores stratigraphic relationships from both sides
+        (``A copre B`` on row A AND ``B coperto da A`` on row B). Both tokens
+        resolve to the same canonical edge ``A overlies B`` — without
+        deduplication the editor renders the same arrow twice.
+
+        Symmetric edge types (``has_same_time``) are deduped on the
+        unordered pair so the bidirectional view doesn't show 2 lines.
+        """
         try:
             from pyarchinit_mini.graphproj.edge_registry import EdgeRegistry
             registry = EdgeRegistry()
         except Exception:
             return []
 
+        # Edges where direction is meaningless (twins).
+        SYMMETRIC = {"has_same_time"}
+        # Edges that are inverses of each other (A overlies B ≡ B is_after A
+        # in stratigraphic Harris semantics). When pyarchinit stores both
+        # sides on different US rows, the editor must show one arrow, not two.
+        INVERSE_PAIRS = {"overlies": "is_after", "is_after": "overlies"}
+
         edges: list[CytoscapeElement] = []
         edge_counter = 0
+        seen: set[tuple] = set()
 
         for r in us_rows:
             us_num = r[3]
@@ -157,6 +197,22 @@ class SwimlaneState:
                 target_node_id = us_num_to_node_id.get(target_int)
                 if target_node_id is None:
                     continue
+
+                if edge_name in SYMMETRIC:
+                    key = (edge_name, tuple(sorted((source_node_id, target_node_id))))
+                else:
+                    key = (edge_name, source_node_id, target_node_id)
+                if key in seen:
+                    continue
+                # Check the inverse pair (overlies vs is_after) under the same
+                # source/target pair — they represent the same edge.
+                inverse_name = INVERSE_PAIRS.get(edge_name)
+                if inverse_name is not None:
+                    inverse_key = (inverse_name, target_node_id, source_node_id)
+                    if inverse_key in seen:
+                        continue
+                seen.add(key)
+
                 edge_counter += 1
                 edges.append(CytoscapeElement(data={
                     "id": f"e{edge_counter}",

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/models/harris_matrix.py

@@ -92,7 +92,10 @@ class Periodizzazione(BaseModel):
     # Confidence and notes
     affidabilita = Column(String(50))       # 'alta', 'media', 'bassa'
     note = Column(Text)
-    
+
+    # Spec 1: stable node identity for s3dgraphy/EM graph round-trip
+    node_uuid = Column(String(36))
+
     # Relationships
     site_ref = relationship("Site", foreign_keys=[sito])
     initial_period = relationship("Period", foreign_keys=[period_id_initial])

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/models/inventario_materiali.py

@@ -97,6 +97,9 @@ class InventarioMateriali(BaseModel):
     photo_id = Column(Text)
     drawing_id = Column(Text)
 
+    # Spec 1: stable node identity for s3dgraphy/EM graph round-trip
+    node_uuid = Column(String(36))
+
     # Relationships
     site_ref = relationship("Site", foreign_keys=[sito],
                            primaryjoin="InventarioMateriali.sito == Site.sito")

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/models/us.py

@@ -196,8 +196,11 @@ class US(BaseModel):
     rapporti2 = Column(Text)
     doc_usv = Column(Text)
 
+    # Spec 1: stable node identity for s3dgraphy/EM graph round-trip
+    node_uuid = Column(String(36))
+
     # Relationships
-    site_ref = relationship("Site", foreign_keys=[sito], 
+    site_ref = relationship("Site", foreign_keys=[sito],
                            primaryjoin="US.sito == Site.sito")
     
     def __repr__(self):

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4}/pyarchinit_mini/web_interface/templates/harris_creator/editor.html

@@ -519,6 +519,25 @@ function renderSwimlaneState(state) {
         });
     });
 
+    // Run dagre layout inside each swimlane row so US nodes spread out
+    // horizontally and stratigraphic edges become visible. Without a layout
+    // pass, all US children of a row get stacked at the row's centroid and
+    // the edges collapse into invisible zero-length segments.
+    try {
+        cy.layout({
+            name: 'dagre',
+            rankDir: 'LR',
+            nodeSep: 50,
+            rankSep: 80,
+            fit: false,
+        }).run();
+    } catch (e) {
+        console.warn('dagre layout failed, falling back to grid:', e);
+        cy.layout({name: 'grid'}).run();
+    }
+    // Fit viewport so the user actually sees the rows + nodes + edges.
+    cy.fit(undefined, 30);
+
     // Save state references for later use
     window._currentSite = state.site;
     window._pendingChanges = state.pending_changes || {

{pyarchinit_mini-2.4.3 → pyarchinit_mini-2.4.4/pyarchinit_mini.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.4.3
+Version: 2.4.4
 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.3 → pyarchinit_mini-2.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyarchinit-mini"
-version = "2.4.3"
+version = "2.4.4"
 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"}