pyarchinit-mini 2.4.0__tar.gz → 2.4.1__tar.gz

{pyarchinit_mini-2.4.0 → pyarchinit_mini-2.4.1}/CHANGELOG.md

@@ -1,3 +1,40 @@
+## [2.4.1] - 2026-05-18
+
+### Fixed (IT)
+- Editor Harris Matrix: `window._currentSite` ora inizializzato server-side
+  dall'hidden input `#site-name`, quindi i pulsanti Save / + New Row /
+  Export yEd GraphML funzionano anche se `/api/load/<site>` fallisce (caso
+  tipico: migration `node_uuid` non ancora applicata sul DB di produzione).
+- Editor Harris Matrix: se `/api/load/<site>` ritorna errore, il corpo
+  della risposta viene mostrato in un alert con suggerimento di lanciare
+  `pyarchinit-mini-migrate-vocab --apply` (prima era silenzioso).
+- Editor Harris Matrix: messaggio "No site loaded" sostituito con
+  istruzione esplicita di tornare all'indice del Creator.
+
+### Added (IT)
+- Nuova pagina `/paradata/` (sezione Tools): picker sito + bottoni rapidi
+  ai 5 tipi di paradata (authors, licenses, embargoes, documents, epochs).
+  Link aggiunto sia al dropdown navbar che alla sidebar laterale.
+- Modal di aiuto nell'editor Harris (icona "?") che spiega la differenza
+  tra GraphML (s3dgraphy clean, auto-regen, per Datacenter/3D), Export
+  yEd GraphML (TableNode swimlane, on-demand, per yEd Desktop), DOT
+  (Graphviz), PNG (snapshot raster).
+- Tooltip migliorati su tutti i pulsanti di export.
+
+### Fixed (EN)
+- Harris Matrix Editor: `window._currentSite` is now initialised server-side
+  from hidden input `#site-name`, so Save / + New Row / Export buttons work
+  even when `/api/load/<site>` fails (typical when the `node_uuid` migration
+  is still pending on production).
+- Harris Matrix Editor: failed swimlane loads now surface the backend error
+  body in an alert with a hint to run `pyarchinit-mini-migrate-vocab`.
+
+### Added (EN)
+- New `/paradata/` landing page (Tools section): site picker + quick links
+  to the 5 paradata kinds. Sidebar entries added.
+- Help modal explaining the four export formats (GraphML, yEd GraphML,
+  DOT, PNG) accessible via a question-mark icon on the editor toolbar.
+
 ## [2.4.0] - 2026-05-18
 
 ### Added (IT)

{pyarchinit_mini-2.4.0/pyarchinit_mini.egg-info → pyarchinit_mini-2.4.1}/PKG-INFO

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

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

{pyarchinit_mini-2.4.0 → pyarchinit_mini-2.4.1}/pyarchinit_mini/web_interface/paradata_ui_routes.py

@@ -3,7 +3,9 @@
 Backed by ParadataStore (JSON sidecar). REST counterparts live in
 paradata_routes.py.
 """
-from flask import Blueprint, render_template, request, redirect, url_for, abort
+import os
+
+from flask import Blueprint, current_app, render_template, request, redirect, url_for, abort
 
 from pyarchinit_mini.graphproj.paradata_store import ParadataStore
 from pyarchinit_mini.graphproj.exceptions import ParadataConflict, ParadataNotFound
@@ -47,6 +49,25 @@ def _kind_or_404(kind):
     return KIND_DEF[kind]
 
 
+@paradata_ui_bp.get("/", endpoint="index")
+def index():
+    """Paradata landing: list available sites + the 5 kinds."""
+    from pyarchinit_mini.models.site import Site
+    if hasattr(current_app, "db_manager"):
+        session_ctx = current_app.db_manager.connection.get_session()
+    else:
+        from pyarchinit_mini.database.connection import DatabaseConnection
+        db_url = os.getenv("DATABASE_URL", "sqlite:///pyarchinit_mini.db")
+        session_ctx = DatabaseConnection.from_url(db_url).get_session()
+    with session_ctx as db:
+        sites = [s.sito for s in db.query(Site).order_by(Site.sito).all()]
+    return render_template(
+        "paradata/index.html",
+        sites=sites,
+        kinds=list(KIND_DEF.keys()),
+    )
+
+
 @paradata_ui_bp.get("/<site>/<kind>", endpoint="list")
 def list_(site, kind):
     cfg = _kind_or_404(kind)

{pyarchinit_mini-2.4.0 → pyarchinit_mini-2.4.1}/pyarchinit_mini/web_interface/templates/base.html

@@ -84,6 +84,7 @@
                     <li><hr class="dropdown-divider"></li>
                     <li><h6 class="dropdown-header">{{ _('Tools') }}</h6></li>
                     <li><a class="dropdown-item" href="{{ url_for('harris_creator.index') }}"><i class="fas fa-project-diagram"></i> {{ _('Harris Matrix Creator') }}</a></li>
+                    <li><a class="dropdown-item" href="{{ url_for('paradata_ui.index') }}"><i class="fas fa-tags"></i> {{ _('Paradata') }}</a></li>
                     <li><a class="dropdown-item" href="{{ url_for('three_d_builder.blender_viewer') }}"><i class="fas fa-cube"></i> {{ _('Blender 3D') }}</a></li>
                     <li><a class="dropdown-item" href="{{ url_for('upload_media') }}"><i class="fas fa-images"></i> {{ _('Media') }}</a></li>
                     <li><a class="dropdown-item" href="{{ url_for('excel_import.index') }}"><i class="fas fa-file-excel"></i> {{ _('Excel Import') }}</a></li>
@@ -177,6 +178,7 @@
                 <li><a href="{{ url_for('upload_media') }}"><i class="fas fa-upload"></i> {{ _('Upload Media') }}</a></li>
                 <li><a href="{{ url_for('media_list') }}"><i class="fas fa-photo-video"></i> {{ _('Media Files') }}</a></li>
                 <li><a href="{{ url_for('harris_creator.index') }}"><i class="fas fa-project-diagram"></i> {{ _('Harris Matrix Creator') }}</a></li>
+                <li><a href="{{ url_for('paradata_ui.index') }}"><i class="fas fa-tags"></i> {{ _('Paradata') }}</a></li>
                 <li><a href="{{ url_for('export_harris_graphml') }}"><i class="fas fa-sitemap"></i> {{ _('Harris Export') }}</a></li>
             </ul>
         </div>

{pyarchinit_mini-2.4.0 → pyarchinit_mini-2.4.1}/pyarchinit_mini/web_interface/templates/harris_creator/editor.html

@@ -158,19 +158,24 @@
             <button class="btn btn-success btn-sm" id="save-btn" title="Save to database">
                 <i class="fas fa-save"></i> Save
             </button>
-            <button class="btn btn-info btn-sm" id="export-graphml-btn" title="Export to GraphML">
+            <button class="btn btn-info btn-sm" id="export-graphml-btn"
+                    title="EM-canonical GraphML (s3dgraphy schema, for Datacenter / 3D pipeline)">
                 <i class="fas fa-download"></i> GraphML
             </button>
-            <button class="btn btn-secondary btn-sm" id="export-dot-btn" title="Export to DOT">
+            <button class="btn btn-secondary btn-sm" id="export-dot-btn" title="Export to Graphviz DOT">
                 <i class="fas fa-download"></i> DOT
             </button>
-            <button class="btn btn-warning btn-sm" id="export-png-btn" title="Export as PNG">
+            <button class="btn btn-warning btn-sm" id="export-png-btn" title="Export current view as PNG image">
                 <i class="fas fa-image"></i> PNG
             </button>
             <!-- Spec 3-bis: Harris Swimlane controls -->
-            <button onclick="showNewRowModal()" class="btn btn-primary btn-sm" title="Add a new swimlane row">+ New Row</button>
-            <button onclick="saveSwimlaneState()" class="btn btn-success btn-sm" title="Save swimlane changes">&#128190; Save Swimlane</button>
-            <button onclick="exportYedGraphml()" class="btn btn-info btn-sm" title="Export yEd GraphML">&#11015; Export yEd GraphML</button>
+            <button onclick="showNewRowModal()" class="btn btn-primary btn-sm" title="Add a new swimlane row (period + phase)">+ New Row</button>
+            <button onclick="saveSwimlaneState()" class="btn btn-success btn-sm" title="Save swimlane changes back to the database">&#128190; Save Swimlane</button>
+            <button onclick="exportYedGraphml()" class="btn btn-info btn-sm"
+                    title="yEd-flavored GraphML with TableNode swimlanes (open in yEd Desktop)">&#11015; Export yEd GraphML</button>
+            <button type="button" class="btn btn-outline-info btn-sm" data-bs-toggle="modal" data-bs-target="#exportFormatsHelp" title="What are these export formats?">
+                <i class="fas fa-question-circle"></i>
+            </button>
             <a href="{{ url_for('harris_creator.index') }}" class="btn btn-outline-secondary btn-sm">
                 <i class="fas fa-arrow-left"></i> Back
             </a>
@@ -373,6 +378,47 @@
 <input type="hidden" id="site-name" value="{{ site_name }}">
 <input type="hidden" id="existing-nodes" value="{{ existing_nodes }}">
 <input type="hidden" id="existing-relationships" value="{{ existing_relationships }}">
+
+<!-- Export formats help modal -->
+<div class="modal fade" id="exportFormatsHelp" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fas fa-question-circle"></i> Export formats &mdash; GraphML vs yEd GraphML</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p>The editor exposes <strong>two GraphML outputs</strong> that look similar but serve different audiences.</p>
+        <table class="table table-bordered table-sm">
+          <thead class="table-light">
+            <tr><th></th><th class="text-info">GraphML</th><th class="text-info">Export yEd GraphML</th></tr>
+          </thead>
+          <tbody>
+            <tr><th>Trigger</th><td>Auto-regenerated on every US save (Spec&nbsp;2)</td><td>On-demand when you click the button (Spec&nbsp;3-bis)</td></tr>
+            <tr><th>File</th><td><code>data/paradata/&lt;site&gt;/stratigraphy.graphml</code></td><td><code>data/exports/harris_yed/&lt;site&gt;-harris-yed.graphml</code></td></tr>
+            <tr><th>Schema</th><td>s3dgraphy clean &mdash; canonical EM nodes (StratigraphicNode) and edges (<code>overlies</code>, <code>abuts</code>, <code>is_after</code>, &hellip;)</td><td>yEd-flavored &mdash; <code>y:TableNode</code> + <code>y:Rows</code> for swimlanes, <code>y:ShapeNode</code> children with VocabProvider colors</td></tr>
+            <tr><th>Audience</th><td>EM Datacenter, 3D pipeline, Heriverse, programmatic consumers</td><td>Humans using <strong>yEd Desktop</strong> for review/printing</td></tr>
+            <tr><th>Round-trip</th><td>Yes (s3dgraphy reader)</td><td>No (one-way export for presentation)</td></tr>
+          </tbody>
+        </table>
+        <h6>DOT / PNG</h6>
+        <ul>
+          <li><strong>DOT</strong> &mdash; Graphviz source, useful for batch rendering or version-controlling diagrams as text.</li>
+          <li><strong>PNG</strong> &mdash; Rasterized snapshot of the current Cytoscape view.</li>
+        </ul>
+        <h6>Quick reference</h6>
+        <ul>
+          <li>Need to feed a 3D / EM pipeline &rarr; use <strong>GraphML</strong>.</li>
+          <li>Need to open in yEd Desktop and tweak by hand &rarr; use <strong>Export yEd GraphML</strong>.</li>
+          <li>Need a quick image for a report &rarr; use <strong>PNG</strong>.</li>
+        </ul>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
 
 {% block extra_js %}
@@ -392,17 +438,29 @@
 <script>
 // === Spec 3-bis: Harris Swimlane integration ===
 
+// Initialize _currentSite server-side from hidden input so Save/+ Row/Export
+// work even if loadSwimlaneState() never succeeds (e.g. DB migration pending).
+window._currentSite = (document.getElementById('site-name') || {}).value || null;
+
 async function loadSwimlaneState(site) {
     try {
         const r = await fetch(`/harris-creator/api/load/${encodeURIComponent(site)}`);
         if (!r.ok) {
-            console.error("Failed to load swimlane state:", await r.text());
+            const body = await r.text();
+            console.error("Failed to load swimlane state:", body);
+            // Surface backend errors so the user understands why swimlanes
+            // are missing (typical cause: node_uuid column / migration not run).
+            const msg = body.length > 400 ? body.slice(0, 400) + '...' : body;
+            alert(`Swimlane load failed (HTTP ${r.status}):\n\n${msg}\n\n` +
+                  `If you see "node_uuid does not exist", run the migration on the server:\n` +
+                  `  pyarchinit-mini-migrate-vocab --apply --yes --database <DSN>`);
             return;
         }
         const state = await r.json();
         renderSwimlaneState(state);
     } catch (e) {
         console.error("loadSwimlaneState error:", e);
+        alert(`Swimlane load error: ${e.message}`);
     }
 }
 
@@ -470,10 +528,10 @@ function renderSwimlaneState(state) {
     console.log(`Loaded swimlane state for ${state.site}: ${state.rows.length} rows, ${usNodes.length} US, ${state.edges.length} edges`);
 }
 
-// Auto-load on page ready if ?site=... in URL
+// Auto-load on page ready: use ?site=... if present, else server-rendered site_name.
 window.addEventListener('DOMContentLoaded', () => {
     const params = new URLSearchParams(window.location.search);
-    const site = params.get('site');
+    const site = params.get('site') || window._currentSite;
     if (site) {
         // Wait briefly for Cytoscape to init then load
         const tryLoad = (retries) => {
@@ -545,7 +603,7 @@ function hideUnsavedIndicator() {
 async function saveSwimlaneState() {
     const site = window._currentSite;
     if (!site) {
-        alert('No site loaded. Open editor with ?site=<name>');
+        alert('No site selected. Return to the Harris Matrix Creator index and choose or create a site.');
         return;
     }
     try {
@@ -576,7 +634,7 @@ async function saveSwimlaneState() {
 function showNewRowModal() {
     const site = window._currentSite;
     if (!site) {
-        alert('No site loaded.');
+        alert('No site selected. Return to the Harris Matrix Creator index and choose or create a site.');
         return;
     }
     const period = prompt('Period name:');
@@ -610,7 +668,7 @@ function showNewRowModal() {
 function exportYedGraphml() {
     const site = window._currentSite;
     if (!site) {
-        alert('No site loaded.');
+        alert('No site selected. Return to the Harris Matrix Creator index and choose or create a site.');
         return;
     }
     window.location.href = `/harris-creator/api/export/${encodeURIComponent(site)}/yed-graphml`;

pyarchinit_mini-2.4.1/pyarchinit_mini/web_interface/templates/paradata/index.html

@@ -0,0 +1,53 @@
+{% extends "base.html" %}
+{% block title %}{{ _('Paradata') }} - PyArchInit-Mini{% endblock %}
+{% block content %}
+<div class="container py-4">
+  <h1><i class="fas fa-tags"></i> {{ _('Paradata') }}</h1>
+  <p class="text-muted">
+    {{ _('Per-site paradata sidecar: authors, licenses, embargoes, documents, epochs. Stored as JSON next to the auto-regenerated stratigraphy graph.') }}
+  </p>
+
+  {% if not sites %}
+    <div class="alert alert-info">{{ _('No sites available. Create a site first.') }}</div>
+  {% else %}
+    <div class="card mb-4">
+      <div class="card-body">
+        <label for="site-picker" class="form-label">{{ _('Choose a site') }}</label>
+        <select id="site-picker" class="form-select">
+          <option value="">— {{ _('select') }} —</option>
+          {% for s in sites %}<option value="{{ s }}">{{ s }}</option>{% endfor %}
+        </select>
+      </div>
+    </div>
+
+    <div id="kind-buttons" class="d-none">
+      <h5>{{ _('Manage') }}:</h5>
+      <div class="d-flex flex-wrap gap-2">
+        {% for k in kinds %}
+        <a id="kind-link-{{ k }}" href="#" class="btn btn-outline-primary">
+          <i class="fas fa-folder"></i> {{ k|capitalize }}
+        </a>
+        {% endfor %}
+      </div>
+    </div>
+  {% endif %}
+</div>
+
+<script>
+(function() {
+  const picker = document.getElementById('site-picker');
+  if (!picker) return;
+  const wrap = document.getElementById('kind-buttons');
+  const base = "{{ url_for('paradata_ui.list', site='__SITE__', kind='__KIND__') }}";
+  picker.addEventListener('change', () => {
+    const site = picker.value;
+    if (!site) { wrap.classList.add('d-none'); return; }
+    wrap.classList.remove('d-none');
+    {% for k in kinds %}
+    document.getElementById('kind-link-{{ k }}').href =
+      base.replace('__SITE__', encodeURIComponent(site)).replace('__KIND__', '{{ k }}');
+    {% endfor %}
+  });
+})();
+</script>
+{% endblock %}

{pyarchinit_mini-2.4.0 → pyarchinit_mini-2.4.1/pyarchinit_mini.egg-info}/PKG-INFO

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

@@ -355,6 +355,7 @@ pyarchinit_mini/web_interface/templates/media/upload.html
 pyarchinit_mini/web_interface/templates/messaging/contacts.html
 pyarchinit_mini/web_interface/templates/operators/directory.html
 pyarchinit_mini/web_interface/templates/paradata/edit.html
+pyarchinit_mini/web_interface/templates/paradata/index.html
 pyarchinit_mini/web_interface/templates/paradata/list.html
 pyarchinit_mini/web_interface/templates/pdf/pottery_sheet.html
 pyarchinit_mini/web_interface/templates/periodizzazione/form.html

{pyarchinit_mini-2.4.0 → pyarchinit_mini-2.4.1}/pyproject.toml

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