Merge pull request #99 from diningphil/fix_filter_exp

minor fix in filter_experiments

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## [1.5.8] Minor fix
+
+## Fixed
+
+- Minor fix in `filter_experiments`
 
 ## [1.5.7] Improving experiment retrieval routines
 

docs/conf.py

@@ -24,7 +24,7 @@
 author = "Federico Errica"
 
 # The full version, including alpha/beta/rc tags
-release = "1.5.7"
+release = "1.5.8"
 
 
 # -- General configuration ---------------------------------------------------

pydgn/evaluation/util.py

@@ -401,15 +401,15 @@ def filter_experiments(
 
     def _finditem(obj, key):
         if key in obj:
-            return obj[key]
+            return obj[key], True
 
         for k, v in obj.items():
             if isinstance(v, dict):
-                item = _finditem(v, key)
-                if item is not None:
-                    return item
+                item, found = _finditem(v, key)
+                if found:
+                    return item, True
 
-        return None
+        return None, False
 
     assert logic in ["AND", "OR"], "logic can only be AND/OR case sensitive"
 
@@ -420,8 +420,8 @@ def _finditem(obj, key):
 
         for k, v in parameters.items():
 
-            cf_v = _finditem(config, k)
-            assert cf_v is not None, (
+            cf_v, found = _finditem(config, k)
+            assert found, (
                 f"Key {k} not found in the " f"configuration, check your input"
             )
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pydgn"
-version = "1.5.7"
+version = "1.5.8"
 description = "A Python Package for Deep Graph Networks"
 authors = [ { name="Federico Errica", email="f.errica@protonmail.com" } ]
 readme = "README.md"