thoth-dbmanager 0.4.3__tar.gz → 0.4.6__tar.gz

{thoth_dbmanager-0.4.3/thoth_dbmanager.egg-info → thoth_dbmanager-0.4.6}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.3
+Version: 0.4.6
 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>
-License: MIT
 Project-URL: Homepage, https://github.com/mptyl/thoth_dbmanager
 Project-URL: Bug Tracker, https://github.com/mptyl/thoth_dbmanager/issues
 Project-URL: Documentation, https://github.com/mptyl/thoth_dbmanager#readme

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6}/pyproject.toml

@@ -4,13 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "thoth_dbmanager"
-version = "0.4.3"
+version = "0.4.6"
 authors = [
   { name="Marco Pancotti", email="mp@tylconsulting.it" },
 ]
 description = "A Python library for managing SQL databases with support for multiple database types, LSH-based similarity search, and a modern plugin architecture."
 readme = "README.md"
-license = {text = "MIT"}
 keywords = ["database", "sql", "lsh", "similarity-search", "orm"]
 requires-python = ">=3.8"
 classifiers = [

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6}/thoth_dbmanager/ThothDbManager.py

@@ -346,6 +346,7 @@ class ThothDbManagerAdapter(ThothDbManager):
         self.db_type = plugin.supported_db_types[0] if plugin.supported_db_types else "unknown"
         self.db_id = getattr(plugin, 'db_id', None)
         self.db_directory_path = getattr(plugin, 'db_directory_path', None)
+        self.schema = getattr(plugin, 'schema', "")
         
         # Engine and connection (delegated to adapter)
         self.engine = getattr(plugin.adapter, 'engine', None) if plugin.adapter else None

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6}/thoth_dbmanager/plugins/mariadb.py

@@ -377,7 +377,30 @@ class MariaDBPlugin(DbPlugin):
         """Lazy load LSH manager for backward compatibility."""
         if self._lsh_manager is None and self.db_directory_path:
             from ..lsh.manager import LshManager
-            self._lsh_manager = LshManager(self.db_directory_path)
+            # Try multiple possible paths for LSH data
+            possible_paths = [
+                self.db_directory_path,  # Original path
+                Path(self.db_root_path) / "data" / f"{self.db_mode}_databases" / self.db_id,  # Data subdirectory
+            ]
+
+            lsh_manager = None
+            for path in possible_paths:
+                try:
+                    temp_manager = LshManager(path)
+                    if temp_manager.is_available():
+                        lsh_manager = temp_manager
+                        logger.info(f"Found LSH data at: {path}")
+                        break
+                except Exception as e:
+                    logger.debug(f"LSH not found at {path}: {e}")
+                    continue
+
+            if lsh_manager is None:
+                # Create manager with original path as fallback
+                lsh_manager = LshManager(self.db_directory_path)
+                logger.warning(f"No LSH data found, using default path: {self.db_directory_path}")
+
+            self._lsh_manager = lsh_manager
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6}/thoth_dbmanager/plugins/mysql.py

@@ -349,7 +349,30 @@ class MySQLPlugin(DbPlugin):
         """Lazy load LSH manager for backward compatibility."""
         if self._lsh_manager is None and self.db_directory_path:
             from ..lsh.manager import LshManager
-            self._lsh_manager = LshManager(self.db_directory_path)
+            # Try multiple possible paths for LSH data
+            possible_paths = [
+                self.db_directory_path,  # Original path
+                Path(self.db_root_path) / "data" / f"{self.db_mode}_databases" / self.db_id,  # Data subdirectory
+            ]
+
+            lsh_manager = None
+            for path in possible_paths:
+                try:
+                    temp_manager = LshManager(path)
+                    if temp_manager.is_available():
+                        lsh_manager = temp_manager
+                        logger.info(f"Found LSH data at: {path}")
+                        break
+                except Exception as e:
+                    logger.debug(f"LSH not found at {path}: {e}")
+                    continue
+
+            if lsh_manager is None:
+                # Create manager with original path as fallback
+                lsh_manager = LshManager(self.db_directory_path)
+                logger.warning(f"No LSH data found, using default path: {self.db_directory_path}")
+
+            self._lsh_manager = lsh_manager
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6}/thoth_dbmanager/plugins/postgresql.py

@@ -27,7 +27,10 @@ class PostgreSQLPlugin(DbPlugin):
         super().__init__(db_root_path, db_mode, **kwargs)
         self.db_id = None
         self.db_directory_path = None
-        
+
+        # PostgreSQL default schema is 'public', but can be overridden
+        self.schema = kwargs.get('schema', 'public')
+
         # LSH manager integration (for backward compatibility)
         self._lsh_manager = None
     
@@ -90,7 +93,30 @@ class PostgreSQLPlugin(DbPlugin):
         """Lazy load LSH manager for backward compatibility"""
         if self._lsh_manager is None and self.db_directory_path:
             from ..lsh.manager import LshManager
-            self._lsh_manager = LshManager(self.db_directory_path)
+            # Try multiple possible paths for LSH data
+            possible_paths = [
+                self.db_directory_path,  # Original path
+                Path(self.db_root_path) / "data" / f"{self.db_mode}_databases" / self.db_id,  # Data subdirectory
+            ]
+
+            lsh_manager = None
+            for path in possible_paths:
+                try:
+                    temp_manager = LshManager(path)
+                    if temp_manager.is_available():
+                        lsh_manager = temp_manager
+                        logger.info(f"Found LSH data at: {path}")
+                        break
+                except Exception as e:
+                    logger.debug(f"LSH not found at {path}: {e}")
+                    continue
+
+            if lsh_manager is None:
+                # Create manager with original path as fallback
+                lsh_manager = LshManager(self.db_directory_path)
+                logger.warning(f"No LSH data found, using default path: {self.db_directory_path}")
+
+            self._lsh_manager = lsh_manager
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6}/thoth_dbmanager/plugins/sqlite.py

@@ -28,7 +28,10 @@ class SQLitePlugin(DbPlugin):
         self.db_id = None
         self.db_directory_path = None
         self.database_path = None
-        
+
+        # SQLite doesn't have named schemas like PostgreSQL, so we use empty string
+        self.schema = ""
+
         # LSH manager integration (for backward compatibility)
         self._lsh_manager = None
     
@@ -114,7 +117,30 @@ class SQLitePlugin(DbPlugin):
         """Lazy load LSH manager for backward compatibility"""
         if self._lsh_manager is None and self.db_directory_path:
             from ..lsh.manager import LshManager
-            self._lsh_manager = LshManager(self.db_directory_path)
+            # Try multiple possible paths for LSH data
+            possible_paths = [
+                self.db_directory_path,  # Original path
+                Path(self.db_root_path) / "data" / f"{self.db_mode}_databases" / self.db_id,  # Data subdirectory
+            ]
+
+            lsh_manager = None
+            for path in possible_paths:
+                try:
+                    temp_manager = LshManager(path)
+                    if temp_manager.is_available():
+                        lsh_manager = temp_manager
+                        logger.info(f"Found LSH data at: {path}")
+                        break
+                except Exception as e:
+                    logger.debug(f"LSH not found at {path}: {e}")
+                    continue
+
+            if lsh_manager is None:
+                # Create manager with original path as fallback
+                lsh_manager = LshManager(self.db_directory_path)
+                logger.warning(f"No LSH data found, using default path: {self.db_directory_path}")
+
+            self._lsh_manager = lsh_manager
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

{thoth_dbmanager-0.4.3 → thoth_dbmanager-0.4.6/thoth_dbmanager.egg-info}/PKG-INFO

@@ -1,9 +1,8 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.3
+Version: 0.4.6
 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>
-License: MIT
 Project-URL: Homepage, https://github.com/mptyl/thoth_dbmanager
 Project-URL: Bug Tracker, https://github.com/mptyl/thoth_dbmanager/issues
 Project-URL: Documentation, https://github.com/mptyl/thoth_dbmanager#readme