ara-cli 0.1.13.3__py3-none-any.whl → 0.1.14.0__py3-none-any.whl

ara_cli/chat.py

@@ -3,8 +3,6 @@ import sys
 import argparse
 import cmd2
 
-from ara_cli.prompt_handler import send_prompt
-
 from . import (
     CATEGORY_CHAT_CONTROL,
     CATEGORY_LLM_CONTROL,
@@ -17,19 +15,11 @@ from . import BINARY_TYPE_MAPPING, DOCUMENT_TYPE_EXTENSIONS
 from . import error_handler
 from ara_cli.error_handler import AraError, AraConfigurationError
 
-from ara_cli.file_loaders.document_file_loader import DocumentFileLoader
-from ara_cli.file_loaders.binary_file_loader import BinaryFileLoader
-from ara_cli.file_loaders.text_file_loader import TextFileLoader
 from ara_cli.chat_agent.agent_process_manager import AgentProcessManager
 
 from ara_cli.chat_script_runner.script_runner import ScriptRunner
 from ara_cli.chat_script_runner.script_completer import ScriptCompleter
 from ara_cli.chat_script_runner.script_lister import ScriptLister
-from ara_cli.chat_web_search.web_search import (
-    perform_web_search_completion,
-    is_web_search_supported,
-    get_supported_models_message,
-)
 
 
 extract_parser = argparse.ArgumentParser()
@@ -291,21 +281,24 @@ class Chat(cmd2.Cmd):
         with open(self.chat_name, "a+", encoding="utf-8") as file:
             last_line = self.get_last_line(file)
 
-            print(role_marker)
+            self.poutput(role_marker)
 
             if not last_line.startswith(role_marker):
                 if last_line:
                     file.write("\n")
                 file.write(role_marker + "\n")
+                file.flush()
+
+            from ara_cli.prompt_handler import send_prompt
 
             for chunk in send_prompt(prompt_to_send):
                 chunk_content = chunk.choices[0].delta.content
                 if not chunk_content:
                     continue
-                print(chunk_content, end="", flush=True)
+                self.poutput(chunk_content, end="")
                 file.write(chunk_content)
                 file.flush()
-            print()
+            self.poutput("")
 
         self.message_buffer.clear()
 
@@ -381,6 +374,8 @@ class Chat(cmd2.Cmd):
         block_delimiter: str = "",
         extract_images: bool = False,
     ):
+        from ara_cli.file_loaders.loaders.text_file_loader import TextFileLoader
+
         loader = TextFileLoader(self)
         return loader.load(
             file_path,
@@ -393,12 +388,14 @@ class Chat(cmd2.Cmd):
     def load_binary_file(
         self, file_path, mime_type: str, prefix: str = "", suffix: str = ""
     ):
+        from ara_cli.file_loaders.loaders.binary_file_loader import BinaryFileLoader
+
         loader = BinaryFileLoader(self)
         return loader.load(file_path, mime_type=mime_type, prefix=prefix, suffix=suffix)
 
     def read_markdown(self, file_path: str, extract_images: bool = False) -> str:
         """Read markdown file and optionally extract/describe images"""
-        from ara_cli.file_loaders.text_file_loader import MarkdownReader
+        from ara_cli.file_loaders.readers.markdown_reader import MarkdownReader
 
         reader = MarkdownReader(file_path)
         return reader.read(extract_images=extract_images)
@@ -411,6 +408,8 @@ class Chat(cmd2.Cmd):
         block_delimiter: str = "```",
         extract_images: bool = False,
     ):
+        from ara_cli.file_loaders.loaders.document_file_loader import DocumentFileLoader
+
         loader = DocumentFileLoader(self)
         return loader.load(
             file_path,
@@ -549,7 +548,7 @@ class Chat(cmd2.Cmd):
     def complete_LOAD(self, text, line, begidx, endidx):
         import glob
 
-        return [x for x in glob.glob(text + "*")]
+        return [x for x in glob.glob(glob.escape(text) + "*")]
 
     def _retrieve_ara_config(self):
         from ara_cli.prompt_handler import ConfigManager
@@ -568,6 +567,10 @@ class Chat(cmd2.Cmd):
             print("What file do you want to load? ", end="", flush=True)
             file_name = sys.stdin.readline().strip()
         file_pattern = os.path.join(os.path.dirname(self.chat_name), file_name)
+
+        if os.path.exists(file_pattern):
+            return [file_pattern]
+
         matching_files = glob.glob(file_pattern)
         if not matching_files:
             error_handler.report_error(
@@ -617,6 +620,11 @@ class Chat(cmd2.Cmd):
 
         # Check if web search is supported by the current model
         from ara_cli.prompt_handler import LLMSingleton
+        from ara_cli.chat_web_search.web_search import (
+            perform_web_search_completion,
+            is_web_search_supported,
+            get_supported_models_message,
+        )
 
         chat_instance = LLMSingleton.get_instance()
         config_parameters = chat_instance.get_config_by_purpose("default")