Merge pull request #11 from SOPTIM/fix-iri-handling

Fix IRI handling

Author: scud-soptim

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgmes2pgm_converter"
-version = "0.2.1"
+version = "0.2.2"
 description = "Library to convert Common Grid Model Exchange Standard (CGMES) datasets to PowerGridModel (PGM) format"
 authors = [
     { name = "Lars Friedrich, Eduard Fried, Udo Schmitz", email = "powergridmodel@soptim.de" },

src/cgmes2pgm_converter/__init__.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 """
-This package provides a library to convert 
-Common Grid Model Exchange Standard (CGMES) data to PGM format 
-and apply the State Estimation from 
+This package provides a library to convert
+Common Grid Model Exchange Standard (CGMES) data to PGM format
+and apply the State Estimation from
 [PowerGridModel](https://github.com/PowerGridModel/power-grid-model).
 """
 

src/cgmes2pgm_converter/common/cgmes_dataset.py

@@ -76,6 +76,17 @@ def mrid_to_urn(self, mrid: str) -> str:
         mrid = mrid.replace('"', "")
         return f"<urn:uuid:{mrid}>"
 
+    def query(
+        self, query: str, add_prefixes=True, remove_uuid_base_uri=True
+    ) -> pd.DataFrame:
+        result = super().query(query, add_prefixes)
+        if remove_uuid_base_uri:
+            # Remove the base URI from all IRIs (if wanted) -> helps to keep the output clean
+            prefix = self.base_url + "#"
+            for col in result.select_dtypes(include="object"):
+                result[col] = result[col].str.replace(f"^{prefix}", "", regex=True)
+        return result
+
     def insert_df(
         self, df: pd.DataFrame, profile: Profile | str, include_mrid=True
     ) -> None:

src/cgmes2pgm_converter/components/measurement/reactive_power_sensor_for_shunt.py

@@ -221,7 +221,7 @@ def _read_meas_from_default_graph(self):
             "$TOPO_ISLAND": self._at_topo_island_node("?tn"),
         }
         q = self._replace(self._query_meas_in_default, args)
-        res = self._source.query(q)
+        res = self._source.query(q, remove_uuid_base_uri=False)
         return res
 
     def _read_meas_from_named_graph(self):
@@ -230,7 +230,7 @@ def _read_meas_from_named_graph(self):
             "$TOPO_ISLAND": self._at_topo_island_node("?tn"),
         }
         q = self._replace(self._query_meas_in_graph, args)
-        res = self._source.query(q)
+        res = self._source.query(q, remove_uuid_base_uri=False)
         return res
 
     def component_name(self) -> ComponentType:

src/cgmes2pgm_converter/components/measurement/voltage_sensor.py

@@ -146,7 +146,7 @@ def _read_meas_from_graph(self):
     def _read_meas_from_default_graph(self):
         args = {"$TOPO_ISLAND": self._at_topo_island_node("?tn")}
         q = self._replace(self._query_meas_in_default, args)
-        res = self._source.query(q)
+        res = self._source.query(q, remove_uuid_base_uri=False)
 
         meas_by_tn = self._join_measurements_by_node(res)