Merge branch 'dev' into dev

Author: arjunsuresh

.github/workflows/test-mlc-core-actions.yaml

@@ -151,13 +151,14 @@ jobs:
         mlc add repo my-new-repo
         mlc add repo https://github.com/mlcommons/inference
         mlc add repo https://mygit.com/myrepo
-      
+     
+    ' Disabled now as MLCFlow automatically deletes corrupted entries
     - name: Test 13 - rm repo where we have a corrupt entry 
       run: |
         rm -r $HOME/MLC/repos/mlcommons@mlperf-automations
         mlc rm repo mlcommons@mlperf-automations
         mlc pull repo mlcommons@mlperf-automations --branch=dev
-        
+    '   
     - name: Test 14 - add script - Add a new MLC script
       run: |
         mlc add script my-script-1 --tags=my,new-tags-1
@@ -201,12 +202,13 @@ jobs:
     - name: Test 21 - Test mlc pull repo to checkout based on particular release tag
       run: |
         mlc rm repo mlcommons@mlperf-automations -f
-        mlc pull repo mlcommons@mlperf-automations --tag=mlperf-automations-v1.0.0
+        mlc pull repo mlcommons@mlperf-automations --tag=v1.2.0
 
     - name: Test 22 - Test silent mode
       run: |
-        ! mlcr detect,cpu -j -s 2>&1 | grep -q INFO
-        ! mlcr detect,cpu -j --silent 2>&1 | grep -q INFO
+        mlcr detect,cpu -j -s --quiet 
+        ! mlcr detect,cpu -j -s --quiet 2>&1 | grep -q INFO
+        ! mlcr detect,cpu -j --silent --quiet 2>&1 | grep -q INFO
 
     - name: Test 23 - Test verbose mode
       run: |

CONTRIBUTORS.md

@@ -29,11 +29,11 @@ Once your contribution exceeds 50 lines of code (in total), we will:
 ## Current Contributors
 
 - **[Arjun Suresh](https://github.com/arjunsuresh)** - *Initial Development Discussions, {Script,Cache} Action implementations*  
-- **[Anandhu Sooraj](https://github.com/anandhu-eng)** - *Initial Development Discussions, RepoAction implmentation, Github Tests*  
+- **[Anandhu Sooraj](https://github.com/anandhu-eng)** - *Initial Development Discussions, RepoAction implementation, Github Tests*
+- **[Sujith Kanakkassery](https://github.com/sujik18)** - *Initial Development Discussions, Persistent index implementation*
 - **[Shaik Masthan](https://github.com/csemasthan)** - *Initial Development Discussions*  
 - **[Sahil Avaran](https://github.com/sahilavaran)** - *Initial Development Discussions*, added logging
 - **[R.A Sidharth](https://github.com/Sid9993)** - *Find repo implementation*
-- **[Sujith Kanakkassery](https://github.com/sujik18)** - *Initial Development Discussions*, adding logging to a file
 - **[Your Name Here]** - This could be you! 🎉  
 
 ---

VERSION

@@ -1 +1 @@
-1.1.9
+1.1.14

mlc/action.py

@@ -106,8 +106,7 @@ def is_curdir_inside_path(base_path):
         # Iterate through the list of repository paths
         for repo_path in repo_paths:
             if not os.path.exists(repo_path):
-                logger.warning(f"""Warning: {repo_path} not found. Considering it as a corrupt entry and deleting automatically...""")
-                logger.warning(f"Deleting the {meta_yaml_path} entry from repos.json")
+                logger.warning(f"""Warning: {repo_path} not found. Considering it as a corrupt entry and deleting from repos.json...""")
                 from .repo_action import rm_repo
                 res = rm_repo(repo_path, os.path.join(self.repos_path, 'repos.json'), True)
 
@@ -166,6 +165,10 @@ def load_repos(self):
             logger.error(f"Error reading file: {e}")
             return None
 
+    def get_index(self):
+        if self._index is None:
+            self._index = Index(self.repos_path, self.repos)
+        return self._index
 
     def __init__(self):        
         setup_logging(log_path=os.getcwd(), log_file='.mlc-log.txt')
@@ -201,7 +204,7 @@ def __init__(self):
 
         self.repos = self.load_repos_and_meta()
         #logger.info(f"In Action class: {self.repos_path}")
-        self.index = Index(self.repos_path, self.repos)
+        self._index = None
 
 
     def add(self, i):
@@ -381,7 +384,7 @@ def rm(self, i):
 
                 logger.info(f"{target_name} item: {item_path} has been successfully removed")
 
-            self.index.rm(item_meta, target_name, item_path)
+            self.get_index().rm(item_meta, target_name, item_path)
 
         return {
             "return": 0,
@@ -414,7 +417,7 @@ def save_new_meta(self, i, item_id, item_name, target_name, item_path, repo):
         if save_result["return"] > 0:
             return save_result
 
-        self.index.add(item_meta, target_name, item_path, repo)
+        self.get_index().add(item_meta, target_name, item_path, repo)
         return {'return': 0}
 
     def update(self, i):
@@ -483,7 +486,7 @@ def update(self, i):
             # Save the updated meta back to the item
             item.meta = meta
             save_result = utils.save_json(item_meta_path, meta=meta)
-            self.index.update(meta, target_name, item.path, item.repo)
+            self.get_index().update(meta, target_name, item.path, item.repo)
 
         return {'return': 0, 'message': f"Tags updated successfully for {len(found_items)} item(s).", 'list': found_items }
 
@@ -642,13 +645,13 @@ def mv(self, run_args):
         #Put the src uid to the destination path
         dest.meta['uid'] = src.meta['uid']
         dest._save_meta()
-        self.index.update(dest.meta, target_name, dest.path, dest.repo)
+        self.get_index().update(dest.meta, target_name, dest.path, dest.repo)
         logger.info(f"""Item with uid {dest.meta['uid']} successfully moved from {src.path} to {dest.path}""")
 
         return {'return': 0, 'src': src, 'dest': dest}
 
     def search(self, i):
-        indices = self.index.indices
+        indices = self.get_index().indices
         target = i.get('target_name', self.action_type)
         target_index = indices.get(target)
         result = []