sunholo 0.90.5__tar.gz → 0.91.0__tar.gz

{sunholo-0.90.5 → sunholo-0.91.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.90.5
+Version: 0.91.0
 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.90.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.91.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -24,6 +24,7 @@ Requires-Dist: langchain>=0.2.12
 Requires-Dist: langchain_experimental>=0.0.61
 Requires-Dist: langchain-community>=0.2.11
 Provides-Extra: all
+Requires-Dist: anthropic[vertex]; extra == "all"
 Requires-Dist: asyncpg; extra == "all"
 Requires-Dist: azure-identity; extra == "all"
 Requires-Dist: azure-storage-blob; extra == "all"
@@ -98,6 +99,7 @@ Requires-Dist: pytesseract; extra == "pipeline"
 Requires-Dist: tabulate; extra == "pipeline"
 Requires-Dist: unstructured[local-inference]==0.14.9; extra == "pipeline"
 Provides-Extra: gcp
+Requires-Dist: anthropic[vertex]; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"
 Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
 Requires-Dist: google-auth-httplib2; extra == "gcp"

{sunholo-0.90.5 → sunholo-0.91.0}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.90.5'
+version = '0.91.0'
 
 setup(
     name='sunholo',
@@ -36,6 +36,7 @@ setup(
     extras_require={
         # Define optional dependencies with feature names
         'all': [
+            "anthropic[vertex]",
             "asyncpg",
             "azure-identity",
             "azure-storage-blob",
@@ -115,6 +116,7 @@ setup(
             "unstructured[local-inference]==0.14.9",
         ],
         'gcp': [
+            "anthropic[vertex]",
             "google-api-python-client",
             "google-cloud-alloydb-connector[pg8000]",
             "google-auth-httplib2",
@@ -139,7 +141,7 @@ setup(
             "tiktoken"
         ],
         'anthropic': [
-            "langchain-anthropic>=0.1.13",        
+            "langchain-anthropic>=0.1.13"   
         ],
         'tools' : [
             'openapi-spec-validator',

{sunholo-0.90.5 → sunholo-0.91.0}/sunholo/components/llm.py

@@ -114,9 +114,18 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None, config=None):
     elif llm_str == 'anthropic':
         from langchain_anthropic import ChatAnthropic
         if model is None:
-            model = 'claude-3-opus-20240229'
+            model = 'claude-3-5-sonnet-20240620'
             log.info(f"No 'model' value in config file - selecting default {model}")
         return ChatAnthropic(model_name = model, temperature=0)
+    elif llm_str == 'anthropic-vertex':
+        from langchain_google_vertexai.model_garden import ChatAnthropicVertex
+        if model is None:
+            model = "claude-3-5-sonnet@20240620"
+            log.info(f"No 'model' value in config file - selecting default {model}")
+        gcp_config = config.vacConfig("gcp_config")
+        return ChatAnthropicVertex(model_name=model, 
+                                   project=gcp_config.get('project_id'), 
+                                   location=gcp_config.get('location'))
 
     if llm_str is None:
         raise NotImplementedError(f'No llm implemented for {llm_str}') 

{sunholo-0.90.5 → sunholo-0.91.0}/sunholo/database/alloydb_client.py

@@ -3,7 +3,7 @@ try:
     import pg8000
     import sqlalchemy
     from sqlalchemy.exc import DatabaseError, ProgrammingError
-    from langchain_google_alloydb_pg import AlloyDBEngine
+    from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore
 except ImportError:
     AlloyDBEngine = None
     pass
@@ -12,6 +12,7 @@ from .database import get_vector_size
 from .uuid import generate_uuid_from_object_id
 from ..custom_logging import log
 from ..utils import ConfigManager
+from ..components import get_embeddings
 
 class AlloyDBClient:
     """
@@ -62,6 +63,7 @@ class AlloyDBClient:
             if not alloydb_config:
                 raise ValueError("Must specify vac.alloydb_config")
             self.config = alloydb_config
+            self.vector_name = self.config.vector_name
             project_id = alloydb_config["project_id"]
             region = alloydb_config["region"]
             cluster_name = alloydb_config["cluster"]
@@ -87,6 +89,11 @@ class AlloyDBClient:
             log.info("Build with Langchain engine - will use default service account for auth")
             self.engine = self._create_engine()
             self.engine_type = "langchain"
+        
+        if self.engine_type == "langchain":
+            self.vectorstore = self.get_vectorstore()
+        else:        
+            self.vectorstore = None
 
     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}"
@@ -134,6 +141,52 @@ class AlloyDBClient:
 
         return engine
     
+    def _get_embedder(self, vector_name):
+        return get_embeddings(vector_name)
+    
+    def get_vectorstore(self):
+        if self.engine_type != "langchain":
+            raise ValueError("Not available using pg8000 engine")
+        
+        if self.vector_name is None:
+            raise ValueError("No vectorname found - init with ConfigManager?")
+        
+        vector_size = get_vector_size(self.vector_name)
+        table_name = f"{self.vector_name}_vectorstore_{vector_size}"
+
+        log.info(f"Initialised AlloyDBClient with AlloyDBVectorStore: {table_name}")
+        self.vectorstore = AlloyDBVectorStore.create_sync(
+                engine=self.engine,
+                table_name=table_name,
+                embedding_service=self._get_embedder(self.vector_name),
+                metadata_columns=["source", "docstore_doc_id"]
+                #metadata_columns=["source", "eventTime"]
+            )
+        
+        return self.vectorstore
+    
+    def _similarity_search(self, query, source_filter:str="", free_filter:str=None):
+
+        if free_filter is None:
+            source_filter_cmd = f"source %LIKE% {source_filter}" if source_filter else None
+        else:
+            source_filter_cmd = free_filter
+
+        log.info(f"Similarity search for {query} and {source_filter_cmd}")       
+
+        return query, source_filter_cmd
+
+    def similarity_search(self, query, source_filter:str="", free_filter:str=None, k:int=5):
+
+        query, source_filter_cmd = self._similarity_search(query, source_filter, free_filter)     
+
+        return self.vectorstore.similarity_search(query, filter=source_filter_cmd, k=k)
+
+    async def asimilarity_search(self, query, source_filter:str="", free_filter:str=None, k:int=5):
+        query, source_filter_cmd = self._similarity_search(query, source_filter, free_filter)     
+
+        return await self.vectorstore.asimilarity_search(query, filter=source_filter_cmd, k=k)
+
     def execute_sql(self, sql_statement):
         if self.engine_type == "pg8000":
             return self._execute_sql_pg8000(sql_statement)

{sunholo-0.90.5 → sunholo-0.91.0}/sunholo/langfuse/evals.py

@@ -3,6 +3,7 @@ import json
 
 from ..pubsub import decode_pubsub_message
 from langfuse import Langfuse
+import traceback
 from ..custom_logging import log
 
 # Example of how eval_funcs might be structured
@@ -71,7 +72,7 @@ def do_evals(trace_id, eval_funcs: list=[eval_length], **kwargs) -> dict:
         try:
             eval_result = eval_func(trace)  # Assuming eval_func returns a dict with 'score' and 'reason'
         except Exception as e:
-            eval_result = {"score": 0, "reason":f"ERROR: {str(e)}"}
+            eval_result = {"score": 0, "reason":f"ERROR: {str(e)} traceback: {traceback.format_exc()}"}
         eval_results.append(eval_result)
 
         eval_name = eval_func.__name__

{sunholo-0.90.5 → sunholo-0.91.0}/sunholo/llamaindex/llamaindex_class.py

@@ -178,6 +178,8 @@ class LlamaIndexVertexCorpusManager:
     
     def query_corpus(self, query:str, corpus_disply_name:str):
         corpus = self.find_corpus_from_list(corpus_disply_name)
+
+        log.info(f"Querying {corpus.name=} with {query=}")
         
         response:RetrieveContextsResponse = rag.retrieval_query(
             rag_resources=[

{sunholo-0.90.5 → sunholo-0.91.0}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.90.5
+Version: 0.91.0
 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.90.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.91.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -24,6 +24,7 @@ Requires-Dist: langchain>=0.2.12
 Requires-Dist: langchain_experimental>=0.0.61
 Requires-Dist: langchain-community>=0.2.11
 Provides-Extra: all
+Requires-Dist: anthropic[vertex]; extra == "all"
 Requires-Dist: asyncpg; extra == "all"
 Requires-Dist: azure-identity; extra == "all"
 Requires-Dist: azure-storage-blob; extra == "all"
@@ -98,6 +99,7 @@ Requires-Dist: pytesseract; extra == "pipeline"
 Requires-Dist: tabulate; extra == "pipeline"
 Requires-Dist: unstructured[local-inference]==0.14.9; extra == "pipeline"
 Provides-Extra: gcp
+Requires-Dist: anthropic[vertex]; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"
 Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
 Requires-Dist: google-auth-httplib2; extra == "gcp"

{sunholo-0.90.5 → sunholo-0.91.0}/sunholo.egg-info/requires.txt

@@ -5,6 +5,7 @@ langchain_experimental>=0.0.61
 langchain-community>=0.2.11
 
 [all]
+anthropic[vertex]
 asyncpg
 azure-identity
 azure-storage-blob
@@ -83,6 +84,7 @@ requests
 rich
 
 [gcp]
+anthropic[vertex]
 google-api-python-client
 google-cloud-alloydb-connector[pg8000]
 google-auth-httplib2