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

sunholo/database/alloydb_client.py

@@ -3,7 +3,7 @@ try:
     import pg8000
     import sqlalchemy
     from sqlalchemy.exc import DatabaseError, ProgrammingError
-    from google.cloud.alloydb.connector import Connector
+    from langchain_google_alloydb_pg import AlloyDBEngine
 except ImportError:
     AlloyDBEngine = None
     pass
@@ -42,16 +42,15 @@ class AlloyDBClient:
                  region: str=None, 
                  cluster_name:str=None, 
                  instance_name:str=None, 
-                 user:str=None, 
-                 password=None, 
+                 user:str=None,
+                 password:str=None,
                  db="postgres"):
         """Initializes the AlloyDB client.
          - project_id (str): GCP project ID where the AlloyDB instance resides.
          - region (str): The region where the AlloyDB instance is located.
          - cluster_name (str): The name of the AlloyDB cluster.
          - instance_name (str): The name of the AlloyDB instance.
-         - user (str): The database user name.
-         - password (str): The database user's password.
+         - user (str): If user is None will use the default service email
          - db_name (str): The name of the database.
         """
         if config is None:
@@ -61,6 +60,7 @@ class AlloyDBClient:
             alloydb_config = config.vacConfig("alloydb_config")
             if not alloydb_config:
                 raise ValueError("Must specify vac.alloydb_config")
+            self.config = alloydb_config
             project_id = alloydb_config["project_id"]
             region = alloydb_config["region"]
             cluster_name = alloydb_config["cluster"]
@@ -70,18 +70,25 @@ class AlloyDBClient:
         if ALLOYDB_DB is None and alloydb_config.get("database") is None:
             log.warning("Could not locate ALLOYDB_DB environment variable or 'alloydb_config.database'")
         
-        self.database = alloydb_config.get("database") or ALLOYDB_DB,
-        self.connector = Connector()
-        self.inst_uri = self._build_instance_uri(project_id, region, cluster_name, instance_name)
-        self.engine = self._create_engine(self.inst_uri, user, password, db)
+        self.database = alloydb_config.get("database") or ALLOYDB_DB
+
+        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()
+        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(self, inst_uri, user, password, db):
+    
+    def _create_engine_from_pg8000(self, user, password, db):
         def getconn() -> pg8000.dbapi.Connection:
             conn = self.connector.connect(
-                inst_uri,
+                self.inst_uri,
                 "pg8000",
                 user=user,
                 password=password,
@@ -93,10 +100,33 @@ class AlloyDBClient:
         engine = sqlalchemy.create_engine(
             "postgresql+pg8000://", 
             isolation_level="AUTOCOMMIT", 
-            creator=getconn
-        )
+            creator=getconn)
         engine.dialect.description_encoding = None
-        log.info(f"Created AlloyDB engine for {inst_uri} and user: {user}")
+
+        log.info(f"Created AlloyDB engine for {self.inst_uri} and user: {user}")
+        return engine
+
+    def _create_engine(self):
+        if not AlloyDBEngine:
+                log.error("Can't create AlloyDBEngine - install via `pip install sunholo[gcp,database]`")
+                raise ValueError("Can't import AlloyDBEngine")
+
+        log.info("Inititaing AlloyDB Langchain engine for database: {self.database}")
+
+        from google.cloud.alloydb.connector import IPTypes
+        engine = AlloyDBEngine.from_instance(
+            project_id=self.config["project_id"],
+            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
+        )
+
+        log.info(f"Created AlloyDB engine for {engine}")
+
         return engine
 
     def execute_sql(self, sql_statement):
@@ -153,7 +183,7 @@ class AlloyDBClient:
         return documents
 
     def get_sources_from_docstore(self, sources, vector_name, search_type="OR", just_source_name=False):
-        """Fetches sources from the docstore asynchronously."""
+        """Fetches sources from the docstore."""
         if just_source_name:
             query = self._list_sources_from_docstore(sources, vector_name=vector_name, search_type=search_type)
         else:
@@ -163,7 +193,7 @@ class AlloyDBClient:
             return []
 
         documents = self.execute_sql(query)
-        
+
         return documents
 
     def _get_sources_from_docstore(self, sources, vector_name, search_type="OR"):

sunholo/vertex/memory_tools.py

@@ -133,8 +133,8 @@ def get_google_search_grounding(vector_name:str=None, config:ConfigManager=None)
         config = ConfigManager(vector_name)
 
     # can't have this and llamaindex memories?
-    ground = config.vacConfig("grounding")
-    if ground and ground.get("google_search"):
+    tools = config.vacConfig("tools")
+    if tools and tools.get("google_search"):
         gs_tool = Tool.from_google_search_retrieval(grounding.GoogleSearchRetrieval())
         log.info(f"Got Search Tool: {gs_tool}")
         return gs_tool

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

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

{sunholo-0.83.0.dist-info → sunholo-0.83.2.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=7qO_WMTIDGK9KMZEtF00Ov7y73qTx8vSX76qObNGjgA,11611
+sunholo/database/alloydb_client.py,sha256=xqXhzHoh0e5RKz0wc7MwCayL89JdrYG016Oq-ZSNfBc,12731
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -131,12 +131,12 @@ sunholo/vertex/extensions_call.py,sha256=QeQbL3aAHlc4_-SynOzooZ_3xkQWAlcgNmFBSwL
 sunholo/vertex/extensions_class.py,sha256=2QGW28lNjoMEnaoVb3QcqEDwphclIsZthnpLUi5_Ivo,21033
 sunholo/vertex/genai_functions.py,sha256=2z6grM9H0Z79Yzx88l8mE1wXck3bRa0TWvnqZZ9ifDc,2051
 sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
-sunholo/vertex/memory_tools.py,sha256=pgSahVDh7GPEulu3nl-w0jb5lTClb4TCnVxPnMokNZY,7533
+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.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.83.0.dist-info/METADATA,sha256=SfRk-Y5FsBylKffBnHxxoURZxAHFfhl5SfC7JAnO-fg,7413
-sunholo-0.83.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.83.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.83.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.83.0.dist-info/RECORD,,
+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,,