thoth-dbmanager 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

thoth_dbmanager/__init__.py

@@ -43,7 +43,6 @@ from .dynamic_imports import (
     import_sqlserver,
     import_oracle,
     import_mariadb,
-    import_informix,
     import_supabase,
 )
 
@@ -62,8 +61,6 @@ def __getattr__(name: str):
         return import_manager('sqlserver')
     elif name == 'ThothOracleManager':
         return import_manager('oracle')
-    elif name == 'ThothInformixManager':
-        return import_manager('informix')
     elif name == 'ThothSupabaseManager':
         return import_manager('supabase')
     
@@ -79,7 +76,6 @@ __all__ = [
     "ThothMariaDbManager",
     "ThothSqlServerManager",
     "ThothOracleManager",
-    "ThothInformixManager",
     "ThothSupabaseManager",
     
     # New architecture
@@ -106,7 +102,6 @@ __all__ = [
     "MariaDBPlugin",
     "SQLServerPlugin",
     "OraclePlugin",
-    "InformixPlugin",
     "SupabasePlugin",
     
     # Adapters
@@ -116,7 +111,6 @@ __all__ = [
     "MariaDBAdapter",
     "SQLServerAdapter",
     "OracleAdapter",
-    "InformixAdapter",
     "SupabaseAdapter",
     
     # LSH functionality
@@ -133,4 +127,4 @@ __all__ = [
     "DatabaseImportError",
 ]
 
-__version__ = "0.4.0"
+__version__ = "0.4.3"

thoth_dbmanager/dynamic_imports.py

@@ -14,45 +14,32 @@ DATABASE_DEPENDENCIES = {
     'mariadb': ['mariadb'],
     'sqlserver': ['pyodbc'],
     'oracle': ['cx_Oracle'],
-    'informix': ['informixdb'],
     'supabase': ['supabase', 'postgrest', 'gotrue'],
     'sqlite': [],  # Built into Python
 }
 
-# Mapping of database names to their manager classes
-DATABASE_MANAGERS = {
-    'postgresql': 'dbmanager.impl.ThothPgManager.ThothPgManager',
-    'mysql': 'dbmanager.impl.ThothMySqlManager.ThothMySqlManager',
-    'mariadb': 'dbmanager.impl.ThothMariaDbManager.ThothMariaDbManager',
-    'sqlserver': 'dbmanager.impl.ThothSqlServerManager.ThothSqlServerManager',
-    'oracle': 'dbmanager.impl.ThothOracleManager.ThothOracleManager',
-    'informix': 'dbmanager.impl.ThothInformixManager.ThothInformixManager',
-    'supabase': 'dbmanager.impl.ThothSupabaseManager.ThothSupabaseManager',
-    'sqlite': 'dbmanager.impl.ThothSqliteManager.ThothSqliteManager',
-}
+# Note: DATABASE_MANAGERS is no longer used - managers are created via factory pattern
 
 # Mapping of database names to their adapter classes
 DATABASE_ADAPTERS = {
-    'postgresql': 'dbmanager.adapters.postgresql.PostgreSQLAdapter',
-    'mysql': 'dbmanager.adapters.mysql.MySQLAdapter',
-    'mariadb': 'dbmanager.adapters.mariadb.MariaDBAdapter',
-    'sqlserver': 'dbmanager.adapters.sqlserver.SQLServerAdapter',
-    'oracle': 'dbmanager.adapters.oracle.OracleAdapter',
-    'informix': 'dbmanager.adapters.informix.InformixAdapter',
-    'supabase': 'dbmanager.adapters.supabase.SupabaseAdapter',
-    'sqlite': 'dbmanager.adapters.sqlite.SQLiteAdapter',
+    'postgresql': 'thoth_dbmanager.adapters.postgresql.PostgreSQLAdapter',
+    'mysql': 'thoth_dbmanager.adapters.mysql.MySQLAdapter',
+    'mariadb': 'thoth_dbmanager.adapters.mariadb.MariaDBAdapter',
+    'sqlserver': 'thoth_dbmanager.adapters.sqlserver.SQLServerAdapter',
+    'oracle': 'thoth_dbmanager.adapters.oracle.OracleAdapter',
+    'supabase': 'thoth_dbmanager.adapters.supabase.SupabaseAdapter',
+    'sqlite': 'thoth_dbmanager.adapters.sqlite.SQLiteAdapter',
 }
 
 # Mapping of database names to their plugin classes
 DATABASE_PLUGINS = {
-    'postgresql': 'dbmanager.plugins.postgresql.PostgreSQLPlugin',
-    'mysql': 'dbmanager.plugins.mysql.MySQLPlugin',
-    'mariadb': 'dbmanager.plugins.mariadb.MariaDBPlugin',
-    'sqlserver': 'dbmanager.plugins.sqlserver.SQLServerPlugin',
-    'oracle': 'dbmanager.plugins.oracle.OraclePlugin',
-    'informix': 'dbmanager.plugins.informix.InformixPlugin',
-    'supabase': 'dbmanager.plugins.supabase.SupabasePlugin',
-    'sqlite': 'dbmanager.plugins.sqlite.SQLitePlugin',
+    'postgresql': 'thoth_dbmanager.plugins.postgresql.PostgreSQLPlugin',
+    'mysql': 'thoth_dbmanager.plugins.mysql.MySQLPlugin',
+    'mariadb': 'thoth_dbmanager.plugins.mariadb.MariaDBPlugin',
+    'sqlserver': 'thoth_dbmanager.plugins.sqlserver.SQLServerPlugin',
+    'oracle': 'thoth_dbmanager.plugins.oracle.OraclePlugin',
+    'supabase': 'thoth_dbmanager.plugins.supabase.SupabasePlugin',
+    'sqlite': 'thoth_dbmanager.plugins.sqlite.SQLitePlugin',
 }
 
 
@@ -93,30 +80,39 @@ def check_dependencies(database: str) -> List[str]:
 
 def import_manager(database: str) -> Any:
     """
-    Dynamically import a database manager class.
-    
+    Dynamically import a database manager using the factory pattern.
+
     Args:
         database: Name of the database
-        
+
     Returns:
-        The database manager class
-        
+        The database manager class (factory-created)
+
     Raises:
         DatabaseImportError: If dependencies are missing
         ImportError: If the manager class cannot be imported
     """
-    if database not in DATABASE_MANAGERS:
+    if database not in DATABASE_PLUGINS:
         raise ValueError(f"Unknown database: {database}")
-    
+
     # Check dependencies
     missing_deps = check_dependencies(database)
     if missing_deps:
         raise DatabaseImportError(database, missing_deps)
-    
-    # Import the manager class
-    module_path, class_name = DATABASE_MANAGERS[database].rsplit('.', 1)
-    module = importlib.import_module(module_path)
-    return getattr(module, class_name)
+
+    # Import the factory and create a manager class
+    from thoth_dbmanager.core.factory import ThothDbFactory
+
+    # Create a wrapper class that can be instantiated like the old managers
+    class DatabaseManagerWrapper:
+        def __init__(self, *args, **kwargs):
+            # Create manager using factory
+            self._manager = ThothDbFactory.create_manager(database, *args, **kwargs)
+
+        def __getattr__(self, name):
+            return getattr(self._manager, name)
+
+    return DatabaseManagerWrapper
 
 
 def import_adapter(database: str) -> Any:
@@ -241,10 +237,6 @@ def import_mariadb():
     """Import MariaDB components."""
     return import_database_components(['mariadb'])['mariadb']
 
-def import_informix():
-    """Import Informix components."""
-    return import_database_components(['informix'])['informix']
-
 def import_supabase():
     """Import Supabase components."""
     return import_database_components(['supabase'])['supabase']

{thoth_dbmanager-0.4.2.dist-info → thoth_dbmanager-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thoth_dbmanager
-Version: 0.4.2
+Version: 0.4.3
 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
@@ -28,6 +28,8 @@ Requires-Dist: datasketch>=1.5.0
 Requires-Dist: tqdm>=4.60.0
 Requires-Dist: SQLAlchemy>=1.4.0
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pandas>=1.3.0
+Requires-Dist: requests>=2.25.0
 Provides-Extra: postgresql
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "postgresql"
 Provides-Extra: mysql
@@ -36,28 +38,24 @@ Provides-Extra: mariadb
 Requires-Dist: mariadb>=1.1.0; extra == "mariadb"
 Provides-Extra: sqlserver
 Requires-Dist: pyodbc>=4.0.0; extra == "sqlserver"
+Requires-Dist: pymssql>=2.3.0; extra == "sqlserver"
 Provides-Extra: oracle
 Requires-Dist: cx_Oracle>=8.3.0; extra == "oracle"
-Provides-Extra: informix
-Requires-Dist: informixdb>=2.2.0; extra == "informix"
+Requires-Dist: oracledb>=3.0.0; extra == "oracle"
 Provides-Extra: supabase
 Requires-Dist: supabase>=2.0.0; extra == "supabase"
-Requires-Dist: postgrest-py>=0.16.0; extra == "supabase"
-Requires-Dist: gotrue-py>=2.0.0; extra == "supabase"
+Requires-Dist: postgrest-py>=0.10.0; extra == "supabase"
+Requires-Dist: gotrue-py>=1.0.0; extra == "supabase"
 Provides-Extra: sqlite
-Provides-Extra: qdrant
-Requires-Dist: qdrant-client>=1.7.0; extra == "qdrant"
 Provides-Extra: all
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"
 Requires-Dist: mysql-connector-python>=8.0.0; extra == "all"
 Requires-Dist: mariadb>=1.1.0; extra == "all"
 Requires-Dist: pyodbc>=4.0.0; extra == "all"
+Requires-Dist: pymssql>=2.3.0; extra == "all"
 Requires-Dist: cx_Oracle>=8.3.0; extra == "all"
-Requires-Dist: informixdb>=2.2.0; extra == "all"
+Requires-Dist: oracledb>=3.0.0; extra == "all"
 Requires-Dist: supabase>=2.0.0; extra == "all"
-Requires-Dist: postgrest-py>=0.16.0; extra == "all"
-Requires-Dist: gotrue-py>=2.0.0; extra == "all"
-Requires-Dist: qdrant-client>=1.7.0; extra == "all"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
@@ -65,6 +63,10 @@ Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: flake8>=5.0.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: pre-commit>=3.0.0; extra == "dev"
+Requires-Dist: build>=1.0.0; extra == "dev"
+Requires-Dist: twine>=4.0.0; extra == "dev"
+Requires-Dist: psutil>=5.8.0; extra == "dev"
+Requires-Dist: docker>=6.0.0; extra == "dev"
 Provides-Extra: test-postgresql
 Requires-Dist: pytest>=7.0.0; extra == "test-postgresql"
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "test-postgresql"

{thoth_dbmanager-0.4.2.dist-info → thoth_dbmanager-0.4.3.dist-info}/RECORD

@@ -1,13 +1,12 @@
 thoth_dbmanager/ThothDbManager.py,sha256=xyPhB6_3Ao3fGb4LjgCe-MvVI_C-9UXxeazra2dhmkI,17846
-thoth_dbmanager/__init__.py,sha256=Aew8n8l8wMPAf9h6xzzOr7mHBS1-ThTT8js1iHKrAvE,3367
+thoth_dbmanager/__init__.py,sha256=zvs3kqKA99s9RJN6JVWTm-8asMeLc1NG5mnEpJTfzNg,3190
 thoth_dbmanager/documents.py,sha256=z-f7zo_CZHqoGM0qHT8-lSUx4NhnMNZTSajpoFtRxn4,5051
-thoth_dbmanager/dynamic_imports.py,sha256=q99hkh-D-Tnz15_pMJRa_e-gcrgOOYLr5QGhqRhXHgI,7939
+thoth_dbmanager/dynamic_imports.py,sha256=nqMmxl2KeczAK-Bi5Fq92f3rPpPsTay-Bq553iHFbWI,7507
 thoth_dbmanager/adapters/__init__.py,sha256=tKIMlo9-gbH_cqnqZJ9yw1zQZKUzsV4hljDUNzcoZXg,486
 thoth_dbmanager/adapters/mariadb.py,sha256=LTsf0gORiwqZkd6WtKcOsYLHyDgysxdqNesBscbJwNs,5709
 thoth_dbmanager/adapters/mysql.py,sha256=TrFbxoMMNWbmUcgkKQYOIfsstmMUmuLlGB7R4ZFEIYI,5698
 thoth_dbmanager/adapters/oracle.py,sha256=JSrsgohjz5PbVc8nI188MZ4QGBQls4ieNmwWfAKA7II,21468
 thoth_dbmanager/adapters/postgresql.py,sha256=qxdlxOV7Nvn8U4Lhat50w87Z2S8AzBfmLfEwKfz7dis,17299
-thoth_dbmanager/adapters/qdrant.py,sha256=sL8ldUbAczENb01MmcrkJBKw0dieWPAG2aj97jznj3k,6557
 thoth_dbmanager/adapters/sqlite.py,sha256=RTDszgnAtkE14LKFeoe9lBHgsqXqkmDk6jDCTmVpnoM,14659
 thoth_dbmanager/adapters/sqlserver.py,sha256=V555kUH54Fb1Atow0BfvbSHmoSwGnrB_RJGn718VQSI,23880
 thoth_dbmanager/adapters/supabase.py,sha256=bl2C6LpOpykPF3vIbdNRDk43aXLADzSk0wQuwTcEHZA,10348
@@ -30,12 +29,11 @@ thoth_dbmanager/plugins/mariadb.py,sha256=ElYa4Rexwrofcjcs0UQKan8fZpbU6-n9zghYR9
 thoth_dbmanager/plugins/mysql.py,sha256=mbDsIDV2H_BWYANU4JHMsUkxLQICuGtjKTTPbig2Ngs,16546
 thoth_dbmanager/plugins/oracle.py,sha256=k4Yxvz5MdsH3Sfty9lxbhr8igSnHvGbGujz3bLpNcHo,5230
 thoth_dbmanager/plugins/postgresql.py,sha256=GF6k4K0t7-Y08THWJzS0eWJkrQ1e4GfoKIcanC0Z5Ng,5401
-thoth_dbmanager/plugins/qdrant.py,sha256=XWmc4K6ILiwvB1BhyJBBtA7ohRzQmk1MiZ1N7S-YF78,1199
 thoth_dbmanager/plugins/sqlite.py,sha256=esgJqDp2aSu4a32WnmynfFyY9JfW5W8VjNTkaA-hZhM,6402
 thoth_dbmanager/plugins/sqlserver.py,sha256=mMb3F5FmSWV02FZwj-Ult-2TjuyeVA4Fl1iME1dbgLU,5289
 thoth_dbmanager/plugins/supabase.py,sha256=mWlaGAdpywx4-pU4Ffpmn24ze8sg0sM5kc6bFDoeYRg,8645
-thoth_dbmanager-0.4.2.dist-info/licenses/LICENSE,sha256=81-BOzGgwtY1XdYfkwMQB87AkOGXI9OMq0kjNcZA4UE,1071
-thoth_dbmanager-0.4.2.dist-info/METADATA,sha256=iMFzfRMoh0BqUahLBLt2Pny1oA7L6F1tB7iF8W4D9no,12183
-thoth_dbmanager-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thoth_dbmanager-0.4.2.dist-info/top_level.txt,sha256=b9ttxm9RUc0KUCASEKRx6FqoREYJ1-KZWSpNuaM0uQ4,16
-thoth_dbmanager-0.4.2.dist-info/RECORD,,
+thoth_dbmanager-0.4.3.dist-info/licenses/LICENSE,sha256=81-BOzGgwtY1XdYfkwMQB87AkOGXI9OMq0kjNcZA4UE,1071
+thoth_dbmanager-0.4.3.dist-info/METADATA,sha256=5cjJw_2qjHE_Ke7gukqF0WrRQLOJGT9PSSn9SegJOoQ,12259
+thoth_dbmanager-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thoth_dbmanager-0.4.3.dist-info/top_level.txt,sha256=b9ttxm9RUc0KUCASEKRx6FqoREYJ1-KZWSpNuaM0uQ4,16
+thoth_dbmanager-0.4.3.dist-info/RECORD,,

thoth_dbmanager/adapters/qdrant.py

@@ -1,189 +0,0 @@
-"""
-Qdrant adapter for Thoth SQL Database Manager.
-"""
-
-from typing import Any, Dict, List, Optional, Union
-from ..core.interfaces import DbAdapter
-
-
-class QdrantAdapter(DbAdapter):
-    """
-    Qdrant vector database adapter implementation.
-    """
-    
-    def __init__(self, **kwargs):
-        """Initialize Qdrant adapter with connection parameters."""
-        super().__init__()
-        self.host = kwargs.get('host', 'localhost')
-        self.port = kwargs.get('port', 6333)
-        self.api_key = kwargs.get('api_key')
-        self.collection_name = kwargs.get('collection_name', 'thoth_documents')
-        self._client = None
-    
-    def connect(self) -> bool:
-        """Establish connection to Qdrant."""
-        try:
-            # Import qdrant_client here to avoid dependency issues
-            from qdrant_client import QdrantClient
-            
-            if self.api_key:
-                self._client = QdrantClient(
-                    host=self.host,
-                    port=self.port,
-                    api_key=self.api_key
-                )
-            else:
-                self._client = QdrantClient(
-                    host=self.host,
-                    port=self.port
-                )
-            
-            # Test connection
-            self._client.get_collections()
-            return True
-        except Exception as e:
-            print(f"Failed to connect to Qdrant: {e}")
-            return False
-    
-    def disconnect(self) -> None:
-        """Disconnect from Qdrant."""
-        if self._client:
-            self._client.close()
-            self._client = None
-    
-    def execute_query(self, query: str, params: Optional[Dict] = None, 
-                     fetch: Union[str, int] = "all", timeout: int = 60) -> Any:
-        """
-        Execute a query against Qdrant.
-        Note: Qdrant doesn't use SQL, so this adapts the interface.
-        """
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        # This is a placeholder - adapt based on your specific needs
-        # Qdrant uses vector search, not SQL queries
-        return {"message": "Qdrant uses vector search, not SQL queries"}
-    
-    def get_tables(self) -> List[Dict[str, str]]:
-        """Get collections (equivalent to tables in Qdrant)."""
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        try:
-            collections = self._client.get_collections()
-            return [
-                {
-                    "table_name": collection.name,
-                    "table_type": "COLLECTION"
-                }
-                for collection in collections.collections
-            ]
-        except Exception as e:
-            print(f"Error getting collections: {e}")
-            return []
-    
-    def get_columns(self, table_name: str) -> List[Dict[str, Any]]:
-        """Get collection info (equivalent to columns in Qdrant)."""
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        try:
-            collection_info = self._client.get_collection(table_name)
-            return [
-                {
-                    "column_name": "id",
-                    "data_type": "UUID",
-                    "is_nullable": False
-                },
-                {
-                    "column_name": "vector",
-                    "data_type": f"VECTOR({collection_info.config.params.vectors.size})",
-                    "is_nullable": False
-                },
-                {
-                    "column_name": "payload",
-                    "data_type": "JSON",
-                    "is_nullable": True
-                }
-            ]
-        except Exception as e:
-            print(f"Error getting collection info: {e}")
-            return []
-    
-    def get_foreign_keys(self) -> List[Dict[str, str]]:
-        """Get foreign keys (not applicable for Qdrant)."""
-        return []
-    
-    def get_unique_values(self) -> Dict[str, Dict[str, List[str]]]:
-        """Get unique values from collections."""
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        # This is a simplified implementation
-        # In practice, you'd need to scroll through points and extract unique payload values
-        return {}
-    
-    def add_documentation(self, doc_type: str, content: Dict[str, Any]) -> str:
-        """Add documentation to Qdrant collection."""
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        try:
-            from qdrant_client.models import PointStruct
-            import uuid
-            
-            # Generate a unique ID for the document
-            doc_id = str(uuid.uuid4())
-            
-            # Create a point with the documentation content
-            point = PointStruct(
-                id=doc_id,
-                vector=content.get('vector', [0.0] * 384),  # Default vector size
-                payload={
-                    "doc_type": doc_type,
-                    "content": content
-                }
-            )
-            
-            # Upsert the point
-            self._client.upsert(
-                collection_name=self.collection_name,
-                points=[point]
-            )
-            
-            return doc_id
-        except Exception as e:
-            print(f"Error adding documentation: {e}")
-            raise
-    
-    def delete_collection(self, collection_name: str) -> bool:
-        """Delete a collection from Qdrant."""
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        try:
-            self._client.delete_collection(collection_name)
-            return True
-        except Exception as e:
-            print(f"Error deleting collection: {e}")
-            return False
-    
-    def create_collection(self, collection_name: str, vector_size: int = 384) -> bool:
-        """Create a new collection in Qdrant."""
-        if not self._client:
-            raise RuntimeError("Not connected to Qdrant")
-        
-        try:
-            from qdrant_client.models import VectorParams, Distance
-            
-            self._client.create_collection(
-                collection_name=collection_name,
-                vectors_config=VectorParams(
-                    size=vector_size,
-                    distance=Distance.COSINE
-                )
-            )
-            return True
-        except Exception as e:
-            print(f"Error creating collection: {e}")
-            return False

thoth_dbmanager/plugins/qdrant.py

@@ -1,41 +0,0 @@
-"""
-Qdrant plugin for Thoth SQL Database Manager.
-"""
-
-from typing import List
-from ..core.interfaces import DbPlugin
-from ..adapters.qdrant import QdrantAdapter
-
-
-class QdrantPlugin(DbPlugin):
-    """Plugin for Qdrant vector database."""
-    
-    plugin_name = "qdrant"
-    plugin_version = "1.0.0"
-    supported_db_types = ["qdrant"]
-    required_dependencies = ["qdrant-client"]
-    
-    def create_adapter(self, **kwargs) -> QdrantAdapter:
-        """Create and return a QdrantAdapter instance."""
-        return QdrantAdapter(**kwargs)
-    
-    def validate_connection_params(self, **kwargs) -> bool:
-        """Validate Qdrant connection parameters."""
-        required_params = ['host']
-        
-        for param in required_params:
-            if param not in kwargs:
-                return False
-        
-        # Validate host format
-        host = kwargs.get('host')
-        if not isinstance(host, str) or not host.strip():
-            return False
-        
-        # Validate port if provided
-        port = kwargs.get('port')
-        if port is not None:
-            if not isinstance(port, int) or port <= 0 or port > 65535:
-                return False
-        
-        return True