From ea1fd9ffe36dc2a2a8ed569adb773733a5e14830 Mon Sep 17 00:00:00 2001
From: bxdd <bxddream@gmail.com>
Date: Tue, 14 Nov 2023 20:27:14 +0800
Subject: [PATCH] [MNT] update hetero organizer

---
 learnware/market/easy/organizer.py                   |  7 +------
 learnware/market/heterogeneous/organizer/__init__.py | 12 +++++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/learnware/market/easy/organizer.py b/learnware/market/easy/organizer.py
index 412664b..e3587e8 100644
--- a/learnware/market/easy/organizer.py
+++ b/learnware/market/easy/organizer.py
@@ -374,13 +374,8 @@ class EasyOrganizer(BaseOrganizer):
         return [self.learnware_list[idx] for idx in learnware_ids]
 
     def reload_learnware(self, learnware_id: str):
-        current_learnware = self.learnware_list.get(learnware_id)
-
-        if current_learnware is None:
-            # add learnware
+        if learnware_id not in self.learnware_list:
             self.count += 1
-        else:
-            pass
 
         target_zip_dir = os.path.join(self.learnware_zip_pool_path, "%s.zip" % (learnware_id))
         target_folder_dir = os.path.join(self.learnware_folder_pool_path, learnware_id)
diff --git a/learnware/market/heterogeneous/organizer/__init__.py b/learnware/market/heterogeneous/organizer/__init__.py
index 758570e..f397726 100644
--- a/learnware/market/heterogeneous/organizer/__init__.py
+++ b/learnware/market/heterogeneous/organizer/__init__.py
@@ -29,13 +29,15 @@ class HeteroMapTableOrganizer(EasyOrganizer):
             if not rebuild:
                 if os.path.exists(self.hetero_specs_path):
                     for hetero_json_path in os.listdir(self.hetero_specs_path):
+                        if not hetero_json_path.endswith(".json"):
+                            continue
                         try:
                             idx = hetero_json_path.split(".")[0]
                             hetero_spec = HeteroMapTableSpecification()
-                            hetero_spec.load(os.path.join(self.hetero_specs_path, f"{idx}.json"))
+                            hetero_spec.load(os.path.join(self.hetero_specs_path, hetero_json_path))
                             self.learnware_list[idx].update_stat_spec(hetero_spec.type, hetero_spec)
-                        except:
-                            logger.warning(f"Learnware {idx} hetero spec loaded failed!")
+                        except Exception as err:
+                            logger.warning(f"Learnware in {hetero_json_path} hetero spec loaded failed! due to {err}.")
                 else:
                     logger.info("No HeteroMapTableSpecification to reload. Use loaded market mapping to regenerate.")
                     self._update_learnware_by_ids(self.get_learnware_ids(check_status=BaseChecker.USABLE_LEARWARE))
@@ -136,8 +138,8 @@ class HeteroMapTableOrganizer(EasyOrganizer):
                 semantic_spec, rkme = spec.get_semantic_spec(), spec.get_stat_spec().get("RKMETableSpecification", None)
                 if isinstance(rkme, RKMETableSpecification) and isinstance(semantic_spec["Input"], dict):
                     ret.append(idx)
-            except:
-                continue
+            except Exception:
+                pass
         return ret
 
     def generate_hetero_map_spec(self, user_info: BaseUserInfo) -> HeteroMapTableSpecification: