spinta 0.2.dev21__py3-none-any.whl → 0.2.dev23__py3-none-any.whl

spinta/auth.py

@@ -58,6 +58,7 @@ from spinta.exceptions import (
     InvalidClientsKeymapStructure,
     InvalidScopes,
     InvalidClientFileFormat,
+    ModelNotFound,
 )
 from spinta.utils import passwords
 from spinta.utils.config import get_clients_path, get_keymap_path, get_id_path, get_helpers_path
@@ -858,40 +859,46 @@ def authorized(
     scope_formatter: ScopeFormatterFunc = None,
 ):
     config: Config = context.get("config")
+
+    # Disable access to nodes that have lower access level than config.access
+    if config.access > node.access:
+        if throw:
+            raise ModelNotFound(model=node.name)
+        return False
+
     token = context.get("auth.token")
-    # Unauthorized clients can only access open nodes.
-    unauthorized = token.get_client_id() == get_default_auth_client_id(context)
-    open_node = node.access >= Access.open
-    if unauthorized and not open_node:
+
+    # Unauthenticated clients can only access nodes if spinta config.access is open.
+    unauthenticated = token.get_client_id() == get_default_auth_client_id(context)
+
+    if unauthenticated and config.access < Access.open:
         if throw:
             raise AuthorizedClientsOnly()
         else:
             return False
 
-    # Private nodes can only be accessed with explicit node scope.
+    # Add explicit node scope
     scopes = [node]
 
-    # Protected and higher level nodes can be accessed with parent nodes scopes.
-    if node.access > Access.private:
-        ns = None
-
-        if isinstance(node, Property):
-            # Hidden nodes also require explicit scope.
-            # XXX: `hidden` parameter should only be used for API control, not
-            #      access control. See docs.
-            if not node.hidden:
-                scopes.append(node.model)
-                scopes.append(node.model.ns)
-                ns = node.model.ns
-        elif isinstance(node, Model):
-            scopes.append(node.ns)
-            ns = node.ns
-        elif isinstance(node, Namespace):
-            ns = node
-
-        # Add all parent namespace scopes too.
-        if ns:
-            scopes.extend(ns.parents())
+    # Add parent node scopes
+    ns = None
+    if isinstance(node, Property):
+        # Hidden nodes also require explicit scope.
+        # XXX: `hidden` parameter should only be used for API control, not
+        #      access control. See docs.
+        if not node.hidden:
+            scopes.append(node.model)
+            scopes.append(node.model.ns)
+            ns = node.model.ns
+    elif isinstance(node, Model):
+        scopes.append(node.ns)
+        ns = node.ns
+    elif isinstance(node, Namespace):
+        ns = node
+
+    # Add all parent namespace scopes too.
+    if ns:
+        scopes.extend(ns.parents())
 
     # Build scope names.
     scope_formatter = scope_formatter or config.scope_formatter

spinta/cli/admin.py

@@ -2,15 +2,14 @@ from __future__ import annotations
 
 import logging
 import pathlib
-import sys
 from typing import Optional, List
 
 from typer import Context as TyperContext, Argument
 from typer import Option
-from typer import echo
 
 from spinta.cli.helpers.admin.components import ADMIN_SCRIPT_TYPE
 from spinta.cli.helpers.admin.registry import admin_script_registry
+from spinta.cli.helpers.message import cli_error
 from spinta.cli.helpers.script.components import ScriptStatusCache
 from spinta.cli.helpers.script.core import run_specific_script
 from spinta.cli.helpers.script.helpers import sort_scripts_by_required
@@ -48,26 +47,30 @@ def admin(
         False,
         "-c",
         "--check",
-        help=("Only runs script checks, skipping execution part (used to find out what scripts are needed to run)."),
+        help="Only runs script checks, skipping execution part (used to find out what scripts are needed to run).",
     ),
     input_path: Optional[pathlib.Path] = Option(
         None,
         "-i",
         "--input",
-        help=("Path to input file (some scripts might require extra data). If not given, script will read from stdin."),
+        help="Path to input file (some scripts might require extra data). If not given, script will read from stdin.",
+    ),
+    output_path: Optional[pathlib.Path] = Option(
+        None,
+        "-o",
+        "--output",
+        help="Path to output file (some scripts might write extra data). If not given, script will write to stdout.",
     ),
 ):
     context = configure_context(ctx.obj)
 
     if force and check_only:
-        echo("Cannot run force mode with check only mode", err=True)
-        sys.exit(1)
+        cli_error("Cannot run force mode with check only mode")
 
     load_config(context, ensure_config_dir=ensure_config_dir)
 
     if not scripts:
-        echo("At least one script needs to be specified", err=True)
-        sys.exit(1)
+        cli_error("At least one script needs to be specified")
 
     script_objects = {}
     for script in scripts:
@@ -86,5 +89,6 @@ def admin(
             script_name=script,
             check_only=check_only,
             input_path=input_path,
+            output_path=output_path,
             status_cache=status_cache,
         )

spinta/cli/helpers/admin/components.py

@@ -15,3 +15,4 @@ class AdminScript(ScriptBase):
 class Script(enum.Enum):
     DEDUPLICATE = "deduplicate"
     CHANGELOG = "changelog"
+    ENUM_LIST = "enum_list"

spinta/cli/helpers/admin/registry.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from spinta.cli.helpers.admin.components import AdminScript, Script, ADMIN_SCRIPT_TYPE
 from spinta.cli.helpers.admin.scripts.changelog import migrate_changelog_duplicates, cli_requires_changelog_migrations
 from spinta.cli.helpers.admin.scripts.deduplicate import migrate_duplicates, cli_requires_deduplicate_migrations
+from spinta.cli.helpers.admin.scripts.enums import gather_invalid_enum_values
 from spinta.cli.helpers.script.components import ScriptTarget, ScriptTag
 from spinta.cli.helpers.script.registry import script_registry
 from spinta.cli.helpers.upgrade.components import Script as UpgradeScript, UPGRADE_SCRIPT_TYPE
@@ -29,3 +30,6 @@ script_registry.register(
         targets={ScriptTarget.BACKEND.value},
     )
 )
+script_registry.register(
+    AdminScript(name=Script.ENUM_LIST.value, run=gather_invalid_enum_values, targets={ScriptTarget.BACKEND.value})
+)

spinta/cli/helpers/admin/scripts/enums.py

@@ -0,0 +1,148 @@
+import csv
+import pathlib
+import sys
+from contextlib import nullcontext
+from typing import Iterator
+
+from multipledispatch import dispatch
+from dataclasses import dataclass, field
+
+from spinta import commands
+from spinta.backends import Backend
+from spinta.backends.postgresql.components import PostgreSQL
+from spinta.cli.helpers.script.helpers import ensure_store_is_loaded
+from spinta.components import Context, Model, Property
+from spinta.core.ufuncs import Expr
+from spinta.manifests.components import Manifest
+
+import sqlalchemy as sa
+
+from spinta.ufuncs.resultbuilder.components import EnumResultBuilder
+
+
+@dispatch(Backend, Property)
+def gather_unique_property_values() -> list:
+    raise NotImplementedError
+
+
+@dispatch(PostgreSQL, Property)
+def gather_unique_property_values(backend: PostgreSQL, prop: Property) -> list:
+    table = backend.get_table(prop)
+    column = backend.get_column(table, prop)
+    result = backend.engine.execute(sa.select(column).distinct()).scalars().all()
+    return result
+
+
+@dispatch(Property)
+def gather_unique_property_values(prop: Property) -> list:
+    return gather_unique_property_values(prop.dtype.backend, prop)
+
+
+def get_models_with_enums(context: Context, manifest: Manifest) -> Iterator[Model]:
+    for model in commands.get_models(context, manifest).values():
+        for prop in model.flatprops.values():
+            if prop.enum:
+                yield model
+                break
+
+
+@dataclass
+class InvalidEnumProperty:
+    prop: Property
+    invalid_values: list = field(default_factory=list)
+
+    def add_invalid_value(self, value: object):
+        if value not in self.invalid_values:
+            self.invalid_values.append(value)
+
+
+@dataclass
+class InvalidEnumModel:
+    model: Model
+    enum_props: dict[str, InvalidEnumProperty] = field(default_factory=dict)
+
+    def add_invalid_value(self, prop: Property, value: object):
+        self.get_prop(prop).add_invalid_value(value)
+
+    def get_prop(self, prop: Property) -> InvalidEnumProperty:
+        if prop.place not in self.enum_props:
+            self.enum_props[prop.place] = InvalidEnumProperty(prop=prop)
+        return self.enum_props[prop.place]
+
+
+def gather_invalid_enum_values(context: Context, output_path: pathlib.Path | None = None, **kwargs):
+    store = ensure_store_is_loaded(context)
+    manifest = store.manifest
+    invalid_models = {}
+    with context:
+        for model in get_models_with_enums(context, manifest):
+            enum_model = InvalidEnumModel(model=model)
+            for prop in model.flatprops.values():
+                if not prop.enum:
+                    continue
+
+                enum_contains_expr = any(isinstance(enum.prepare, Expr) for enum in prop.enum.values())
+                values = gather_unique_property_values(prop)
+                for value in values:
+                    if value is None and not prop.dtype.required:
+                        continue
+                    elif value is None:
+                        enum_model.add_invalid_value(prop, value)
+                        continue
+
+                    if str(value) in prop.enum:
+                        continue
+
+                    check_value = value
+                    if enum_contains_expr:
+                        for enum in prop.enum.values():
+                            env = EnumResultBuilder(context).init(value)
+                            val = env.resolve(enum.prepare)
+                            if env.has_value_changed:
+                                check_value = val
+                                break
+
+                    if str(check_value) not in prop.enum:
+                        enum_model.add_invalid_value(prop, value)
+
+            if enum_model.enum_props:
+                invalid_models[model.model_type()] = enum_model
+
+    output_invalid_enums_to_csv(invalid_models, output_path)
+
+
+def output_invalid_enums_to_csv(invalid_models: dict, output_path: pathlib.Path | None = None):
+    stream_ctx = open(output_path, "w") if output_path else nullcontext(sys.stdout)
+    with stream_ctx as stream:
+        writer = csv.DictWriter(stream, fieldnames=["model", "property", "invalid_value"], lineterminator="\n")
+        writer.writeheader()
+        for model_key, model in sorted(invalid_models.items()):
+            model_written = False
+
+            for prop_name, prop in model.enum_props.items():
+                it = iter(prop.invalid_values)
+                first = next(it, None)
+                if first is None:
+                    continue
+
+                model_name = ""
+                if not model_written:
+                    model_name = model_key
+                    model_written = True
+
+                writer.writerow(
+                    {
+                        "model": model_name,
+                        "property": prop_name,
+                        "invalid_value": first,
+                    }
+                )
+
+                for value in it:
+                    writer.writerow(
+                        {
+                            "model": "",
+                            "property": "",
+                            "invalid_value": value,
+                        }
+                    )

spinta/cli/helpers/message.py

@@ -1,3 +1,5 @@
+import sys
+
 import tqdm
 from click import echo
 from click.exceptions import Exit
@@ -9,7 +11,9 @@ def cli_error(message: str):
 
 
 def cli_message(message: str, progress_bar: tqdm.tqdm = None):
+    # https://pubs.opengroup.org/onlinepubs/9799919799/
+    # This documentation states that `stderr` should be used for diagnostic messages (in our case status)
     if progress_bar is not None:
-        progress_bar.write(message)
+        progress_bar.write(message, file=sys.stderr)
     else:
-        echo(message)
+        echo(message, err=True)

spinta/cli/helpers/script/components.py

@@ -31,7 +31,7 @@ class _ScriptMeta(type):
 
 class ScriptBase(metaclass=_ScriptMeta):
     """
-    Represents an script with optional preconditions and target constraints.
+    Represents a script with optional preconditions and target constraints.
 
     Targets and tags are mainly used to be able to filter specific scripts. Main use case would be to set target as
     specific object, like sqlalchemy keymap and tag as migration, so then you could filter all database migration

spinta/cli/helpers/script/core.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from click import echo
-
+from spinta.cli.helpers.message import cli_message
 from spinta.cli.helpers.script.components import ScriptStatus, ScriptBase, ScriptStatusCache
 from spinta.cli.helpers.script.helpers import sort_scripts_by_required, script_check_status_message
 from spinta.cli.helpers.script.registry import script_registry
@@ -54,7 +53,7 @@ def run_specific_script(
     if force:
         status = ScriptStatus.FORCED
 
-    echo(script_check_status_message(script_name, status))
+    cli_message(script_check_status_message(script_name, status))
     if status in (ScriptStatus.FORCED, ScriptStatus.REQUIRED) and not check_only:
         script.run(context, destructive=destructive, **kwargs)
         if status_cache is not None:
@@ -73,7 +72,7 @@ def check_script(
             script = script.value
 
         if not script_registry.contains(script_type, script):
-            echo(f"Warning: {script_type!r} script {script!r} was not found", err=True)
+            cli_message(f"Warning: {script_type!r} script {script!r} was not found")
             return ScriptStatus.SKIPPED
 
         script = script_registry.get(script_type, script)
@@ -92,9 +91,8 @@ def check_script(
                 ScriptStatus.REQUIRED,
                 ScriptStatus.SKIPPED,
             ):
-                echo(
-                    f"Warning: {required_script_type!r} script {required_script!r} requirement is not met for {script.name!r} script",
-                    err=True,
+                cli_message(
+                    f"Warning: {script_type!r} script {required_script!r} requirement is not met for {script.name!r} script",
                 )
                 return ScriptStatus.SKIPPED
 

spinta/cli/helpers/script/helpers.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from collections import defaultdict, deque
 
-from typer import echo
 
+from spinta.cli.helpers.message import cli_message
 from spinta.cli.helpers.script.components import ScriptStatus
 from spinta.cli.helpers.upgrade.components import UpgradeScript
 from spinta.components import Context, Store
@@ -44,7 +44,7 @@ def sort_scripts_by_required(scripts: dict[str, UpgradeScript]) -> dict:
 
     if len(result) != len(data):
         unresolved = set(data) - set(result)
-        echo(f"Warning: Dependency cycle detected or unresolved dependencies in: {unresolved}", err=True)
+        cli_message(f"Warning: Dependency cycle detected or unresolved dependencies in: {unresolved}")
         # Extend results, potentially might cause errors, because of cycles
         result.extend(unresolved)
 

spinta/cli/helpers/upgrade/scripts/backends/postgresql/schemas.py

@@ -1,8 +1,6 @@
 from contextlib import ExitStack
 from typing import Generator
 
-from alembic.operations import Operations
-from alembic.runtime.migration import MigrationContext
 from click import echo
 from sqlalchemy.engine import Inspector
 from tqdm import tqdm
@@ -105,6 +103,9 @@ def gather_associated_tables(backend: PostgreSQL, table_identifier: TableIdentif
 
 
 def migrate_schemas(context: Context, **kwargs):
+    from alembic.operations import Operations
+    from alembic.runtime.migration import MigrationContext
+
     ensure_store_is_loaded(context)
     store = context.get("store")
 

spinta/components.py

@@ -1095,7 +1095,8 @@ class Config:
     scope_log: bool
     check_contract_scopes: bool
     default_auth_client: str
-    default_access_level: str
+    default_access_level: Access
+    access: Access
     http_basic_auth: bool
     token_validation_key: dict | None = None
     token_validation_keys_download_url: str | None = None

spinta/config.py

@@ -344,7 +344,8 @@ CONFIG = {
             },
             "config_path": pathlib.Path("tests/config"),
             "default_auth_client": "baa448a8-205c-4faa-a048-a10e4b32a136",
-            "default_access_level": "protected",
+            "default_access_level": "open",
+            "access": "open",
             "sync_retry_count": 0,
         },
     },

spinta/datasets/backends/dataframe/backends/json/commands/read.py

@@ -164,7 +164,7 @@ 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:
             root_source = _get_prop_full_source(model.external.name, prop.external.name)
             props[prop.external.name] = {

spinta/datasets/backends/dataframe/backends/soap/commands/read.py

@@ -21,7 +21,9 @@ from spinta.typing import ObjectData
 from spinta.ufuncs.querybuilder.components import QueryParams
 
 
-def _get_data_soap(url: str, backend: Soap, soap_request_body: dict, extra_headers: dict) -> list[dict]:
+def _get_data_soap(
+    url: str, backend: Soap, soap_request_body: dict, extra_headers: dict, source: str | None = None
+) -> list[dict]:
     for key, value in soap_request_body.items():
         if isinstance(value, MakeCDATA):
             soap_request_body[key] = value()
@@ -38,6 +40,15 @@ def _get_data_soap(url: str, backend: Soap, soap_request_body: dict, extra_heade
     except zeep.exceptions.Error as e:
         raise UnexpectedErrorReadingData(exception=type(e).__name__, message=str(e))
 
+    if isinstance(response_data, dict):
+        for part in source.split("/"):
+            if not part:
+                continue
+            if part in response_data:
+                response_data = response_data[part]
+            else:
+                response_data = []
+                break
     if response_data and not isinstance(response_data, list):
         response_data = [response_data]
 
@@ -137,6 +148,7 @@ def getall(
             backend=backend,
             soap_request_body=builder.soap_request_body,
             extra_headers=http_headers,
+            source=model.external.name,
         )
         .flatten()
         .to_dataframe(meta=meta)

spinta/datasets/backends/dataframe/commands/read.py

@@ -276,6 +276,11 @@ def dask_get_all(
             val = _get_row_value(context, row, sel, env.params)
             if sel.prop:
                 if isinstance(sel.prop.dtype, PrimaryKey):
+                    if isinstance(val, list):
+                        val = [
+                            list_value.get("_id", list_value) if isinstance(list_value, dict) else list_value
+                            for list_value in val
+                        ]
                     val = keymap.encode(sel.prop.model.model_type(), val)
                 elif isinstance(sel.prop.dtype, Ref):
                     val = handle_ref_key_assignment(context, keymap, env, val, sel.prop.dtype)

spinta/datasets/backends/dataframe/ufuncs/query/ufuncs.py

@@ -336,12 +336,15 @@ def select(env: DaskDataFrameQueryBuilder, selected: Selected) -> Selected:
 
 @ufunc.resolver(DaskDataFrameQueryBuilder, Ref, GetAttr)
 def select(env: DaskDataFrameQueryBuilder, dtype: Ref, prep: GetAttr) -> Selected | None:
-    prep = env.call("select", prep)
-    if prep is not None:
-        return Selected(
-            prop=dtype.prop,
-            prep=prep,
-        )
+    resolved_prep = env.call("select", prep)
+
+    result = {}
+    result["_id"] = Selected(prop=dtype.prop, prep=resolved_prep)
+    for prop in dtype.properties.values():
+        sel = env.call("select", prop)
+        result[prop.name] = sel
+
+    return Selected(prop=dtype.prop, prep=result)
 
 
 @ufunc.resolver(DaskDataFrameQueryBuilder, Ref, object)
@@ -353,6 +356,18 @@ def select(env: DaskDataFrameQueryBuilder, dtype: Ref, prep: Any) -> Selected:
     )
 
 
+@ufunc.resolver(DaskDataFrameQueryBuilder, Ref)
+def select(env: DaskDataFrameQueryBuilder, dtype: Ref) -> Selected:
+    prep = {}
+    prep["_id"] = Selected(item=dtype.prop.external.name, prop=dtype.prop)
+
+    for prop in dtype.properties.values():
+        sel = env.call("select", prop)
+        prep[prop.name] = sel
+
+    return Selected(prop=dtype.prop, prep=prep)
+
+
 @ufunc.resolver(DaskDataFrameQueryBuilder, GetAttr)
 def select(env: DaskDataFrameQueryBuilder, attr: GetAttr) -> Selected:
     resolved = env.resolve_property(attr)

spinta/datasets/backends/helpers.py

@@ -14,6 +14,10 @@ from spinta.utils.schema import NA
 
 
 def handle_ref_key_assignment(context: Context, keymap: KeyMap, env: Env, value: Any, ref: Ref) -> dict:
+    original_value = value
+    if isinstance(value, dict):
+        value = value["_id"]
+
     keymap_name = ref.model.model_type()
     if ref.refprops != ref.model.external.pkeys:
         keymap_name = f"{keymap_name}.{'_'.join(prop.name for prop in ref.refprops)}"
@@ -55,7 +59,16 @@ def handle_ref_key_assignment(context: Context, keymap: KeyMap, env: Env, value:
 
             # FIXME Quick hack when trying to get `Internal` model keys while running in `External` mode (should probably return error, or None)
             if ref_model.mode == Mode.external and not check_if_model_has_backend_and_source(ref_model):
-                return {"_id": keymap.encode(keymap_name, target_value)}
+                val = {"_id": keymap.encode(keymap_name, target_value)}
+                if isinstance(original_value, dict):
+                    for nested_prop_name, nested_prop in ref.properties.items():
+                        nested_value = original_value[nested_prop_name]
+                        if isinstance(nested_value, dict):
+                            nested_value = handle_ref_key_assignment(
+                                context, keymap, env, nested_value, nested_prop.dtype
+                            )
+                        val[nested_prop_name] = nested_value
+                return val
 
             expr_parts = ["select()"]
             for i, prop in enumerate(ref.refprops):
@@ -67,7 +80,10 @@ def handle_ref_key_assignment(context: Context, keymap: KeyMap, env: Env, value:
             for row in rows:
                 if val is not None:
                     raise MultiplePrimaryKeyCandidatesFound(ref, values=target_value)
-                val = row["_id"]
+                if "_id" in row:
+                    val = row["_id"]
+                else:
+                    val = keymap.encode(keymap_name, target_value)
                 found_value = True
 
             if not found_value:
@@ -84,6 +100,13 @@ def handle_ref_key_assignment(context: Context, keymap: KeyMap, env: Env, value:
                 values = values[0]
             val[prop] = values
             i = i + count
+
+    if isinstance(original_value, dict):
+        for nested_prop_name, nested_prop in ref.properties.items():
+            nested_value = original_value[nested_prop_name]
+            if isinstance(nested_value, dict):
+                nested_value = handle_ref_key_assignment(context, keymap, env, nested_value, nested_prop.dtype)
+            val[nested_prop_name] = nested_value
     return val
 
 

spinta/exceptions.py

@@ -1223,3 +1223,9 @@ class SourceOrPrepareNotAllowed(UserError):
     template = """
         The source {source} was not expected. Delete it from the manifest or update the prepare function to allow it.    
     """
+
+
+class PartialIncorrectProperty(BaseError):
+    template = (
+        "The composite property {property} is not correct. Check if all parts of the composite property are present."
+    )

spinta/testing/client.py

@@ -94,7 +94,6 @@ def create_remote_server(
         {
             "config_path": confdir,
             "default_auth_client": None,
-            "default_access_level": "protected",
         }
     )
     context = create_test_context(rc)
@@ -294,7 +293,6 @@ def create_rc(
             },
             # tests/config/clients/3388ea36-4a4f-4821-900a-b574c8829d52.yml
             "default_auth_client": "3388ea36-4a4f-4821-900a-b574c8829d52",
-            "default_access_level": "protected",
         }
     )
 

spinta/testing/csv.py

@@ -1,8 +1,13 @@
-from typing import List
+import pathlib
 
 from requests.models import Response
 
 
-def parse_csv(resp: Response) -> List[List[str]]:
+def parse_csv(resp: Response) -> list[list[str]]:
     resp.raise_for_status()
     return [line.strip().split(",") for line in resp.text.splitlines()]
+
+
+def read_csv(path: pathlib.Path) -> list[list[str]]:
+    with path.open("r") as f:
+        return [line.strip().split(",") for line in f.readlines()]

spinta/types/config.py

@@ -83,6 +83,11 @@ def load(context: Context, config: Config) -> Config:
         default="private",
         cast=lambda name: get_enum_by_name(Access, name),
     )
+    config.access = rc.get(
+        "access",
+        default="open",
+        cast=lambda name: get_enum_by_name(Access, name),
+    )
     config.http_basic_auth = rc.get("http_basic_auth", default=False, cast=asbool)
     config.token_validation_key = rc.get("token_validation_key", cast=json.loads) or None
     config.token_validation_keys_download_url = rc.get("token_validation_keys_download_url")

spinta/types/partial/link.py

@@ -2,23 +2,29 @@ from copy import copy
 
 from spinta import commands
 from spinta.components import Context, Property
-from spinta.exceptions import PartialTypeNotFound, ParentNodeNotFound
+from spinta.core.enums import Mode
+from spinta.exceptions import PartialTypeNotFound, ParentNodeNotFound, PartialIncorrectProperty
 from spinta.types.datatype import Partial, Ref
 
 
-def get_ref_value(context: Context, prop: Property):
+def get_ref_value(context: Context, prop: Property) -> Property | None:
     parent = prop.parent
-    if isinstance(parent, Property) and isinstance(parent.dtype, Ref):
-        parent_parent = parent.parent
-        if isinstance(parent_parent, Property) and isinstance(parent_parent.dtype, Ref):
-            model = parent_parent.dtype.model
-            first_level = model.properties[parent.name]
-            if prop.name in first_level.dtype.properties:
-                return first_level.dtype.properties[prop.name]
-        else:
-            model = parent.dtype.model
-            if prop.name in model.properties:
-                return model.properties[prop.name]
+    if not (isinstance(parent, Property) and isinstance(parent.dtype, Ref)):
+        return None
+    if isinstance(parent.dtype.model, str):
+        parent.dtype.model = commands.get_model(context, prop.model.manifest, parent.dtype.model)
+    model = parent.dtype.model
+
+    if prop.name not in model.properties:
+        return None
+
+    model_property_value = model.properties[prop.name]
+    model_dtype = model_property_value.dtype
+    if hasattr(model_dtype, "model") and isinstance(model_dtype.model, str):
+        model_property_value.dtype.model = commands.get_model(
+            context, prop.model.manifest, model_property_value.dtype.model
+        )
+    return model_property_value
 
 
 @commands.link.register(Context, Partial)
@@ -29,14 +35,23 @@ def link(context: Context, dtype: Partial):
         if isinstance(parent.dtype, Ref):
             props = dtype.properties
             result = get_ref_value(context, prop)
+            if not result:
+                raise PartialIncorrectProperty(dtype)
             prop.dtype = copy(result.dtype)
             prop.dtype.properties = props
             prop.dtype.inherited = True
             prop.given.explicit = False
             prop.given.name = ""
             prop.dtype.prop = prop
-            for partial_prop in props.values():
-                commands.link(context, partial_prop)
+            if prop.level is None:
+                prop.level = result.level
+            # For external mode copy the external mapping
+            # For internal mode leave it as is, because it breaks multi-level denormalization
+            if result.external and prop.model.mode == Mode.external:
+                prop.external = copy(result.external)
+            if isinstance(prop.dtype, Ref):
+                prop.dtype.refprops = []
+            commands.link(context, prop.dtype)
         else:
             raise PartialTypeNotFound(dtype)
     else:

spinta/types/ref/link.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from spinta import commands
-from spinta.components import Context
+from spinta.components import Context, Model
 from spinta.types.datatype import Ref
 from spinta.exceptions import ModelReferenceNotFound, MissingRefModel
 from spinta.exceptions import ModelReferenceKeyNotFound
@@ -25,6 +25,8 @@ def link(context: Context, dtype: Ref) -> None:
         # Self reference.
         dtype.model = dtype.prop.model
     else:
+        if isinstance(rmodel, Model):
+            rmodel = rmodel.name
         if not commands.has_model(context, dtype.prop.model.manifest, rmodel):
             raise ModelReferenceNotFound(dtype, ref=rmodel)
         dtype.model = commands.get_model(context, dtype.prop.model.manifest, rmodel)

{spinta-0.2.dev21.dist-info → spinta-0.2.dev23.dist-info}/METADATA

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

{spinta-0.2.dev21.dist-info → spinta-0.2.dev23.dist-info}/RECORD

@@ -12,7 +12,7 @@ spinta/api/inspect.py,sha256=sf3Q8gUEqqCusPCiT1ZqH4Kyc7T9voKWWVRlQXSoIU0,6776
 spinta/api/schema.py,sha256=rsWeKxk6JigoawD56pb8n8AYve59YIrKQyVrqpUsX9I,7634
 spinta/api/validators.py,sha256=GcdKAq-3n9oe58VLClNOBXo3MSNyguCtgWqracHR_9w,666
 spinta/asgi.py,sha256=Too66Cvo4UX0a05K-SSVRUrj8NEBVYpaql_1sq3d8gw,530
-spinta/auth.py,sha256=gCFAuCMBkOkV7NzPr5ckCzaNSyryYF3QJQE-PLpkjCM,42550
+spinta/auth.py,sha256=4QmNrZpVrjaVU3E9g2OWWMkI_4pt7l0JXHW3JA6iXS0,42587
 spinta/backends/__init__.py,sha256=i8zlodXE0ku_N38EBoDoNXvLvBWvc_AIm5SGHSP3aAI,56972
 spinta/backends/components.py,sha256=4nV3Yvye2rYAnBe0PV-rPuK2IXnHzrUFm37ceGI47eo,1663
 spinta/backends/constants.py,sha256=RdmpPhIIUsSwO6sQv1eZdmdl6Rf1h_3qAHDUcTOYOy0,828
@@ -173,18 +173,19 @@ spinta/backends/postgresql/ufuncs/result/ufuncs.py,sha256=n96VPXwU0vxS8lZu-8s_zK
 spinta/backends/postgresql/ufuncs/ufuncs.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/backends/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/cli/__init__.py,sha256=3DWdLNWcfRk0mVZPwqKhQfRc47w716jhFjHLXSFTH-c,21
-spinta/cli/admin.py,sha256=HT_aEn4tqUXckKWUXPV8VEoMXe1ZW3strNGoEimCd9A,2902
+spinta/cli/admin.py,sha256=FYFiMjWTcRGYZiS3GYcbF8h16XuYuq63VI9qToDGXP0,3123
 spinta/cli/auth.py,sha256=WDwn7p5JDwTq3xS9pki3xykmRrd1D7VxRkyv7nGjvIY,6036
 spinta/cli/config.py,sha256=U8WjKkHo9B0TczZuZLUhWmoCyh5YI8EW5loTqFJyGao,1736
 spinta/cli/data.py,sha256=nOlVj2GEZIvs0oRjTRibmlR0DlLh-GUs3nefZVrLS0c,8288
 spinta/cli/get.py,sha256=GUzj7hg3X0W06EIARveLL93vxKTWfVAUNvtQfmcxepA,1191
 spinta/cli/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/cli/helpers/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spinta/cli/helpers/admin/components.py,sha256=4cE2vAJtqzm2w8ZPsyMAKMHYq3FBeugHms_ca1Yzu0U,307
-spinta/cli/helpers/admin/registry.py,sha256=yi_HJLpxd6KeyTmfLrN5ePmmTYZeHP1Wa-5BwCknw4o,1303
+spinta/cli/helpers/admin/components.py,sha256=ir_CXA-r6GOdHx2nLT5Jiy-9vmxWj-6Ypz5xf27tbz0,335
+spinta/cli/helpers/admin/registry.py,sha256=aJH9rJAeTfBaLadGE7x266TvBHSPhMIowCMjQRq8Ynw,1524
 spinta/cli/helpers/admin/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/cli/helpers/admin/scripts/changelog.py,sha256=r5heUIoGxILLUB2qqIpliN1JWYcGB6WmPfbVpOzWYm4,13771
 spinta/cli/helpers/admin/scripts/deduplicate.py,sha256=kn4vR7ZFC2-uihRIjYTY0en1BCGEM915mGE8IPI1K_8,9128
+spinta/cli/helpers/admin/scripts/enums.py,sha256=OiNvg3KGLk5QnwgwyHp8nqoT5rf_d0XzX-Ma_f4yWco,5176
 spinta/cli/helpers/auth.py,sha256=qg35WJBCPHpQVLMOnvLKRqNcD6dSSX6NqldlauAuXBU,1196
 spinta/cli/helpers/data.py,sha256=T1t0X01beFthJQnlKFXWHMYxXjnZaPMxsbCP0wlJgHg,5530
 spinta/cli/helpers/errors.py,sha256=ILUm-sHIr4_bNlaonMuEaUJaPcYmOHz589M_sxpRzCo,412
@@ -198,7 +199,7 @@ spinta/cli/helpers/export/commands.py,sha256=obYO_6bXTfpJCkHn_fV9dsIwzhQwPQVUPhk
 spinta/cli/helpers/export/components.py,sha256=a5Q9qYym5KeZ0lyb5RXmKVND5EzQdf-PaeezzQMecXQ,1773
 spinta/cli/helpers/export/helpers.py,sha256=OpuPxrz3PNc9hKZROaavxdXbHsiiYoVXWWtxvETM0II,4737
 spinta/cli/helpers/manifest.py,sha256=8R39le_edqfXnC1ar_Q79JgEz05gBko64SarOjSixBs,1317
-spinta/cli/helpers/message.py,sha256=sSKYNeDp0rql7fKuheYU9xAJX4g-sfaUJahpcLjnP1g,317
+spinta/cli/helpers/message.py,sha256=EwcZtC4JkUFsXcNmw6URfqPR2TQMLTIBD6EvfojMZ4M,518
 spinta/cli/helpers/migrate.py,sha256=fhd4tra_jqYyEEMbh-2GBXQ3d_RGWt3HSfAmvSimiPo,460
 spinta/cli/helpers/push/__init__.py,sha256=KEllTU28EFUKU9qGagCeaT6E49zXSb6HTQYzN6G8NAY,2141
 spinta/cli/helpers/push/components.py,sha256=FeAPb4dOxv4Kok_Sf-3hpqbiHLPeyJ4J7r-D5oKHxao,2235
@@ -210,9 +211,9 @@ spinta/cli/helpers/push/sync.py,sha256=dSH5TuDTQwbl5qaVLGW5a4vV1eiq2Yo8dB4huRCKM
 spinta/cli/helpers/push/utils.py,sha256=Jc9TNaosbYp2TecumSVDSP59EDsdcoUfXwAihV4xI30,5846
 spinta/cli/helpers/push/write.py,sha256=mqKDHq_naooWGW_okpyj4jKjutwF7Gt3ssLhGB3mhyA,13563
 spinta/cli/helpers/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spinta/cli/helpers/script/components.py,sha256=mhUq2MG64TMY88HWhwwT9yvGKyo4bYR2W1LW8k9ot_k,4418
-spinta/cli/helpers/script/core.py,sha256=U41UigkfrPeSWZsPAK7SVXiBAsSeQzcSQsWMWpUtpOM,3717
-spinta/cli/helpers/script/helpers.py,sha256=ILjTrUknrL_bBHRtf57Y4PQr-m6VpS3zfaaaT5e_-1M,2201
+spinta/cli/helpers/script/components.py,sha256=OSmIuQ7wG20vdgYoRZKrkiHkw4YM8bV5puV7EdP348k,4417
+spinta/cli/helpers/script/core.py,sha256=KltI0rHaowz__j5AbpTPTlVc-j3SAiGarJwGPyO1jEM,3716
+spinta/cli/helpers/script/helpers.py,sha256=ubx9BhhrPqEWIVrYC2LUTgwILI3I1WDGd8e68RIBzkU,2226
 spinta/cli/helpers/script/registry.py,sha256=h-wPrE7fOCD7B9hmqWTHNPHf1GyuEZuvJd9VmlB5khE,3266
 spinta/cli/helpers/store.py,sha256=LLXQtbuU0tjBB3f1DmWqmy57htY3pjog4tmJZDu9IrA,5507
 spinta/cli/helpers/sync/__init__.py,sha256=zarobjW3JbLgtYl9TWKusrFyzten5qRbwDo3447Kyrc,140
@@ -235,7 +236,7 @@ spinta/cli/helpers/upgrade/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 spinta/cli/helpers/upgrade/scripts/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/cli/helpers/upgrade/scripts/backends/postgresql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/cli/helpers/upgrade/scripts/backends/postgresql/comments.py,sha256=ZqbbY0yTgS1p46N_Fn-RDsWxYdgslIwqstcEczqTxGI,9239
-spinta/cli/helpers/upgrade/scripts/backends/postgresql/schemas.py,sha256=6CwhML-E8WCFQpzBiFPLmsGfrYgBWOPA5AVEcXe44pE,11522
+spinta/cli/helpers/upgrade/scripts/backends/postgresql/schemas.py,sha256=lUoeup6OumGb9A_8iTMVctyBQrza7jsufuZXWkcaLxs,11531
 spinta/cli/helpers/upgrade/scripts/clients.py,sha256=-OrfJvJZ4e07TyYpE7ltPoqntBgs_21J2TuzH6ukYVQ,7420
 spinta/cli/helpers/upgrade/scripts/keymaps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/cli/helpers/upgrade/scripts/keymaps/sqlalchemy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -266,8 +267,8 @@ spinta/commands/search.py,sha256=Yn-lxFhAQrDzDWFGlTm_WmQmUFXsu6NhuT7PpNJ67Ls,311
 spinta/commands/version.py,sha256=rZGszGCU_cgyJyRUgZgg_ts3ZldqemLcugpOOY_UJ64,745
 spinta/commands/write.py,sha256=en2dcD1nb2T28cQDMa41qbeIhZEVH2B1xPDP-nG8mBs,42398
 spinta/compat.py,sha256=eI-tsNtWww_rEW6Gw7tcgoLvUMOb_f1vV-kLjzFPRMs,2919
-spinta/components.py,sha256=jLgIFxMO6gwol-yxHmKGSWNhGs2qF99SbDvzLjwG1to,35373
-spinta/config.py,sha256=xrkMwNo_XrtUZLmXMS303-Pqcjoo0PfV7gT8wOOf4xk,16247
+spinta/components.py,sha256=uZ6VFzonu0MolUN2lYSrl_Ggsaoak6cNP5VcZ1BbtMc,35395
+spinta/config.py,sha256=YR4Cxt1ceg-u9B4lZxOYKuAeGrsqiJKKA9pTffppn4A,16272
 spinta/config.yml,sha256=RvUjqZt-EL5wnWaizmoz1b85aBz43NhQwK0fB9WWoHA,3447
 spinta/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/core/access.py,sha256=EAfG-5hMmhvHdCRSZ65z1y_n6-8i-X-ISElMbR9MIxw,2247
@@ -285,13 +286,13 @@ spinta/datasets/backends/dataframe/backends/csv/commands/read.py,sha256=4klYZKtG
 spinta/datasets/backends/dataframe/backends/csv/components.py,sha256=0EZvqouPeaPq3sHtzSGX9HW4eLtMMnRjAlMNYlu4cAI,209
 spinta/datasets/backends/dataframe/backends/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/backends/json/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spinta/datasets/backends/dataframe/backends/json/commands/read.py,sha256=WfU0R5dmlyI2ETmGzNe34oBNwN0uzo5HI4YQXioC4Vk,7119
+spinta/datasets/backends/dataframe/backends/json/commands/read.py,sha256=pjSsUEbZiCeXs02qFDoicfpJFSAFhB81qp4Lps9yt0U,7118
 spinta/datasets/backends/dataframe/backends/json/components.py,sha256=kPKQEEvWGZKq_IpiwhVNG4A-7CaEux5fGEuwwcaHCLk,211
 spinta/datasets/backends/dataframe/backends/memory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/backends/memory/components.py,sha256=tByPlAR0hp8WsL0i5JxAPbOh7bdawlw9UQEfT5SUIEo,226
 spinta/datasets/backends/dataframe/backends/soap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/backends/soap/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spinta/datasets/backends/dataframe/backends/soap/commands/read.py,sha256=BXdfQPkgayP35YyAuTJk8JZCD6LKgqc8dSrSBvkKjUo,5300
+spinta/datasets/backends/dataframe/backends/soap/commands/read.py,sha256=5pVdcSQ47QH9RXgu6_sw8E0eMLW9colZ-6AgeWwnh_I,5667
 spinta/datasets/backends/dataframe/backends/soap/components.py,sha256=TtJFhUfJ6MZTbCUxQC_yiADEGPL8uGVVX9nDVrGiJoA,1451
 spinta/datasets/backends/dataframe/backends/soap/ufuncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/backends/soap/ufuncs/components.py,sha256=VmKOHUeeCBcYz3xSh6qj657VeU7BgBL6X8DoSLmEMLE,886
@@ -302,15 +303,15 @@ spinta/datasets/backends/dataframe/backends/xml/commands/read.py,sha256=dqb_8lL_
 spinta/datasets/backends/dataframe/backends/xml/components.py,sha256=CcqTkD2MWky4R_wuY588nUnuUrzagBWTctHa5kV47L4,209
 spinta/datasets/backends/dataframe/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/commands/check.py,sha256=eghehENfCjCcGeCXGzPXRXczQenV7F5j9T1xuDVUx7c,1385
-spinta/datasets/backends/dataframe/commands/read.py,sha256=C0f1GZoM6btgyOV_NUBdTa12Dw7jcth8E6_APHYJ1IA,10831
+spinta/datasets/backends/dataframe/commands/read.py,sha256=kzQu-MD21H5UaA2fDIt4wLEb-ukfTevW6spk6vhkQGY,11095
 spinta/datasets/backends/dataframe/components.py,sha256=cnlB1VlZrdtVo4-8q7LukyAvsUr9l2SD-R0PzqJSoMQ,235
 spinta/datasets/backends/dataframe/ufuncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/ufuncs/components.py,sha256=gmfS7P6gMyPbjJf2ZY-zWRySXGaIxbIPIqar6p9ARh8,90
 spinta/datasets/backends/dataframe/ufuncs/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/dataframe/ufuncs/query/components.py,sha256=uekQHMdpJi5506-sWH-HakCw_kGS_0BN5A5Ym1i4yAs,2342
-spinta/datasets/backends/dataframe/ufuncs/query/ufuncs.py,sha256=LQs10MMEIzQ4bX-mikHSpOFnME2EwhHpOrhwRZzDNJw,19023
+spinta/datasets/backends/dataframe/ufuncs/query/ufuncs.py,sha256=LUCL7rAqM1unZar0BwBH0oIA-FLt-L4E4_J9nBhlyiE,19537
 spinta/datasets/backends/dataframe/ufuncs/ufuncs.py,sha256=LRy_jE48FYtW41-oj4G35ihA70P39qCGWfbgS7amv9U,391
-spinta/datasets/backends/helpers.py,sha256=yjoi5mx_UsY62wRcmSKT2zsM_908LVPCJRmyxXsYefE,6557
+spinta/datasets/backends/helpers.py,sha256=2UZGZfEsb45jpsLRFmeDhMTuXBk9DX2cAqo_oD4jL3U,7689
 spinta/datasets/backends/notimpl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/notimpl/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/datasets/backends/notimpl/commands/load.py,sha256=5wbxy7LJ61fBSM2YpSWqHRFWh2-OQgsG9SUiOW4zCzc,372
@@ -460,7 +461,7 @@ spinta/dimensions/prefix/commands/load.py,sha256=P8Lzd7smS-lJ30NTFBPs_2ywmZw2qlr
 spinta/dimensions/prefix/components.py,sha256=5VJel2wvZUCol_4riD119CD5F5R6TSdf5ISeWDglKsk,618
 spinta/dimensions/prefix/helpers.py,sha256=VE6TT50tqyy-9becV2PV_TMjA4HXGrSSidV4F7aUCxE,1003
 spinta/dispatcher.py,sha256=FZaBJ7O2J-0hZ4fGL2w3a_cO8jzOVuxqyfOqON6jg0E,3769
-spinta/exceptions.py,sha256=vKbaYqFmF-XgS2yMe7jabt_cLaq2YBI9f_JUum8merg,35860
+spinta/exceptions.py,sha256=6KPBa-zLMyhz-focdNypsnTDyTXFCGzh4ShmPLM8Ohc,36046
 spinta/fetcher.py,sha256=55-nxQy9WuISrLAPuJOxjJjtZ0opqTlPiCHI7iABiic,1330
 spinta/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/formats/ascii/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -611,10 +612,10 @@ spinta/templates/error.html,sha256=nlC52cRicXqs1nxdwl_4ikMZA9-N9WKp1-OLOp_oJwA,1
 spinta/templates/form.html,sha256=Ioszr7D8v_-ZkwmEHNeeMyHnh6p60te0wMDkKwdDaCA,794
 spinta/testing/__init__.py,sha256=bXkhOgOOugNFKv6O6uHrANccQ98B4E352WeBtJDUZ4E,50
 spinta/testing/cli.py,sha256=HPwUHeo2W5q5dRl56kIytJIxvG7WTdi52N_CMylEuvM,1840
-spinta/testing/client.py,sha256=XdTF4J36GVpM-HXc1b6FG_TY4-lB5PyXNmKEPvJD2ls,10138
+spinta/testing/client.py,sha256=q_SLseq_hLN7O8-pxWJmNfJqeoMCGQrfWPy8Fh-oqQ8,10040
 spinta/testing/config.py,sha256=o40GCI0qAeQGK1u-VrxtnUh45m0o-tPHySJ0oQmN4j4,2919
 spinta/testing/context.py,sha256=9lDGKEN1wV58TW9KlrJyuzCo2vMer_HSP2MKQsKPZqI,3382
-spinta/testing/csv.py,sha256=XxAXwlQLd9yHmNi7m3oClPJJcDCnMX2qqOAz4WrAbgA,214
+spinta/testing/csv.py,sha256=JnrB3xwQDvd0EL7fQN9CcvLs9Bspydq0mdqAE11QlPM,357
 spinta/testing/data.py,sha256=YHIypRRy1InkFwgx-jvLUaCCAvY1rA-QeHPYn4bL1iE,7259
 spinta/testing/datasets.py,sha256=gzPQoq_1XEzN1v9ghESNEFN5GPrwE622uifObDaBKMs,1478
 spinta/testing/dtypes.py,sha256=5qGBuCjDJywTJSvJmvA62DvY8H-dJFti441wtGkrvO0,6288
@@ -636,7 +637,7 @@ spinta/types/array/resolve.py,sha256=o8fEPK0RZx5FT6oMQ2RZyE8WYT3WK9qdh6QTORzndD8
 spinta/types/backref/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/types/backref/link.py,sha256=_q7wHvuRUuGpllth_zTerq6Eoajq3C_WqjsqjxZTc7c,4684
 spinta/types/command.py,sha256=pmlL4ZQYFwzNm0nMY4q7GZIoPNqiYxZ-k6CzfTByCg4,975
-spinta/types/config.py,sha256=wm-kFU15eIkOI0ZyOrDQgCrQv_5J5QT8uFXk7BJbO8Q,6438
+spinta/types/config.py,sha256=Yl9oGiE3znHZgtHQNtr8s7BGARCV_O10ibe1Mp8orss,6572
 spinta/types/datatype.py,sha256=zbarMo6S9MX__NHfnekw2Oto3MGqj3X4Ms5tWGodjps,16747
 spinta/types/denorm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/types/denorm/check.py,sha256=2lZrDwd_F71hkflF7jvgFp_vyPRtAQV3HVlFZAEodwY,606
@@ -659,10 +660,10 @@ spinta/types/object/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 spinta/types/object/check.py,sha256=14D_lGNIsZvNevQ9FhRTKtGGK3VJA9ugCI83xg4QYX4,276
 spinta/types/object/link.py,sha256=wjtzkVcS4gN-9etAauj2sLJczOi8Gwig-WpVaSFu_aA,361
 spinta/types/partial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spinta/types/partial/link.py,sha256=VusV7jenKC6LZNj7gFBp2ibmWQiBKP-D66UvQUv6JMY,1823
+spinta/types/partial/link.py,sha256=G4ieydtTOJloGPqB7VHpjmyZ3BIKieA-I1ROX3cvyw0,2487
 spinta/types/ref/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spinta/types/ref/check.py,sha256=I8gFHJiuYWGw1UIlGx2vyxlqExt15EkJ1jPz409fLXs,853
-spinta/types/ref/link.py,sha256=b3tahnT5VGq2Rg1qEyL5r56r6HAFeBubXCNkp6-AJbY,2008
+spinta/types/ref/link.py,sha256=Cuu1E6iUYBcGXLYYm814ptlBe6lXNWr-QvBDGQm1X8U,2086
 spinta/types/ref/resolve.py,sha256=X3J5etLCaBIWfp0saqBIb0XOS7DkpM8-tFhVUvlN8OQ,309
 spinta/types/store.py,sha256=6dVzeIUoYZC-1F-LVA4ZSG23t593twvRY0-aa1-RWiY,5234
 spinta/types/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -740,8 +741,8 @@ spinta/utils/tree.py,sha256=iF8eOSBagUoDmdJGNQgsYB_gshsFajmiUALXqU9luHE,591
 spinta/utils/types.py,sha256=lfYSxKGPuPeUsO14d2OYodtbRY3zsa-o-z8HveVH3t0,801
 spinta/utils/units.py,sha256=CFFLv1NHYsoSSzwiar3zXYmt4m3sccW5niUgkZQgo3k,747
 spinta/utils/url.py,sha256=b6sqQEpmCdT3oV4vGDzXnN8w415InAYjIW_o2djhQS8,2950
-spinta-0.2.dev21.dist-info/METADATA,sha256=aPvAeY7zuGWVoo5Uhv28-SZHYJkW1Y5nIvP4wWuJHfQ,10214
-spinta-0.2.dev21.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-spinta-0.2.dev21.dist-info/entry_points.txt,sha256=-jdsOQZcMu3rUOwgIJNS3gZS4rwWPACuXXy128F676w,46
-spinta-0.2.dev21.dist-info/licenses/LICENSE,sha256=JKmjfBLapeFWNI_qdVr5bXGlsuMPa6nRarKPK5davKw,1071
-spinta-0.2.dev21.dist-info/RECORD,,
+spinta-0.2.dev23.dist-info/METADATA,sha256=InX-K2DKF6mZUaQ5Kn7jEHA58o2JHRM38T1o_sM5ptU,10214
+spinta-0.2.dev23.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+spinta-0.2.dev23.dist-info/entry_points.txt,sha256=-jdsOQZcMu3rUOwgIJNS3gZS4rwWPACuXXy128F676w,46
+spinta-0.2.dev23.dist-info/licenses/LICENSE,sha256=JKmjfBLapeFWNI_qdVr5bXGlsuMPa6nRarKPK5davKw,1071
+spinta-0.2.dev23.dist-info/RECORD,,