sunholo 0.83.1__py3-none-any.whl → 0.83.3__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -43,6 +43,7 @@ class AlloyDBClient:
                  cluster_name:str=None, 
                  instance_name:str=None, 
                  user:str=None,
+                 password:str=None,
                  db="postgres"):
         """Initializes the AlloyDB client.
          - project_id (str): GCP project ID where the AlloyDB instance resides.
@@ -71,11 +72,40 @@ class AlloyDBClient:
         
         self.database = alloydb_config.get("database") or ALLOYDB_DB
 
-        if user and not user.endswith(".iam"):
-            raise ValueError("If you supply an IAM user it must end with .iam e.g. 'sa-cloudbuild@multivac-deploy.iam'")
-        
         self.user = user
-        self.engine = self._create_engine()
+        self.password = password
+        self.inst_url = ""
+        if user:
+            log.info("User specified {user} - using pg8000 engine")
+            self.inst_url = self._build_instance_uri(project_id, region, cluster_name, instance_name)
+            self.engine = self._create_engine_from_pg8000()
+        else:
+            log.info("Build with Langchain engine - will use default service account for auth")
+            self.engine = self._create_engine()
+
+    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}"
+    
+    def _create_engine_from_pg8000(self, user, password, db):
+        def getconn() -> pg8000.dbapi.Connection:
+            conn = self.connector.connect(
+                self.inst_uri,
+                "pg8000",
+                user=user,
+                password=password,
+                db=db,
+                enable_iam_auth=True,
+            )
+            return conn
+
+        engine = sqlalchemy.create_engine(
+            "postgresql+pg8000://", 
+            isolation_level="AUTOCOMMIT", 
+            creator=getconn)
+        engine.dialect.description_encoding = None
+
+        log.info(f"Created AlloyDB engine for {self.inst_uri} and user: {user}")
+        return engine
 
     def _create_engine(self):
         if not AlloyDBEngine:
@@ -90,7 +120,7 @@ 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
         )

{sunholo-0.83.1.dist-info → sunholo-0.83.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.1
+Version: 0.83.3
 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.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.83.3.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.83.1.dist-info → sunholo-0.83.3.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=3Jdye7vTfAVQhAmEd5FjxBQ0a_iENFmvzoOIP-pNz6I,11554
+sunholo/database/alloydb_client.py,sha256=138gtbPzgcFT9j6hLQ1QD263ny_wJ0qPXCjKIK49Xts,12722
 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.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.83.1.dist-info/METADATA,sha256=yihJkACY1C9pmb-C1dCKwI714WHSYVr_DkcCrPU_gCs,7413
-sunholo-0.83.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.83.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.83.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.83.1.dist-info/RECORD,,
+sunholo-0.83.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.83.3.dist-info/METADATA,sha256=SIKK5jlQKCKbpXixBWG5EJZiU_BUku1ytzEbiz0tnWE,7413
+sunholo-0.83.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.83.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.83.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.83.3.dist-info/RECORD,,