thoth-dbmanager 0.4.9__tar.gz → 0.4.13__tar.gz

{thoth_dbmanager-0.4.9/thoth_dbmanager.egg-info → thoth_dbmanager-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.9
+Version: 0.4.13
 Summary: A Python library for managing SQL databases with support for multiple database types, LSH-based similarity search, and a modern plugin architecture.
 Author-email: Marco Pancotti <mp@tylconsulting.it>
 Project-URL: Homepage, https://github.com/mptyl/thoth_dbmanager
@@ -44,7 +44,7 @@ Requires-Dist: oracledb>=3.0.0; extra == "oracle"
 Provides-Extra: supabase
 Requires-Dist: supabase>=2.0.0; extra == "supabase"
 Requires-Dist: postgrest-py>=0.10.0; extra == "supabase"
-Requires-Dist: gotrue-py>=1.0.0; extra == "supabase"
+Requires-Dist: gotrue>=1.0.0; extra == "supabase"
 Provides-Extra: sqlite
 Provides-Extra: all
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"

{thoth_dbmanager-0.4.9 → thoth_dbmanager-0.4.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "thoth_dbmanager"
-version = "0.4.9"
+version = "0.4.13"
 authors = [
   { name="Marco Pancotti", email="mp@tylconsulting.it" },
 ]
@@ -40,7 +40,7 @@ mysql = ["mysql-connector-python>=8.0.0"]
 mariadb = ["mariadb>=1.1.0"]
 sqlserver = ["pyodbc>=4.0.0", "pymssql>=2.3.0"]
 oracle = ["cx_Oracle>=8.3.0", "oracledb>=3.0.0"]
-supabase = ["supabase>=2.0.0", "postgrest-py>=0.10.0", "gotrue-py>=1.0.0"]
+supabase = ["supabase>=2.0.0", "postgrest-py>=0.10.0", "gotrue>=1.0.0"]
 sqlite = []
 
 # Convenience groups

{thoth_dbmanager-0.4.9 → thoth_dbmanager-0.4.13}/thoth_dbmanager/core/registry.py

@@ -16,6 +16,7 @@ class DbPluginRegistry:
     
     _plugins: Dict[str, Type[DbPlugin]] = {}
     _instances: Dict[tuple, DbPlugin] = {}  # Singleton instances
+    _registered_plugins: set = set()  # Track already registered plugins to avoid spam
     
     @classmethod
     def register(cls, db_type: str, plugin_class: Type[DbPlugin]) -> None:
@@ -29,7 +30,15 @@ class DbPluginRegistry:
         if not issubclass(plugin_class, DbPlugin):
             raise TypeError(f"Plugin class {plugin_class.__name__} must inherit from DbPlugin")
         
+        # Check if plugin is already registered to avoid spam logs
+        plugin_key = f"{db_type}:{plugin_class.__name__}"
+        if plugin_key in cls._registered_plugins:
+            # Plugin already registered, don't log again
+            cls._plugins[db_type] = plugin_class
+            return
+        
         cls._plugins[db_type] = plugin_class
+        cls._registered_plugins.add(plugin_key)
         logger.info(f"Registered plugin {plugin_class.__name__} for database type '{db_type}'")
     
     @classmethod
@@ -44,6 +53,10 @@ class DbPluginRegistry:
             plugin_class = cls._plugins.pop(db_type)
             logger.info(f"Unregistered plugin {plugin_class.__name__} for database type '{db_type}'")
             
+            # Remove from registered plugins set
+            plugin_key = f"{db_type}:{plugin_class.__name__}"
+            cls._registered_plugins.discard(plugin_key)
+            
             # Remove any cached instances
             keys_to_remove = [key for key in cls._instances.keys() if key[0] == db_type]
             for key in keys_to_remove:
@@ -198,6 +211,7 @@ class DbPluginRegistry:
         """Clear the entire plugin registry."""
         cls._plugins.clear()
         cls._instances.clear()
+        cls._registered_plugins.clear()
         logger.info("Cleared plugin registry")
 
 

{thoth_dbmanager-0.4.9 → thoth_dbmanager-0.4.13}/thoth_dbmanager/plugins/sqlite.py

@@ -75,30 +75,77 @@ class SQLitePlugin(DbPlugin):
         # Handle database path resolution
         database_path = kwargs.get('database_path')
         database_name = kwargs.get('database_name')
-        
+
         if not database_path and database_name:
             # Create database path from name and root path
             db_root = Path(self.db_root_path)
-            db_dir = db_root / f"{self.db_mode}_databases" / database_name
-            db_dir.mkdir(parents=True, exist_ok=True)
-            database_path = str(db_dir / f"{database_name}.db")
+            
+            # Handle local development case where db_root_path might be Docker path
+            # but we're running locally - check for data subdirectory
+            potential_roots = [
+                db_root,  # Original path (e.g., /app/data)
+                Path.cwd() / "data",  # Current working directory + data
+                Path(self.db_root_path).parent / "data" if self.db_root_path != "/app/data" else Path.cwd() / "data"
+            ]
+            
+            database_path = None
+            
+            # Try each potential root directory
+            for root in potential_roots:
+                if not root.exists():
+                    continue
+                    
+                db_dir = root / f"{self.db_mode}_databases" / database_name
+                
+                # Check for existing database files with different extensions
+                potential_files = [
+                    db_dir / f"{database_name}.sqlite",
+                    db_dir / f"{database_name}.db",
+                    db_dir / f"{database_name}.sqlite3"
+                ]
+                
+                for potential_file in potential_files:
+                    if potential_file.exists():
+                        database_path = str(potential_file)
+                        logger.info(f"Found existing database file: {database_path}")
+                        break
+                
+                if database_path:
+                    break
+            
+            # If no existing file found, use the first valid root and create directory
+            if not database_path:
+                # Use the first existing root, or cwd/data as fallback
+                for root in potential_roots:
+                    if root.exists():
+                        db_root = root
+                        break
+                else:
+                    db_root = Path.cwd() / "data"
+                
+                db_dir = db_root / f"{self.db_mode}_databases" / database_name
+                db_dir.mkdir(parents=True, exist_ok=True)
+                database_path = str(db_dir / f"{database_name}.sqlite")
+                logger.info(f"No existing database found, will use: {database_path}")
+            
             kwargs['database_path'] = database_path
-        
-        # Set database path for adapter
+
+        # Set database path for adapter - ensure we use the provided database_path
         self.database_path = database_path
-        
-        # Initialize with updated kwargs
-        super().initialize(**kwargs)
-        
-        # Set up database directory path and ID
+
+        # Set up database directory path and ID before calling super().initialize()
         if database_name:
             self.db_id = database_name
         else:
             # Extract database name from path
-            self.db_id = Path(database_path).stem
-        
-        self._setup_directory_path(self.db_id)
-        
+            self.db_id = Path(database_path).stem if database_path else None
+
+        if self.db_id:
+            self._setup_directory_path(self.db_id)
+
+        # Initialize with updated kwargs - this will create and connect the adapter
+        super().initialize(**kwargs)
+
         logger.info(f"SQLite plugin initialized for database: {self.db_id} at {self.database_path}")
     
     def _setup_directory_path(self, db_id: str) -> None:

{thoth_dbmanager-0.4.9 → thoth_dbmanager-0.4.13/thoth_dbmanager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.9
+Version: 0.4.13
 Summary: A Python library for managing SQL databases with support for multiple database types, LSH-based similarity search, and a modern plugin architecture.
 Author-email: Marco Pancotti <mp@tylconsulting.it>
 Project-URL: Homepage, https://github.com/mptyl/thoth_dbmanager
@@ -44,7 +44,7 @@ Requires-Dist: oracledb>=3.0.0; extra == "oracle"
 Provides-Extra: supabase
 Requires-Dist: supabase>=2.0.0; extra == "supabase"
 Requires-Dist: postgrest-py>=0.10.0; extra == "supabase"
-Requires-Dist: gotrue-py>=1.0.0; extra == "supabase"
+Requires-Dist: gotrue>=1.0.0; extra == "supabase"
 Provides-Extra: sqlite
 Provides-Extra: all
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"

{thoth_dbmanager-0.4.9 → thoth_dbmanager-0.4.13}/thoth_dbmanager.egg-info/requires.txt

@@ -49,7 +49,7 @@ pymssql>=2.3.0
 [supabase]
 supabase>=2.0.0
 postgrest-py>=0.10.0
-gotrue-py>=1.0.0
+gotrue>=1.0.0
 
 [test-mysql]
 pytest>=7.0.0