sunholo 0.73.2__py3-none-any.whl → 0.73.3__py3-none-any.whl

sunholo/cli/chat_vac.py

@@ -8,6 +8,8 @@ from ..qna.parsers import parse_output
 from ..gcs.add_file import add_file_to_gcs
 from .run_proxy import clean_proxy_list, start_proxy, stop_proxy
 from ..invoke import invoke_vac
+from ..utils.big_context import has_text_extension, merge_text_files, load_gitignore_patterns, build_file_tree
+import tempfile
 
 import uuid
 import os
@@ -24,6 +26,55 @@ from rich.panel import Panel
 from rich.text import Text
 from rich.table import Table
 
+def read_and_add_to_user_input(user_input):
+    read_input = None
+
+    path = user_input.split(" ", 1)[1] if " " in user_input else None
+    if not path:
+        console.print("[bold red]Please provide a valid file or folder path.[/bold red]")
+        return None
+
+    if os.path.isfile(path):
+        if not has_text_extension(path):
+            console.print("[bold red]Unsupported file type. Please provide a text file or preprocess to text, or use !upload (e.g. images) or `sunholo embed`.[/bold red]")
+            return None
+
+        try:
+            with open(path, 'r', encoding='utf-8') as file:
+                file_content = file.read()
+            read_input = file_content
+            console.print(f"[bold yellow]File content from {path} read into user_input: [{len(read_input.split())}] words[/bold yellow]")
+        except FileNotFoundError:
+            console.print("[bold red]File not found. Please check the path and try again.[/bold red]")
+            return None
+        except IOError:
+            console.print("[bold red]File could not be read. Please ensure it is a readable text file.[/bold red]")
+            return None
+    elif os.path.isdir(path):
+        patterns = []
+        gitignore_path = os.path.join(path, '.gitignore')
+    
+        if os.path.exists(gitignore_path):
+            patterns = load_gitignore_patterns(gitignore_path)
+    
+        try:
+            with tempfile.NamedTemporaryFile(delete=False, mode='w+', encoding='utf-8') as temp_file:
+                temp_file_path = temp_file.name
+                file_tree = merge_text_files(path, temp_file_path, patterns)
+                console.print(f"[bold yellow]Contents of the folder '{path}' have been merged add added to input.[/bold yellow]")
+                console.print("\n".join(file_tree))
+                temp_file.seek(0)
+                read_input = temp_file.read()
+                console.print(f"[bold yellow]Total words: [{len(read_input.split())}] - watch out for high token costs! Use !clear_read to reset[/bold yellow]")
+            os.remove(temp_file_path)  # Clean up the temporary file
+        except Exception as e:
+            console.print(f"[bold red]An error occurred while reading the folder: {str(e)}[/bold red]")
+            return None
+    else:
+        console.print("[bold red]The provided path is neither a file nor a folder. Please check the path and try again.[/bold red]")
+        return None
+    
+    return read_input
 
 def get_service_url(vac_name, project, region, no_config=False):
 
@@ -67,6 +118,8 @@ def stream_chat_session(service_url, service_name, stream=True):
     chat_history = []
     agent_name = ConfigManager(service_name).vacConfig("agent")
     file_reply = None
+    read_file = None
+    read_file_count = None
     while True:
         session_id = str(uuid.uuid4())
         user_input = Prompt.ask("[bold cyan]You[/bold cyan]")
@@ -81,9 +134,26 @@ def stream_chat_session(service_url, service_name, stream=True):
 
         if special_reply:
              console.print(f"[bold yellow]{service_name}:[/bold yellow] {special_reply}", end='\n')
-             continue    
-
-        if user_input.lower().startswith("upload"):
+             continue
+
+        if user_input.lower().startswith("!read"):
+            read_file = read_and_add_to_user_input(user_input)
+            if read_file:
+                read_file_count = len(read_file.split())
+            continue
+
+        if user_input.lower().startswith("!ls"):
+            items = os.listdir(os.getcwd())
+            for item in items:
+                console.print(item)
+            continue
+
+        if user_input.lower().startswith("!tree"):
+            tree = build_file_tree(os.getcwd(), patterns=[])
+            console.print(tree)
+            continue
+
+        if user_input.lower().startswith("!upload"):
             file_path = user_input.split(" ", 1)[1] if " " in user_input else None
             if not file_path:
                 console.print("[bold red]Please provide a valid file path.[/bold red]")
@@ -95,7 +165,7 @@ def stream_chat_session(service_url, service_name, stream=True):
                     console.print("[bold red]Invalid file upload[/bold red]")
                     continue
                 
-                console.print(f"[bold yellow]{service_name}:[/bold yellow] Uploaded {file_path} to {file_reply} - image will be sent each reply until you issue 'clear_upload' ", end='\n')
+                console.print(f"[bold yellow]{service_name}:[/bold yellow] Uploaded {file_path} to {file_reply} - image will be sent each reply until you issue '!clear_upload' ", end='\n')
             
             except FileNotFoundError:
                 console.print("[bold red]File not found. Please check the path and try again.[/bold red]")
@@ -103,10 +173,25 @@ def stream_chat_session(service_url, service_name, stream=True):
             # file_reply stays for each message from now on
             continue 
 
-        if user_input.lower().startswith("clear_upload"):
+        if user_input.lower().startswith("!clear_upload"):
             console.print("[bold yellow]File upload path cleared.[/bold yellow]")
             file_path = None
+            continue
+
+        if user_input.lower().startswith("!clear_read"):
+            console.print("[bold yellow]Read in file(s) cleared.[/bold yellow]")
+            read_file = None
+            read_file_count = None
+            continue
         
+        if read_file:
+            user_input = f"<user added file>{read_file}</user added file>\n{user_input}"
+        
+        # guardrail
+        if len(user_input)> 1000000:
+            console.print("[bold red]Over 1 million characters in user_input, aborting as probably unintentional. Use API directly instead.[/bold red]")
+            continue
+
         if not stream:
             vac_response = send_to_qa(user_input,
                 vector_name=service_name,
@@ -166,8 +251,15 @@ def stream_chat_session(service_url, service_name, stream=True):
             response_started = False
             vac_response = ""
 
-            # point or star?
-            with console.status(f"[bold orange]Thinking...{file_reply}[/bold orange]", spinner="star") as status:
+            
+            thinking = "[bold orange]Thinking...[/bold orange]"
+            if file_reply:
+                thinking = f"[bold orange]Thinking with upload {file_reply} - issue !clear_upload to remove...[/bold orange]"
+            
+            if read_file:
+                thinking = f"{thinking} - [bold orange]additional [{read_file_count}] words added via !read_file contents - issue !clear_read to remove[/bold orange]"
+
+            with console.status(thinking, spinner="star") as status:
                 for token in stream_response():
                     if not response_started:
                         status.stop()

{sunholo-0.73.2.dist-info → sunholo-0.73.3.dist-info}/METADATA

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

{sunholo-0.73.2.dist-info → sunholo-0.73.3.dist-info}/RECORD

@@ -33,7 +33,7 @@ sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
 sunholo/chunker/publish.py,sha256=tiO615A2uo_ZjzdFDzNH1PL_1kJeLMUQwLJ4w67rNIc,2932
 sunholo/chunker/splitter.py,sha256=jtGfi_ZdhVdyFhfw0e4ynEpmwIyrxQtV63OituYWy6o,6729
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/chat_vac.py,sha256=nDhBwUW7RHj7s4qhUcSK2FK4ae031iM71eKQ_WLBxgc,18695
+sunholo/cli/chat_vac.py,sha256=9NNdIt0pWLZandxtav9Eu7ru9WOBHjh1TN1oP3pqMbM,22852
 sunholo/cli/cli.py,sha256=u70fcSQzQx2iPvE23SVCVYRFabmZ-XtgEd6vHcrABi0,3725
 sunholo/cli/cli_init.py,sha256=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
@@ -117,9 +117,9 @@ sunholo/vertex/extensions_class.py,sha256=4PsUM9dSYrIPpq9bZ3K2rL9MRb_rlqAgnMsW0o
 sunholo/vertex/init.py,sha256=-w7b9GKsyJnAJpYHYz6_zBUtmeJeLXlEkgOfwoe4DEI,2715
 sunholo/vertex/memory_tools.py,sha256=pomHrDKqvY8MZxfUqoEwhdlpCvSGP6KmFJMVKOimXjs,6842
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
-sunholo-0.73.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.73.2.dist-info/METADATA,sha256=TUj-qcbRdSqJj0mt0Nz3mhoiz2oYwRgWEfVt3vDqgag,6909
-sunholo-0.73.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-sunholo-0.73.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.73.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.73.2.dist-info/RECORD,,
+sunholo-0.73.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.73.3.dist-info/METADATA,sha256=oZNyJJifnIAdT0EMyILv8u5vKUaR4lzyPUmNcXU9bvw,6909
+sunholo-0.73.3.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+sunholo-0.73.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.73.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.73.3.dist-info/RECORD,,