problem_method simplified

Author: franaudo

src/compas_fea2/problem/problem.py

@@ -369,6 +369,8 @@ def write_input_file(self, path=None):
             The InputFile objects that generates the input file.
         """
         path = path or self.path
+        if not isinstance(path, Path):
+            path = Path(path)
         if not path.exists():
             path.mkdir(parents=True)
         input_file = InputFile.from_problem(self)

src/compas_fea2/utilities/_utils.py

@@ -190,24 +190,48 @@ def problem_method(f):
     def wrapper(*args, **kwargs):
         func_name = f.__qualname__.split(".")[-1]
         self_obj = args[0]
-        problems = kwargs.setdefault("problems", self_obj.problems)
-        if not problems:
-            raise ValueError("No problems found in the model")
-        if not isinstance(problems, Iterable):
-            problems = [problems]
-        vars = []
-        for problem in problems:
-            if problem.model != self_obj:
-                raise ValueError("{} is not registered to this model".format(problem))
-            if "steps" in kwargs:
-                kwargs.setdefault("steps", self_obj.steps)
-            var = getattr(problem, func_name)(*args[1::], **kwargs)
-            if var:
-                vars.append(var)
-        return vars
-
+        res = [vars for problem in self_obj.problems if (vars := getattr(problem, func_name)(*args[1::], **kwargs))]
+        res = list(itertools.chain.from_iterable(res))
+        return res
     return wrapper
 
+# def problem_method(f):
+#     """Run a problem level method. In this way it is possible to bring to the
+#     model level some of the functions of the problems.
+
+#     Parameters
+#     ----------
+#     method : str
+#         name of the method to call.
+
+#     Returns
+#     -------
+#     [var]
+#         List results of the method per each problem in the model.
+#     """
+
+#     @wraps(f)
+#     def wrapper(*args, **kwargs):
+#         func_name = f.__qualname__.split(".")[-1]
+#         self_obj = args[0]
+#         problems = kwargs.setdefault("problems", self_obj.problems)
+#         if not problems:
+#             raise ValueError("No problems found in the model")
+#         if not isinstance(problems, Iterable):
+#             problems = [problems]
+#         vars = []
+#         for problem in problems:
+#             if problem.model != self_obj:
+#                 raise ValueError("{} is not registered to this model".format(problem))
+#             if "steps" in kwargs:
+#                 kwargs.setdefault("steps", self_obj.steps)
+#             var = getattr(problem, func_name)(*args[1::], **kwargs)
+#             if var:
+#                 vars.append(var)
+#         return vars
+
+#     return wrapper
+
 def to_dimensionless(func):
     """Decorator to convert pint Quantity objects to dimensionless in the base units.
     """