Merge branch 'develop' into v1_0_0_docs

bis-med-it · Jan 17, 2025 · f1b9386 · f1b9386
2 parents 9db6247 + 6c89bc1
commit f1b9386
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 55 deletions.
diff --git a/src/pysdmx/io/json/fusion/messages/code.py b/src/pysdmx/io/json/fusion/messages/code.py
@@ -41,8 +41,8 @@ def __handle_date(self, datestr: str) -> datetime:
     def __get_val(
         self, a: FusionAnnotation
     ) -> Tuple[Optional[datetime], Optional[datetime]]:
-        vals = a.title.split("/")
-        if a.title.startswith("/"):
+        vals = a.title.split("/")  # type: ignore[union-attr]
+        if a.title.startswith("/"):  # type: ignore[union-attr]
             return (None, self.__handle_date(vals[1]))
         else:
             valid_from = self.__handle_date(vals[0])

diff --git a/src/pysdmx/io/json/fusion/messages/core.py b/src/pysdmx/io/json/fusion/messages/core.py
@@ -1,7 +1,7 @@
 """Collection of Fusion-JSON schemas for common artefacts."""
 
 from datetime import datetime
-from typing import Any, Optional, Sequence
+from typing import Any, Optional, Sequence, Union
 
 import msgspec
 
@@ -10,20 +10,23 @@
 from pysdmx.util import find_by_urn
 
 
-class FusionAnnotation(msgspec.Struct, frozen=True):
-    """Fusion-JSON payload for annotations."""
-
-    title: str
-    type: str
-
-
 class FusionString(msgspec.Struct, frozen=True):
     """Fusion-JSON payload for an international string."""
 
     locale: str
     value: str
 
 
+class FusionAnnotation(msgspec.Struct, frozen=True):
+    """Fusion-JSON payload for annotations."""
+
+    id: Optional[str] = None
+    title: Optional[str] = None
+    type: Optional[str] = None
+    value: Optional[str] = None
+    text: Sequence[FusionString] = ()
+
+
 class FusionLink(msgspec.Struct, frozen=True):
     """Fusion-JSON payload for link objects."""
 
@@ -55,6 +58,12 @@ class FusionRepresentation(msgspec.Struct, frozen=True):
     minOccurs: Optional[int] = None
     maxOccurs: Optional[int] = None
 
+    def __to_number(self, input: str) -> Union[int, float]:
+        try:
+            return int(input)
+        except ValueError:
+            return float(input)
+
     def to_facets(self) -> Optional[Facets]:
         """Return a Facets domain object."""
         if self.textFormat and (
@@ -70,14 +79,35 @@ def to_facets(self) -> Optional[Facets]:
             or self.textFormat.startTime
             or self.textFormat.endTime
         ):
+            min = (
+                self.__to_number(self.textFormat.minValue)
+                if self.textFormat.minValue
+                else None
+            )
+            max = (
+                self.__to_number(self.textFormat.maxValue)
+                if self.textFormat.maxValue
+                else None
+            )
+            sta = (
+                self.__to_number(self.textFormat.startValue)
+                if self.textFormat.startValue
+                else None
+            )
+            end = (
+                self.__to_number(self.textFormat.endValue)
+                if self.textFormat.endValue
+                else None
+            )
+
             return Facets(
                 min_length=self.textFormat.minLength,
                 max_length=self.textFormat.maxLength,
                 is_sequence=self.textFormat.isSequence,
-                min_value=self.textFormat.minValue,  # type: ignore[arg-type]
-                max_value=self.textFormat.maxValue,  # type: ignore[arg-type]
-                start_value=self.textFormat.startValue,  # type: ignore
-                end_value=self.textFormat.endValue,  # type: ignore[arg-type]
+                min_value=min,
+                max_value=max,
+                start_value=sta,
+                end_value=end,
                 decimals=self.textFormat.decimals,
                 pattern=self.textFormat.pattern,
                 start_time=self.textFormat.startTime,

diff --git a/tests/api/fmr/samples/code/freq.fusion.json b/tests/api/fmr/samples/code/freq.fusion.json
@@ -34,6 +34,14 @@
                                     "value": "N:Annual"
                                 }
                             ]
+                        },
+                        {
+                            "text": [
+                                {
+                                    "locale": "en",
+                                    "value": "Empty"
+                                }
+                            ]
                         }
                     ],
                     "names": [

diff --git a/tests/api/fmr/samples/code/freq.json b/tests/api/fmr/samples/code/freq.json
@@ -55,6 +55,12 @@
                                 "texts": {
                                     "en": "N:Annual"
                                 }
+                            },
+                            {
+                                "text": "Empty",
+                                "texts": {
+                                    "en": "Empty"
+                                }
                             }
                         ],
                         "name": "Annual",

diff --git a/tests/api/fmr/samples/df/no_const.fusion.json b/tests/api/fmr/samples/df/no_const.fusion.json
@@ -10619,9 +10619,11 @@
                         "urn": "urn:sdmx:org.sdmx.infomodel.datastructure.DataAttribute=BIS:BIS_CBS(1.0).UNIT_MULT",
                         "representation": {
                             "textFormat": {
-                                "textType": "String",
+                                "textType": "Integer",
                                 "minLength": 1,
-                                "maxLength": 2
+                                "maxLength": 2,
+                                "minValue": "-15",
+                                "maxValue": "15"
                             },
                             "representation": "urn:sdmx:org.sdmx.infomodel.codelist.Codelist=BIS:CL_UNIT_MULT(1.0)"
                         },
@@ -10637,9 +10639,11 @@
                     "urn": "urn:sdmx:org.sdmx.infomodel.datastructure.Measure=BIS:BIS_CBS(1.0).OBS_VALUE",
                     "representation": {
                         "textFormat": {
-                            "textType": "String",
+                            "textType": "Double",
                             "minLength": 1,
-                            "maxLength": 15
+                            "maxLength": 15,
+                            "startValue": "0.00",
+                            "endValue": "42.99"
                         }
                     },
                     "concept": "urn:sdmx:org.sdmx.infomodel.conceptscheme.Concept=BIS:STANDALONE_CONCEPT_SCHEME(1.0).OBS_VALUE",

diff --git a/tests/api/fmr/samples/df/no_const.json b/tests/api/fmr/samples/df/no_const.json
@@ -15474,7 +15474,9 @@
                                     "enumerationFormat": {
                                         "maxLength": 2,
                                         "minLength": 1,
-                                        "dataType": "String"
+                                        "minValue": -15,
+                                        "maxValue": 15,
+                                        "dataType": "Integer"
                                     },
                                     "enumeration": "urn:sdmx:org.sdmx.infomodel.codelist.Codelist=BIS:CL_UNIT_MULT(1.0)"
                                 },
@@ -15803,9 +15805,9 @@
                                 "id": "OBS_VALUE",
                                 "localRepresentation": {
                                     "format": {
-                                        "maxLength": 15,
-                                        "minLength": 1,
-                                        "dataType": "String"
+                                        "dataType": "Double",
+                                        "startValue": 0.0,
+                                        "endValue": 42.99
                                     }
                                 },
                                 "conceptIdentity": "urn:sdmx:org.sdmx.infomodel.conceptscheme.Concept=BIS:STANDALONE_CONCEPT_SCHEME(1.0).OBS_VALUE"

diff --git a/tests/api/fmr/samples/df/schema.fusion.json b/tests/api/fmr/samples/df/schema.fusion.json
@@ -4693,7 +4693,7 @@
                         "urn": "urn:sdmx:org.sdmx.infomodel.datastructure.DataAttribute=BIS:BIS_CBS(1.0).UNIT_MULT",
                         "representation": {
                             "textFormat": {
-                                "textType": "String",
+                                "textType": "Integer",
                                 "minLength": 1,
                                 "maxLength": 2,
                                 "minValue": "-15",

diff --git a/tests/api/fmr/samples/df/schema.json b/tests/api/fmr/samples/df/schema.json
@@ -6680,7 +6680,7 @@
                                         "minLength": 1,
                                         "minValue": -15,
                                         "maxValue": 15,
-                                        "dataType": "String"
+                                        "dataType": "Integer"
                                     },
                                     "enumeration": "urn:sdmx:org.sdmx.infomodel.codelist.Codelist=BIS:CL_UNIT_MULT(1.0)"
                                 },