ara-cli 0.1.9.91__tar.gz → 0.1.9.93__tar.gz

{ara_cli-0.1.9.91 → ara_cli-0.1.9.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.91
+Version: 0.1.9.93
 Summary: Powerful, open source command-line tool for managing, structuring and automating software development artifacts in line with Business-Driven Development (BDD) and AI-assisted processes
 Description-Content-Type: text/markdown
 Requires-Dist: litellm

{ara_cli-0.1.9.91 → ara_cli-0.1.9.93}/ara_cli/ara_config.py

@@ -97,12 +97,12 @@ class ARAconfig(BaseModel):
             max_tokens=4000
         )
     })
-    default_llm: Optional[str] = "gpt-5"
-    extraction_llm: Optional[str] = "gpt-5-mini"
+    default_llm: Optional[str] = None
+    extraction_llm: Optional[str] = None
 
     @model_validator(mode='after')
     def check_critical_fields(self) -> 'ARAconfig':
-        """Check for empty critical fields and use defaults if needed."""
+        """Check for empty critical fields and validate default_llm and extraction_llm."""
         critical_fields = {
             'ext_code_dirs': [{"source_dir": "./src"}, {"source_dir": "./tests"}],
             'local_ara_templates_dir': "./ara/.araconfig/templates/",
@@ -116,6 +116,30 @@ class ARAconfig(BaseModel):
                 print(f"Warning: Value for '{field}' is missing or empty. Using default.")
                 setattr(self, field, default_value)
         
+        if not self.llm_config:
+            print("Warning: 'llm_config' is empty. 'default_llm' and 'extraction_llm' cannot be set.")
+            self.default_llm = None
+            self.extraction_llm = None
+            return self
+
+        first_available_llm = next(iter(self.llm_config))
+
+        if not self.default_llm:
+            print(f"Warning: 'default_llm' is not set. Defaulting to the first available model: '{first_available_llm}'.")
+            self.default_llm = first_available_llm
+        elif self.default_llm not in self.llm_config:
+            print(f"Warning: The configured 'default_llm' ('{self.default_llm}') does not exist in 'llm_config'.")
+            print(f"-> Reverting to the first available model: '{first_available_llm}'.")
+            self.default_llm = first_available_llm
+
+        if not self.extraction_llm:
+            print(f"Warning: 'extraction_llm' is not set. Setting it to the same as 'default_llm': '{self.default_llm}'.")
+            self.extraction_llm = self.default_llm
+        elif self.extraction_llm not in self.llm_config:
+            print(f"Warning: The configured 'extraction_llm' ('{self.extraction_llm}') does not exist in 'llm_config'.")
+            print(f"-> Reverting to the 'default_llm' value: '{self.default_llm}'.")
+            self.extraction_llm = self.default_llm
+            
         return self
 
 # Function to ensure the necessary directories exist

{ara_cli-0.1.9.91 → ara_cli-0.1.9.93}/ara_cli/chat.py

@@ -532,7 +532,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         return [x for x in glob.glob(text + '*')]
 
     def _retrieve_ara_config(self):
-        from ara_cli.ara_config import ConfigManager
+        from ara_cli.prompt_handler import ConfigManager
         return ConfigManager().get_config()
 
     def _retrieve_llm_config(self):
@@ -625,7 +625,7 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
     @cmd2.with_category(CATEGORY_LLM_CONTROL)
     def do_CHOOSE_MODEL(self, model_name):
         from ara_cli.prompt_handler import LLMSingleton
-        from ara_cli.ara_config import DEFAULT_CONFIG_LOCATION, save_data, ConfigManager
+        from ara_cli.ara_config import DEFAULT_CONFIG_LOCATION, save_data
         from ara_cli.directory_navigator import DirectoryNavigator
 
         original_dir = os.getcwd()
@@ -634,22 +634,20 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         os.chdir('..')
 
         if not self._verify_llm_choice(model_name):
-            os.chdir(original_dir)
             return
 
-        ConfigManager.reset()
-        self.config = ConfigManager.get_config()
         self.config.default_llm = model_name
         save_data(filepath=DEFAULT_CONFIG_LOCATION, config=self.config)
 
-        LLMSingleton.set_model(model_name)
+        LLMSingleton.set_default_model(model_name)
+        print(f"Language model switched to '{model_name}'")
 
         os.chdir(original_dir)
 
     @cmd2.with_category(CATEGORY_LLM_CONTROL)
     def do_CHOOSE_EXTRACTION_MODEL(self, model_name):
-        """Choose the language model for extraction tasks."""
-        from ara_cli.ara_config import DEFAULT_CONFIG_LOCATION, save_data, ConfigManager
+        from ara_cli.prompt_handler import LLMSingleton
+        from ara_cli.ara_config import DEFAULT_CONFIG_LOCATION, save_data
         from ara_cli.directory_navigator import DirectoryNavigator
 
         original_dir = os.getcwd()
@@ -658,27 +656,28 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         os.chdir('..')
 
         if not self._verify_llm_choice(model_name):
-            os.chdir(original_dir)
             return
 
-        ConfigManager.reset()
-        self.config = ConfigManager.get_config()
         self.config.extraction_llm = model_name
         save_data(filepath=DEFAULT_CONFIG_LOCATION, config=self.config)
+        
+        LLMSingleton.set_extraction_model(model_name)
         print(f"Extraction model switched to '{model_name}'")
 
         os.chdir(original_dir)
 
     @cmd2.with_category(CATEGORY_LLM_CONTROL)
     def do_CURRENT_MODEL(self, _):
-        """Displays the current default and extraction language models."""
-        from ara_cli.ara_config import ConfigManager
+        from ara_cli.prompt_handler import LLMSingleton
+
+        print(LLMSingleton.get_default_model())
 
-        ConfigManager.reset()
-        config = self._retrieve_ara_config()
+    @cmd2.with_category(CATEGORY_LLM_CONTROL)
+    def do_CURRENT_EXTRACTION_MODEL(self, _):
+        """Displays the current extraction language model."""
+        from ara_cli.prompt_handler import LLMSingleton
         
-        print(f"Current Reasoning LLM (default_llm): {config.default_llm}")
-        print(f"Current Extraction LLM (extraction_llm): {config.extraction_llm}")
+        print(LLMSingleton.get_extraction_model())
 
     def _complete_llms(self, text, line, begidx, endidx):
         llm_config = self._retrieve_llm_config()

{ara_cli-0.1.9.91 → ara_cli-0.1.9.93}/ara_cli/prompt_handler.py

@@ -17,47 +17,84 @@ import logging
 
 class LLMSingleton:
     _instance = None
-    _model = None
+    _default_model = None
+    _extraction_model = None
 
-    def __init__(self, model_id):
+    def __init__(self, default_model_id, extraction_model_id):
         config = ConfigManager().get_config()
-        selected_config = config.llm_config.get(str(model_id))
+        default_config_data = config.llm_config.get(str(default_model_id))
 
-        if not selected_config:
-            raise ValueError(f"No configuration found for the model: {model_id}")
-        
-        LLMSingleton._model = model_id
+        if not default_config_data:
+            raise ValueError(f"No configuration found for the default model: {default_model_id}")
+        self.default_config_params = default_config_data.model_dump(exclude_none=True)
 
-        # Typesafe for None values inside the config.
-        self.config_parameters = selected_config.model_dump(exclude_none=True)
+        extraction_config_data = config.llm_config.get(str(extraction_model_id))
+        if not extraction_config_data:
+            raise ValueError(f"No configuration found for the extraction model: {extraction_model_id}")
+        self.extraction_config_params = extraction_config_data.model_dump(exclude_none=True)
 
+        LLMSingleton._default_model = default_model_id
+        LLMSingleton._extraction_model = extraction_model_id
         LLMSingleton._instance = self
 
     @classmethod
     def get_instance(cls):
         if cls._instance is None:
             config = ConfigManager().get_config()
-            llm_config = config.llm_config
-            model_to_use = next(iter(llm_config))
-            default_llm = getattr(config, "default_llm", None)
-            if default_llm and default_llm in llm_config:
-                model_to_use = default_llm
-            cls(model_to_use)
+            default_model = config.default_llm
+            if not default_model:
+                if not config.llm_config:
+                    raise ValueError("No LLM configurations are defined in the configuration file.")
+                default_model = next(iter(config.llm_config))
+
+            extraction_model = getattr(config, 'extraction_llm', default_model)
+            if not extraction_model:
+                extraction_model = default_model
+
+            cls(default_model, extraction_model)
         return cls._instance
 
     @classmethod
-    def set_model(cls, model_name):
-        if model_name == cls._model:
+    def get_config_by_purpose(cls, purpose='default'):
+        """
+        purpose= 'default' or 'extraction'
+        """
+        instance = cls.get_instance()
+        if purpose == 'extraction':
+            return instance.extraction_config_params.copy()
+        return instance.default_config_params.copy()
+
+    @classmethod
+    def set_default_model(cls, model_name):
+        """Sets the default language model for the current session."""
+        cls.get_instance()
+        if model_name == cls._default_model:
             return cls._instance
-        cls(model_name)
-        print(f"Language model switched to '{model_name}'")
+        cls(model_name, cls._extraction_model)
         return cls._instance
 
     @classmethod
-    def get_model(cls):
+    def set_extraction_model(cls, model_name):
+        """Sets the extraction language model for the current session."""
+        cls.get_instance()
+        if model_name == cls._extraction_model:
+            return cls._instance
+        cls(cls._default_model, model_name)
+        return cls._instance
+
+    @classmethod
+    def get_default_model(cls):
+        """Gets the default model name stored in the singleton instance."""
+        if cls._instance is None:
+            cls.get_instance()
+        return cls._default_model
+
+    @classmethod
+    def get_extraction_model(cls):
+        """Gets the extraction model name stored in the singleton instance."""
         if cls._instance is None:
             cls.get_instance()
-        return cls._model
+        return cls._extraction_model
 
 
 def write_string_to_file(filename, string, mode):
@@ -71,28 +108,6 @@ def read_string_from_file(path):
         text = file.read()
     return text
 
-def _get_model_config(purpose: str) -> dict:
-    """
-    Resolves model ID by purpose and returns its prepared configuration for LiteLLM.
-    """
-    config = ConfigManager().get_config()
-
-    # Determine which model to use based on the purpose
-    model_id = config.default_llm
-    if purpose == 'extraction':
-        # Use extraction_llm if it exists, otherwise fall back to default_llm
-        model_id = getattr(config, 'extraction_llm', config.default_llm)
-
-    selected_config = config.llm_config.get(str(model_id))
-
-    if not selected_config:
-        raise ValueError(f"No configuration found for model '{model_id}' used for '{purpose}'")
-
-    config_parameters = selected_config.model_dump(exclude_none=True)
-    config_parameters.pop("provider", None)
-    
-    return config_parameters
-
 
 def _is_valid_message(message: dict) -> bool:
     """
@@ -116,7 +131,10 @@ def _is_valid_message(message: dict) -> bool:
 
 def send_prompt(prompt, purpose='default'):
     """Prepares and sends a prompt to the LLM, streaming the response."""
-    config_parameters = _get_model_config(purpose)
+    chat_instance = LLMSingleton.get_instance()
+    config_parameters = chat_instance.get_config_by_purpose(purpose)
+
+    config_parameters.pop("provider", None)
 
     filtered_prompt = [msg for msg in prompt if _is_valid_message(msg)]
 
@@ -172,9 +190,9 @@ def describe_image(image_path: str) -> str:
         ]
     }
     
-    # Get response from LLM
+    # Get response from LLM using the extraction model purpose
     response_text = ""
-    for chunk in send_prompt([message]):
+    for chunk in send_prompt([message], purpose='extraction'):
         chunk_content = chunk.choices[0].delta.content
         if chunk_content:
             response_text += chunk_content
@@ -461,7 +479,11 @@ def append_images_to_message(message, image_data_list):
     message_content = message["content"]
     logger.debug(f"Original message content: {message_content}")
 
-    message["content"] = message_content + image_data_list
+    if isinstance(message_content, str):
+        message["content"] = [{"type": "text", "text": message_content}]
+    
+    message["content"].extend(image_data_list)
+
     logger.debug(f"Updated message content with {len(image_data_list)} images")
 
     return message
@@ -517,7 +539,7 @@ def generate_config_prompt_template_file(prompt_data_path, config_prompt_templat
 def generate_config_prompt_givens_file(prompt_data_path, config_prompt_givens_name, artefact_to_mark=None):
     config_prompt_givens_path = os.path.join(prompt_data_path, config_prompt_givens_name)
     config = ConfigManager.get_config()
-    dir_list = ["ara"] + [ext['source_dir'] for ext in config.ext_code_dirs] + [config.doc_dir] + [config.glossary_dir]
+    dir_list = ["ara"] + [path for d in config.ext_code_dirs for path in d.values()] + [config.doc_dir] + [config.glossary_dir]
 
     print(f"used {dir_list} for prompt givens file listing")
     generate_markdown_listing(dir_list, config.ara_prompt_given_list_includes, config_prompt_givens_path)

{ara_cli-0.1.9.91 → ara_cli-0.1.9.93}/ara_cli/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.9.91"   # fith parameter like .0 for local install test purposes only. official numbers should be 4 digit numbers
+__version__ = "0.1.9.93"   # fith parameter like .0 for local install test purposes only. official numbers should be 4 digit numbers

{ara_cli-0.1.9.91 → ara_cli-0.1.9.93}/ara_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.91
+Version: 0.1.9.93
 Summary: Powerful, open source command-line tool for managing, structuring and automating software development artifacts in line with Business-Driven Development (BDD) and AI-assisted processes
 Description-Content-Type: text/markdown
 Requires-Dist: litellm