spinta 0.2.dev16__tar.gz → 0.2.dev17__tar.gz

{spinta-0.2.dev16 → spinta-0.2.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spinta
-Version: 0.2.dev16
+Version: 0.2.dev17
 Summary: A platform for describing, extracting, transforming, loading and serving open data.
 License: MIT
 License-File: LICENSE

{spinta-0.2.dev16 → spinta-0.2.dev17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spinta"
-version = "0.2dev16"
+version = "0.2dev17"
 description = "A platform for describing, extracting, transforming, loading and serving open data."
 authors = ["Mantas Zimnickas <sirexas@gmail.com>"]
 license = "MIT"

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/datasets/backends/dataframe/backends/soap/commands/read.py

@@ -12,7 +12,7 @@ from spinta.core.ufuncs import Expr
 from spinta.datasets.backends.dataframe.backends.soap.components import Soap
 from spinta.datasets.backends.dataframe.backends.soap.ufuncs.components import SoapQueryBuilder
 from spinta.datasets.backends.dataframe.backends.soap.ufuncs.ufuncs import MakeCDATA
-from spinta.datasets.backends.dataframe.commands.read import parametrize_bases, get_dask_dataframe_meta, dask_get_all
+from spinta.datasets.backends.dataframe.commands.read import parametrize_bases, dask_get_all, get_dask_dataframe_meta
 from spinta.datasets.backends.dataframe.ufuncs.query.components import DaskDataFrameQueryBuilder
 from spinta.datasets.components import Resource
 from spinta.dimensions.param.components import ResolvedParams

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/datasets/backends/dataframe/backends/xml/commands/read.py

@@ -12,9 +12,9 @@ from spinta.core.ufuncs import Expr
 from spinta.datasets.backends.dataframe.backends.xml.components import Xml
 from spinta.datasets.backends.dataframe.commands.read import (
     parametrize_bases,
-    get_dask_dataframe_meta,
     dask_get_all,
     get_pkeys_if_ref,
+    get_dask_dataframe_meta,
 )
 from spinta.datasets.backends.helpers import is_file_path
 from spinta.dimensions.param.components import ResolvedParams
@@ -132,9 +132,13 @@ def getall(
     builder.update(model=model, params={param.name: param for param in resource.params}, url_query_params=query)
 
     props = {}
-    for prop in model.properties.values():
+
+    for prop in model.flatprops.values():
         if prop.external and prop.external.name:
-            props[prop.name] = {"source": prop.external.name, "pkeys": get_pkeys_if_ref(prop)}
+            props[prop.place] = {
+                "source": prop.external.name,
+                "pkeys": get_pkeys_if_ref(prop),
+            }
 
     meta = get_dask_dataframe_meta(model)
 

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/datasets/backends/dataframe/commands/read.py

@@ -32,6 +32,8 @@ from spinta.ufuncs.resultbuilder.components import ResultBuilder
 from spinta.utils.data import take
 from spinta.utils.schema import NA
 
+OBJECT_DTYPE = "object"
+
 
 def _resolve_expr(context: Context, row: Any, sel: Selected, params: dict) -> Any:
     if sel.item is None:
@@ -192,9 +194,9 @@ def get_pkeys_if_ref(prop: Property) -> list[str]:
 
 def get_dask_dataframe_meta(model: Model):
     dask_meta = {}
-    for prop in model.properties.values():
+    for prop in model.flatprops.values():
         if prop.external and prop.external.name:
-            dask_meta[prop.external.name] = spinta_to_np_dtype(prop.dtype)
+            dask_meta[prop.external.name] = OBJECT_DTYPE
     return dask_meta
 
 

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/dimensions/enum/helpers.py

@@ -19,10 +19,11 @@ from spinta.dimensions.enum.components import EnumFormula
 from spinta.dimensions.enum.components import EnumItem
 from spinta.dimensions.enum.components import EnumValue
 from spinta.dimensions.enum.components import Enums
-from spinta.exceptions import ValueNotInEnum
+from spinta.exceptions import ValueNotInEnum, EnumPrepareMissing
 from spinta.manifests.components import Manifest
 from spinta.manifests.tabular.components import EnumRow
 from spinta.nodes import load_node
+from spinta.types.datatype import String
 from spinta.utils.schema import NA
 
 
@@ -35,7 +36,11 @@ def _load_enum_item(
     parent = parents[0]
     item = load_node(context, item, data, parent=parent)
     item = cast(EnumItem, item)
-    if item.prepare is not NA:
+
+    if item.prepare is NA:
+        if hasattr(parent, "dtype") and not isinstance(parent.dtype, String):
+            raise EnumPrepareMissing(enum=item.source)
+    else:
         ast = item.prepare
         expr = asttoexpr(ast)
         env = EnumFormula(

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/exceptions.py

@@ -1209,3 +1209,9 @@ class UnsupportedDataTypeConfiguration(UserError):
     template = """
         DataType {data_type!r} currently does not support custom type assignment in configuration.
     """
+
+
+class EnumPrepareMissing(UserError):
+    template = """
+        Enum {enum} is missing a required value in the prepare column.
+    """

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/manifests/xsd/helpers.py

@@ -330,7 +330,7 @@ class XSDReader:
             # can be enum
             enumerations = restrictions[0].xpath('./*[local-name() = "enumeration"]')
             for enumeration in enumerations:
-                enum_item = {"source": enumeration.get("value")}
+                enum_item = {"source": enumeration.get("value"), "prepare": enumeration.get("value")}
                 enum_value.update({enumeration.get("value"): enum_item})
             enums[""] = enum_value
 

{spinta-0.2.dev16 → spinta-0.2.dev17}/spinta/manifests/xsd2/helpers.py

@@ -869,7 +869,7 @@ class XSDReader:
 
     def process_enumeration(self, node: _Element, state: State) -> dict[str, dict[str, str]]:
         enum_value = node.attrib.get("value")
-        enum_item = {enum_value: {"source": enum_value}}
+        enum_item = {enum_value: {"source": enum_value, "prepare": enum_value}}
         return enum_item
 
     def process_simple_type(self, node: _Element, state: State) -> XSDType: