pysdmx 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

pysdmx/__init__.py

@@ -1,3 +1,3 @@
 """Your opinionated Python SDMX library."""
 
-__version__ = "1.5.0"
+__version__ = "1.5.2"

pysdmx/io/input_processor.py

@@ -13,9 +13,11 @@ from httpx import HTTPStatusError, create_ssl_context
 
 from pysdmx.errors import Invalid, NotImplemented
 from pysdmx.io.format import Format
-from pysdmx.io.xml.__parse_xml import SCHEMA_ROOT_31
 from pysdmx.util import map_httpx_errors
 
+SCHEMA_ROOT_31 = "http://www.sdmx.org/resources/sdmxml/schemas/v3_1/"
+SCHEMA_ROOT_30 = "http://www.sdmx.org/resources/sdmxml/schemas/v3_0/"
+
 
 def __remove_bom(input_string: str) -> str:
     return input_string.replace("\ufeff", "")
@@ -55,8 +57,6 @@ def __get_sdmx_ml_flavour(input_str: str) -> Tuple[str, Format]:
     flavour_check = input_str[:1000].lower()
     if ":generic" in flavour_check:
         return input_str, Format.DATA_SDMX_ML_2_1_GEN
-    # Local import to ensure xml extra is checked at the latest moment
-    from pysdmx.io.xml.__parse_xml import SCHEMA_ROOT_30
 
     if ":structurespecificdata" in flavour_check:
         if SCHEMA_ROOT_30 in flavour_check:

pysdmx/io/xml/__structure_aux_reader.py

@@ -170,7 +170,7 @@ from pysdmx.model.dataflow import (
     Components,
     Dataflow,
     DataStructureDefinition,
-    GroupDimension,
+    Group,
     Role,
 )
 from pysdmx.model.vtl import (
@@ -955,7 +955,7 @@ class StructureParser(Struct):
                         for d in group_dimensions
                     ]
 
-                element[GROUPS_LOW] = [GroupDimension(**g) for g in groups]
+                element[GROUPS_LOW] = [Group(**g) for g in groups]
                 del element[DSD_COMPS][GROUP]
         return element
 

pysdmx/io/xml/__structure_aux_writer.py

@@ -124,7 +124,7 @@ from pysdmx.model.dataflow import (
     Component,
     Dataflow,
     DataStructureDefinition,
-    GroupDimension,
+    Group,
     Role,
 )
 from pysdmx.util import (
@@ -392,7 +392,7 @@ def __write_item(
 
 
 def __write_groups(
-    groups: list[GroupDimension], indent: str, references_30: bool = False
+    groups: list[Group], indent: str, references_30: bool = False
 ) -> str:
     out_file = ""
     for group in groups:
@@ -487,7 +487,7 @@ def __write_components(  # noqa: C901
 
 
 def __find_matching_group_id(
-    att_rel: str, groups: list[GroupDimension]
+    att_rel: str, groups: list[Group]
 ) -> Optional[str]:
     comps_to_relate = att_rel.split(",") if "," in att_rel else [att_rel]
     for group in groups:
@@ -519,7 +519,7 @@ def __write_attribute_relation(  # noqa: C901
     item: Component,
     indent: str,
     component_info: Dict[str, Any],
-    groups: list[GroupDimension],
+    groups: list[Group],
     references_30: bool = False,
 ) -> str:
     measure_relationship = ""
@@ -599,7 +599,7 @@ def __write_component(
     position: int,
     indent: str,
     component_info: Dict[str, Any],
-    groups: list[GroupDimension],
+    groups: list[Group],
     references_30: bool = False,
 ) -> str:
     """Writes the component to the XML file."""

pysdmx/model/dataflow.py

@@ -232,7 +232,7 @@ class Component(
         return f"{self.__class__.__name__}({', '.join(attrs)})"
 
 
-class GroupDimension(
+class Group(
     IdentifiableArtefact, frozen=True, omit_defaults=True, kw_only=True
 ):
     """A group of dimensions that can be used to identify a group."""
@@ -472,7 +472,7 @@ class Schema(Struct, frozen=True, omit_defaults=True, repr_omit_defaults=True):
     version: str = "1.0"
     artefacts: Sequence[str] = ()
     generated: datetime = datetime.now(timezone.utc)
-    groups: Optional[Sequence[GroupDimension]] = None
+    groups: Optional[Sequence[Group]] = None
 
     def __str__(self) -> str:
         """Custom string representation without the class name."""
@@ -538,7 +538,7 @@ class DataStructureDefinition(MaintainableArtefact, frozen=True, kw_only=True):
     """
 
     components: Components
-    groups: Optional[Sequence[GroupDimension]] = None
+    groups: Optional[Sequence[Group]] = None
     evolving_structure: bool = False
 
     def __extract_artefacts(self) -> Sequence[str]:

{pysdmx-1.5.0.dist-info → pysdmx-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysdmx
-Version: 1.5.0
+Version: 1.5.2
 Summary: Your opinionated Python SDMX library
 License: Apache-2.0
 Keywords: sdmx,data discovery,data retrieval,metadata,fmr

{pysdmx-1.5.0.dist-info → pysdmx-1.5.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pysdmx/__extras_check.py,sha256=I39OaM1lAPBnyzHVJ7kA_ZA_tMeDAQLr6ZKqEQ9MK1Q,1659
-pysdmx/__init__.py,sha256=5z10nwG-grwF4ljX4qnTW3mCl2fdff-9iqmtKljWHL0,67
+pysdmx/__init__.py,sha256=lCxIWAalK5owRQR4jCgDW0NekksEmfHD_f-6xsEa4gM,67
 pysdmx/api/__init__.py,sha256=8lRaF6kEO51ehl0fmW_pHLvkN_34TtEhqhr3oKo6E6g,26
 pysdmx/api/dc/__init__.py,sha256=oPU32X8CRZy4T1to9mO5KMqMwxQsVI424dPqai-I8zI,121
 pysdmx/api/dc/_api.py,sha256=poy1FYFXnF6maBGy5lpOodf32-7QQjH8PCBNDkuOXxQ,7747
@@ -32,7 +32,7 @@ pysdmx/io/csv/sdmx20/__init__.py,sha256=mNfMJKSpmMfk4CbbHhjnBOTQ2IZFY15cNUhHtJPc
 pysdmx/io/csv/sdmx20/reader/__init__.py,sha256=HSSUE3iL9g2Bzb_vKw97-Uw_3H3yUQxN8ssAyr1EJkI,4925
 pysdmx/io/csv/sdmx20/writer/__init__.py,sha256=xqNg2L2BdCkKVIkMrBpkbR6wq2gZ3r1K7oZRkZ1aBoU,2062
 pysdmx/io/format.py,sha256=BJghvHaXNvsfqJCWvB8jhjGMaLPv7zi7N12O0qRwChc,4749
-pysdmx/io/input_processor.py,sha256=MALwyWI26KoxIlRARgIsXxHvEHH9tZ9TTHExtYAPCk8,6406
+pysdmx/io/input_processor.py,sha256=KJPWOumYqjoewetbFQ4qzqDqOC6hpcksaThvLp_Y7Oc,6366
 pysdmx/io/json/fusion/messages/__init__.py,sha256=C0LAG6UfIZcQdlCv5d_D1ZNIcCq04RxZYLAp6tLDqwY,1573
 pysdmx/io/json/fusion/messages/category.py,sha256=E9jrzXenEpqDNUhT1JJLYxty37PSGegRtx45mB3-COg,4589
 pysdmx/io/json/fusion/messages/code.py,sha256=kB3RJiSA75G4IJYObYR0hdiXYcRs-vNMKqUeA6F4SSo,7529
@@ -81,8 +81,8 @@ pysdmx/io/xml/__data_aux.py,sha256=ztivjZANN1PJ63IvoMfx-5TA2AiPQTVPC_0YYHOT9Ns,4
 pysdmx/io/xml/__init__.py,sha256=tcUsSEiM3nBA7lDbZPwGZ7Vu_K9gQd8oliASUMTGjFE,105
 pysdmx/io/xml/__parse_xml.py,sha256=SITC7Yptq_qY_exetRez90lJCukH1WsKDMqlk7Q1RaY,2899
 pysdmx/io/xml/__ss_aux_reader.py,sha256=Tfp7oSb_0-AVEVdu7YFtj-SlBuEKp7fpg3-SxCmOHW0,2868
-pysdmx/io/xml/__structure_aux_reader.py,sha256=guK6hEi2TN-6csc6JMeXbW4JDHKA6pKy6GoFzQ6FNJE,40276
-pysdmx/io/xml/__structure_aux_writer.py,sha256=mXsURMFJuaku6Ac-7nWOrerxfPfTVtQxzBwjRgZeQu8,43588
+pysdmx/io/xml/__structure_aux_reader.py,sha256=dGPmAiW4j38fbsAJ8xCDwXgUcwpOCwgO5jQpvgoKD4Q,40258
+pysdmx/io/xml/__structure_aux_writer.py,sha256=9x2wGYRP9vPGLlHA-3P5Xr3gY5g3gW5fmz0tDQJyH4U,43543
 pysdmx/io/xml/__tokens.py,sha256=Y_SlFWYIXolsgjHoFq7pm3TYlEu07CR9TmJKk2jHfQ0,6823
 pysdmx/io/xml/__write_aux.py,sha256=KHZxEhGSjZPRW93OvniZ0kHmiAJtKJu-2aLtMhsKt90,15396
 pysdmx/io/xml/__write_data_aux.py,sha256=DlFwR1KmVMJmwID_G7Tl9zasah9iiQKHuuHKJpd0huk,5052
@@ -122,7 +122,7 @@ pysdmx/model/__init__.py,sha256=gmY8uGK0_SK9Ca5TqtYJqPSXvO9godlDKu2rhYouPSU,4984
 pysdmx/model/category.py,sha256=WWWysaTdlcU8KZpQyZgbZkrOelNVCGOfVUk_APJxm-w,6031
 pysdmx/model/code.py,sha256=KEG2D74UHbZuOplSrztLWCNTzFTOg22imRe_eQvqAM8,12600
 pysdmx/model/concept.py,sha256=mQfqJdtWc10WdTKX_Mw7Znw65cN3QO-kCar9MWYeWO4,9645
-pysdmx/model/dataflow.py,sha256=9SgbQ9n2j5N_TqvN9eQtshL4Lom4kDnapP97cREP-e4,22999
+pysdmx/model/dataflow.py,sha256=gcpPJnyl0FI4mtk52VvPsPU4msFw67AiM0MaV1nsyiE,22972
 pysdmx/model/dataset.py,sha256=Lbr7tYonGHD3NZUD-M9hK2puaEAluOVPG2DbkOohzMM,4861
 pysdmx/model/gds.py,sha256=QrnmI8Hn--C95gGXCeUeWwhn-Ur7DuT08Cg7oPJIEVI,4976
 pysdmx/model/map.py,sha256=IYoxKYpt0-9kYAgU24wryrSchR-lrc3NMacI5Vt5las,17213
@@ -142,7 +142,7 @@ pysdmx/util/__init__.py,sha256=m_XWRAmVJ7F6ai4Ckrj_YuPbhg3cJZAXeZrEThrL88k,3997
 pysdmx/util/_date_pattern_map.py,sha256=IS1qONwVHbTBNIFCT0Rqbijj2a9mYvs7onXSK6GeQAQ,1620
 pysdmx/util/_model_utils.py,sha256=d0XY8cnxvviQtkJJInVik7LWeuqX-eb4-zikFortL58,2335
 pysdmx/util/_net_utils.py,sha256=nOTz_x3FgFrwKh42_J70IqYXz9duQkMFJWtejZXcLHs,1326
-pysdmx-1.5.0.dist-info/LICENSE,sha256=3XTNDPtv2RxDUNkQzn9MIWit2u7_Ob5daMLEq-4pBJs,649
-pysdmx-1.5.0.dist-info/METADATA,sha256=K7v8g6s1ooDheCBRC4DaAg68MA3mixhIGlw3cnAP2gc,4690
-pysdmx-1.5.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pysdmx-1.5.0.dist-info/RECORD,,
+pysdmx-1.5.2.dist-info/LICENSE,sha256=3XTNDPtv2RxDUNkQzn9MIWit2u7_Ob5daMLEq-4pBJs,649
+pysdmx-1.5.2.dist-info/METADATA,sha256=hHjNyQNC0uUh9cF40kLB4LBRnPRXJ3vqU3iu-BVRbvs,4690
+pysdmx-1.5.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pysdmx-1.5.2.dist-info/RECORD,,