clickzetta-dbutils 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

clickzetta_dbutils/db_utils.py

@@ -23,6 +23,7 @@ class ConnectionConfig:
     dsType: int
     schema: str = "public"
     workspaceName: str = "default"
+    table: Optional[str] = None
     host: Optional[str] = None
     magicToken: Optional[str] = None
     username: Optional[str] = None
@@ -223,6 +224,7 @@ class DatabaseConnectionManager:
                 query=conn_info.query
             )
             connect_args = {'options': self._convert_options(options)}
+
         elif ds_type == 1:  # ClickZetta
             if not conn_info.workspaceName or not conn_info.instanceName:
                 raise DatabaseConnectionError("Missing required parameters 'workspace_name', "
@@ -230,32 +232,39 @@ class DatabaseConnectionManager:
             if not self._vcluster:
                 raise DatabaseConnectionError("Missing virtual cluster for ClickZetta data source")
 
-            if conn_info.username and conn_info.password:
-                base_url = (f"clickzetta://{conn_info.username}:{conn_info.password}@{conn_info.instanceName}."
-                            f"{conn_info.host}/"
-                            f"{conn_info.workspaceName}"
-                            f"?virtualcluster={self._vcluster}"
-                            )
-            elif conn_info.magicToken:
-                base_url = (f"clickzetta://{conn_info.instanceName}.{conn_info.host}/"
-                            f"{conn_info.workspaceName}"
-                            f"?magic_token={conn_info.magicToken}"
-                            f"&virtualcluster={self._vcluster}"
-                            )
-            else:
-                raise ValueError("username and password or token must be specified")
+            # Generate base parameters
+            query_params = {
+                "virtualcluster": self._vcluster
+            }
 
-            # Add schema if provided
             if schema:
-                base_url += f"&schema={schema}"
+                query_params["schema"] = schema
 
-            options.update(conn_info.query)
+            query_params.update(options)
+            query_params.update(conn_info.query)
 
-            # Add query string if provided
-            if options:
-                base_url += f"&{urllib.parse.urlencode(options)}"
+            full_host = f"{conn_info.instanceName}.{conn_info.host}"
 
-            url = base_url
+            if conn_info.username and conn_info.password:
+                url = URL.create(
+                    drivername="clickzetta",
+                    username=conn_info.username,
+                    password=conn_info.password,
+                    host=full_host,
+                    database=conn_info.workspaceName,
+                    query=query_params
+                )
+            elif conn_info.magicToken:
+                # Use magic token for authentication, do not require username and password
+                query_params["magic_token"] = conn_info.magicToken
+                url = URL.create(
+                    drivername="clickzetta",
+                    host=full_host,
+                    database=conn_info.workspaceName,
+                    query=query_params
+                )
+            else:
+                raise ValueError("username and password or token must be specified")
         else:
             raise ValueError(f"Unsupported data source type: {ds_type}")
 
@@ -266,7 +275,7 @@ class DatabaseConnectionManager:
     def _convert_options(options):
         if not options:
             return ''
-        return ' '.join([f'-c {k}={v}' for k, v in options.items()])
+        return ' '.join([f'-c{k}={v}' for k, v in options.items()])
 
 
 def get_lakehouse_connection(conn):
@@ -279,6 +288,8 @@ def get_active_engine(
         workspace: Optional[str] = None,
         schema: Optional[str] = None,
         options: Optional[Dict[str, str]] = None,
+        query: Optional[Dict[str, str]] = None,
+        driver: Optional[str] = None,
         *args, **kwargs
 ) -> Engine:
     """
@@ -290,6 +301,9 @@ def get_active_engine(
         workspace (str, optional): Workspace name. Default is 'default'.
         schema (str, optional): Schema name for the connection. Default is 'public'.
         options (dict, optional): Additional connection options.
+        query (dict, optional): Additional query parameters for SQLAlchemy url.
+        driver (str, optional): Driver name for the connection.
+        *args: Additional arguments for SQLAlchemy engine.
 
     Returns:
         SQLAlchemy Engine instance
@@ -304,5 +318,9 @@ def get_active_engine(
         manager.use_vcluster(vcluster)
     if options:
         manager.use_options(options)
+    if query:
+        manager.use_query(query)
+    if driver:
+        manager.use_driver(driver)
 
     return manager.build(*args, **kwargs)

clickzetta_dbutils/version.py

@@ -1 +1 @@
-__version__ = "1.0.5"
+__version__ = "1.0.7"

{clickzetta_dbutils-1.0.5.dist-info → clickzetta_dbutils-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: clickzetta-dbutils
-Version: 1.0.5
+Version: 1.0.7
 Summary: clickzetta dbutils
 Author-email: "lin.zhang" <lin.zhang@clickzetta.com>
 Project-URL: documentation, https://www.yunqi.tech/
@@ -14,13 +14,10 @@ Requires-Dist: psycopg2-binary
 Requires-Dist: mysql-connector-python
 Provides-Extra: dev
 Requires-Dist: pytest==8.2.1; extra == "dev"
-Requires-Dist: sqlparse; extra == "dev"
-Requires-Dist: grpcio; extra == "dev"
-Requires-Dist: grpcio-tools; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
-Requires-Dist: pytz; extra == "dev"
-Requires-Dist: apache-superset==4.0.2; extra == "dev"
+Provides-Extra: cliclzetta-legecy-sdk
+Requires-Dist: clickzetta-connector; extra == "cliclzetta-legecy-sdk"
+Requires-Dist: clickzetta-sqlalchemy; extra == "cliclzetta-legecy-sdk"
 Provides-Extra: cliclzetta
-Requires-Dist: clickzetta-connector; extra == "cliclzetta"
-Requires-Dist: clickzetta-sqlalchemy; extra == "cliclzetta"
+Requires-Dist: clickzetta-connector-python; extra == "cliclzetta"

clickzetta_dbutils-1.0.7.dist-info/RECORD

@@ -0,0 +1,7 @@
+clickzetta_dbutils/__init__.py,sha256=Q_6kas0RvZ0767qlaA_xGESmXxm0dks1YQ8DqCX8LV0,290
+clickzetta_dbutils/db_utils.py,sha256=Vv00OcjoBZdC8z1ucEtekEwqPhu95GkgazBdoRBd-bI,10643
+clickzetta_dbutils/version.py,sha256=98rTj2jvgnCZhTIeHpbml7e2xuhIqt_9BJNSWkWEQb8,21
+clickzetta_dbutils-1.0.7.dist-info/METADATA,sha256=IPehhi4jMgaS7VZfqMhSwTkYkAbnLXHKf708o4537jo,852
+clickzetta_dbutils-1.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+clickzetta_dbutils-1.0.7.dist-info/top_level.txt,sha256=8o5KqMSg9pxnPNejHjMaqZV2vEDvwvsz2GdChZI0N6I,19
+clickzetta_dbutils-1.0.7.dist-info/RECORD,,

clickzetta_dbutils-1.0.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-clickzetta_dbutils/__init__.py,sha256=Q_6kas0RvZ0767qlaA_xGESmXxm0dks1YQ8DqCX8LV0,290
-clickzetta_dbutils/db_utils.py,sha256=TQobsTlxNTzUwIFgWZvVMtydNUPk_7AG82ChWQ4BCQY,10085
-clickzetta_dbutils/version.py,sha256=ZR1VA9cGs0vIK6cWK4YKLfBTnmUCAcDaaP9ARPPYxEs,21
-clickzetta_dbutils-1.0.5.dist-info/METADATA,sha256=2QYdvLVx4oQCI0J727G0ACdKrwuNAlYXjPpUKuSS6mI,938
-clickzetta_dbutils-1.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-clickzetta_dbutils-1.0.5.dist-info/top_level.txt,sha256=8o5KqMSg9pxnPNejHjMaqZV2vEDvwvsz2GdChZI0N6I,19
-clickzetta_dbutils-1.0.5.dist-info/RECORD,,