ara-cli 0.1.9.75__py3-none-any.whl → 0.1.9.77__py3-none-any.whl

ara_cli/chat.py

@@ -34,6 +34,8 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             ".jpg": "image/jpeg",
             ".jpeg": "image/jpeg",
         }
+    
+    DOCUMENT_TYPE_EXTENSIONS = [".docx", ".doc", ".odt", ".pdf"]
 
     def __init__(
         self,
@@ -371,9 +373,52 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
         with open(self.chat_name, 'a', encoding='utf-8') as chat_file:
             chat_file.write(write_content)
             return True
+    
+    def read_docx(self, file_path):
+        import docx
+        doc = docx.Document(file_path)
+        return '\n'.join(para.text for para in doc.paragraphs)
+
+    def read_pdf(self, file_path):
+        import pymupdf4llm
+        return pymupdf4llm.to_markdown(file_path, write_images=False)
+
+    def read_odt(self, file_path):
+        import pymupdf4llm
+        return pymupdf4llm.to_markdown(file_path, write_images=False)
+
+    @file_exists_check
+    def load_document_file(self, file_path: str, prefix: str = "", suffix: str = "", block_delimiter: str = "```"):
+        import os
+
+        _, ext = os.path.splitext(file_path)
+        ext = ext.lower()
+
+        text_content = ""
+        match ext:
+            case ".docx":
+                text_content = self.read_docx(file_path)
+            case ".pdf":
+                text_content = self.read_pdf(file_path)
+            case ".odt":
+                text_content = self.read_odt(file_path)
+            # Add more cases if needed.
+            case _:
+                print("Unsupported document type.")
+                return False
+
+        if block_delimiter:
+            text_content = f"{block_delimiter}\n{text_content}\n{block_delimiter}"
+
+        write_content = f"{prefix}{text_content}{suffix}\n"
+
+        with open(self.chat_name, 'a', encoding='utf-8') as chat_file:
+            chat_file.write(write_content)
+        return True
 
     def load_file(self, file_name: str, prefix: str = "", suffix: str = "", block_delimiter: str = ""):
         binary_type_mapping = Chat.BINARY_TYPE_MAPPING
+        document_type_extensions = Chat.DOCUMENT_TYPE_EXTENSIONS
 
         file_type = None
         file_name_lower = file_name.lower()
@@ -382,7 +427,16 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
                 file_type = mime_type
                 break
 
-        if file_type:
+        is_file_document = any(file_name_lower.endswith(ext) for ext in document_type_extensions)
+
+        if is_file_document:
+            return self.load_document_file(
+                file_name=file_name,
+                prefix=prefix,
+                suffix=suffix,
+                block_delimiter=block_delimiter
+            )
+        elif file_type:
             return self.load_binary_file(
                 file_name=file_name,
                 mime_type=file_type,
@@ -503,6 +557,19 @@ Start chatting (type 'HELP'/'h' for available commands, 'QUIT'/'q' to exit chat
             return False
         return True
 
+    @cmd2.with_category(CATEGORY_CHAT_CONTROL)
+    def do_LOAD_DOCUMENT(self, file_name):
+        """Load a document file (PDF, DOCX, DOC, ODT) and append its text content to chat file. Can be given the file name in-line. Will attempt to find the file relative to chat file first, then treat the given path as absolute"""
+        matching_files = self.find_matching_files_to_load(file_name)
+        if not matching_files:
+            return
+
+        for file_path in matching_files:
+            prefix = f"\nFile: {file_path}\n"
+            self.add_prompt_tag_if_needed(self.chat_name)
+            if not os.path.isdir(file_path) and self.load_document_file(file_path, prefix=prefix):
+                print(f"Loaded document file {file_path}")
+
     @cmd2.with_category(CATEGORY_CHAT_CONTROL)
     def do_LOAD_IMAGE(self, file_name):
         """Load an image file and append it to chat file. Can be given the file name in-line. Will attempt to find the file relative to chat file first, then treat the given path as absolute"""

ara_cli/version.py

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

{ara_cli-0.1.9.75.dist-info → ara_cli-0.1.9.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ara_cli
-Version: 0.1.9.75
+Version: 0.1.9.77
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai
@@ -13,4 +13,6 @@ Requires-Dist: argcomplete
 Requires-Dist: cmd2>=2.5
 Requires-Dist: pydantic
 Requires-Dist: pydantic_ai
+Requires-Dist: python-docx
+Requires-Dist: pymupdf4llm
 Dynamic: requires-dist

{ara_cli-0.1.9.75.dist-info → ara_cli-0.1.9.77.dist-info}/RECORD

@@ -1,18 +1,18 @@
 ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
-ara_cli/__main__.py,sha256=Z6XYWRLceIoZPvfC-X9EXouSZdtFOOe84kKVWJGA4r4,1861
+ara_cli/__main__.py,sha256=ppfq0FIi4x6ONRzP67784A4BPo2labh8Bd_EExuXo4U,2011
 ara_cli/ara_command_action.py,sha256=J613DUTjRxrPG8Jm-fJcIM0QlZTeULmq9Q7DKkDxJHg,22039
-ara_cli/ara_command_parser.py,sha256=HHuLxGeLjsd3R-JcoWJ5MUgaxXqkECHoqE95amlaVXY,18115
+ara_cli/ara_command_parser.py,sha256=vyxLELnyAZFC2C3v0hH4-r9QBmJ8oIs0hCZukkMFXfc,20136
 ara_cli/ara_config.py,sha256=SgZfQVpqj5JJN4SB0n2IvAH0sKIdS3k1K1Zht2wDywA,8814
-ara_cli/artefact_autofix.py,sha256=XT-OGiznPCX7b6wwxFigHaVt5KzC2pFm6IT8HuwiSVs,17519
+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
 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_reader.py,sha256=E6DMBvbOYf1OoLf-OyLaiB6K2-gd7iHmjoQZU9Rsy6g,6965
+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=CR30wBfKaS8DVCeavEEYFMeCFp3IyRtybQnk-GrCj7U,29341
+ara_cli/chat.py,sha256=Plje33XcOedSx-nmLCkuFIXSqHPIvMcy5I71xYWuYmU,31956
 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,9 +31,9 @@ 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=pKiqeeWiFsEsFOcA9URWYucMsyrAfEmlaiQ8MVZ8ApI,146
+ara_cli/version.py,sha256=YZaVX1MbXXFpamZLvZnUrGSRq0Szw8TohbROLVLDRkA,146
 ara_cli/artefact_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ara_cli/artefact_models/artefact_load.py,sha256=dNcwZDW2Dk0bts9YnPZ0ESmWD2NbsLIvl4Z-qQeGmTQ,401
+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
 ara_cli/artefact_models/artefact_templates.py,sha256=8HNM-TsNvKgTpruOBs751yRDXJypTiJhc1tkWCiYG7s,9830
@@ -45,7 +45,7 @@ ara_cli/artefact_models/feature_artefact_model.py,sha256=FrR7_xydOmMySAz0QpWgrNF
 ara_cli/artefact_models/issue_artefact_model.py,sha256=v6CpKnkqiUh6Wch2kkEmyyW49c8ysdy1qz8l1Ft9uJA,2552
 ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=J9oXLsCAo22AW31D5Z104y02ss0S0O4tPCcd09zYCD0,4066
 ara_cli/artefact_models/serialize_helper.py,sha256=Wks30wy-UrwJURetydKykLgJkdGRgXFHkDT24vHe5tU,595
-ara_cli/artefact_models/task_artefact_model.py,sha256=OrG7Z0u5QDGoS1a0PlWNxC2n47j9RtNZQo0rz1kNs84,5841
+ara_cli/artefact_models/task_artefact_model.py,sha256=1BSMbz9D-RXvdpdd0RlAr9hUx84Rcuysk2YfQC8Qy14,6046
 ara_cli/artefact_models/userstory_artefact_model.py,sha256=2awH31ROtm7j4T44Bv4cylQDYLQtnfgXZMhDu_pgw-k,6435
 ara_cli/artefact_models/vision_artefact_model.py,sha256=frjaUJj-mmIlVHEhzAQztCGs-CtvNu_odSborgztfzo,5251
 ara_cli/templates/agile.artefacts,sha256=nTA8dp98HWKAD-0qhmNpVYIfkVGoJshZqMJGnphiOsE,7932
@@ -124,14 +124,14 @@ ara_cli/templates/specification_breakdown_files/template.technology.md,sha256=by
 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=pvkdPLTzgLkOijil0HaN0mhLC2Rdu4Fu5RfXEyOlRfs,16672
-tests/test_artefact_autofix.py,sha256=K5h-IcPHZHdbLFgQHoto3K4fgX8cNW-ddHgQwCAIlFc,22145
+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_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=BcVCGJjdBHEIXR9l-9Q83fQXP7Hly6yHewY2qEuZ1DE,49161
+tests/test_chat.py,sha256=fUGqpsyilLjwIFNlCAC69pYGEhwRuU6pplywwGJk-K8,54907
 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
@@ -141,8 +141,8 @@ tests/test_list_filter.py,sha256=fJA3d_SdaOAUkE7jn68MOVS0THXGghy1fye_64Zvo1U,796
 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.75.dist-info/METADATA,sha256=gWhv0kRyRzVik_sN-4cY1ILDTcqrWyE8p5y9d50ODpo,415
-ara_cli-0.1.9.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.75.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.75.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.75.dist-info/RECORD,,
+ara_cli-0.1.9.77.dist-info/METADATA,sha256=HYjYn2M6mOc2aYugIuai2mhaV8uaDi2xWtT_x-p3aq0,469
+ara_cli-0.1.9.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.77.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.77.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.77.dist-info/RECORD,,

tests/test_artefact_autofix.py

@@ -15,6 +15,7 @@ from ara_cli.artefact_autofix import (
     _has_valid_contribution,
     set_closest_contribution,
     fix_contribution,
+    fix_rule
 )
 from ara_cli.artefact_models.artefact_model import Artefact, ArtefactType, Contribution
 
@@ -60,6 +61,24 @@ def mock_artefact_with_contribution():
     return mock_artefact
 
 
+@pytest.fixture
+def mock_contribution():
+    m = MagicMock()
+    m.artefact_name = "parent_name"
+    m.classifier = "feature"
+    m.rule = "my_rule"
+    return m
+
+@pytest.fixture
+def mock_artefact(mock_contribution):
+    m = MagicMock()
+    m.contribution = mock_contribution
+    m._artefact_type.return_value.value = "requirement"
+    m.title = "my_title"
+    m.serialize.return_value = "serialized-text"
+    return m
+
+
 def test_read_report_file_success():
     """Tests successful reading of the report file."""
     mock_content = "# Artefact Check Report\n- `file.feature`: reason"
@@ -614,4 +633,72 @@ def test_apply_autofix_single_pass(
     assert "Single-pass mode enabled" in output
     assert "Attempt 1/1" in output
     assert "Attempt 2/1" not in output
-    mock_check_file.assert_called_once()
+    mock_check_file.assert_called_once()
+
+
+@patch("ara_cli.artefact_autofix._update_rule")
+@patch("ara_cli.artefact_autofix.populate_classified_artefact_info")
+def test_fix_rule_with_rule(mock_populate, mock_update_rule, mock_artefact, mock_contribution, capsys):
+    # Contribution has a rule
+    artefact_class = MagicMock()
+    artefact_class.deserialize.return_value = mock_artefact
+    mock_populate.return_value = {"info": "dummy"}
+
+    result = fix_rule(
+        file_path="dummy.feature",
+        artefact_text="text",
+        artefact_class=artefact_class,
+        classified_artefact_info={},
+    )
+
+    # deserialize called
+    artefact_class.deserialize.assert_called_once_with("text")
+    # _update_rule called with correct args
+    mock_update_rule.assert_called_once_with(
+        artefact=mock_artefact,
+        name="parent_name",
+        classifier="feature",
+        classified_file_info={"info": "dummy"},
+        delete_if_not_found=True,
+    )
+    # Feedback message contains rule
+    assert "with rule" in capsys.readouterr().out
+    # Result is the serialized text
+    assert result == "serialized-text"
+
+@patch("ara_cli.artefact_autofix._update_rule")
+@patch("ara_cli.artefact_autofix.populate_classified_artefact_info")
+def test_fix_rule_without_rule(mock_populate, mock_update_rule, mock_artefact, mock_contribution, capsys):
+    # Contribution rule becomes None after update
+    mock_contribution.rule = None
+    artefact_class = MagicMock()
+    artefact_class.deserialize.return_value = mock_artefact
+    mock_populate.return_value = {"info": "dummy"}
+
+    result = fix_rule(
+        file_path="dummy.feature",
+        artefact_text="text",
+        artefact_class=artefact_class,
+        classified_artefact_info={},
+    )
+
+    # Feedback message says "without a rule"
+    assert "without a rule" in capsys.readouterr().out
+    assert result == "serialized-text"
+
+@patch("ara_cli.artefact_autofix.populate_classified_artefact_info")
+def test_fix_rule_contribution_none_raises(mock_populate):
+    # artefact.contribution is None: should assert
+    artefact = MagicMock()
+    artefact.contribution = None
+    artefact_class = MagicMock()
+    artefact_class.deserialize.return_value = artefact
+    mock_populate.return_value = {}
+
+    with pytest.raises(AssertionError):
+        fix_rule(
+            file_path="dummy.feature",
+            artefact_text="stuff",
+            artefact_class=artefact_class,
+            classified_artefact_info={},
+        )

tests/test_chat.py

@@ -185,7 +185,7 @@ def test_disable_commands(temp_chat_file):
     (["This is a line.", "Another line here.", "Yet another line."], None),
     (["This is a line.", "# ara prompt:", "Another line here."], "# ara prompt:"),
     (["This is a line.", "# ara prompt:", "Another line here.", "# ara response:"], "# ara response:"),
-    (["This is a line.", "  # ara prompt:  ", "Another line here.", "  # ara response:   "], "# ara response:"),
+    (["This is a line.", "  # ara prompt:  ", "Another line here.", "  # ara response:    "], "# ara response:"),
     (["# ara prompt:", "# ara response:"], "# ara response:"),
     (["# ara response:", "# ara prompt:", "# ara prompt:", "# ara response:"], "# ara response:"),
     ([], None)
@@ -233,8 +233,8 @@ def test_start(temp_chat_file):
     (["This is a line.\n", "# ara prompt:\n", "Another line here.\n", "# ara response:\n"],
      ["This is a line.\n", "# ara prompt:\n", "Another line here.\n", "# ara response:\n", "\n", "# ara prompt:"]),
 
-    (["This is a line.\n", "  # ara prompt:  \n", "Another line here.\n", "  # ara response:   \n"],
-     ["This is a line.\n", "  # ara prompt:  \n", "Another line here.\n", "  # ara response:   \n", "\n", "# ara prompt:"]),
+    (["This is a line.\n", "  # ara prompt:  \n", "Another line here.\n", "  # ara response:    \n"],
+     ["This is a line.\n", "  # ara prompt:  \n", "Another line here.\n", "  # ara response:    \n", "\n", "# ara prompt:"]),
 
     (["# ara prompt:\n", "# ara response:\n"],
      ["# ara prompt:\n", "# ara response:\n", "\n", "# ara prompt:"]),
@@ -257,7 +257,7 @@ def test_add_prompt_tag_if_needed(temp_chat_file, initial_content, expected_cont
 
 
 @pytest.mark.parametrize("lines, expected", [
-    (["\n", "   ", "# ara prompt:", "Another line here.", "  \n"], "Another line here."),
+    (["\n", "    ", "# ara prompt:", "Another line here.", "  \n"], "Another line here."),
     (["This is a line.", "Another line here.", "  \n", "\n"], "Another line here."),
     (["\n", "  \n", "  \n"], ""),
     (["This is a line.", "Another line here.", "# ara response:", "  \n"], "# ara response:"),
@@ -270,7 +270,7 @@ def test_get_last_non_empty_line(lines, expected, temp_chat_file):
         assert Chat.get_last_non_empty_line(Chat, file) == expected
 
 @pytest.mark.parametrize("lines, expected", [
-    (["\n", "   ", "# ara prompt:", "Another line here.", "  \n"], ""),
+    (["\n", "    ", "# ara prompt:", "Another line here.", "  \n"], ""),
     (["This is a line.", "Another line here."], "Another line here."),
     (["\n", "  \n", "  \n"], ""),
     (["This is a line.", "Another line here.", "# ara response:", "  \n"], ""),
@@ -290,7 +290,7 @@ def test_get_last_line(lines, expected, temp_chat_file):
     (["Text with image", "(data:image/png;base64,abc123)"],
      "Text with image",
      [{"type": "image_url", "image_url": {"url": "data:image/png;base64,abc123"}}]),
-    (["Just text", "Another (data:image/png;base64,xyz789) image"], 
+    (["Just text", "Another (data:image/png;base64,xyz789) image"],
      "Just text",
      [{"type": "image_url", "image_url": {"url": "data:image/png;base64,xyz789"}}]),
     (["No images here at all"], "No images here at all", []),
@@ -392,7 +392,7 @@ def test_save_message(temp_chat_file, role, message, initial_content, expected_c
 def test_resend_message(temp_chat_file, initial_content, expected_content):
     temp_chat_file.writelines(initial_content)
     temp_chat_file.flush()
-    
+
     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)
@@ -456,7 +456,7 @@ def test_determine_file_path(temp_chat_file):
     ]
 
     with patch('os.path.exists') as mock_exists, \
-        patch('os.path.dirname', return_value="current_directory") as mock_dirname:
+         patch('os.path.dirname', return_value="current_directory") as mock_dirname:
 
         for file_name, exists_in_current, exists_elsewhere, expected_path in test_cases:
             mock_exists.side_effect = [exists_in_current, exists_elsewhere]
@@ -501,9 +501,9 @@ def test_load_text_file_file_not_found(temp_chat_file):
         with patch("builtins.open", mock_open()) as mock_file:
             result = chat.load_text_file("nonexistent.txt")
 
-        assert result is False
+    assert result is False
 
-        mock_file.assert_not_called()
+    mock_file.assert_not_called()
 
 
 @pytest.mark.parametrize("file_name, mime_type, file_content, expected, path_exists", [
@@ -516,7 +516,6 @@ def test_load_binary_file(temp_chat_file, file_name, mime_type, file_content, ex
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
 
-    # Mock open to handle both read and write operations
     mock_file = mock_open(read_data=file_content)
 
     with patch('builtins.open', mock_file) as mocked_open, \
@@ -535,36 +534,112 @@ def test_load_binary_file(temp_chat_file, file_name, mime_type, file_content, ex
             assert result is False
 
 
-@pytest.mark.parametrize("file_name, is_binary", [
-    ("image.png", True),  # Binary file
-    ("document.txt", False)  # Text file
+@pytest.mark.parametrize("file_name, loader_path, mock_setup, expected_content", [
+    (
+        "test.docx",
+        "docx.Document",
+        lambda mock: setattr(mock.return_value, 'paragraphs', [MagicMock(text="Docx content")]),
+        "Docx content"
+    ),
+    pytest.param(
+        "test.pdf",
+        "pymupdf4llm.to_markdown",
+        lambda mock: setattr(mock, 'return_value', "PDF content"),
+        "PDF content",
+        marks=pytest.mark.filterwarnings("ignore::DeprecationWarning")
+    ),
+    pytest.param(
+        "test.odt",
+        "pymupdf4llm.to_markdown",
+        lambda mock: setattr(mock, 'return_value', "ODT content"),
+        "ODT content",
+        marks=pytest.mark.filterwarnings("ignore::DeprecationWarning")
+    ),
 ])
-def test_load_file(temp_chat_file, file_name, is_binary):
+def test_load_document_file(temp_chat_file, file_name, loader_path, mock_setup, expected_content):
+    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(loader_path, create=True) as mock_loader, \
+         patch("builtins.open", mock_open()) as mock_chat_open:
+
+        mock_setup(mock_loader)
+
+        with patch.object(chat, 'determine_file_path', return_value=file_name):
+            result = chat.load_document_file(file_name, prefix="Prefix-", suffix="-Suffix", block_delimiter="```")
+
+    assert result is True
+
+    if loader_path == "pymupdf4llm.to_markdown":
+        mock_loader.assert_called_once_with(file_name, write_images=False)
+    else:
+        mock_loader.assert_called_once_with(file_name)
+
+    expected_write = f"Prefix-```\n{expected_content}\n```-Suffix\n"
+    mock_chat_open.assert_called_with(chat.chat_name, 'a', encoding='utf-8')
+    mock_chat_open().write.assert_called_once_with(expected_write)
+
+
+def test_load_document_file_unsupported(temp_chat_file, capsys):
+    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)
+
+    unsupported_file = "test.txt"
+    with patch.object(chat, 'determine_file_path', return_value=unsupported_file):
+        result = chat.load_document_file(unsupported_file)
+
+        assert result is False
+        captured = capsys.readouterr()
+        assert "Unsupported document type." in captured.out
+
+
+@pytest.mark.parametrize("file_name, file_type, mime_type", [
+    ("image.png", "binary", "image/png"),
+    ("document.txt", "text", None),
+    ("document.docx", "document", None),
+    ("document.pdf", "document", None),
+    ("archive.zip", "text", None),
+])
+def test_load_file(temp_chat_file, file_name, file_type, mime_type):
     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, 'load_binary_file', return_value=True) as mock_load_binary, \
-            patch.object(chat, 'load_text_file', return_value=True) as mock_load_text:
+            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)
+        chat.load_file(file_name=file_name, prefix="p-", suffix="-s", block_delimiter="b")
 
-        if is_binary:
+        if file_type == "binary":
             mock_load_binary.assert_called_once_with(
                 file_name=file_name,
-                mime_type='image/png',
-                prefix="",
-                suffix=""
+                mime_type=mime_type,
+                prefix="p-",
+                suffix="-s"
             )
             mock_load_text.assert_not_called()
+            mock_load_document.assert_not_called()
+        elif file_type == "document":
+            mock_load_binary.assert_not_called()
+            mock_load_text.assert_not_called()
+            mock_load_document.assert_called_once_with(
+                file_name=file_name,
+                prefix="p-",
+                suffix="-s",
+                block_delimiter="b"
+            )
         else:
+            mock_load_binary.assert_not_called()
             mock_load_text.assert_called_once_with(
                 file_name=file_name,
-                prefix="",
-                suffix="",
-                block_delimiter=""
+                prefix="p-",
+                suffix="-s",
+                block_delimiter="b"
             )
-            mock_load_binary.assert_not_called()
+            mock_load_document.assert_not_called()
 
 
 @pytest.mark.parametrize("files, pattern, user_input, expected_output, expected_file", [
@@ -788,6 +863,71 @@ def test_complete_LOAD(monkeypatch, temp_chat_file, text, line, begidx, endidx,
     assert completions == matching_files
 
 
+@pytest.mark.parametrize("file_name, is_image, expected_mime", [
+    ("test.png", True, "image/png"),
+    ("test.jpg", True, "image/jpeg"),
+    ("test.jpeg", True, "image/jpeg"),
+    ("test.txt", False, None)
+])
+def test_load_image(capsys, temp_chat_file, file_name, is_image, expected_mime):
+    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, 'load_binary_file', return_value=True) as mock_load_binary:
+        chat.load_image(file_name=file_name, prefix="p-", suffix="-s")
+
+        if is_image:
+            mock_load_binary.assert_called_once_with(
+                file_name=file_name,
+                mime_type=expected_mime,
+                prefix="p-",
+                suffix="-s"
+            )
+        else:
+            mock_load_binary.assert_not_called()
+            captured = capsys.readouterr()
+            assert f"File {file_name} not recognized as image, could not load" in captured.out
+
+
+def test_do_LOAD_DOCUMENT(capsys, 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)
+
+    doc_file = "test.docx"
+    with patch.object(chat, 'find_matching_files_to_load', return_value=[doc_file]) as mock_find, \
+         patch.object(chat, 'load_document_file', return_value=True) as mock_load, \
+         patch.object(chat, 'add_prompt_tag_if_needed') as mock_add_tag:
+
+        chat.do_LOAD_DOCUMENT(doc_file)
+
+        mock_find.assert_called_once_with(doc_file)
+        mock_add_tag.assert_called_once_with(chat.chat_name)
+        mock_load.assert_called_once_with(doc_file, prefix=f"\nFile: {doc_file}\n")
+        captured = capsys.readouterr()
+        assert f"Loaded document file {doc_file}" in captured.out
+
+
+def test_do_LOAD_IMAGE(capsys, 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)
+
+    image_file = "test.png"
+    with patch.object(chat, 'find_matching_files_to_load', return_value=[image_file]) as mock_find, \
+         patch.object(chat, 'load_image', return_value=True) as mock_load, \
+         patch.object(chat, 'add_prompt_tag_if_needed') as mock_add_tag:
+
+        chat.do_LOAD_IMAGE(image_file)
+
+        mock_find.assert_called_once_with(image_file)
+        mock_add_tag.assert_called_once_with(chat.chat_name)
+        mock_load.assert_called_once_with(image_file, prefix=f"\nFile: {image_file}\n")
+        captured = capsys.readouterr()
+        assert f"Loaded image file {image_file}" in captured.out
+
+
 @pytest.mark.parametrize("input_chat_name, expected_chat_name", [
     ("", "What should be the new chat name? "),
     ("new_chat", "new_chat_chat.md"),
@@ -796,13 +936,13 @@ def test_complete_LOAD(monkeypatch, temp_chat_file, text, line, begidx, endidx,
 def test_do_new(monkeypatch, temp_chat_file, input_chat_name, expected_chat_name):
     def mock_input(prompt):
         return "input_chat_name"
-    
+
     monkeypatch.setattr('builtins.input', mock_input)
 
     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, '__init__', return_value=None) as mock_init:
         chat.do_NEW(input_chat_name)
         if input_chat_name == "":
@@ -1057,10 +1197,9 @@ def test_do_SEND(temp_chat_file):
     ("AnotherTemplate", MagicMock(serialize=MagicMock(return_value="other_content")), "other_content", "Loaded AnotherTemplate artefact template\n"),
 ])
 def test_do_LOAD_TEMPLATE_success(temp_chat_file, template_name, artefact_obj, expected_write, expected_print, capsys):
-    mock_config = MagicMock()  # or use get_default_config() if needed
+    mock_config = MagicMock()
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
-    # Patch the artefact loader to return artefact_obj
     with patch('ara_cli.artefact_models.artefact_templates.template_artefact_of_type', return_value=artefact_obj) as mock_template_loader, \
          patch.object(chat, 'add_prompt_tag_if_needed') as mock_add_prompt_tag, \
          patch("builtins.open", mock_open()) as mock_file:
@@ -1087,4 +1226,4 @@ def test_do_LOAD_TEMPLATE_missing_artefact(temp_chat_file, template_name):
         chat.do_LOAD_TEMPLATE(template_name)
         mock_template_loader.assert_called_once_with(template_name)
         mock_add_prompt_tag.assert_not_called()
-        mock_file.assert_not_called()
+        mock_file.assert_not_called()