fix: fix bug in data model that assumed that the market_unit_mrid was…

src/cimsparql/adaptions.py

@@ -10,18 +10,18 @@
 from string import Template
 from typing import TYPE_CHECKING
 
 from rdflib import ConjunctiveGraph
 from rdflib.namespace import XSD
 from rdflib.plugins.sparql import prepareUpdate
 from rdflib.query import ResultRow
 from rdflib.term import BNode, Literal, URIRef
 
 from cimsparql.graphdb import default_namespaces
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
 
     from rdflib import Graph
 
 
 class XmlModelAdaptor:
@@ -71,10 +71,15 @@
             """
         )
 
+    def add_market_code_to_non_conform_load(self) -> None:
+        self.update_graph("add_non_conform_load_group.sparql")
+        self.update_graph("add_market_code_for_load_groups.sparql")
+
     def adapt(self, eq_uri: str) -> None:
         self.add_zero_sv_power_flow()
         self.add_zero_sv_injection()
         self.add_generating_unit()
+        self.add_market_code_to_non_conform_load()
         self.add_mrid()
         self.add_dtypes()
         self.set_generation_type()

src/cimsparql/data_models.py

@@ -3,9 +3,9 @@
 import datetime as dt
 from typing import Self
 
 import pandera as pa
 from pandera.api.pandas.model_config import BaseConfig
 from pandera.typing import DataFrame, Index, Series
 
 
 class CoercingSchema(pa.DataFrameModel):
@@ -427,7 +427,7 @@
 
 class StationGroupForPowerUnitSchema(CoercingSchema):
     power_system_model_mrid: str = pa.Field(unique=True)
-    market_unit_mrid: str = pa.Field(unique=True)
+    market_unit_mrid: str = pa.Field()
     resource_name: str
     market_code: str
 

src/cimsparql/sparql/test_configuration_modifications/add_market_code_for_load_groups.sparql

@@ -0,0 +1,14 @@
+prefix cim:<${cim}>
+prefix SN:<${SN}>
+
+# Assign all loads that does not have a load group to the newly created load group
+insert {
+    graph <http://cimsparql/xml-adpator/EQ-modifications> {
+        ?load cim:NonConformLoad.LoadGroup ?created_group
+    }
+}
+where {
+    ?load a cim:EnergyConsumer .
+    ?created_group cim:IdentifiedObject.name "created-group" .
+    filter not exists{?load cim:NonConformLoad.LoadGroup ?group}
+}

src/cimsparql/sparql/test_configuration_modifications/add_non_conform_load_group.sparql

@@ -0,0 +1,12 @@
+prefix cim:<${cim}>
+prefix SN:<${SN}>
+
+# Create a load group
+insert data {
+    graph <http://cimsparql/xml-adpator/EQ-modifications> {
+        _:b0 a cim:NonConformLoadGroup;
+            cim:IdentifiedObject.name "created-group";
+            SN:NonConformLoadGroup.ScheduleResource _:b1 .
+        _:b1 SN:ScheduleResource.marketCode "created-load-resource-mcode"
+    }
+}

tests/test_micro_t1_nl.py

@@ -369,4 +369,4 @@ def test_station_group_for_power_unit(test_model: t_common.ModelTest) -> None:
     assert test_model.model
 
     group_for_units = test_model.model.station_group_for_power_unit()
-    assert len(group_for_units) == 4
+    assert len(group_for_units) == 10

tests/test_xml_adaptor.py

@@ -70,3 +70,11 @@ def test_add_generating_unit(xml_adaptor: XmlModelAdaptor) -> None:
     xml_adaptor.add_generating_unit()
     query = "select * {?machine cim:SynchronousMachine.GeneratingUnit ?unit}"
     assert len(xml_adaptor.graph.query(query, initNs=xml_adaptor.namespaces())) > 0
+
+
+def test_add_market_code_to_non_conform_load(xml_adaptor: XmlModelAdaptor) -> None:
+    query = "select * {?group SN:NonConformLoadGroup.ScheduleResource/SN:ScheduleResource.marketCode ?code}"
+    assert len(xml_adaptor.graph.query(query, initNs=xml_adaptor.namespaces())) == 0
+
+    xml_adaptor.add_market_code_to_non_conform_load()
+    assert len(xml_adaptor.graph.query(query, initNs=xml_adaptor.namespaces())) == 1