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

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

@@ -1,3 +1,48 @@
+## [2.4.5] - 2026-05-18
+
+### Changed (IT)
+- `/api/node-types` ora alimenta la sidebar del Harris Creator **direttamente
+  da VocabProvider** (s3dgraphy JSON catalogues), abbandonando il vecchio
+  YAML legacy. Conseguenza: i tipi USVs / USVn / USN / RSF / serSU /
+  serUSD / serUSVn / serUSVs / TSU / UL / BR / SE / USD compaiono
+  finalmente in sidebar. Aggiornare s3dgraphy aggiungerà automaticamente
+  nuovi tipi all'editor.
+- Colore e forma di ogni voce vengono presi da `visual_style.fill_color`
+  e `visual_style.shape` di s3dgraphy (es. SF / VSF / RSF = octagon,
+  USVs = parallelogram, USVn = hexagon, USD = roundrectangle, BR = diamond).
+
+### Fixed (IT)
+- Pannello Properties ora si popola correttamente al click di un nodo US:
+  `SwimlaneState.load` aggiunge `us_number`, `description` (da
+  `d_stratigrafica`), `area`, `datazione`, `file_path` ai `data` Cytoscape
+  che il pannello legge.
+- Ai US viene allegato anche `shape` / `border_color` / `border_style` da
+  VocabProvider — i nodi rendono con la simbologia EM appropriata, non più
+  rettangoli grigi.
+
+### Added (IT)
+- Toggle Hide/Show del pannello Properties (icona angle-double in alto a
+  destra del pannello): collassa a 36px e la scelta viene persistita in
+  `localStorage`. Cytoscape viene `fit()` dopo l'animazione per riempire
+  lo spazio guadagnato.
+
+### Changed (EN)
+- `/api/node-types` is now sourced from VocabProvider (s3dgraphy JSON
+  catalogues). Bumping s3dgraphy is enough to surface new types in the
+  sidebar.
+- US nodes pick `shape`/`fill_color`/`border_color`/`border_style` from
+  the s3dgraphy `visual_style` block so EM symbology renders correctly.
+
+### Fixed (EN)
+- Properties panel populates again on node click — `SwimlaneState.load`
+  now attaches `us_number` / `description` / `area` / `datazione` /
+  `file_path` to the Cytoscape `data` payload.
+
+### Added (EN)
+- Properties panel Hide/Show toggle (collapses to a thin strip on the
+  right). Choice persisted in `localStorage`; Cytoscape re-fits the
+  viewport after the transition.
+
 ## [2.4.4] - 2026-05-18
 
 ### Fixed (IT)

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

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

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

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

@@ -52,31 +52,64 @@ 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.
+        # Resolve unit_type → visual_style via VocabProvider once per request,
+        # cached. The editor's Cytoscape style uses `data(color)` and
+        # `data(shape)`; if either is missing the node renders grey rectangles
+        # and Cytoscape logs a warning per node.
+        _SHAPE_TO_CYTOSCAPE = {
+            "rounded_rectangle": "roundrectangle",
+            "parallelogram": "rhomboid",
+            "trapezium": "triangle",
+            "trapezium2": "vee",
+            # Names that are already valid Cytoscape shapes pass through.
+        }
         try:
             from pyarchinit_mini.vocab.provider import VocabProvider
             _vocab = VocabProvider.instance()
-            _color_cache: dict[str, str] = {}
+            _style_cache: dict[str, dict] = {}
 
-            def _color_for(ut: str) -> str:
-                if ut in _color_cache:
-                    return _color_cache[ut]
+            def _style_for(ut: str) -> dict:
+                if ut in _style_cache:
+                    return _style_cache[ut]
                 try:
-                    style = _vocab.get_visual_style(ut)
-                    c = getattr(style, "fill_color", None) or "#CCCCCC"
+                    vs = _vocab.get_visual_style(ut)
+                    raw_shape = (
+                        vs.get("shape") if isinstance(vs, dict)
+                        else getattr(vs, "shape", "rectangle")
+                    )
+                    fill = (
+                        vs.get("fill_color") if isinstance(vs, dict)
+                        else getattr(vs, "fill_color", None)
+                    ) or "#CCCCCC"
+                    border = (
+                        vs.get("border_color") if isinstance(vs, dict)
+                        else getattr(vs, "border_color", None)
+                    ) or "#333333"
+                    border_style = (
+                        vs.get("border_style") if isinstance(vs, dict)
+                        else getattr(vs, "border_style", None)
+                    ) or "solid"
+                    out = {
+                        "color": fill,
+                        "shape": _SHAPE_TO_CYTOSCAPE.get(raw_shape, raw_shape),
+                        "border_color": border,
+                        "border_style": border_style,
+                    }
                 except Exception:
-                    c = "#CCCCCC"
-                _color_cache[ut] = c
-                return c
+                    out = {"color": "#CCCCCC", "shape": "rectangle",
+                           "border_color": "#333333", "border_style": "solid"}
+                _style_cache[ut] = out
+                return out
         except Exception:
-            def _color_for(ut: str) -> str:
-                return "#CCCCCC"
+            def _style_for(ut: str) -> dict:
+                return {"color": "#CCCCCC", "shape": "rectangle",
+                        "border_color": "#333333", "border_style": "solid"}
 
         # Load US records for site
         us_rows = session.execute(text(
             "SELECT id_us, sito, area, us, unita_tipo, rapporti, node_uuid, "
-            "periodo_iniziale, fase_iniziale "
+            "periodo_iniziale, fase_iniziale, "
+            "d_stratigrafica, datazione, file_path "
             "FROM us_table WHERE sito = :sito ORDER BY id_us"
         ), {"sito": site}).fetchall()
 
@@ -104,17 +137,30 @@ class SwimlaneState:
 
             pos = initial_node_position(_RowLike(), idx)
 
+            style = _style_for(unita_tipo)
             nodes.append(CytoscapeElement(
                 data={
                     "id": node_id,
                     "label": f"{unita_tipo}{us_num}",
                     "parent": parent_row_id,
                     "unit_type": unita_tipo,
-                    "color": _color_for(unita_tipo),
-                    "period": periodo,
-                    "phase": fase,
+                    # Visual fields — read by harris_creator_editor.js Cytoscape style
+                    "color": style["color"],
+                    "shape": style["shape"],
+                    "border_color": style["border_color"],
+                    "border_style": style["border_style"],
+                    # Identity + provenance
                     "us": us_num,
+                    "us_number": us_num,          # Properties panel reads this name
                     "node_uuid": r[6],
+                    # Temporal
+                    "period": periodo,
+                    "phase": fase,
+                    # Descriptive fields the Properties panel populates
+                    "description": r[9] or "",   # d_stratigrafica
+                    "area": (r[2] or "") if r[2] is not None else "",
+                    "datazione": r[10] or "",
+                    "file_path": r[11] or "",
                 },
                 position=pos,
             ))

{pyarchinit_mini-2.4.4 → pyarchinit_mini-2.4.5}/pyarchinit_mini/web_interface/harris_creator_routes.py

@@ -481,17 +481,20 @@ def export_matrix(format):
 
 @harris_creator_bp.route('/api/node-types')
 def get_node_types():
+    """List Extended Matrix node types from VocabProvider (s3dgraphy JSON
+    catalogues). The previous implementation read a legacy YAML config and
+    so missed every node type added in s3dgraphy >= 0.1.42 (USVs/USVn/USN/
+    RSF/serSU/serUSD/serUSVn/serUSVs/TSU/UL/BR/SE...). With this refactor,
+    upgrading s3dgraphy is enough to make new types appear in the editor.
     """
-    Get list of Extended Matrix node types with descriptions
-    Now dynamically loaded from YAML configuration
-    """
-    # Map GraphML/yEd shapes to Cytoscape.js compatible shapes
+    # Map s3dgraphy yEd-style shapes to Cytoscape.js shapes.
     SHAPE_MAP = {
-        'note': 'roundrectangle',      # Document shape -> rounded rectangle
-        'trapezium': 'triangle',        # Trapezoid -> triangle
-        'trapezium2': 'vee',            # Inverted trapezoid -> vee
-        'parallelogram': 'rhomboid',    # Parallelogram -> rhomboid
-        # Valid Cytoscape shapes pass through unchanged
+        'note': 'roundrectangle',
+        'trapezium': 'triangle',
+        'trapezium2': 'vee',
+        'parallelogram': 'rhomboid',
+        'rounded_rectangle': 'roundrectangle',
+        # Cytoscape-native shapes pass through.
         'rectangle': 'rectangle',
         'roundrectangle': 'roundrectangle',
         'ellipse': 'ellipse',
@@ -503,49 +506,36 @@ def get_node_types():
         'star': 'star',
         'diamond': 'diamond',
         'vee': 'vee',
-        'rhomboid': 'rhomboid'
+        'rhomboid': 'rhomboid',
     }
 
     try:
-        config_manager = get_config_manager()
-        all_types = config_manager.get_all_node_types()
-
-        # Default colors for visual editor (can be customized in config)
-        default_colors = {
-            'US': '#90CAF9', 'USM': '#FFAB91', 'USVA': '#CE93D8',
-            'USVB': '#E1BEE7', 'USVC': '#F48FB1', 'TU': '#80CBC4',
-            'USD': '#A5D6A7', 'SF': '#FFD54F', 'VSF': '#FFE082',
-            'CON': '#BCAAA4', 'DOC': '#B0BEC5', 'Extractor': '#EF9A9A',
-            'Combinar': '#9FA8DA', 'property': '#CFD8DC'
-        }
+        from pyarchinit_mini.vocab.provider import VocabProvider
+        provider = VocabProvider.instance()
+        unit_types = provider.get_unit_types()
 
         node_types = []
-        for tipo_id, config in all_types.items():
-            visual = config.get('visual', {})
-
-            # Build label
-            label = f"{tipo_id} - {config.get('name', tipo_id)}"
-            if config.get('description'):
-                label += f" ({config.get('description')})"
-
-            # Get shape from config and map to Cytoscape-compatible shape
-            config_shape = visual.get('shape', 'rectangle')
-            cytoscape_shape = SHAPE_MAP.get(config_shape, 'rectangle')
+        for ut in unit_types:
+            style = getattr(ut, "visual_style", None) or {}
+            shape = style.get("shape", "rectangle") if isinstance(style, dict) else getattr(style, "shape", "rectangle")
+            fill = style.get("fill_color", "#CCCCCC") if isinstance(style, dict) else getattr(style, "fill_color", "#CCCCCC")
+            description = getattr(ut, "description", "") or ""
+            label = ut.abbreviation
+            if description:
+                label = f"{ut.abbreviation} - {description[:80]}"
 
             node_types.append({
-                'value': tipo_id,
-                'label': label,
-                'color': default_colors.get(tipo_id, '#B0BEC5'),  # Use default or gray
-                'shape': cytoscape_shape,
-                'custom': config.get('custom', False)
+                "value": ut.abbreviation,
+                "label": label,
+                "color": fill,
+                "shape": SHAPE_MAP.get(shape, "rectangle"),
+                "family": getattr(ut, "family", None),
             })
-
         return jsonify(node_types)
-
     except Exception as e:
-        # Fallback to minimal list if config fails
         return jsonify([
-            {'value': 'US', 'label': 'US - Standard Stratigraphic Unit', 'color': '#90CAF9', 'shape': 'rectangle'}
+            {"value": "US", "label": "US - Standard Stratigraphic Unit",
+             "color": "#F0F0F0", "shape": "rectangle"}
         ])
 
 

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

@@ -63,6 +63,26 @@
     padding: 15px;
     width: 300px;
     overflow-y: auto;
+    transition: width 0.2s ease, padding 0.2s ease;
+}
+#properties-panel.collapsed {
+    width: 36px;
+    padding: 6px 4px;
+    overflow: hidden;
+}
+#properties-panel.collapsed > *:not(.props-toggle-bar) {
+    display: none !important;
+}
+.props-toggle-bar {
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 8px;
+}
+#properties-panel.collapsed .props-toggle-bar {
+    justify-content: center;
+}
+#properties-panel.collapsed .props-toggle-bar button .toggle-label {
+    display: none;
 }
 
 .property-field {
@@ -280,6 +300,12 @@
 
         <!-- Right Properties Panel -->
         <div id="properties-panel">
+            <div class="props-toggle-bar">
+                <button type="button" class="btn btn-sm btn-outline-secondary" onclick="togglePropertiesPanel()" title="Hide/show Properties panel">
+                    <i class="fas fa-angle-double-right"></i>
+                    <span class="toggle-label">Hide</span>
+                </button>
+            </div>
             <h6 class="mb-3"><i class="fas fa-cog"></i> Properties</h6>
 
             <div id="no-selection" class="text-center text-muted py-5">
@@ -442,6 +468,31 @@
 // work even if loadSwimlaneState() never succeeds (e.g. DB migration pending).
 window._currentSite = (document.getElementById('site-name') || {}).value || null;
 
+// Properties panel collapse/expand (persists choice in localStorage).
+function togglePropertiesPanel() {
+    const panel = document.getElementById('properties-panel');
+    if (!panel) return;
+    const collapsed = panel.classList.toggle('collapsed');
+    try { localStorage.setItem('harris_props_collapsed', collapsed ? '1' : '0'); } catch (e) {}
+    const icon = panel.querySelector('.props-toggle-bar button i');
+    if (icon) {
+        icon.classList.toggle('fa-angle-double-right', !collapsed);
+        icon.classList.toggle('fa-angle-double-left', collapsed);
+    }
+    const lbl = panel.querySelector('.props-toggle-bar .toggle-label');
+    if (lbl) lbl.textContent = collapsed ? 'Show' : 'Hide';
+    if (typeof cy !== 'undefined') {
+        setTimeout(() => { try { cy.resize(); cy.fit(undefined, 30); } catch(e){} }, 220);
+    }
+}
+window.addEventListener('DOMContentLoaded', () => {
+    try {
+        if (localStorage.getItem('harris_props_collapsed') === '1') {
+            togglePropertiesPanel();
+        }
+    } catch (e) {}
+});
+
 async function loadSwimlaneState(site) {
     try {
         const r = await fetch(`/harris-creator/api/load/${encodeURIComponent(site)}`);

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

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

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

{pyarchinit_mini-2.4.4 → pyarchinit_mini-2.4.5}/tests/fixtures/_generate_harris_swimlane_synthetic.py

@@ -34,6 +34,7 @@ CREATE TABLE us_table (
     id_us INTEGER PRIMARY KEY AUTOINCREMENT,
     sito TEXT, area TEXT, us INTEGER, unita_tipo TEXT,
     d_stratigrafica TEXT, d_interpretativa TEXT,
+    datazione TEXT, file_path TEXT,
     rapporti TEXT, node_uuid TEXT,
     periodo_iniziale TEXT, fase_iniziale TEXT,
     periodo_finale TEXT, fase_finale TEXT
@@ -62,11 +63,12 @@ for i in range(30):
     us_records.append(
         ("Volterra", "A", 1000 + i, "US",
          f"strat {i}", f"interp {i}",
+         f"100..200", None,
          rapporti, f"uuid-{i:03d}",
          period, phase, None, None)
     )
 c.executemany(
-    "INSERT INTO us_table (sito, area, us, unita_tipo, d_stratigrafica, d_interpretativa, rapporti, node_uuid, periodo_iniziale, fase_iniziale, periodo_finale, fase_finale) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)",
+    "INSERT INTO us_table (sito, area, us, unita_tipo, d_stratigrafica, d_interpretativa, datazione, file_path, rapporti, node_uuid, periodo_iniziale, fase_iniziale, periodo_finale, fase_finale) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
     us_records,
 )
 

{pyarchinit_mini-2.4.4 → pyarchinit_mini-2.4.5}/tests/integration/test_harris_swimlane_routes_session_missing.py

@@ -32,7 +32,8 @@ def client_no_session(tmp_path, monkeypatch):
     );
     CREATE TABLE us_table (
         id_us INTEGER PRIMARY KEY,
-        sito TEXT, us INTEGER, unita_tipo TEXT,
+        sito TEXT, area TEXT, us INTEGER, unita_tipo TEXT,
+        d_stratigrafica TEXT, datazione TEXT, file_path TEXT,
         rapporti TEXT, node_uuid TEXT,
         periodo_iniziale TEXT, fase_iniziale TEXT
     );