| @@ -381,14 +381,14 @@ class LearnwareClient: | |||||
| @staticmethod | @staticmethod | ||||
| def _check_semantic_specification(semantic_spec): | def _check_semantic_specification(semantic_spec): | ||||
| return EasySemanticChecker.check_semantic_spec(semantic_spec) != BaseChecker.INVALID_LEARNWARE | |||||
| return EasySemanticChecker.check_semantic_spec(semantic_spec)[0] != BaseChecker.INVALID_LEARNWARE | |||||
| @staticmethod | @staticmethod | ||||
| def _check_stat_specification(learnware): | def _check_stat_specification(learnware): | ||||
| from ..market import CondaChecker | from ..market import CondaChecker | ||||
| stat_checker = CondaChecker(inner_checker=EasyStatChecker()) | stat_checker = CondaChecker(inner_checker=EasyStatChecker()) | ||||
| return stat_checker(learnware) != BaseChecker.INVALID_LEARNWARE | |||||
| return stat_checker(learnware)[0] != BaseChecker.INVALID_LEARNWARE | |||||
| @staticmethod | @staticmethod | ||||
| def check_learnware(learnware_zip_path, semantic_specification=None): | def check_learnware(learnware_zip_path, semantic_specification=None): | ||||
| @@ -84,7 +84,7 @@ class LearnwareMarket: | |||||
| ) | ) | ||||
| for name in checker_names: | for name in checker_names: | ||||
| checker = self.learnware_checker[name] | checker = self.learnware_checker[name] | ||||
| check_status = checker(pending_learnware) | |||||
| check_status, message = checker(pending_learnware) | |||||
| final_status = max(final_status, check_status) | final_status = max(final_status, check_status) | ||||
| if check_status == BaseChecker.INVALID_LEARNWARE: | if check_status == BaseChecker.INVALID_LEARNWARE: | ||||
| @@ -16,11 +16,11 @@ class CondaChecker(BaseChecker): | |||||
| try: | try: | ||||
| with LearnwaresContainer(learnware, ignore_error=False) as env_container: | with LearnwaresContainer(learnware, ignore_error=False) as env_container: | ||||
| learnwares = env_container.get_learnwares_with_container() | learnwares = env_container.get_learnwares_with_container() | ||||
| check_status = self.inner_checker(learnwares[0]) | |||||
| check_status, message = self.inner_checker(learnwares[0]) | |||||
| except Exception as e: | except Exception as e: | ||||
| traceback.print_exc() | traceback.print_exc() | ||||
| message = f"Conda Checker failed due to installed learnware failed and {e}" | message = f"Conda Checker failed due to installed learnware failed and {e}" | ||||
| logger.warning(message) | logger.warning(message) | ||||
| message += "\n" + traceback.format_exc() | message += "\n" + traceback.format_exc() | ||||
| return BaseChecker.INVALID_LEARNWARE, message | return BaseChecker.INVALID_LEARNWARE, message | ||||
| return check_status | |||||
| return check_status, message | |||||