improved fobs register_folder to catch ValueError. (#2958)

NVIDIA · Sep 26, 2024 · 5a2668d · 5a2668d
1 parent 2d67f17
commit 5a2668d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nvflare/fuel/utils/fobs/fobs.py b/nvflare/fuel/utils/fobs/fobs.py
@@ -243,7 +243,7 @@ def register_folder(folder: str, package: str):
                     # classes who are abstract or take extra args in __init__ can't be auto-registered
                     if issubclass(cls_obj, Decomposer) and not inspect.isabstract(cls_obj) and len(spec.args) == 1:
                         register(cls_obj)
-            except (ModuleNotFoundError, RuntimeError) as e:
+            except (ModuleNotFoundError, RuntimeError, ValueError) as e:
                 log.debug(
                     f"Try to import module {decomposers}, but failed: {secure_format_exception(e)}. "
                     f"Can't use name in config to refer to classes in module: {decomposers}."
@@ -275,7 +275,7 @@ def register_custom_folder(folder: str):
                                 log.warning(
                                     f"Invalid Decomposer from {module}: can't have argument in Decomposer's constructor"
                                 )
-                except (ModuleNotFoundError, RuntimeError):
+                except (ModuleNotFoundError, RuntimeError, ValueError):
                     pass
 
 

diff --git a/nvflare/private/fed/utils/fed_utils.py b/nvflare/private/fed/utils/fed_utils.py
@@ -251,7 +251,7 @@ def register_decomposer_module(decomposer_module):
                 package_name = module_info.name
                 folder = os.path.join(folder_name, package_name.split(".")[-1])
                 fobs.register_folder(folder, package_name)
-    except (ModuleNotFoundError, RuntimeError) as e:
+    except (ModuleNotFoundError, RuntimeError, ValueError) as e:
         # logger.warning(f"Could not register decomposers from: {decomposer_module}")
         pass