sunholo 0.83.2__py3-none-any.whl → 0.83.4__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -72,15 +72,18 @@ class AlloyDBClient:
         
         self.database = alloydb_config.get("database") or ALLOYDB_DB
 
+        self.user = user
+        self.password = password
+        self.inst_url = ""
         if user:
             log.info("User specified {user} - using pg8000 engine")
-            self.user = user
-            self.password = password
             self.inst_url = self._build_instance_uri(project_id, region, cluster_name, instance_name)
             self.engine = self._create_engine_from_pg8000()
+            self.engine_type = "pg8000"
         else:
             log.info("Build with Langchain engine - will use default service account for auth")
             self.engine = self._create_engine()
+            self.engine_type = "langchain"
 
     def _build_instance_uri(self, project_id, region, cluster_name, instance_name):
         return f"projects/{project_id}/locations/{region}/clusters/{cluster_name}/instances/{instance_name}"
@@ -119,7 +122,6 @@ class AlloyDBClient:
             region=self.config["region"],
             cluster=self.config["cluster"],
             instance=self.config["instance"],
-            user=self.user,
             password=self.password,
             database=self.database,
             ip_type=self.config.get("ip_type") or IPTypes.PRIVATE
@@ -128,8 +130,17 @@ class AlloyDBClient:
         log.info(f"Created AlloyDB engine for {engine}")
 
         return engine
-
+    
     def execute_sql(self, sql_statement):
+        if self.engine_type == "pg8000":
+            return self._execute_sql_pg8000(sql_statement)
+        elif self.engine_type == "langchain":
+            return self._execute_sql_langchain(sql_statement)
+    
+    def _execute_sql_langchain(self, sql_statement):
+        return self.engine._fetch(query = sql_statement)
+
+    def _execute_sql_pg8000(self, sql_statement):
         """Executes a given SQL statement with error handling.
 
          - sql_statement (str): The SQL statement to execute.
@@ -152,6 +163,17 @@ class AlloyDBClient:
         return result
     
     async def execute_sql_async(self, sql_statement):
+        if self.engine_type == "pg8000":
+            result = await self._execute_sql_async_pg8000(sql_statement)
+        elif self.engine_type == "langchain":
+            result = await self._execute_sql_async_langchain(sql_statement)
+        
+        return result
+
+    async def _execute_sql_async_langchain(self, sql_statement):
+        return await self.engine._afetch(query = sql_statement)
+        
+    async def _execute_sql_async_pg8000(self, sql_statement):
         """Executes a given SQL statement asynchronously with error handling."""
         sql_ = sqlalchemy.text(sql_statement)
         result = None

{sunholo-0.83.2.dist-info → sunholo-0.83.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.2
+Version: 0.83.4
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.83.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.83.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.83.2.dist-info → sunholo-0.83.4.dist-info}/RECORD

@@ -59,7 +59,7 @@ sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
 sunholo/database/alloydb.py,sha256=YH8wNPS8gN-TDZEXQcVHxwd1NScHRfAxma3gK4R6KCk,11740
-sunholo/database/alloydb_client.py,sha256=xqXhzHoh0e5RKz0wc7MwCayL89JdrYG016Oq-ZSNfBc,12731
+sunholo/database/alloydb_client.py,sha256=Ws_GfoST_WHqq7iISW06dqFeOnfbjdPaEl9qNm3cGEc,13651
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -134,9 +134,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.83.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.83.2.dist-info/METADATA,sha256=L_LY3La6qhCknE_-6il21csG0OjyiikTyiPiJTx2EQQ,7413
-sunholo-0.83.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.83.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.83.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.83.2.dist-info/RECORD,,
+sunholo-0.83.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.83.4.dist-info/METADATA,sha256=5ET_6DFTvDaLytFoVb5we2TYf0vMyhK657U1MYmTm0o,7413
+sunholo-0.83.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.83.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.83.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.83.4.dist-info/RECORD,,