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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.6
+Version: 0.4.8
 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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "thoth_dbmanager"
-version = "0.4.6"
+version = "0.4.8"
 authors = [
   { name="Marco Pancotti", email="mp@tylconsulting.it" },
 ]

{thoth_dbmanager-0.4.6 → thoth_dbmanager-0.4.8}/thoth_dbmanager/lsh/manager.py

@@ -98,7 +98,12 @@ class LshManager:
         """
         try:
             if not self.storage_strategy.exists(self.lsh_base_path):
-                logging.warning(f"LSH files not found at {self.lsh_base_path}")
+                # Show the actual file paths being checked for better debugging
+                lsh_file = self.lsh_base_path.with_suffix('.pkl')
+                minhashes_file = self.lsh_base_path.parent / f"{self.lsh_base_path.stem}_minhashes.pkl"
+                logging.warning(f"LSH files not found. Expected files:")
+                logging.warning(f"  LSH file: {lsh_file}")
+                logging.warning(f"  Minhashes file: {minhashes_file}")
                 return False
             
             lsh_data, minhashes_data = self.storage_strategy.load(self.lsh_base_path)

{thoth_dbmanager-0.4.6 → thoth_dbmanager-0.4.8}/thoth_dbmanager/lsh/storage.py

@@ -92,5 +92,19 @@ class PickleStorage(LshStorageStrategy):
         """Check if both LSH and minhashes pickle files exist."""
         lsh_path = base_path.with_suffix('.pkl')
         minhashes_path = base_path.parent / f"{base_path.stem}_minhashes.pkl"
-        
-        return lsh_path.exists() and minhashes_path.exists()
+
+        # Add debug logging to help diagnose path issues
+        import logging
+        logger = logging.getLogger(__name__)
+        logger.debug(f"Checking LSH files existence:")
+        logger.debug(f"  Base path: {base_path}")
+        logger.debug(f"  LSH path: {lsh_path} (exists: {lsh_path.exists()})")
+        logger.debug(f"  Minhashes path: {minhashes_path} (exists: {minhashes_path.exists()})")
+
+        lsh_exists = lsh_path.exists()
+        minhashes_exists = minhashes_path.exists()
+
+        if not lsh_exists or not minhashes_exists:
+            logger.warning(f"LSH files missing - LSH: {lsh_path} (exists: {lsh_exists}), Minhashes: {minhashes_path} (exists: {minhashes_exists})")
+
+        return lsh_exists and minhashes_exists

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

@@ -377,30 +377,7 @@ 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
-            # 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
+            self._lsh_manager = LshManager(self.db_directory_path)
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

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

@@ -349,30 +349,7 @@ 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
-            # 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
+            self._lsh_manager = LshManager(self.db_directory_path)
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

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

@@ -93,30 +93,7 @@ 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
-            # 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
+            self._lsh_manager = LshManager(self.db_directory_path)
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

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

@@ -117,30 +117,7 @@ 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
-            # 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
+            self._lsh_manager = LshManager(self.db_directory_path)
         return self._lsh_manager
     
     # LSH integration methods for backward compatibility

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.6
+Version: 0.4.8
 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