ara-cli 0.1.9.57__py3-none-any.whl → 0.1.9.59__py3-none-any.whl

ara_cli/artefact_creator.py

@@ -7,7 +7,7 @@ from ara_cli.artefact_models.artefact_model import Artefact
 from ara_cli.artefact_models.artefact_templates import template_artefact_of_type
 from ara_cli.artefact_fuzzy_search import suggest_close_name_matches
 from pathlib import Path
-from shutil import copyfile
+from shutil import copyfile, rmtree
 
 
 class ArtefactCreator:
@@ -104,6 +104,9 @@ class ArtefactCreator:
         file_exists = self.file_system.path.exists(file_path)
         dir_exists = self.file_system.path.exists(dir_path)
 
+        if dir_exists and not os.listdir(dir_path):
+            dir_exists = False
+
         if not self.handle_existing_files(file_exists, dir_exists):
             return
 
@@ -116,6 +119,7 @@ class ArtefactCreator:
             )
 
         artefact_content = artefact.serialize()
+        rmtree(dir_path)
         os.makedirs(dir_path, exist_ok=True)
         with open(file_path, 'w') as artefact_file:
             artefact_file.write(artefact_content)

ara_cli/artefact_renamer.py

@@ -2,10 +2,7 @@ import os
 from functools import lru_cache
 from ara_cli.classifier import Classifier
 from ara_cli.artefact_link_updater import ArtefactLinkUpdater
-from ara_cli.artefact_reader import ArtefactReader
-from ara_cli.artefact_models.artefact_model import Contribution
 from ara_cli.template_manager import DirectoryNavigator
-from ara_cli.artefact_fuzzy_search import suggest_close_name_matches
 import re
 
 
@@ -25,78 +22,47 @@ class ArtefactRenamer:
         return re.compile(pattern)
 
     def rename(self, old_name, new_name, classifier):
+        original_directory = self.navigate_to_target()
+
         if not new_name:
             raise ValueError("New name must be provided for renaming.")
+
         if not Classifier.is_valid_classifier(classifier):
             raise ValueError("Invalid classifier provided. Please provide a valid classifier.")
 
-        fs = self.file_system
-        original_directory = self.navigate_to_target()
-        original_directory = fs.path.abspath(original_directory)
-
-        classified_artefacts = ArtefactReader.read_artefacts()
-
-        artefacts_by_current_classifier = classified_artefacts.get(classifier, [])
-        matching_artefacts = list(filter(lambda a: a.title == old_name, artefacts_by_current_classifier))
+        sub_directory = Classifier.get_sub_directory(classifier)
+        old_file_path = self.file_system.path.join(sub_directory, f"{old_name}.{classifier}")
+        new_file_path = self.file_system.path.join(sub_directory, f"{new_name}.{classifier}")
 
-        if not matching_artefacts:
-            all_artefact_names = [artefact.title for artefact in artefacts_by_current_classifier]
-            suggest_close_name_matches(old_name, all_artefact_names)
-            return
+        old_dir_path = self.file_system.path.join(sub_directory, f"{old_name}.data")
+        new_dir_path = self.file_system.path.join(sub_directory, f"{new_name}.data")
 
-        matching_artefact = matching_artefacts[0]
+        old_dir_exists = self.file_system.path.exists(old_dir_path)
 
-        old_file_path = matching_artefact.file_path
-        old_base_path = fs.path.dirname(old_file_path)
-        old_dir_path = f"{old_base_path}/{old_name}.data"
-
-        old_file_path_display = old_file_path.replace('./', 'ara/')
-        old_dir_path_display = old_dir_path.replace('./', 'ara/')
-
-        old_dir_exists = fs.path.exists(old_dir_path)
-
-        if not fs.path.exists(old_file_path):
+        # Check if the original file exists
+        if not self.file_system.path.exists(old_file_path):
             raise FileNotFoundError(f"The file {old_file_path} does not exist.")
 
-        children_by_classifier = ArtefactReader.find_children(
-            artefact_name=old_name,
-            classifier=classifier,
-            classified_artefacts=classified_artefacts
-        )
-
-        matching_artefact.title = new_name
-        new_file_path = matching_artefact.file_path
-        new_base_path = fs.path.dirname(new_file_path)
-        new_dir_path = f"{new_base_path}/{new_name}.data"
-        if fs.path.exists(new_file_path):
+        # Check if the new file name and directory already exist
+        if self.file_system.path.exists(new_file_path):
             raise FileExistsError(f"The new file name {new_file_path} already exists.")
-        if fs.path.exists(new_dir_path):
+        if self.file_system.path.exists(new_dir_path):
             raise FileExistsError(f"The new directory name {new_dir_path} already exists.")
 
-        new_file_path_display = new_file_path.replace('./', 'ara/')
-        new_dir_path_display = new_dir_path.replace('./', 'ara/')
+        # Perform the renaming of the file and directory
+        self.file_system.rename(old_file_path, new_file_path)
+        print(f"Renamed file: ara/{old_file_path} to ara/{new_file_path}")
+        if old_dir_exists:
+            self.file_system.rename(old_dir_path, new_dir_path)
+            print(f"Renamed directory: ara/{old_dir_path} to ara/{new_dir_path}")
 
-        serialized_artefact = matching_artefact.serialize()
-        with open(matching_artefact.file_path, 'w') as file:
-            file.write(serialized_artefact)
-        fs.remove(old_file_path)
+        # Update the title within the artefact file
+        self._update_title_in_artefact(new_file_path, new_name, classifier)
 
-        print(f"Renamed file: {old_file_path_display} to {new_file_path_display}")
+        # Update links in related artefact files
+        self.link_updater.update_links_in_related_artefacts(old_name, new_name)
 
-        if old_dir_exists:
-            fs.rename(old_dir_path, new_dir_path)
-            print(f"Renamed directory: {old_dir_path_display} to {new_dir_path_display}")
-
-        for children in children_by_classifier.values():
-            for child in children:
-                contribution = child.contribution
-                contribution.artefact_name = new_name
-                child.contribution = contribution
-                serialized_artefact = child.serialize()
-                with open(child.file_path, 'w') as file:
-                    file.write(serialized_artefact)
-
-        fs.chdir(original_directory)
+        os.chdir(original_directory)
 
     def _update_title_in_artefact(self, artefact_path, new_title, classifier):
         # Format the new title: replace underscores with spaces

ara_cli/tests/test_file_creator.py

@@ -25,7 +25,8 @@ def test_run_with_invalid_classifier_prints_error_message(capfd):
 
 @patch("ara_cli.artefact_creator.input", return_value="n")
 @patch("ara_cli.artefact_creator.os.path.exists", return_value=True)
-def test_run_with_existing_file_does_not_overwrite(mock_input, mock_exists, capfd):
+@patch("ara_cli.artefact_creator.os.listdir", return_value=["data_folder_content"])
+def test_run_with_existing_file_does_not_overwrite(mock_input, mock_exists, mock_list, capfd):
     fc = ArtefactCreator()
     fc.run("filename", "vision")
 
@@ -42,6 +43,7 @@ def test_create_artefact_exploration_success():
             creator.create_artefact_prompt_files("./dest", "./source", "sample")
 
 
+
 def test_create_artefact_exploration_source_not_found():
     creator = ArtefactCreator()
 

ara_cli/version.py

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

{ara_cli-0.1.9.57.dist-info → ara_cli-0.1.9.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: ara-cli
-Version: 0.1.9.57
+Metadata-Version: 2.4
+Name: ara_cli
+Version: 0.1.9.59
 Requires-Dist: litellm
 Requires-Dist: llama-index
 Requires-Dist: llama-index-llms-openai
@@ -10,6 +10,6 @@ Requires-Dist: markdown-it-py
 Requires-Dist: json-repair
 Requires-Dist: argparse
 Requires-Dist: argcomplete
-Requires-Dist: cmd2 >=2.5
+Requires-Dist: cmd2>=2.5
 Requires-Dist: pydantic
-
+Dynamic: requires-dist

{ara_cli-0.1.9.57.dist-info → ara_cli-0.1.9.59.dist-info}/RECORD

@@ -4,13 +4,13 @@ ara_cli/analyse_artefacts.py,sha256=JwA2zxkCy8vNOHoU9f3TICJesXRRXndHi2hT5m_uQ8Q,
 ara_cli/ara_command_action.py,sha256=OsmNJ9XHVMPveVO0kxlYNU5vR16bX9Sn7mGKaOieZqg,18925
 ara_cli/ara_command_parser.py,sha256=HluFJimQbxS_yuZ2IzLcsfUPrmIJbKJB71YvsGiUXQE,16883
 ara_cli/ara_config.py,sha256=_Arkr-b9XnrNHbBlFKb9tAo3OmdP4ZZiWvbY9m6Sbo0,4178
-ara_cli/artefact_creator.py,sha256=s0hY8-X0EAwEfZvIRK1F67bW55tB-EvgnvH2gYNTGpY,6022
+ara_cli/artefact_creator.py,sha256=7d4iuh2sx73gy7MRZ_zzfN7P1Mt9KuGGWTY0Q4O5pPY,6139
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
 ara_cli/artefact_fuzzy_search.py,sha256=XAvoiRafd1u21uKbX5-bow7hdq7uiLLy1KtxHNAFbCk,1337
 ara_cli/artefact_link_updater.py,sha256=itMS_Z64jE8bBly9WA01z8PqkBeNW6ntTO7ryMeCTRg,3703
 ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
 ara_cli/artefact_reader.py,sha256=qNaMPWShmWtDU5LLdh9efFB27djI4NAoq6zEFwdTd38,6983
-ara_cli/artefact_renamer.py,sha256=aJriqHdkeXAvHx1PuKOhpqgg9EBr7PMv6NK67CCasbU,5319
+ara_cli/artefact_renamer.py,sha256=loIn1DF9kVnjhH7wP1v5qUvt3s0uKeWXuQPrHXenQGE,4025
 ara_cli/artefact_scan.py,sha256=DgFGv4hnbCjYdIgPA2PbAuGDWg1q2fCjtIqxGs57b9w,1762
 ara_cli/chat.py,sha256=7xTtPEDk052_wmIzoti7GavEJ1vpRxe5c084WQ1C7dg,28617
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
@@ -31,7 +31,7 @@ ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,23
 ara_cli/tag_extractor.py,sha256=R5T103Y60NppYifKV7b8KoI5kE1M66fULz6f_Fdc9VU,1081
 ara_cli/template_manager.py,sha256=YXPj2jGNDb-diIHFEK_vGJ-ZucodnXSGAPofKTnOofI,6633
 ara_cli/update_config_prompt.py,sha256=PZgNIN3dTw6p80GyX8Sp5apkAhSoykwnkEbHo3IOkUo,4571
-ara_cli/version.py,sha256=NgYOrYvT6ewQjO9blMaF-5PiscTJqlK0ahlRP7Xw_tI,146
+ara_cli/version.py,sha256=96UGMMnHR8CYMHP9Ai6qBVKbtLO4hpk3ZjYQaSuTzhc,146
 ara_cli/artefact_models/artefact_load.py,sha256=dNcwZDW2Dk0bts9YnPZ0ESmWD2NbsLIvl4Z-qQeGmTQ,401
 ara_cli/artefact_models/artefact_mapping.py,sha256=8aD0spBjkJ8toMAmFawc6UTUxB6-tEEViZXv2I-r88Q,1874
 ara_cli/artefact_models/artefact_model.py,sha256=vV-Hhtl6DwVt7qcFTnxxr_WqyTZnKtkFU-nryVnTbUg,14853
@@ -142,14 +142,14 @@ ara_cli/tests/test_chat.py,sha256=V75baLk2ZFz5WDSFTlvdbmMb6Dm7o12xoFEulmMgMDI,46
 ara_cli/tests/test_classifier.py,sha256=grYGPksydNdPsaEBQxYHZTuTdcJWz7VQtikCKA6BNaQ,1920
 ara_cli/tests/test_directory_navigator.py,sha256=7G0MVrBbtBvbrFUpL0zb_9EkEWi1dulWuHsrQxMJxDY,140
 ara_cli/tests/test_file_classifier.py,sha256=6OYM-lYVYjxq4Qwl8U1btv_FYJhc5t3rKjYr2CXZ4uI,10069
-ara_cli/tests/test_file_creator.py,sha256=ssrl7gfU13H4ogrrX1BXx4WO4bQ7OG1R2tXZC1MP8EY,2004
+ara_cli/tests/test_file_creator.py,sha256=G257M1duenDrgLCSql3wVWNuzcxyQqLQDybfbxiGYN0,2100
 ara_cli/tests/test_file_lister.py,sha256=f6B_vIv-wAulKH2ZGgNg4SG79XqGGbfwoIvZlbEnYyM,4306
 ara_cli/tests/test_list_filter.py,sha256=gSRKirTtFuhRS3QlFHqWl89WvCvAdVEnFsCWTYmgB2o,7928
 ara_cli/tests/test_tag_extractor.py,sha256=n2xNApbDciqKO3QuaveEWSPXU1PCUa_EhxlZMrukONw,2074
 ara_cli/tests/test_template_manager.py,sha256=bRxka6cxHsCAOvXjfG8MrVO8qSZXhxW01tnph80UtNk,3143
 ara_cli/tests/test_update_config_prompt.py,sha256=vSsLvc18HZdVjVM93qXWVbJt752xTLL6VGjSVCrPufk,6729
-ara_cli-0.1.9.57.dist-info/METADATA,sha256=PWvHyn9Eh2F65XzuO9mkqp8xgp_-SHCpxk6vrjK3VZQ,367
-ara_cli-0.1.9.57.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-ara_cli-0.1.9.57.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.57.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
-ara_cli-0.1.9.57.dist-info/RECORD,,
+ara_cli-0.1.9.59.dist-info/METADATA,sha256=_L6D_eKlZKaC4Ltua2K2WPQr3Y0sZeJue6AdNtLtRm0,388
+ara_cli-0.1.9.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.59.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.59.dist-info/top_level.txt,sha256=zzee_PwFmKqfBi9XgIunP6xy2S4TIt593CLLxenNaAE,8
+ara_cli-0.1.9.59.dist-info/RECORD,,

{ara_cli-0.1.9.57.dist-info → ara_cli-0.1.9.59.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any