ara-cli 0.1.9.76__py3-none-any.whl → 0.1.9.78__py3-none-any.whl

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()

ara_cli-0.1.9.76.dist-info/METADATA

@@ -1,16 +0,0 @@
-Metadata-Version: 2.4
-Name: ara_cli
-Version: 0.1.9.76
-Requires-Dist: litellm
-Requires-Dist: llama-index
-Requires-Dist: llama-index-llms-openai
-Requires-Dist: llama-index-retrievers-bm25
-Requires-Dist: openai
-Requires-Dist: markdown-it-py
-Requires-Dist: json-repair
-Requires-Dist: argparse
-Requires-Dist: argcomplete
-Requires-Dist: cmd2>=2.5
-Requires-Dist: pydantic
-Requires-Dist: pydantic_ai
-Dynamic: requires-dist