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

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

@@ -635,14 +635,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 +652,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 +661,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 +714,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 +750,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 +907,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 +915,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 +1232,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
     )