Add param names to DataflowRef and DataflowInfo

src/pysdmx/fmr/fusion/dataflow.py

@@ -27,11 +27,13 @@ class FusionDataflowRef(Struct, frozen=True, rename={"agency": "agencyId"}):
     def to_model(self) -> DataflowRef:
         """Converts a FusionDataflowRef to a standard dataflow ref."""
         return DataflowRef(
-            self.id,
-            self.agency,
-            self.names[0].value if self.names else None,
-            self.descriptions[0].value if self.descriptions else None,
-            self.version,
+            id=self.id,
+            agency=self.agency,
+            name=self.names[0].value if self.names else None,
+            description=(
+                self.descriptions[0].value if self.descriptions else None
+            ),
+            version=self.version,
         )
 
 
@@ -80,12 +82,12 @@ def to_model(
             )
         )[0]
         return DataflowInfo(
-            df.id,
-            components,
-            Agency(df.agency),
-            df.names[0].value,
-            df.descriptions[0].value if df.descriptions else None,
-            df.version,
-            prvs,
+            id=df.id,
+            components=components,
+            agency=Agency(df.agency),
+            name=df.names[0].value,
+            description=df.descriptions[0].value if df.descriptions else None,
+            version=df.version,
+            providers=prvs,
             dsd_ref=df.dataStructureRef,
         )

src/pysdmx/fmr/fusion/org.py

@@ -119,7 +119,7 @@ class FusionProviderScheme(Struct, frozen=True):
 
     def __get_df_ref(self, ref: str) -> DataflowRef:
         a = parse_urn(ref)
-        return DataflowRef(a.id, a.agency, version=a.version)
+        return DataflowRef(id=a.id, agency=a.agency, version=a.version)
 
     def to_model(
         self, pas: Sequence[FusionProvisionAgreement]

src/pysdmx/fmr/sdmx/dataflow.py

@@ -26,11 +26,11 @@ class JsonDataflowRef(Struct, frozen=True, rename={"agency": "agencyID"}):
     def to_model(self) -> DataflowRef:
         """Converts a JsonDataflowRef to a standard dataflow ref."""
         return DataflowRef(
-            self.id,
-            self.agency,
-            self.name,
-            self.description,
-            self.version,
+            id=self.id,
+            agency=self.agency,
+            name=self.name,
+            description=self.description,
+            version=self.version,
         )
 
 
@@ -75,13 +75,13 @@ def to_model(
             )
         )[0]
         return DataflowInfo(
-            df.id,
-            components,
-            Agency(df.agency),
-            df.name,
-            df.description,
-            df.version,
-            prvs,
+            id=df.id,
+            components=components,
+            agency=Agency(df.agency),
+            name=df.name,
+            description=df.description,
+            version=df.version,
+            providers=prvs,
             dsd_ref=df.structure,
         )
 

src/pysdmx/fmr/sdmx/org.py

@@ -17,7 +17,7 @@ class JsonDataProviderScheme(Struct, frozen=True):
 
     def __get_df_ref(self, ref: str) -> DataflowRef:
         a = parse_urn(ref)
-        return DataflowRef(a.id, a.agency, version=a.version)
+        return DataflowRef(id=a.id, agency=a.agency, version=a.version)
 
     def to_model(
         self, pas: Sequence[JsonProvisionAgreement]

tests/model/test_category.py

@@ -34,7 +34,7 @@ def test_default(id):
 
 def test_full_instantiation(id, name, desc):
     cats = [Category(id="chld", name="Child")]
-    flows = [DataflowRef("EXR", "BIS")]
+    flows = [DataflowRef(id="EXR", agency="BIS")]
 
     c = Category(
         id=id, name=name, description=desc, categories=cats, dataflows=flows

tests/model/test_organisation.py

@@ -25,8 +25,8 @@ def contact():
 
 @pytest.fixture()
 def dataflows():
-    df1 = DataflowRef("DF1", "TEST")
-    df2 = DataflowRef("DF2", "Also TEST")
+    df1 = DataflowRef(id="DF1", name="TEST", agency="T1")
+    df2 = DataflowRef(id="DF2", name="Also TEST", agency="T1")
     return [df1, df2]