pandahub 0.4.1__zip → 0.4.2__zip

{pandahub-0.4.1 → pandahub-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandahub
-Version: 0.4.1
+Version: 0.4.2
 Summary: Data hub for pandapower and pandapipes networks based on MongoDB
 Author-email: Jan Ulffers <jan.ulffers@iee.fraunhofer.de>, Leon Thurner <leon.thurner@retoflow.de>, Jannis Kupka <jannis.kupka@retoflow.de>, Mike Vogt <mike.vogt@iee.fraunhofer.de>, Joschka Thurner <joschka.thurner@retoflow.de>, Alexander Scheidler <alexander.scheidler@iee.fraunhofer.de>
 License: Copyright (c) 2022 by University of Kassel, Fraunhofer Institute for Energy Economics

{pandahub-0.4.1 → pandahub-0.4.2}/pandahub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandahub
-Version: 0.4.1
+Version: 0.4.2
 Summary: Data hub for pandapower and pandapipes networks based on MongoDB
 Author-email: Jan Ulffers <jan.ulffers@iee.fraunhofer.de>, Leon Thurner <leon.thurner@retoflow.de>, Jannis Kupka <jannis.kupka@retoflow.de>, Mike Vogt <mike.vogt@iee.fraunhofer.de>, Joschka Thurner <joschka.thurner@retoflow.de>, Alexander Scheidler <alexander.scheidler@iee.fraunhofer.de>
 License: Copyright (c) 2022 by University of Kassel, Fraunhofer Institute for Energy Economics

{pandahub-0.4.1 → pandahub-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pandahub"
-version = "0.4.1"  # File format version '__format_version__' is tracked in __init__.py
+version = "0.4.2"  # File format version '__format_version__' is tracked in __init__.py
 authors=[
     { name = "Jan Ulffers", email = "jan.ulffers@iee.fraunhofer.de" },
     { name = "Leon Thurner", email = "leon.thurner@retoflow.de" },

{pandahub-0.4.1 → pandahub-0.4.2}/pandahub/lib/PandaHub.py

@@ -1020,13 +1020,6 @@ class PandaHub:
         elif not isinstance(add_edge_branches, list):
             raise ValueError("add_edge_branches must be a list or a boolean")
 
-        # Add elements for which the user has provided a filter function
-        for element, filter_func in additional_filters.items():
-            if element in ignore_elements:
-                continue
-            add_args["filter"] = filter_func(net)
-            self._add_element_from_collection(element_type=element, **add_args)
-
         branch_nodes = set()
         for branch_name, node_cols in zip(default_branches, default_node_cols):
             operator = "$or" if branch_name in add_edge_branches else "$and"
@@ -1074,6 +1067,13 @@ class PandaHub:
             add_args["filter"] = {node_name: {"$in": nodes}}
             self._add_element_from_collection(element_type=element, **add_args)
 
+        # Add elements for which the user has provided a filter function
+        for element, filter_func in additional_filters.items():
+            if element in ignore_elements:
+                continue
+            add_args["filter"] = filter_func(net)
+            self._add_element_from_collection(element_type=element, **add_args)
+
         # add all other collections
         collection_names = self.get_net_collections(db)
         for collection in collection_names: