ara-cli 0.1.9.93__py3-none-any.whl → 0.1.9.95__py3-none-any.whl

{ara_cli-0.1.9.93.dist-info → ara_cli-0.1.9.95.dist-info}/RECORD

@@ -1,18 +1,18 @@
-ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
+ara_cli/__init__.py,sha256=CzGZUcf4WQP051xeNziNKQj8oNr-n_lZCW5_cR_WNVw,455
 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=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/ara_command_action.py,sha256=uyMN05ZYffWqN9nwL53MmQ_yHpuxHVqZ_scAMEoD1jw,21516
+ara_cli/ara_command_parser.py,sha256=A1lMc9Gc0EMJt-380PTcv3aKoxbXGfx5gGax-sZqV3I,21020
+ara_cli/ara_config.py,sha256=VJeage_v-446OtSXIfpazUbetpH7kGNv8Un1lKYx5ZE,9321
+ara_cli/artefact_autofix.py,sha256=w6erUYrpPiwtHToiZEfjkDgDDPPSA9zaNc7w2NqrZ2M,20730
+ara_cli/artefact_creator.py,sha256=wchIq1w636ui_kRCfNWPffqiIiXqSb49pgTpQj3KzA0,6132
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
 ara_cli/artefact_fuzzy_search.py,sha256=iBlDqjZf-_D3VUjFf7ZwkiQbpQDcwRndIU7aG_sRTgE,2668
 ara_cli/artefact_link_updater.py,sha256=nKdxTpDKqWTOAMD8viKmUaklSFGWzJZ8S8E8xW_ADuM,3775
-ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
+ara_cli/artefact_lister.py,sha256=M-ggazAgZ-OLeW9NB48r_sd6zPx0p4hEpeS63qHwI1A,4176
 ara_cli/artefact_reader.py,sha256=Pho0_Eqm7kD9CNbVMhKb6mkNM0I3iJiCJXbXmVp1DJU,7827
-ara_cli/artefact_renamer.py,sha256=Hnz_3zD9xxnBa1FHyUE6mIktLk_9ttP2rFRvQIkmz-o,4061
+ara_cli/artefact_renamer.py,sha256=8S4QWD19_FGKsKlWojnu_RUOxx0u9rmLugydM4s4VDc,4219
 ara_cli/artefact_scan.py,sha256=msPCm-vPWOAZ_e_z5GylXxq1MtNlmJ4zvKrsdOFCWF4,4813
-ara_cli/chat.py,sha256=mbpv5XQOcJSAUBJxCrfmyl7W5a0GhQU9cblxiTJNpP8,37841
+ara_cli/chat.py,sha256=i2v-Ctem66sgO-HUV3kvMbk4wfotsc2oNet_i1-wfAI,39901
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
@@ -21,18 +21,20 @@ ara_cli/directory_navigator.py,sha256=6QbSAjJrJ5a6Lutol9J4HFgVDMiAQ672ny9TATrh04
 ara_cli/file_classifier.py,sha256=A7wilPtIFm81iMgvqD0PjkOVL_QMUc9TB2w2Z9UcPcM,4001
 ara_cli/file_lister.py,sha256=0C-j8IzajXo5qlvnuy5WFfe43ALwJ-0JFh2K6Xx2ccw,2332
 ara_cli/filename_validator.py,sha256=Aw9PL8d5-Ymhp3EY6lDrUBk3cudaNqo1Uw5RzPpI1jA,118
+ara_cli/global_file_lister.py,sha256=IIrtFoN5KYyJ3jVPanXZJ4UbYZfSdONRwxkZzvmq6-k,2806
 ara_cli/list_filter.py,sha256=qKGwwQsrWe7L5FbdxEbBYD1bbbi8c-RMypjXqXvLbgs,5291
 ara_cli/output_suppressor.py,sha256=nwiHaQLwabOjMoJOeUESBnZszGMxrQZfJ3N2OvahX7Y,389
 ara_cli/prompt_chat.py,sha256=kd_OINDQFit6jN04bb7mzgY259JBbRaTaNp9F-webkc,1346
-ara_cli/prompt_extractor.py,sha256=Sk1aQkvn8W_YNcGhfChsbT19wUAWEJmOHTr3mveyQww,7754
-ara_cli/prompt_handler.py,sha256=6yfiMFNHGHANREAsjT8dv9jKxBKeazPkF7xQQI4l6vQ,22312
+ara_cli/prompt_extractor.py,sha256=-_17aVYXYH6kPX5FOSb9T8lbEkKPXE6nlHWq1pvO_Og,8423
+ara_cli/prompt_handler.py,sha256=8a9fcMwE_C6ntbw7UeroNJeU5LxrxEppiUtvYNUTB2U,23292
 ara_cli/prompt_rag.py,sha256=ydlhe4CUqz0jdzlY7jBbpKaf_5fjMrAZKnriKea3ZAg,7485
 ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,2360
-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=UYGRHXHl4vgX5k6OLDjyffvrV4jDkHj_fVeKiGqQ8XU,146
+ara_cli/tag_extractor.py,sha256=k2yRl7dAMZ4YTARzUke4wgY0oEIOmWkOHGet7nXB6uw,3317
+ara_cli/template_manager.py,sha256=l2c785YHB7m0e2TjE0CX-nwXrS4v3EiT9qrS5KuatAc,7105
+ara_cli/update_config_prompt.py,sha256=moqj2Kha7S7fEGzTReU0v2y8UjXC8QfnoiieOQr35C4,5157
+ara_cli/version.py,sha256=rYDZfGIzWScBRjMjgeqPAsdSGThurJ7PgpedF2Ekr2U,146
 ara_cli/artefact_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ara_cli/artefact_models/artefact_data_retrieval.py,sha256=CooXOJBYWSyiViN2xkC8baS8OUaslry3YGVVUeDxRAU,527
 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
 ara_cli/artefact_models/artefact_model.py,sha256=qSbcrmFWAYgBqcNl9QARI1_uLQJm-TPVgP5q2AEFnjE,15983
@@ -50,15 +52,20 @@ ara_cli/artefact_models/userstory_artefact_model.py,sha256=2awH31ROtm7j4T44Bv4cy
 ara_cli/artefact_models/vision_artefact_model.py,sha256=frjaUJj-mmIlVHEhzAQztCGs-CtvNu_odSborgztfzo,5251
 ara_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/commands/command.py,sha256=Y_2dNeuxRjbyI3ScXNv55lptSe8Hs_ya78L0nPYNZHA,154
-ara_cli/commands/extract_command.py,sha256=TfKuOnKQzJ8JPpJyKDm7qhm5mvbZnHspCem8g6YgACo,835
+ara_cli/commands/extract_command.py,sha256=qpi2_ac3DyxS7FiOz4GsTtRR4xtpegckUmfXzDOwymM,858
 ara_cli/commands/load_command.py,sha256=H3CfeHIL-criDU5oi4BONTSpyzJ4m8DzJ0ZCIiAZFeI,2204
 ara_cli/commands/load_image_command.py,sha256=g9-PXAYdqx5Ed1PdVo-FIb4CyJGEpRFbgQf9Dxg6DmM,886
+ara_cli/commands/read_command.py,sha256=bo1BvRWuNKdFqBNN1EWORNrX_yuFAOyBruDUolHq1Vc,3791
 ara_cli/file_loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/file_loaders/binary_file_loader.py,sha256=1HHH1Nk4lEM83CTnf4z9wYz6rMLgpxydFoRcSgkBHmQ,940
 ara_cli/file_loaders/document_file_loader.py,sha256=VxGFChYyM9K-e6eOCK3yk5jQuEXgz01Mh_NoA6CA_RM,1017
 ara_cli/file_loaders/document_reader.py,sha256=SD9_5-XJ6homKUes6o8GWcG--X63UslfAosPbrJZQvo,7721
+ara_cli/file_loaders/document_readers.py,sha256=aG7xrUJwLxWpuFTYlvxzDqoS00Idpvwzt865L0OuQcA,8124
 ara_cli/file_loaders/file_loader.py,sha256=bc1BrMG4pEtwsZLm3Ct53YsMPgnbSaEvZEd8isRDYRY,1711
-ara_cli/file_loaders/text_file_loader.py,sha256=x_ZqnOUb2glpdxziceWCBX8oEBk7JZhAluLRRvBjuQs,6626
+ara_cli/file_loaders/file_loaders.py,sha256=9QqArTRDmcUUar58JEr-qnpiAtH9ySP-MV9bvooQNpI,4290
+ara_cli/file_loaders/image_processor.py,sha256=laPThh-i0-obYyS_linQTMcTUwuxMxrSjedGRYb8cIA,3462
+ara_cli/file_loaders/markdown_reader.py,sha256=R-hvvc9Sj9pWwENqJ0j6wrW0eN1tUqEKWcK2YUFsvsU,2542
+ara_cli/file_loaders/text_file_loader.py,sha256=62U59RkWgAML0U0P-sUeFsK51mJM8Fu54gGlnmMwYpY,6804
 ara_cli/templates/agile.artefacts,sha256=nTA8dp98HWKAD-0qhmNpVYIfkVGoJshZqMJGnphiOsE,7932
 ara_cli/templates/template.businessgoal.prompt_log.md,sha256=xF6bkgj_GqAAqHxJWJiQNt11mEuSGemIqoZ2wOo6dI0,214
 ara_cli/templates/template.capability.prompt_log.md,sha256=eO8EzrHgb2vYJ-DP1jGzAfDlMo8nY75hZDfhh0s40uQ,208
@@ -134,27 +141,28 @@ ara_cli/templates/specification_breakdown_files/template.technology.exploration.
 ara_cli/templates/specification_breakdown_files/template.technology.md,sha256=bySiksz-8xtq0Nnj4svqe2MgUftWrVkbK9AcrDUE3KY,952
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_ara_command_action.py,sha256=JTLqXM9BSMlU33OQgrk_sZnoowFJZKZAx8q-st-wa34,25821
-tests/test_ara_config.py,sha256=H5GwDbab0GMSa6IbHdruzmbsHy5Ia0xX0uteJdfZ9Rg,14277
+tests/test_ara_config.py,sha256=RbVhS0SS1lr_SVopEMT1Fake5a-4rWN8MprgJtgI-FA,15883
 tests/test_artefact_autofix.py,sha256=pApZ-N0dW8Ujt-cNLbgvd4bhiIIK8oXb-saLf6QlA-8,25022
 tests/test_artefact_fuzzy_search.py,sha256=5Sh3_l9QK8-WHn6JpGPU1b6h4QEnl2JoMq1Tdp2cj1U,1261
 tests/test_artefact_link_updater.py,sha256=biqbEp2jCOz8giv72hu2P2hDfeJfJ9OrVGdAv5d9cK4,2191
-tests/test_artefact_lister.py,sha256=VCEOCgDgnAOeUUgIoGAbWgz60hf9UT-tdHg18LGfB34,22656
+tests/test_artefact_lister.py,sha256=35R13UU-YsX1HOsEN8M2-vIiCUA9RSBm6SwestDaFhE,20388
 tests/test_artefact_reader.py,sha256=660K-d8ed-j8hulsUB_7baPD2-hhbg9TffUR5yVc4Uo,927
 tests/test_artefact_renamer.py,sha256=lSnKCCfoFGgKhTdDZrEaeBq1xJAak1QoqH5aSeOe9Ro,3494
 tests/test_artefact_scan.py,sha256=uNWgrt7ieZ4ogKACsPqzAsh59JF2BhTKSag31hpVrTQ,16887
-tests/test_chat.py,sha256=-2vs3ORlym0yv05BLSCNX-6tNYXqoZiBFar8gswPuw8,57072
+tests/test_chat.py,sha256=sf4mXmOjXZeaYPNSYXSyfz0b5pZA6Mq7_R3gWjQaJw4,56152
 tests/test_classifier.py,sha256=grYGPksydNdPsaEBQxYHZTuTdcJWz7VQtikCKA6BNaQ,1920
 tests/test_directory_navigator.py,sha256=7G0MVrBbtBvbrFUpL0zb_9EkEWi1dulWuHsrQxMJxDY,140
 tests/test_file_classifier.py,sha256=kLWPiePu3F5mkVuI_lK_2QlLh2kXD_Mt2K8KZZ1fAnA,10940
 tests/test_file_creator.py,sha256=D3G7MbgE0m8JmZihxnTryxLco6iZdbV--2CGc0L20FM,2109
 tests/test_file_lister.py,sha256=Q9HwhKKx540EPzTmfzOCnvtAgON0aMmpJE2eOe1J3EA,4324
+tests/test_global_file_lister.py,sha256=ycvf2YL8q5QSEMwcnQfUdoWnQQ8xTSyEtccAeXwl6QU,5487
 tests/test_list_filter.py,sha256=fJA3d_SdaOAUkE7jn68MOVS0THXGghy1fye_64Zvo1U,7964
-tests/test_prompt_handler.py,sha256=3-lYBvyHLQgD29MODkXB3YylUWXmRCYdAwrQrtlW8WU,30871
+tests/test_prompt_handler.py,sha256=kW8FU09ho4I5qC-f4G9r4ZgI-NlqdOkTmAazG7FaTrw,32299
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
-tests/test_template_manager.py,sha256=q-LMHRG4rHkD6ON6YW4cpZxUx9hul6Or8wVVRC2kb-8,4099
+tests/test_template_manager.py,sha256=qliEeYgAEakn8JIqIHa8u0Ht6DY4L3T6DcHBXkjzR4I,4167
 tests/test_update_config_prompt.py,sha256=xsqj1WTn4BsG5Q2t-sNPfu7EoMURFcS-hfb5VSXUnJc,6765
-ara_cli-0.1.9.93.dist-info/METADATA,sha256=BEbyd6dizmW-wO3XCdsyU9t2FrgKvQdIPMhAcxm8__M,6739
-ara_cli-0.1.9.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.93.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.93.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.93.dist-info/RECORD,,
+ara_cli-0.1.9.95.dist-info/METADATA,sha256=ZVJWS_s9Xmdeftrsy6337QTfO_BVESYERmL5r_2tT3s,6789
+ara_cli-0.1.9.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.95.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.95.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.95.dist-info/RECORD,,

tests/test_ara_config.py

@@ -115,6 +115,34 @@ class TestARAconfig:
         assert config.glossary_dir == "./glossary"
         assert "Warning: Value for 'glossary_dir' is missing or empty. Using default." in mock_stdout.getvalue()
 
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_validator_with_empty_llm_config(self, mock_stdout):
+        """Tests validator when llm_config is empty, setting default and extraction to None."""
+        config = ARAconfig(llm_config={})
+        assert config.llm_config == {}
+        assert config.default_llm is None
+        assert config.extraction_llm is None
+        assert "Warning: 'llm_config' is empty" in mock_stdout.getvalue()
+
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_validator_with_invalid_default_llm(self, mock_stdout):
+        """Tests that an invalid default_llm is reverted to the first available model."""
+        config = ARAconfig(default_llm="non_existent_model")
+        first_llm = next(iter(config.llm_config))
+        assert config.default_llm == first_llm
+        output = mock_stdout.getvalue()
+        assert "Warning: The configured 'default_llm' ('non_existent_model') does not exist" in output
+        assert f"-> Reverting to the first available model: '{first_llm}'" in output
+
+    @patch('sys.stdout', new_callable=StringIO)
+    def test_validator_with_invalid_extraction_llm(self, mock_stdout):
+        """Tests that an invalid extraction_llm is reverted to the default_llm."""
+        config = ARAconfig(default_llm="gpt-4o", extraction_llm="non_existent_model")
+        assert config.extraction_llm == "gpt-4o"
+        output = mock_stdout.getvalue()
+        assert "Warning: The configured 'extraction_llm' ('non_existent_model') does not exist" in output
+        assert "-> Reverting to the 'default_llm' value: 'gpt-4o'" in output
+
 # --- Test Helper Functions ---
 
 class TestEnsureDirectoryExists:

tests/test_artefact_lister.py

@@ -2,6 +2,11 @@ import pytest
 from unittest.mock import MagicMock, patch
 from ara_cli.artefact_lister import ArtefactLister
 from ara_cli.list_filter import ListFilter
+from ara_cli.artefact_models.artefact_data_retrieval import (
+    artefact_content_retrieval,
+    artefact_path_retrieval,
+    artefact_tags_retrieval,
+)
 
 
 @pytest.fixture
@@ -9,66 +14,6 @@ def artefact_lister():
     return ArtefactLister()
 
 
-@pytest.mark.parametrize(
-    "users, status, tags, expected_tags",
-    [
-        # Normal case with all fields populated
-        (
-            ["john", "alice"],
-            "in-progress",
-            ["important", "urgent"],
-            ["user_john", "user_alice", "in-progress", "important", "urgent"]
-        ),
-        # Case with empty users
-        (
-            [],
-            "to-do",
-            ["feature", "backend"],
-            ["to-do", "feature", "backend"]
-        ),
-        # Case with empty tags
-        (
-            ["bob"],
-            "done",
-            [],
-            ["user_bob", "done"]
-        ),
-        # Case with all empty fields
-        (
-            [],
-            "",
-            [],
-            [""]
-        ),
-        # Case with None values for tags (should handle gracefully)
-        (
-            ["admin"],
-            "closed",
-            None,
-            ["user_admin", "closed"]
-        ),
-    ]
-)
-def test_artefact_tags_retrieval(users, status, tags, expected_tags):
-    # Create a mock artefact with the specified attributes
-    artefact_mock = MagicMock()
-    artefact_mock.users = users
-    artefact_mock.status = status
-    artefact_mock.tags = tags if tags is not None else []
-
-    # Call the method under test
-    result = ArtefactLister.artefact_tags_retrieval(artefact_mock)
-
-    # Verify the result
-    assert result == expected_tags
-
-
-def test_artefact_tags_retrieval_with_none():
-    # Test with None artefact
-    result = ArtefactLister.artefact_tags_retrieval(None)
-    assert result == []
-
-
 @pytest.mark.parametrize(
     "classified_files, list_filter, filter_result",
     [
@@ -76,39 +21,36 @@ def test_artefact_tags_retrieval_with_none():
         (
             {"type1": [MagicMock(), MagicMock()]},
             None,
-            {"type1": [MagicMock(), MagicMock()]}
+            {"type1": [MagicMock(), MagicMock()]},
         ),
         # Case 2: Filter with include tags
         (
             {"type1": [MagicMock(), MagicMock()]},
             ListFilter(include_tags=["tag1"]),
-            {"type1": [MagicMock()]}
+            {"type1": [MagicMock()]},
         ),
         # Case 3: Filter with exclude tags
         (
             {"type1": [MagicMock(), MagicMock()], "type2": [MagicMock()]},
             ListFilter(exclude_tags=["tag2"]),
-            {"type1": [MagicMock()], "type2": []}
+            {"type1": [MagicMock()], "type2": []},
         ),
         # Case 4: Empty result after filtering
         (
             {"type1": [MagicMock(), MagicMock()]},
             ListFilter(include_tags=["nonexistent"]),
-            {"type1": []}
+            {"type1": []},
         ),
         # Case 5: Multiple artefact types
         (
             {"type1": [MagicMock()], "type2": [MagicMock(), MagicMock()]},
             ListFilter(exclude_extension=[".txt"]),
-            {"type1": [], "type2": [MagicMock()]}
+            {"type1": [], "type2": [MagicMock()]},
         ),
     ],
 )
 def test_filter_artefacts(
-    artefact_lister,
-    classified_files,
-    list_filter,
-    filter_result
+    artefact_lister, classified_files, list_filter, filter_result
 ):
     # Mock the filter_list function
     with patch("ara_cli.artefact_lister.filter_list") as mock_filter_list:
@@ -121,9 +63,9 @@ def test_filter_artefacts(
         mock_filter_list.assert_called_once_with(
             list_to_filter=classified_files,
             list_filter=list_filter,
-            content_retrieval_strategy=ArtefactLister.artefact_content_retrieval,
-            file_path_retrieval=ArtefactLister.artefact_path_retrieval,
-            tag_retrieval=ArtefactLister.artefact_tags_retrieval
+            content_retrieval_strategy=artefact_content_retrieval,
+            file_path_retrieval=artefact_path_retrieval,
+            tag_retrieval=artefact_tags_retrieval,
         )
 
         # Verify the structure matches (don't compare the actual MagicMock objects)
@@ -132,30 +74,6 @@ def test_filter_artefacts(
             assert len(result[key]) == len(filter_result[key])
 
 
-@pytest.mark.parametrize("artefact_content", ["content1", "content2", "content3"])
-def test_artefact_content_retrieval(artefact_content):
-    artefact_mock = MagicMock()
-    artefact_mock.serialize.return_value = artefact_content  # Mock serialize()
-
-    content = ArtefactLister.artefact_content_retrieval(artefact_mock)
-    assert content == artefact_content
-
-
-@pytest.mark.parametrize(
-    "file_path",
-    [
-        ("./ara/userstories/test.userstory"),
-        ("./ara/epics/test.epic"),
-    ],
-)
-def test_artefact_path_retrieval(file_path):
-    artefact_mock = MagicMock()
-    artefact_mock.file_path = file_path
-
-    path = ArtefactLister.artefact_path_retrieval(artefact_mock)
-    assert path == file_path
-
-
 @pytest.mark.parametrize(
     "tags, navigate_to_target, list_filter, mock_artefacts, filtered_artefacts, expected_filtered",
     [
@@ -476,20 +394,21 @@ def test_list_data_artefact_found_data_exists(artefact_lister):
     classified_artefacts = {
         "epic": [
             {"title": "Epic1", "file_path": "path/to/Epic1.epic"},
-            {"title": "Epic2", "file_path": "path/to/Epic2.epic"}
+            {"title": "Epic2", "file_path": "path/to/Epic2.epic"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
         mock_file_classifier.return_value = mock_classifier_instance
         mock_classifier_instance.classify_files.return_value = classified_artefacts
-        
+
         mock_os.path.splitext.return_value = ("path/to/Epic1", ".epic")
         mock_os.path.exists.return_value = True
 
@@ -510,20 +429,21 @@ def test_list_data_artefact_found_data_not_exists(artefact_lister):
     classified_artefacts = {
         "epic": [
             {"title": "Epic1", "file_path": "path/to/Epic1.epic"},
-            {"title": "Epic2", "file_path": "path/to/Epic2.epic"}
+            {"title": "Epic2", "file_path": "path/to/Epic2.epic"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
         mock_file_classifier.return_value = mock_classifier_instance
         mock_classifier_instance.classify_files.return_value = classified_artefacts
-        
+
         mock_os.path.splitext.return_value = ("path/to/Epic1", ".epic")
         mock_os.path.exists.return_value = False
 
@@ -544,14 +464,15 @@ def test_list_data_artefact_not_found(artefact_lister):
     classified_artefacts = {
         "epic": [
             {"title": "Epic1", "file_path": "path/to/Epic1.epic"},
-            {"title": "Epic2", "file_path": "path/to/Epic2.epic"}
+            {"title": "Epic2", "file_path": "path/to/Epic2.epic"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
@@ -562,10 +483,7 @@ def test_list_data_artefact_not_found(artefact_lister):
         artefact_lister.list_data(classifier, artefact_name, list_filter)
 
         # Verify interactions
-        mock_suggest.assert_called_once_with(
-            artefact_name,
-            ["Epic1", "Epic2"]
-        )
+        mock_suggest.assert_called_once_with(artefact_name, ["Epic1", "Epic2"])
         mock_os.path.splitext.assert_not_called()
         mock_os.path.exists.assert_not_called()
         mock_list_files.assert_not_called()
@@ -578,20 +496,21 @@ def test_list_data_with_filter(artefact_lister):
     classified_artefacts = {
         "userstory": [
             {"title": "Story1", "file_path": "path/to/Story1.userstory"},
-            {"title": "Story2", "file_path": "path/to/Story2.userstory"}
+            {"title": "Story2", "file_path": "path/to/Story2.userstory"},
         ]
     }
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()
         mock_file_classifier.return_value = mock_classifier_instance
         mock_classifier_instance.classify_files.return_value = classified_artefacts
-        
+
         mock_os.path.splitext.return_value = ("path/to/Story1", ".userstory")
         mock_os.path.exists.return_value = True
 
@@ -610,11 +529,12 @@ def test_list_data_empty_artefact_list(artefact_lister):
     artefact_name = "Epic1"
     list_filter = None
     classified_artefacts = {"epic": []}
-    
-    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, \
-         patch("ara_cli.artefact_lister.suggest_close_name_matches") as mock_suggest, \
-         patch("ara_cli.artefact_lister.os") as mock_os, \
-         patch("ara_cli.artefact_lister.list_files_in_directory") as mock_list_files:
+
+    with patch("ara_cli.artefact_lister.FileClassifier") as mock_file_classifier, patch(
+        "ara_cli.artefact_lister.suggest_close_name_matches"
+    ) as mock_suggest, patch("ara_cli.artefact_lister.os") as mock_os, patch(
+        "ara_cli.artefact_lister.list_files_in_directory"
+    ) as mock_list_files:
 
         # Configure mocks
         mock_classifier_instance = MagicMock()

tests/test_chat.py

@@ -10,6 +10,7 @@ from types import SimpleNamespace
 from ara_cli.chat import Chat
 from ara_cli.template_manager import TemplatePathManager
 from ara_cli.ara_config import ConfigManager
+from ara_cli.file_loaders.text_file_loader import TextFileLoader
 
 
 def get_default_config():
@@ -471,42 +472,28 @@ def test_determine_file_path(temp_chat_file):
             mock_exists.reset_mock()
 
 
-@pytest.mark.parametrize("file_name, file_content, prefix, suffix, block_delimiter, expected_content", [
-    ("document.txt", "Hello World", "", "", "", "Hello World\n"),
-    ("document.txt", "Hello World", "Prefix-", "-Suffix", "", "Prefix-Hello World-Suffix\n"),
-    ("document.txt", "Hello World", "", "", "---", "---\nHello World\n---\n"),
-    ("document.txt", "Hello World", "Prefix", "Suffix", "---", "Prefix---\nHello World\n---Suffix\n"),
+@pytest.mark.parametrize("file_name, expected_content", [
+    ("document.txt", "Hello World\n"),
+    ("another_document.txt", "Another World\n"),
 ])
-def test_load_text_file(temp_chat_file, file_name, file_content, prefix, suffix, block_delimiter, expected_content):
-    mock_config = get_default_config()
+def test_load_text_file(temp_chat_file, file_name, expected_content):
+    # Create a mock config
+    mock_config = MagicMock()
+
+    # Patch the get_config method to return the mock config
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
 
-    with patch.object(chat, 'determine_file_path', return_value=file_name):
-        with patch("builtins.open", mock_open(read_data=file_content)) as mock_file:
-            result = chat.load_text_file(file_name, prefix, suffix, block_delimiter)
-
-            assert result is True
-
-            mock_file.assert_any_call(file_name, 'r', encoding='utf-8', errors="replace")
-
-            mock_file.assert_any_call(chat.chat_name, 'a', encoding='utf-8')
-
-            mock_file().write.assert_called_once_with(expected_content)
-
-
-# def test_load_text_file_file_not_found(temp_chat_file):
-#     mock_config = get_default_config()
-#     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
-#         chat = Chat(temp_chat_file.name, reset=False)
-
-#     with patch.object(chat, 'determine_file_path', return_value=None):
-#         with patch("builtins.open", mock_open()) as mock_file:
-#             result = chat.load_text_file("nonexistent.txt")
+    # Mock the TextFileLoader
+    with patch.object(TextFileLoader, 'load', return_value=True) as mock_load:
+        # Call the load_text_file method
+        result = chat.load_text_file(file_name)
 
-#     assert result is False
+        # Check that the load method was called once
+        mock_load.assert_called_once()
 
-#     mock_file.assert_not_called()
+        # Check that the result is True
+        assert result is True
 
 
 @pytest.mark.parametrize(
@@ -635,14 +622,14 @@ def test_load_file(temp_chat_file, file_name, file_type, mime_type):
             patch.object(chat, 'load_text_file', return_value=True) as mock_load_text, \
             patch.object(chat, 'load_document_file', return_value=True) as mock_load_document:
 
-        chat.load_file(file_name=file_name, prefix="p-", suffix="-s", block_delimiter="b", extract_images=False)
+        chat.load_file(file_name=file_name, prefix="p-", suffix="-f", block_delimiter="b", extract_images=False)
 
         if file_type == "binary":
             mock_load_binary.assert_called_once_with(
                 file_path=file_name,
                 mime_type=mime_type,
                 prefix="p-",
-                suffix="-s"
+                suffix="-f"
             )
             mock_load_text.assert_not_called()
             mock_load_document.assert_not_called()
@@ -652,7 +639,7 @@ def test_load_file(temp_chat_file, file_name, file_type, mime_type):
             mock_load_document.assert_called_once_with(
                 file_path=file_name,
                 prefix="p-",
-                suffix="-s",
+                suffix="-f",
                 block_delimiter="b",
                 extract_images=False
             )
@@ -661,7 +648,7 @@ def test_load_file(temp_chat_file, file_name, file_type, mime_type):
             mock_load_text.assert_called_once_with(
                 file_path=file_name,
                 prefix="p-",
-                suffix="-s",
+                suffix="-f",
                 block_delimiter="b",
                 extract_images=False
             )
@@ -714,7 +701,7 @@ def test_load_helper(monkeypatch, capsys, temp_chat_file, directory, pattern, fi
     def mock_input(prompt):
         return user_input
 
-    def mock_load_file(self, file_path, prefix="", suffix=""):
+    def mock_load_file(self, file_path):
         return True
 
     monkeypatch.setattr(glob, 'glob', mock_glob)
@@ -750,7 +737,7 @@ def test_load_helper_with_exclude(monkeypatch, capsys, temp_chat_file, directory
     def mock_input(prompt):
         return user_input
 
-    def mock_load_file(self, file_path, prefix="", suffix=""):
+    def mock_load_file(self, file_path):
         return True
 
     monkeypatch.setattr(glob, 'glob', mock_glob)
@@ -907,7 +894,7 @@ def test_load_image(capsys, temp_chat_file, file_name, is_image, expected_mime):
         chat = Chat(temp_chat_file.name, reset=False)
 
     with patch.object(chat, 'load_binary_file', return_value=True) as mock_load_binary:
-        chat.load_image(file_name=file_name, prefix="p-", suffix="-s")
+        chat.load_image(file_name=file_name, prefix="p-", suffix="-f")
 
         if is_image:
             # FIX: The called method's parameter is `file_path`, not `file_name`.
@@ -915,7 +902,7 @@ def test_load_image(capsys, temp_chat_file, file_name, is_image, expected_mime):
                 file_path=file_name,
                 mime_type=expected_mime,
                 prefix="p-",
-                suffix="-s"
+                suffix="-f"
             )
         else:
             mock_load_binary.assert_not_called()
@@ -1232,13 +1219,14 @@ def test_do_EXTRACT(MockExtractCommand, temp_chat_file):
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
 
-    # FIX: The `onecmd_plus_hooks` method requires the `orig_rl_history_length` argument.
+    # The `onecmd_plus_hooks` method requires the `orig_rl_history_length` argument.
     # We can pass a dummy value like 0 for the test.
     chat.onecmd_plus_hooks("EXTRACT", orig_rl_history_length=0)
 
     MockExtractCommand.assert_called_once_with(
         file_name=chat.chat_name,
-        skip_queries=False,
+        force=False,
+        write=False,
         output=chat.poutput,
         error_output=chat.perror
     )