Fix bug if size_prop is part of additional_properties

Author: FlorentinD

changelog.md

@@ -10,6 +10,7 @@
 ## Bug fixes
 
 * Fixed a bug with `from_gds` where graphs with different relationship types would fail if they had different properties.
+* Fixed a bug with `from_gds` where the additional property would be skipped if its also defined as the size property.
 
 
 ## Improvements

python-wrapper/src/neo4j_viz/gds.py

@@ -148,7 +148,10 @@ def from_gds(
     if size_property is not None:
         if "size" in all_actual_node_properties and size_property != "size":
             node_props_df.rename(columns={"size": "__size"}, inplace=True)
-        node_props_df.rename(columns={size_property: "size"}, inplace=True)
+        if size_property not in additional_node_properties:
+            node_props_df.rename(columns={size_property: "size"}, inplace=True)
+        else:
+            node_props_df["size"] = node_props_df[size_property]
 
     for lbl, df in node_dfs.items():
         if "labels" in all_actual_node_properties:

python-wrapper/tests/test_gds.py

@@ -134,7 +134,6 @@ def test_from_gds_integration_all_properties(gds: Any) -> None:
             (2, 0, "REL", "REL", 3.0, 2.5),
         ]
 
-
 def test_from_gds_mocked(mocker: MockerFixture) -> None:
     from graphdatascience import Graph, GraphDataScience
 
@@ -196,14 +195,14 @@ def test_from_gds_mocked(mocker: MockerFixture) -> None:
     G = Graph()  # type: ignore[call-arg]
 
     VG = from_gds(
-        gds, G, size_property="score", additional_node_properties=["component"], node_radius_min_max=(3.14, 1337)
+        gds, G, size_property="score", additional_node_properties=["component", "score"], node_radius_min_max=(3.14, 1337)
     )
 
     assert len(VG.nodes) == 3
     assert sorted(VG.nodes, key=lambda x: x.id) == [
-        Node(id=0, caption="['A']", size=float(1337), properties=dict(labels=["A"], component=float(1))),
-        Node(id=1, caption="['C']", size=float(42), properties=dict(labels=["C"], component=float(4))),
-        Node(id=2, caption="['A', 'B']", size=float(3.14), properties=dict(labels=["A", "B"], component=float(2))),
+        Node(id=0, caption="['A']", size=float(1337), properties=dict(labels=["A"], component=float(1), score=float(1337))),
+        Node(id=1, caption="['C']", size=float(42), properties=dict(labels=["C"], component=float(4), score=float(42))),
+        Node(id=2, caption="['A', 'B']", size=float(3.14), properties=dict(labels=["A", "B"], component=float(2), score=float(3.14))),
     ]
 
     assert len(VG.relationships) == 3