pyarchinit-mini 2.0.1__tar.gz → 2.0.2__tar.gz

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.0.2] - 2026-02-24
+
+### Fixed
+- **PostgreSQL type mismatch on US creation**: `us_table.us` column was migrated from INTEGER to VARCHAR(100) but code was still passing integer values, causing `psycopg2.errors.UndefinedFunction: operator does not exist: character varying = integer` on PostgreSQL databases
+- Fixed `us_service._get_us_by_site_area_number`: always cast `us_number` to `str` in SQL params
+- Fixed `us_service.create_us_dto`: cast `US.us == str(us_data['us'])` in ORM filter
+- Fixed `web_interface/app.py`: `us` field kept as `str` instead of `int` in `us_data` dict (create and update flows)
+- Fixed `web_interface/three_d_builder_routes.py`: `US.us == str(data['us'])` in all 3D builder filters
+- Fixed `desktop_gui/dialogs.py`: validate US number as int but pass as str to DB layer
+- Fixed `inventario_service.py`: cast `us_number` to str in all US existence checks
+- Fixed `api/schemas.py`: `us` field changed from `int` to `str` (with backward-compatible validator accepting both)
+- Fixed `mcp_server/graphml_parser.py`: safe int cast for Periodizzazione.us comparison (still INTEGER column)
+
+
 # Changelog
 
 All notable changes to PyArchInit-Mini will be documented in this file.

{pyarchinit_mini-2.0.1/pyarchinit_mini.egg-info → pyarchinit_mini-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.0.1
+Version: 2.0.2
 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.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/api/schemas.py

@@ -3,7 +3,7 @@ Pydantic schemas for API request/response validation
 """
 
 from datetime import datetime
-from typing import Optional, List
+from typing import Optional, List, Union
 from pydantic import BaseModel, Field, validator
 
 # Base schemas
@@ -59,7 +59,12 @@ class USBase(BaseModel):
     """Base US schema"""
     sito: str = Field(..., max_length=350, description="Site name")
     area: Optional[str] = Field(None, max_length=20, description="Area")
-    us: int = Field(..., gt=0, description="US number")
+    us: str = Field(..., description="US number (numeric or alphanumeric, e.g. '1' or 'A1')")
+
+    @validator('us', pre=True)
+    def us_to_str(cls, v):
+        """Accept int or str — us column is VARCHAR(100)"""
+        return str(v).strip() if v is not None else v
     d_stratigrafica: Optional[str] = Field(None, max_length=350, description="Stratigraphic description")
     d_interpretativa: Optional[str] = Field(None, max_length=350, description="Interpretative description")
     descrizione: Optional[str] = Field(None, description="Description")
@@ -231,7 +236,11 @@ class USUpdate(BaseModel):
     """Schema for updating a US"""
     sito: Optional[str] = Field(None, max_length=350)
     area: Optional[str] = Field(None, max_length=20)
-    us: Optional[int] = Field(None, gt=0)
+    us: Optional[str] = Field(None, description="US number (numeric or alphanumeric)")
+
+    @validator('us', pre=True)
+    def us_to_str(cls, v):
+        return str(v).strip() if v is not None else v
     d_stratigrafica: Optional[str] = Field(None, max_length=350)
     d_interpretativa: Optional[str] = Field(None, max_length=350)
     descrizione: Optional[str] = None
@@ -413,7 +422,7 @@ class InventarioBase(BaseModel):
     definizione: Optional[str] = Field(None, max_length=20, description="Definition")
     descrizione: Optional[str] = Field(None, description="Description")
     area: Optional[str] = Field(None, max_length=20, description="Area")
-    us: Optional[int] = Field(None, gt=0, description="US number")
+    us: Optional[str] = Field(None, description="US number (numeric or alphanumeric)")
     lavato: Optional[str] = Field(None, max_length=5, description="Washed")
     nr_cassa: Optional[str] = Field(None, max_length=20, description="Box number")
     luogo_conservazione: Optional[str] = Field(None, max_length=350, description="Conservation location")
@@ -460,7 +469,7 @@ class InventarioUpdate(BaseModel):
     definizione: Optional[str] = Field(None, max_length=20)
     descrizione: Optional[str] = None
     area: Optional[str] = Field(None, max_length=20)
-    us: Optional[int] = Field(None, gt=0)
+    us: Optional[str] = Field(None, description="US number")
     lavato: Optional[str] = Field(None, max_length=5)
     nr_cassa: Optional[str] = Field(None, max_length=20)
     luogo_conservazione: Optional[str] = Field(None, max_length=350)

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/desktop_gui/dialogs.py

@@ -643,17 +643,18 @@ class USDialog(BaseDialog):
                 messagebox.showerror(_("Error"), _("US number is required"))
                 return
 
+            # Validate: must be numeric (keep legacy GUI behavior)
             try:
-                us_number = int(us_number)
+                int(us_number)  # validate only, keep as string for DB
             except ValueError:
                 messagebox.showerror(_("Error"), _("US number must be an integer"))
                 return
 
-            # Prepare data
+            # Prepare data (us is VARCHAR(100) in DB — pass as string)
             us_data = {
                 'sito': sito,
                 'area': self.fields['area'].get().strip() or None,
-                'us': us_number,
+                'us': str(us_number).strip(),
                 'd_stratigrafica': self.fields['d_stratigrafica'].get("1.0", tk.END).strip() or None,
                 'd_interpretativa': self.fields['d_interpretativa'].get("1.0", tk.END).strip() or None,
                 'schedatore': self.fields['schedatore'].get().strip() or None,

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/mcp_server/graphml_parser.py

@@ -543,7 +543,7 @@ class GraphMLParser:
             .filter(
                 Periodizzazione.sito == us_record.sito,
                 Periodizzazione.area == us_record.area,
-                Periodizzazione.us == us_record.us,
+                Periodizzazione.us == (int(us_record.us) if str(us_record.us).lstrip('-').isdigit() else -1),
             )
             .first()
         )

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/services/inventario_service.py

@@ -97,7 +97,7 @@ class InventarioService:
         count = session.query(US).filter(
             US.sito == sito,
             or_(US.area == area, (US.area.is_(None) & (area == ''))),
-            US.us == us_number
+            US.us == str(us_number)  # us is VARCHAR(100)
         ).count()
         
         if count == 0:
@@ -271,7 +271,7 @@ class InventarioService:
         count = self.db_manager.execute_raw_query(query, {
             'sito': sito,
             'area': area,
-            'us_number': us_number
+            'us_number': str(us_number)  # us is VARCHAR(100)
         })[0][0]
         
         if count == 0:

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/services/us_service.py

@@ -60,7 +60,7 @@ class USService:
                 existing_us = session.query(US).filter(
                     US.sito == us_data['sito'],
                     US.area == us_data.get('area', ''),
-                    US.us == us_data['us']
+                    US.us == str(us_data['us'])  # us is VARCHAR(100)
                 ).first()
                 
                 if existing_us:
@@ -237,9 +237,10 @@ class USService:
         filters = {'sito': site_name, 'area': area}
         return self.get_all_us(page=page, size=size, filters=filters)
     
-    def _get_us_by_site_area_number(self, sito: str, area: str, us_number: int) -> Optional[US]:
-        """Get US by site, area and number combination"""
-        # This would need a compound query
+    def _get_us_by_site_area_number(self, sito: str, area: str, us_number) -> Optional[US]:
+        """Get US by site, area and number combination.
+        us_number can be int or str — us column is VARCHAR(100) in PostgreSQL.
+        """
         query = """
         SELECT * FROM us_table 
         WHERE sito = :sito AND 
@@ -252,7 +253,7 @@ class USService:
             result = session.execute(text(query), {
                 'sito': sito,
                 'area': area,
-                'us_number': us_number
+                'us_number': str(us_number)  # always str: us column is VARCHAR
             }).fetchone()
             
             if result:

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/web_interface/app.py

@@ -884,7 +884,7 @@ def create_app():
                     # TAB 1: Informazioni Base
                     'sito': form.sito.data,
                     'area': form.area.data,
-                    'us': to_int(form.us.data),
+                    'us': str(form.us.data).strip() if form.us.data else None,
                     'unita_tipo': form.unita_tipo.data,
                     'tipo_documento': form.tipo_documento.data if form.unita_tipo.data == 'DOC' else None,
                     'anno_scavo': form.anno_scavo.data,
@@ -979,7 +979,7 @@ def create_app():
                     with db_manager.connection.get_session() as session:
                         relationship_sync_service.sync_rapporti_to_relationships_table(
                             sito=us_data['sito'],
-                            us_number=int(us_data['us']),
+                            us_number=int(str(us_data['us'])) if us_data.get('us') and str(us_data.get('us','')).strip().lstrip('-').isdigit() else 0,
                             rapporti_text=us_data.get('rapporti', ''),
                             session=session
                         )
@@ -1117,7 +1117,7 @@ def create_app():
                     # TAB 1: Informazioni Base
                     'sito': form.sito.data,
                     'area': form.area.data,
-                    'us': to_int(form.us.data),
+                    'us': str(form.us.data).strip() if form.us.data else None,
                     'unita_tipo': form.unita_tipo.data,
                     'tipo_documento': form.tipo_documento.data if form.unita_tipo.data == 'DOC' else None,
                     'anno_scavo': form.anno_scavo.data,
@@ -1212,7 +1212,7 @@ def create_app():
                     with db_manager.connection.get_session() as session:
                         relationship_sync_service.sync_rapporti_to_relationships_table(
                             sito=update_data['sito'],
-                            us_number=int(update_data['us']),
+                            us_number=int(str(update_data['us'])) if update_data.get('us') and str(update_data.get('us','')).strip().lstrip('-').isdigit() else 0,
                             rapporti_text=update_data.get('rapporti', ''),
                             session=session
                         )

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyarchinit_mini/web_interface/three_d_builder_routes.py

@@ -1354,7 +1354,7 @@ def create_us():
             existing = db_session.query(US).filter(
                 US.sito == data['sito'],
                 US.area == data.get('area', ''),
-                US.us == int(data['us'])
+                US.us == str(data['us'])
             ).first()
 
             if existing:
@@ -1367,7 +1367,7 @@ def create_us():
             new_us = US()
             new_us.sito = data['sito']
             new_us.area = data.get('area', '')
-            new_us.us = int(data['us'])
+            new_us.us = str(data['us'])
             new_us.unita_tipo = 'USM' if data.get('tipo') == 'usm' else 'US'
             new_us.d_stratigrafica = data.get('d_stratigrafica', '')
             new_us.d_interpretativa = data.get('d_interpretativa', '')
@@ -1442,7 +1442,7 @@ def update_us():
             us_record = db_session.query(US).filter(
                 US.sito == data['sito'],
                 US.area == data.get('area', ''),
-                US.us == int(data['us'])
+                US.us == str(data['us'])
             ).first()
 
             if not us_record:
@@ -1520,7 +1520,7 @@ def delete_us():
             us_record = db_session.query(US).filter(
                 US.sito == data['sito'],
                 US.area == data.get('area', ''),
-                US.us == int(data['us'])
+                US.us == str(data['us'])
             ).first()
 
             if not us_record:

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2/pyarchinit_mini.egg-info}/PKG-INFO

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

@@ -5,15 +5,8 @@ babel.cfg
 pyproject.toml
 requirements.txt
 setup.py
-data/media_viewer_demo.db
-data/pyarchinit_mini 2.db
-data/pyarchinit_mini.db
 data/pyarchinit_mini_sample.db
 data/pyarchinit_tutorial.db
-data/pyarchinit_tutorial_backup_20251030_093228.db
-data/pyarchinit_tutorial_clean.db
-data/pyarchinit_tutorial_video.db
-data/pyarchinit_v18_demo.db
 logo/logo_pyarchinit-mini.png
 pyarchinit_mini/__init__.py
 pyarchinit_mini/exceptions.py
@@ -132,8 +125,6 @@ pyarchinit_mini/mcp_server/tools/build_3d_tool.py
 pyarchinit_mini/mcp_server/tools/chatgpt_fetch_tool.py
 pyarchinit_mini/mcp_server/tools/chatgpt_search_tool.py
 pyarchinit_mini/mcp_server/tools/configure_em_nodes_tool.py
-pyarchinit_mini/mcp_server/tools/create_database_tool.py
-pyarchinit_mini/mcp_server/tools/create_harris_matrix_tool.py
 pyarchinit_mini/mcp_server/tools/data_import_parser_tool.py
 pyarchinit_mini/mcp_server/tools/data_management_tool.py
 pyarchinit_mini/mcp_server/tools/database_manager_tool.py
@@ -185,10 +176,6 @@ pyarchinit_mini/scripts/__init__.py
 pyarchinit_mini/scripts/auto_translate.py
 pyarchinit_mini/scripts/configure_claude_desktop.py
 pyarchinit_mini/scripts/create_admin_user.py
-pyarchinit_mini/scripts/create_correct_stratigraphy_sample.py
-pyarchinit_mini/scripts/create_italian_sample_database.py
-pyarchinit_mini/scripts/create_sample_for_webapp.py
-pyarchinit_mini/scripts/create_sample_with_50_us.py
 pyarchinit_mini/scripts/generate_test_3d_model.py
 pyarchinit_mini/scripts/load_italian_as_main.py
 pyarchinit_mini/scripts/load_sample_as_main.py
@@ -227,10 +214,7 @@ pyarchinit_mini/stratigraph/sync_orchestrator.py
 pyarchinit_mini/stratigraph/sync_queue.py
 pyarchinit_mini/stratigraph/sync_state_machine.py
 pyarchinit_mini/stratigraph/uuid_manager.py
-pyarchinit_mini/translations/messages.pot
-pyarchinit_mini/translations/en/LC_MESSAGES/messages.mo
 pyarchinit_mini/translations/en/LC_MESSAGES/messages.po
-pyarchinit_mini/translations/it/LC_MESSAGES/messages.mo
 pyarchinit_mini/translations/it/LC_MESSAGES/messages.po
 pyarchinit_mini/utils/__init__.py
 pyarchinit_mini/utils/auth.py

{pyarchinit_mini-2.0.1 → pyarchinit_mini-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyarchinit-mini"
-version = "2.0.1"
+version = "2.0.2"
 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.0.1/pyarchinit_mini/mcp_server/tools/create_database_tool.py

@@ -1,118 +0,0 @@
-"""
-Create Database Tool
-
-Creates empty PyArchInit-Mini databases with full schema.
-Supports both SQLite and PostgreSQL databases.
-"""
-
-import logging
-from typing import Dict, Any
-from .base_tool import BaseTool, ToolDescription
-
-logger = logging.getLogger(__name__)
-
-
-class CreateDatabaseTool(BaseTool):
-    """Create Database - Creates empty PyArchInit-Mini database with schema"""
-
-    def to_tool_description(self) -> ToolDescription:
-        return ToolDescription(
-            name="create_database",
-            description=(
-                "Create an empty PyArchInit-Mini database with full schema. "
-                "Supports SQLite and PostgreSQL. Creates all necessary tables "
-                "for sites, stratigraphic units, inventories, relationships, etc."
-            ),
-            input_schema={
-                "type": "object",
-                "properties": {
-                    "db_type": {
-                        "type": "string",
-                        "enum": ["sqlite", "postgresql"],
-                        "description": "Database type: sqlite or postgresql"
-                    },
-                    "db_path": {
-                        "type": "string",
-                        "description": "For SQLite: file path (e.g., 'data/new_project.db'). For PostgreSQL: database name"
-                    },
-                    "overwrite": {
-                        "type": "boolean",
-                        "description": "If true, overwrite existing database. Default: false",
-                        "default": False
-                    },
-                    "postgres_config": {
-                        "type": "object",
-                        "description": "PostgreSQL connection configuration (required for postgresql)",
-                        "properties": {
-                            "host": {"type": "string", "description": "PostgreSQL host", "default": "localhost"},
-                            "port": {"type": "integer", "description": "PostgreSQL port", "default": 5432},
-                            "user": {"type": "string", "description": "PostgreSQL user"},
-                            "password": {"type": "string", "description": "PostgreSQL password"},
-                        }
-                    }
-                },
-                "required": ["db_type", "db_path"],
-            },
-        )
-
-    async def execute(self, arguments: Dict[str, Any]) -> Dict[str, Any]:
-        """Execute database creation"""
-        try:
-            db_type = arguments.get("db_type")
-            db_path = arguments.get("db_path")
-            overwrite = arguments.get("overwrite", False)
-            postgres_config = arguments.get("postgres_config", {})
-
-            if not db_type or not db_path:
-                return self._format_error("Both db_type and db_path are required")
-
-            logger.info(f"Creating {db_type} database: {db_path}")
-
-            if db_type == "sqlite":
-                result = self._create_sqlite(db_path, overwrite)
-            elif db_type == "postgresql":
-                result = self._create_postgresql(db_path, postgres_config, overwrite)
-            else:
-                return self._format_error(f"Invalid db_type: {db_type}")
-
-            if result.get('success'):
-                return self._format_success(result, f"Successfully created {db_type} database with {result.get('tables_created', 0)} tables")
-            else:
-                return self._format_error(result.get('message', 'Database creation failed'))
-
-        except Exception as e:
-            logger.error(f"Database creation error: {str(e)}", exc_info=True)
-            return self._format_error(f"Failed to create database: {str(e)}")
-
-    def _create_sqlite(self, db_path: str, overwrite: bool) -> Dict[str, Any]:
-        """Create SQLite database"""
-        from pyarchinit_mini.database.database_creator import create_sqlite_database
-        try:
-            return create_sqlite_database(db_path, overwrite=overwrite)
-        except FileExistsError as e:
-            return {'success': False, 'message': f'Database already exists: {db_path}. Set overwrite=true to replace it.'}
-        except Exception as e:
-            return {'success': False, 'message': str(e)}
-
-    def _create_postgresql(self, db_name: str, config: Dict[str, Any], overwrite: bool) -> Dict[str, Any]:
-        """Create PostgreSQL database"""
-        from pyarchinit_mini.database.database_creator import create_postgresql_database
-        try:
-            host = config.get('host', 'localhost')
-            port = config.get('port', 5432)
-            user = config.get('user')
-            password = config.get('password')
-
-            if not user:
-                return {'success': False, 'message': 'PostgreSQL user is required in postgres_config'}
-
-            return create_postgresql_database(
-                db_name=db_name,
-                host=host,
-                port=port,
-                user=user,
-                password=password,
-                overwrite=overwrite
-            )
-        except Exception as e:
-            return {'success': False, 'message': str(e)}