Update _lookup.py

Author: fkiraly

pytorch_forecasting/_registry/_lookup.py

@@ -11,6 +11,7 @@
 __author__ = ["fkiraly"]
 # all_objects is based on the sklearn utility all_estimators
 
+from inspect import isclass
 from pathlib import Path
 
 from skbase.lookup import all_objects as _all_objects
@@ -133,25 +134,39 @@ def all_objects(
     result = []
     ROOT = str(Path(__file__).parent.parent)  # package root directory
 
-    if isinstance(filter_tags, str):
-        filter_tags = {filter_tags: True}
-    filter_tags = filter_tags.copy() if filter_tags else None
-
-    if object_types:
-        if filter_tags and "object_type" not in filter_tags.keys():
-            object_tag_filter = {"object_type": object_types}
-        elif filter_tags:
-            filter_tags_filter = filter_tags.get("object_type", [])
-            if isinstance(object_types, str):
-                object_types = [object_types]
-            object_tag_update = {"object_type": object_types + filter_tags_filter}
-            filter_tags.update(object_tag_update)
+    def _coerce_to_str(obj):
+        if isinstance(obj, (list, tuple)):
+            return [_coerce_to_str(o) for o in obj]
+        if isclass(obj):
+            obj = obj.get_tag("object_type")
+        return obj
+
+    def _coerce_to_list_of_str(obj):
+        obj = _coerce_to_str(obj)
+        if isinstance(obj, str):
+            return [obj]
+        return obj
+
+    if object_types is not None:
+        object_types = _coerce_to_list_of_str(object_types)
+        object_types = list(set(object_types))
+
+    if object_types is not None:
+        if filter_tags is None:
+            filter_tags = {}
+        elif isinstance(filter_tags, str):
+            filter_tags = {filter_tags: True}
         else:
-            object_tag_filter = {"object_type": object_types}
-        if filter_tags:
-            filter_tags.update(object_tag_filter)
+            filter_tags = filter_tags.copy()
+
+        if "object_type" in filter_tags:
+            obj_field = filter_tags["object_type"]
+            obj_field = _coerce_to_list_of_str(obj_field)
+            obj_field = obj_field + object_types
         else:
-            filter_tags = object_tag_filter
+            obj_field = object_types
+
+        filter_tags["object_type"] = obj_field
 
     result = _all_objects(
         object_types=[_BaseObject],