pyarchinit-mini 2.4.5__tar.gz → 2.4.7__tar.gz

{pyarchinit_mini-2.4.5 → pyarchinit_mini-2.4.7}/CHANGELOG.md

@@ -1,3 +1,49 @@
+## [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)
+- Editor swimlane su DB SQLite locali tornava HTTP 500 "no such column:
+  periodo" perché `period_table` era stata creata dal modello SQLAlchemy
+  con lo schema legacy `period_name/phase_name/start_date/end_date`.
+  Nuova migration `_2026_05_period_table_schema` aggiunge le colonne
+  reali pyarchinit (`periodo`, `fase`, `datazione`, `descrizione`,
+  `sito`) e backfilla `periodo ← period_name`, `fase ← phase_name`.
+  Auto-applicata dal `migrate_all_tables()`.
+- Modello SQLAlchemy `Period` aggiornato per dichiarare entrambi i set
+  di colonne (legacy + reale), così `Base.metadata.create_all()` su DB
+  nuovi parte già con lo schema corretto.
+
+### Fixed (EN)
+- Swimlane editor on local SQLite DBs returned HTTP 500 "no such column:
+  periodo" because `period_table` was created with the legacy schema
+  (`period_name/phase_name/...`). New `_2026_05_period_table_schema`
+  migration adds the real pyarchinit columns (`periodo`, `fase`,
+  `datazione`, `descrizione`, `sito`) and backfills them from legacy
+  ones. Auto-applied by `migrate_all_tables()`.
+- SQLAlchemy `Period` model now declares both legacy and real column
+  sets, so freshly-created DBs start with the right shape.
+
 ## [2.4.5] - 2026-05-18
 
 ### Changed (IT)

{pyarchinit_mini-2.4.5/pyarchinit_mini.egg-info → pyarchinit_mini-2.4.7}/PKG-INFO

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

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

pyarchinit_mini-2.4.7/pyarchinit_mini/database/migrations/_2026_05_period_table_schema.py

@@ -0,0 +1,146 @@
+"""Schema migration (2026-05-18):
+Add the pyarchinit-compatible columns to ``period_table``.
+
+The SQLAlchemy ``Period`` model historically declared (``period_name``,
+``phase_name``, ``start_date``, ``end_date``, ``description``, ``chronology``).
+The real pyarchinit schema (used by QGIS plugin and PG ``pyarchinit_v2``)
+is (``periodo``, ``fase``, ``datazione``, ``descrizione``, ``sito``). Spec
+3-bis queries the latter, so existing SQLite/PostgreSQL DBs created via
+``Base.metadata.create_all()`` need the new columns aliased over.
+
+Idempotent: re-running on a DB that already has the new columns is a
+no-op. Backfills ``periodo`` from ``period_name`` / ``fase`` from
+``phase_name`` when both exist.
+
+Supports SQLite and PostgreSQL backends.
+"""
+import sqlite3
+from dataclasses import dataclass, field
+from urllib.parse import urlparse
+
+
+@dataclass
+class MigrationReport:
+    script: str
+    db: str
+    tables_changed: list = field(default_factory=list)
+    tables_skipped: list = field(default_factory=list)
+    dry_run: bool = False
+    status: str = "ok"
+
+
+TABLE = "period_table"
+NEW_COLUMNS = [
+    ("periodo", "TEXT"),
+    ("fase", "TEXT"),
+    ("datazione", "TEXT"),
+    ("descrizione", "TEXT"),
+    ("sito", "TEXT"),
+]
+
+
+def _table_exists_sqlite(conn, table):
+    return conn.execute(
+        "SELECT name FROM sqlite_master WHERE type='table' AND name=?", (table,)
+    ).fetchone() is not None
+
+
+def _has_column_sqlite(conn, table, col):
+    rows = conn.execute(f"PRAGMA table_info({table})").fetchall()
+    return any(r[1] == col for r in rows)
+
+
+def _run_sqlite(path: str, dry_run: bool, report: MigrationReport) -> None:
+    conn = sqlite3.connect(path)
+    try:
+        if not _table_exists_sqlite(conn, TABLE):
+            report.tables_skipped.append(f"{TABLE} (missing)")
+            return
+        existing = {r[1] for r in conn.execute(f"PRAGMA table_info({TABLE})").fetchall()}
+        added = []
+        for col, ctype in NEW_COLUMNS:
+            if col in existing:
+                continue
+            if not dry_run:
+                conn.execute(f"ALTER TABLE {TABLE} ADD COLUMN {col} {ctype}")
+            added.append(col)
+        # Backfill: periodo ← period_name, fase ← phase_name (only if legacy cols exist)
+        if not dry_run and added:
+            if "period_name" in existing and "periodo" in added:
+                conn.execute(
+                    f"UPDATE {TABLE} SET periodo = period_name WHERE periodo IS NULL"
+                )
+            if "phase_name" in existing and "fase" in added:
+                conn.execute(
+                    f"UPDATE {TABLE} SET fase = phase_name WHERE fase IS NULL"
+                )
+            conn.commit()
+        if added:
+            report.tables_changed.append(f"{TABLE} (+{','.join(added)})")
+        else:
+            report.tables_skipped.append(f"{TABLE} (already aligned)")
+    finally:
+        conn.close()
+
+
+def _run_postgresql(url: str, dry_run: bool, report: MigrationReport) -> None:
+    import psycopg2
+    p = urlparse(url)
+    conn = psycopg2.connect(
+        host=p.hostname, port=p.port or 5432,
+        user=p.username, password=p.password,
+        dbname=p.path.lstrip("/"),
+    )
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            "SELECT to_regclass(%s)", (f"public.{TABLE}",)
+        )
+        if cur.fetchone()[0] is None:
+            report.tables_skipped.append(f"{TABLE} (missing)")
+            return
+        cur.execute(
+            "SELECT column_name FROM information_schema.columns "
+            "WHERE table_schema='public' AND table_name=%s", (TABLE,)
+        )
+        existing = {r[0] for r in cur.fetchall()}
+        added = []
+        for col, ctype in NEW_COLUMNS:
+            if col in existing:
+                continue
+            if not dry_run:
+                cur.execute(f"ALTER TABLE {TABLE} ADD COLUMN {col} {ctype}")
+            added.append(col)
+        if not dry_run and added:
+            if "period_name" in existing and "periodo" in added:
+                cur.execute(
+                    f"UPDATE {TABLE} SET periodo = period_name WHERE periodo IS NULL"
+                )
+            if "phase_name" in existing and "fase" in added:
+                cur.execute(
+                    f"UPDATE {TABLE} SET fase = phase_name WHERE fase IS NULL"
+                )
+            conn.commit()
+        if added:
+            report.tables_changed.append(f"{TABLE} (+{','.join(added)})")
+        else:
+            report.tables_skipped.append(f"{TABLE} (already aligned)")
+    finally:
+        conn.close()
+
+
+def run(url: str, dry_run: bool = False) -> MigrationReport:
+    report = MigrationReport(
+        script=__name__, db=url, dry_run=dry_run,
+    )
+    try:
+        if url.startswith("sqlite"):
+            path = url.replace("sqlite:///", "", 1)
+            _run_sqlite(path, dry_run, report)
+        elif url.startswith("postgresql") or url.startswith("postgres"):
+            _run_postgresql(url, dry_run, report)
+        else:
+            report.status = "unsupported"
+    except Exception as e:
+        report.status = f"error: {e}"
+    return report

{pyarchinit_mini-2.4.5 → pyarchinit_mini-2.4.7}/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
@@ -830,6 +835,7 @@ class DatabaseMigrations:
             f"{pkg}._2026_05_node_uuid_schema",
             f"{pkg}._2026_05_node_uuid_backfill",
             f"{pkg}._2026_05_vocab_alignment",
+            f"{pkg}._2026_05_period_table_schema",
         ]
         url = str(self.connection.engine.url)
         applied = 0

{pyarchinit_mini-2.4.5 → pyarchinit_mini-2.4.7}/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.5 → pyarchinit_mini-2.4.7}/pyarchinit_mini/models/harris_matrix.py

@@ -44,20 +44,38 @@ class USRelationships(BaseModel):
 
 class Period(BaseModel):
     """
-    Archaeological periods and phases
+    Archaeological periods and phases.
+
+    Carries BOTH the legacy field set (``period_name``/``phase_name``/
+    ``start_date``/``end_date``/``description``/``chronology``) and the
+    pyarchinit-real field set (``periodo``/``fase``/``datazione``/
+    ``descrizione``/``sito``) so the same model works whether the database
+    was created by pyarchinit-mini's create_all (legacy names) or by
+    pyarchinit QGIS (real names). The Spec-3-bis swimlane editor queries
+    the real names; the ``_2026_05_period_table_schema`` migration adds
+    those columns to existing legacy-schema DBs and backfills them.
     """
     __tablename__ = 'period_table'
-    
+
     id_period = Column(Integer, primary_key=True, autoincrement=True)
-    period_name = Column(String(200), nullable=False)
+    # Legacy column set (kept for backward compat with existing pyarchinit-mini DBs)
+    period_name = Column(String(200))
     phase_name = Column(String(200))
-    start_date = Column(Integer)  # Anno inizio
-    end_date = Column(Integer)    # Anno fine
+    start_date = Column(Integer)
+    end_date = Column(Integer)
     description = Column(Text)
-    chronology = Column(String(100))  # Sistema cronologico
-    
+    chronology = Column(String(100))
+    # Real pyarchinit column set (Spec 3-bis swimlane editor reads these)
+    sito = Column(String(350))
+    periodo = Column(String(200))
+    fase = Column(String(200))
+    datazione = Column(Text)
+    descrizione = Column(Text)
+
     def __repr__(self):
-        return f"<Period('{self.period_name}', {self.start_date}-{self.end_date})>"
+        # Prefer real-schema field when populated, fall back to legacy.
+        label = self.periodo or self.period_name or "?"
+        return f"<Period('{label}', sito={self.sito})>"
 
 class Periodizzazione(BaseModel):
     """

{pyarchinit_mini-2.4.5 → pyarchinit_mini-2.4.7/pyarchinit_mini.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.4.5
+Version: 2.4.7
 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.5 → pyarchinit_mini-2.4.7}/pyarchinit_mini.egg-info/SOURCES.txt

@@ -65,6 +65,7 @@ pyarchinit_mini/database/migration_scripts/change_us_area_to_text.py
 pyarchinit_mini/database/migration_scripts/change_us_area_to_text_simple.py
 pyarchinit_mini/database/migrations/_2026_05_node_uuid_backfill.py
 pyarchinit_mini/database/migrations/_2026_05_node_uuid_schema.py
+pyarchinit_mini/database/migrations/_2026_05_period_table_schema.py
 pyarchinit_mini/database/migrations/_2026_05_vocab_alignment.py
 pyarchinit_mini/database/migrations/__init__.py
 pyarchinit_mini/database/migrations/backup.py

{pyarchinit_mini-2.4.5 → pyarchinit_mini-2.4.7}/pyproject.toml

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