sunholo 0.118.1__tar.gz → 0.118.4__tar.gz

{sunholo-0.118.1/src/sunholo.egg-info → sunholo-0.118.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sunholo
-Version: 0.118.1
+Version: 0.118.4
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0
@@ -59,10 +59,10 @@ Requires-Dist: lancedb; extra == "all"
 Requires-Dist: langchain>=0.2.16; extra == "all"
 Requires-Dist: langchain-experimental>=0.0.61; extra == "all"
 Requires-Dist: langchain-community>=0.2.11; extra == "all"
-Requires-Dist: langchain-openai==0.1.25; extra == "all"
-Requires-Dist: langchain-google-genai==1.0.10; extra == "all"
+Requires-Dist: langchain-openai>=0.3.2; extra == "all"
+Requires-Dist: langchain-google-genai>=2.0.9; extra == "all"
 Requires-Dist: langchain_google_alloydb_pg; extra == "all"
-Requires-Dist: langchain-anthropic==0.1.23; extra == "all"
+Requires-Dist: langchain-anthropic>=0.1.23; extra == "all"
 Requires-Dist: langchain-google-vertexai; extra == "all"
 Requires-Dist: langchain-unstructured; extra == "all"
 Requires-Dist: langfuse; extra == "all"
@@ -142,7 +142,7 @@ Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
 Requires-Dist: langchain-google-vertexai; extra == "gcp"
 Requires-Dist: pillow; extra == "gcp"
 Provides-Extra: openai
-Requires-Dist: langchain-openai==0.1.25; extra == "openai"
+Requires-Dist: langchain-openai>=0.3.2; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"
 Provides-Extra: anthropic
 Requires-Dist: langchain-anthropic>=0.1.23; extra == "anthropic"

{sunholo-0.118.1 → sunholo-0.118.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sunholo"
-version = "0.118.1"
+version = "0.118.4"
 description = "Large Language Model DevOps - a package to help deploy LLMs to the Cloud."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -90,10 +90,10 @@ all = [
     "langchain>=0.2.16",
     "langchain-experimental>=0.0.61",
     "langchain-community>=0.2.11",
-    "langchain-openai==0.1.25",
-    "langchain-google-genai==1.0.10",
+    "langchain-openai>=0.3.2",
+    "langchain-google-genai>=2.0.9",
     "langchain_google_alloydb_pg",
-    "langchain-anthropic==0.1.23",
+    "langchain-anthropic>=0.1.23",
     "langchain-google-vertexai",
     "langchain-unstructured",
     "langfuse",
@@ -180,7 +180,7 @@ gcp = [
     "pillow"
 ]
 openai = [
-    "langchain-openai==0.1.25",
+    "langchain-openai>=0.3.2",
     "tiktoken"
 ]
 anthropic = [

{sunholo-0.118.1 → sunholo-0.118.4}/src/sunholo/genai/file_handling.py

@@ -10,8 +10,10 @@ import os
 import traceback
 try:
     import google.generativeai as genai
+    from google import genai as genaiv2
 except ImportError:
     genai = None
+    genaiv2 = None
 
 DOCUMENT_MIMES = [
     'application/pdf',
@@ -85,7 +87,7 @@ def sanitize_file(filename):
     # Reattach the original extension
     return sanitized_name[:40]
 
-async def construct_file_content(gs_list, bucket:str):
+async def construct_file_content(gs_list, bucket:str, genai_lib=False):
     """
     Args:
     - gs_list: a list of dicts representing files in a bucket
@@ -93,6 +95,7 @@ async def construct_file_content(gs_list, bucket:str):
        - storagePath: The path in the bucket
        - name: The name of the file
     - bucket: The bucket the files are in
+    - genai: whether its using the genai SDK
 
     """
     
@@ -124,7 +127,12 @@ async def construct_file_content(gs_list, bucket:str):
         display_name = file_info['name']
         log.info(f"Processing {name=} {display_name=}")
         try:
-            myfile = genai.get_file(name)
+            if not genai_lib:
+                myfile = genai.get_file(name)
+            else:
+                client = genaiv2.Client()
+                myfile = client.files.get(name)
+
             content.append(
                 {"role": "user", "parts": [
                     {"file_data": myfile}, 
@@ -132,7 +140,6 @@ async def construct_file_content(gs_list, bucket:str):
                     ]
                 })
             log.info(f"Found existing genai.get_file {name=}")
-            
         except Exception as e:
             log.info(f"Not found checking genai.get_file: '{name}' {str(e)}")
             tasks.append(
@@ -140,7 +147,8 @@ async def construct_file_content(gs_list, bucket:str):
                                           mime_type=mime_type, 
                                           name=name, 
                                           display_url=display_url, 
-                                          display_name=display_name)
+                                          display_name=display_name,
+                                          genai_lib=genai_lib)
                                           )
 
     # Run all tasks in parallel
@@ -164,7 +172,7 @@ async def download_gcs_upload_genai(img_url,
                                     name=None, 
                                     display_url=None, 
                                     display_name=None, 
-                                    retries=3, delay=2):
+                                    retries=3, delay=2, genai_lib=False):
     import aiofiles
     from google.generativeai.types import file_types
     """
@@ -213,13 +221,23 @@ async def download_gcs_upload_genai(img_url,
 
             # Upload the file and get its content reference
             try:
-                downloaded_content: file_types.File = await asyncio.to_thread(
-                    partial(genai.upload_file, name=name, mime_type=mime_type, display_name=display_name), 
-                    sanitized_file
-                    )
-                return {"role": "user", "parts": [{"file_data": downloaded_content}, 
-                                                  {"text": f"You have been given the ability to read and work with filename '{display_name=}' with {mime_type=} {display_url=}"}
-                                                  ]}
+                if not genai_lib:
+                    downloaded_content: file_types.File = await asyncio.to_thread(
+                        partial(genai.upload_file, name=name, mime_type=mime_type, display_name=display_name), 
+                        sanitized_file
+                        )
+                    return {"role": "user", "parts": [{"file_data": downloaded_content}, 
+                                                    {"text": f"You have been given the ability to read and work with filename '{display_name=}' with {mime_type=} {display_url=}"}
+                                                    ]}
+                else:
+                    client = genaiv2.Client()
+                    downloaded_content = await asyncio.to_thread(
+                        partial(client.files.upload, name=name, config=dict(mime_type=mime_type, display_name=display_name)), 
+                        sanitized_file
+                        )
+                    return {"role": "user", "parts": [{"file_data": downloaded_content}, 
+                                                    {"text": f"You have been given the ability to read and work with filename '{display_name=}' with {mime_type=} {display_url=}"}
+                                                    ]}   
             except Exception as err:
                 msg = f"Could not upload {sanitized_file} to genai.upload_file: {str(err)} {traceback.format_exc()} {display_url=}"
                 log.error(msg)

{sunholo-0.118.1 → sunholo-0.118.4}/src/sunholo/utils/big_context.py

@@ -22,7 +22,8 @@ def has_text_extension(file_path):
         '.txt', '.md', '.py', '.json', '.xml', '.csv', '.html', '.htm',
         '.css', '.js', '.java', '.c', '.cpp', '.h', '.hpp', '.r', '.sh',
         '.bat', '.ini', '.yaml', '.yml', '.toml', '.pl', '.rb', '.go', 
-        '.ts', '.tsx', '.rs', '.swift', '.kt', '.kts', '.scala', '.sql'
+        '.ts', '.tsx', '.rs', '.swift', '.kt', '.kts', '.scala', '.sql',
+        '.tf', '.tfvars',
     }
     # Get the file extension and check if it's in the set
     _, ext = os.path.splitext(file_path)
@@ -141,6 +142,8 @@ def merge_text_files(source_folder, output_file, patterns):
                             outfile.write(f"\n--- End of {file_path} ---\n\n")
                     except (IOError, UnicodeDecodeError):
                         print(f"Skipping file (cannot read as text): {file_path}")
+                else:
+                    print(f"Skipping file (not a recognised text file extension): {file_path}")
         outfile.write("\n--- File Tree ---\n")
         outfile.write("\n".join(file_tree))
     

{sunholo-0.118.1 → sunholo-0.118.4/src/sunholo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sunholo
-Version: 0.118.1
+Version: 0.118.4
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0
@@ -59,10 +59,10 @@ Requires-Dist: lancedb; extra == "all"
 Requires-Dist: langchain>=0.2.16; extra == "all"
 Requires-Dist: langchain-experimental>=0.0.61; extra == "all"
 Requires-Dist: langchain-community>=0.2.11; extra == "all"
-Requires-Dist: langchain-openai==0.1.25; extra == "all"
-Requires-Dist: langchain-google-genai==1.0.10; extra == "all"
+Requires-Dist: langchain-openai>=0.3.2; extra == "all"
+Requires-Dist: langchain-google-genai>=2.0.9; extra == "all"
 Requires-Dist: langchain_google_alloydb_pg; extra == "all"
-Requires-Dist: langchain-anthropic==0.1.23; extra == "all"
+Requires-Dist: langchain-anthropic>=0.1.23; extra == "all"
 Requires-Dist: langchain-google-vertexai; extra == "all"
 Requires-Dist: langchain-unstructured; extra == "all"
 Requires-Dist: langfuse; extra == "all"
@@ -142,7 +142,7 @@ Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
 Requires-Dist: langchain-google-vertexai; extra == "gcp"
 Requires-Dist: pillow; extra == "gcp"
 Provides-Extra: openai
-Requires-Dist: langchain-openai==0.1.25; extra == "openai"
+Requires-Dist: langchain-openai>=0.3.2; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"
 Provides-Extra: anthropic
 Requires-Dist: langchain-anthropic>=0.1.23; extra == "anthropic"

{sunholo-0.118.1 → sunholo-0.118.4}/src/sunholo.egg-info/requires.txt

@@ -37,10 +37,10 @@ lancedb
 langchain>=0.2.16
 langchain-experimental>=0.0.61
 langchain-community>=0.2.11
-langchain-openai==0.1.25
-langchain-google-genai==1.0.10
+langchain-openai>=0.3.2
+langchain-google-genai>=2.0.9
 langchain_google_alloydb_pg
-langchain-anthropic==0.1.23
+langchain-anthropic>=0.1.23
 langchain-google-vertexai
 langchain-unstructured
 langfuse
@@ -139,7 +139,7 @@ langchain-community
 langsmith
 
 [openai]
-langchain-openai==0.1.25
+langchain-openai>=0.3.2
 tiktoken
 
 [pipeline]