ara-cli 0.1.9.91__py3-none-any.whl → 0.1.9.92__py3-none-any.whl

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/chat.py

@@ -671,14 +671,23 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
 
     @cmd2.with_category(CATEGORY_LLM_CONTROL)
     def do_CURRENT_MODEL(self, _):
-        """Displays the current default and extraction language models."""
+        """Displays the current default (reasoning) language model."""
         from ara_cli.ara_config import ConfigManager
 
         ConfigManager.reset()
         config = self._retrieve_ara_config()
         
-        print(f"Current Reasoning LLM (default_llm): {config.default_llm}")
-        print(f"Current Extraction LLM (extraction_llm): {config.extraction_llm}")
+        print(config.default_llm)
+
+    @cmd2.with_category(CATEGORY_LLM_CONTROL)
+    def do_CURRENT_EXTRACTION_MODEL(self, _):
+        """Displays the current extraction language model."""
+        from ara_cli.ara_config import ConfigManager
+
+        ConfigManager.reset()
+        config = self._retrieve_ara_config()
+        
+        print(config.extraction_llm)
 
     def _complete_llms(self, text, line, begidx, endidx):
         llm_config = self._retrieve_llm_config()

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.92"   # fith parameter like .0 for local install test purposes only. official numbers should be 4 digit numbers

{ara_cli-0.1.9.91.dist-info → ara_cli-0.1.9.92.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.91
+Version: 0.1.9.92
 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.dist-info → ara_cli-0.1.9.92.dist-info}/RECORD

@@ -2,7 +2,7 @@ ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
 ara_cli/__main__.py,sha256=J5DCDLRZ6UcpYwM1-NkjaLo4PTetcSj2dB4HrrftkUw,2064
 ara_cli/ara_command_action.py,sha256=_LHE2V5hbJxN7ccYiptuPktRfbTnXmQEt_D_FxDBlBY,22456
 ara_cli/ara_command_parser.py,sha256=I-e9W-QwTIMKMzlHycSlCWCyBFQfiFYvGre1XsDbrFI,20573
-ara_cli/ara_config.py,sha256=B_o6llPUNVOluOt1d-ioE7KZMa9wEuxONh2G9JyTYLQ,7410
+ara_cli/ara_config.py,sha256=5uBo_flNgZSk7B9lmyfvzWyxfIQzb13LbieCpJfdZJI,8765
 ara_cli/artefact_autofix.py,sha256=WVTiIR-jo4YKmmz4eS3qTFvl45W1YKwAk1XSuz9QX10,20015
 ara_cli/artefact_creator.py,sha256=0Ory6cB-Ahkw-BDNb8QHnTbp_OHGABdkb9bhwcEdcIc,6063
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
@@ -12,7 +12,7 @@ ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,47
 ara_cli/artefact_reader.py,sha256=Pho0_Eqm7kD9CNbVMhKb6mkNM0I3iJiCJXbXmVp1DJU,7827
 ara_cli/artefact_renamer.py,sha256=Hnz_3zD9xxnBa1FHyUE6mIktLk_9ttP2rFRvQIkmz-o,4061
 ara_cli/artefact_scan.py,sha256=msPCm-vPWOAZ_e_z5GylXxq1MtNlmJ4zvKrsdOFCWF4,4813
-ara_cli/chat.py,sha256=Y_LSYvpntnoRikYSOI95rWPImA-Rr_xppNIhN-cjjUY,37966
+ara_cli/chat.py,sha256=m_nMOCKDhjC4SPEDiG3Wu_0hLphe0ey0A4YuZV0LQxQ,38167
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
@@ -31,7 +31,7 @@ ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,23
 ara_cli/tag_extractor.py,sha256=TGdaQOVnjy25R0zDsAifB67C5oom0Fwo24s0_fr5A_I,3151
 ara_cli/template_manager.py,sha256=YwrN6AYPpl6ZrW8BVQpVXx8yTRf-oNpJUIKeg4NAggs,6606
 ara_cli/update_config_prompt.py,sha256=Oy9vNTw6UhDohyTEfSKkqE5ifEMPlmWNYkKHgUrK_pY,4607
-ara_cli/version.py,sha256=B3OzxM9cfU7TOWcR4tcsGLFojByOhZd98cMMsL45DYc,146
+ara_cli/version.py,sha256=NFSXE1c5XdqCXt75PBLQ12kGF9XoLW2MiAQbfCkmfto,146
 ara_cli/artefact_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/artefact_models/artefact_load.py,sha256=IXzWxP-Q_j_oDGMno0m-OuXCQ7Vd5c_NctshGr4ROBw,621
 ara_cli/artefact_models/artefact_mapping.py,sha256=8aD0spBjkJ8toMAmFawc6UTUxB6-tEEViZXv2I-r88Q,1874
@@ -153,8 +153,8 @@ tests/test_prompt_handler.py,sha256=Ysxq2e6JFfNpj3bTRFNNThzpDNkAGDphwVf2Ysz2EK0,
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
 tests/test_template_manager.py,sha256=q-LMHRG4rHkD6ON6YW4cpZxUx9hul6Or8wVVRC2kb-8,4099
 tests/test_update_config_prompt.py,sha256=xsqj1WTn4BsG5Q2t-sNPfu7EoMURFcS-hfb5VSXUnJc,6765
-ara_cli-0.1.9.91.dist-info/METADATA,sha256=V9fNcWjRmFt46pPhw1qNZKejVfobM82LT0s2kXmEaM4,6739
-ara_cli-0.1.9.91.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.91.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.91.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.91.dist-info/RECORD,,
+ara_cli-0.1.9.92.dist-info/METADATA,sha256=9X9Ol5Xh8ApM3-XaY1O_FbfNNCjqdLErIR-y5zxQklw,6739
+ara_cli-0.1.9.92.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.92.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.92.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.92.dist-info/RECORD,,