diff --git a/poetry.lock b/poetry.lock index 68003dce..eb6c10f6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -812,42 +812,29 @@ tomli = ">=1.1.0" [[package]] name = "dapla-toolbelt-metadata" -version = "0.1.2" +version = "0.2.0" description = "Dapla Toolbelt Metadata" optional = false python-versions = "<4.0,>=3.10" files = [ - {file = "dapla_toolbelt_metadata-0.1.2-py3-none-any.whl", hash = "sha256:82a5a89a587aa151d87759353f9bc120581f87603081ce086ec2c864460ba342"}, - {file = "dapla_toolbelt_metadata-0.1.2.tar.gz", hash = "sha256:77e9487d98458b865aaa9e57f181aefdc6b96bbccc0d640ea37e44dd7c6623d6"}, + {file = "dapla_toolbelt_metadata-0.2.0-py3-none-any.whl", hash = "sha256:b2479b36d91b03b96735cd2e7a55631a7ffd1f4eb28aea17f297d07cc354897a"}, + {file = "dapla_toolbelt_metadata-0.2.0.tar.gz", hash = "sha256:6bd69eddcac54985fcb541751a929ddf16010243b90d6631427e13296b4e440c"}, ] [package.dependencies] arrow = ">=1.3.0" beautifulsoup4 = ">=4.12.3" -black = ">=24.8.0,<25.0.0" bs4 = ">=0.0.2,<0.0.3" -click = ">=8.0.1" cloudpathlib = {version = ">=0.17.0", extras = ["gs"]} -coverage = ">=7.6.1,<8.0.0" dapla-toolbelt = ">=1.3.3" -faker = ">=26.1.0,<27.0.0" -furo = ">=2024.7.18,<2025.0.0" -gunicorn = ">=21.2.0" pandas = ">=1.4.2" -pre-commit = ">=3.8.0,<4.0.0" pyarrow = ">=8.0.0" pydantic = ">=2.5.2" -pygments = ">=2.18.0,<3.0.0" pyjwt = ">=2.8.0" -pytest = ">=8.3.2,<9.0.0" -pytest-mock = ">=3.14.0,<4.0.0" python-dotenv = ">=1.0.1" requests = ">=2.31.0" -requests-mock = ">=1.12.1,<2.0.0" -ruff = ">=0.5.6,<0.6.0" ssb-datadoc-model = ">=6.0.0,<7.0.0" ssb-klass-python = ">=0.0.9" -types-beautifulsoup4 = ">=4.12.0.20240511,<5.0.0.0" [[package]] name = "dash" @@ -5263,4 +5250,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.10,<4.0" -content-hash = "86e7284e5642e83a5f048acbf25c3ea61cf91dd0d72e03d98cc52baf7c14190d" +content-hash = "bf55d7a80ba98b779fc39138efe50bf945c95749846b09f93863c5ddaa675875" diff --git a/pyproject.toml b/pyproject.toml index b78cff5c..71593242 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ pyjwt = ">=2.8.0" ssb-klass-python = ">=0.0.9" ssb-dash-components = ">=0.8.1" ssb-datadoc-model = "^6.0.0" -dapla-toolbelt-metadata = "^0.1.2" +dapla-toolbelt-metadata = "^0.2.0" [tool.poetry.group.dev.dependencies] mypy = ">=0.950" diff --git a/src/datadoc/app.py b/src/datadoc/app.py index 6ce9ccf0..af515462 100644 --- a/src/datadoc/app.py +++ b/src/datadoc/app.py @@ -9,12 +9,12 @@ import logging from pathlib import Path +from dapla_metadata.datasets import Datadoc +from dapla_metadata.datasets.code_list import CodeList +from dapla_metadata.datasets.statistic_subject_mapping import StatisticSubjectMapping from dash import Dash from dash import dcc from dash import html -from dataset import Datadoc -from dataset.code_list import CodeList -from dataset.statistic_subject_mapping import StatisticSubjectMapping from flask_healthz import healthz from datadoc import config diff --git a/src/datadoc/config.py b/src/datadoc/config.py index 9c4c393b..d0a29a19 100644 --- a/src/datadoc/config.py +++ b/src/datadoc/config.py @@ -8,7 +8,7 @@ from pprint import pformat from typing import Literal -from dataset import enums +from dapla_metadata.datasets import enums from dotenv import dotenv_values from dotenv import load_dotenv diff --git a/src/datadoc/enums.py b/src/datadoc/enums.py index 66b4951a..9336e593 100644 --- a/src/datadoc/enums.py +++ b/src/datadoc/enums.py @@ -4,8 +4,8 @@ from enum import Enum -from dataset import enums -from dataset import model +from dapla_metadata.datasets import enums +from dapla_metadata.datasets import model class LanguageStringsEnum(Enum): diff --git a/src/datadoc/frontend/callbacks/dataset.py b/src/datadoc/frontend/callbacks/dataset.py index af9abda6..a49bc44b 100644 --- a/src/datadoc/frontend/callbacks/dataset.py +++ b/src/datadoc/frontend/callbacks/dataset.py @@ -8,9 +8,9 @@ from typing import TYPE_CHECKING import arrow +from dapla_metadata.datasets import DaplaDatasetPathInfo +from dapla_metadata.datasets import Datadoc from dash import no_update -from dataset import DaplaDatasetPathInfo -from dataset import Datadoc from pydantic import ValidationError from datadoc import config @@ -51,7 +51,7 @@ if TYPE_CHECKING: import dash_bootstrap_components as dbc - from dataset import model + from dapla_metadata.datasets import model logger = logging.getLogger(__name__) diff --git a/src/datadoc/frontend/callbacks/register_callbacks.py b/src/datadoc/frontend/callbacks/register_callbacks.py index 90463f2a..e94599f1 100644 --- a/src/datadoc/frontend/callbacks/register_callbacks.py +++ b/src/datadoc/frontend/callbacks/register_callbacks.py @@ -9,6 +9,8 @@ import warnings from typing import TYPE_CHECKING +from dapla_metadata.datasets import ObligatoryDatasetWarning +from dapla_metadata.datasets import ObligatoryVariableWarning from dash import MATCH from dash import Dash from dash import Input @@ -17,8 +19,6 @@ from dash import ctx from dash import html from dash import no_update -from dataset import ObligatoryDatasetWarning -from dataset import ObligatoryVariableWarning from datadoc import state from datadoc.frontend.callbacks.dataset import accept_dataset_metadata_date_input diff --git a/src/datadoc/frontend/callbacks/utils.py b/src/datadoc/frontend/callbacks/utils.py index 3b25fb53..044eaf51 100644 --- a/src/datadoc/frontend/callbacks/utils.py +++ b/src/datadoc/frontend/callbacks/utils.py @@ -9,8 +9,8 @@ import arrow import ssb_dash_components as ssb +from dapla_metadata.datasets import model from dash import html -from dataset import model from datadoc import config from datadoc import state diff --git a/src/datadoc/frontend/callbacks/variables.py b/src/datadoc/frontend/callbacks/variables.py index e0a0be3c..858f89d6 100644 --- a/src/datadoc/frontend/callbacks/variables.py +++ b/src/datadoc/frontend/callbacks/variables.py @@ -33,7 +33,7 @@ if TYPE_CHECKING: import dash_bootstrap_components as dbc - from dataset import model + from dapla_metadata.datasets import model logger = logging.getLogger(__name__) diff --git a/src/datadoc/frontend/components/builders.py b/src/datadoc/frontend/components/builders.py index 606a6029..7fbb878a 100644 --- a/src/datadoc/frontend/components/builders.py +++ b/src/datadoc/frontend/components/builders.py @@ -16,7 +16,7 @@ from datadoc.frontend.fields.display_base import FieldTypes if TYPE_CHECKING: - from dataset import model + from dapla_metadata.datasets import model class AlertTypes(Enum): diff --git a/src/datadoc/frontend/fields/display_base.py b/src/datadoc/frontend/fields/display_base.py index 84af46ee..254b9a14 100644 --- a/src/datadoc/frontend/fields/display_base.py +++ b/src/datadoc/frontend/fields/display_base.py @@ -10,16 +10,16 @@ from typing import Any import ssb_dash_components as ssb +from dapla_metadata.datasets import enums from dash import html -from dataset import enums from datadoc import state if TYPE_CHECKING: from collections.abc import Callable + from dapla_metadata.datasets import model from dash.development.base_component import Component - from dataset import model from pydantic import BaseModel from datadoc.enums import LanguageStringsEnum diff --git a/src/datadoc/frontend/fields/display_dataset.py b/src/datadoc/frontend/fields/display_dataset.py index 8ed41408..f0cc934a 100644 --- a/src/datadoc/frontend/fields/display_dataset.py +++ b/src/datadoc/frontend/fields/display_dataset.py @@ -6,7 +6,7 @@ import logging from enum import Enum -from dataset import enums +from dapla_metadata.datasets import enums from datadoc import state from datadoc.enums import Assessment diff --git a/src/datadoc/frontend/fields/display_variables.py b/src/datadoc/frontend/fields/display_variables.py index 110775b1..a3902e22 100644 --- a/src/datadoc/frontend/fields/display_variables.py +++ b/src/datadoc/frontend/fields/display_variables.py @@ -5,7 +5,7 @@ import functools from enum import Enum -from dataset import enums +from dapla_metadata.datasets import enums from datadoc import state from datadoc.enums import DataType diff --git a/src/datadoc/state.py b/src/datadoc/state.py index 47859b9e..610a4665 100644 --- a/src/datadoc/state.py +++ b/src/datadoc/state.py @@ -13,9 +13,11 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from datadoc.backend.code_list import CodeList - from datadoc.backend.core import Datadoc - from datadoc.backend.statistic_subject_mapping import StatisticSubjectMapping + from dapla_metadata.datasets.code_list import CodeList + from dapla_metadata.datasets.core import Datadoc + from dapla_metadata.datasets.statistic_subject_mapping import ( + StatisticSubjectMapping, + ) # Global metadata container diff --git a/tests/conftest.py b/tests/conftest.py index fd8f8060..07c3b917 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,11 +16,11 @@ import pytest from bs4 import BeautifulSoup from bs4 import ResultSet -from dataset import Datadoc -from dataset import model -from dataset.code_list import CodeList -from dataset.statistic_subject_mapping import StatisticSubjectMapping -from dataset.user_info import TestUserInfo +from dapla_metadata.datasets import Datadoc +from dapla_metadata.datasets import model +from dapla_metadata.datasets.code_list import CodeList +from dapla_metadata.datasets.statistic_subject_mapping import StatisticSubjectMapping +from dapla_metadata.datasets.user_info import TestUserInfo from datadoc import state @@ -39,7 +39,7 @@ from pytest_mock import MockerFixture -DATADOC_METADATA_MODULE = "dataset" +DATADOC_METADATA_MODULE = "dapla_metadata.datasets" CODE_LIST_DIR = "code_list" STATISTICAL_SUBJECT_STRUCTURE_DIR = "statistical_subject_structure" diff --git a/tests/frontend/callbacks/test_callbacks_utils.py b/tests/frontend/callbacks/test_callbacks_utils.py index 1b0a20fb..36a00220 100644 --- a/tests/frontend/callbacks/test_callbacks_utils.py +++ b/tests/frontend/callbacks/test_callbacks_utils.py @@ -1,6 +1,6 @@ import pytest +from dapla_metadata.datasets import model from dash import html -from dataset import model from datadoc.frontend.callbacks.utils import find_existing_language_string from datadoc.frontend.callbacks.utils import render_tabs diff --git a/tests/frontend/callbacks/test_dataset_callbacks.py b/tests/frontend/callbacks/test_dataset_callbacks.py index 4d84fab2..f02a143e 100644 --- a/tests/frontend/callbacks/test_dataset_callbacks.py +++ b/tests/frontend/callbacks/test_dataset_callbacks.py @@ -11,8 +11,8 @@ import dash import dash_bootstrap_components as dbc import pytest -from dataset import ObligatoryDatasetWarning -from dataset import model +from dapla_metadata.datasets import ObligatoryDatasetWarning +from dapla_metadata.datasets import model from datadoc import enums from datadoc import state @@ -30,7 +30,7 @@ from datadoc.frontend.fields.display_dataset import DatasetIdentifiers if TYPE_CHECKING: - from dataset import Datadoc + from dapla_metadata.datasets import Datadoc from datadoc.frontend.callbacks.utils import MetadataInputTypes diff --git a/tests/frontend/callbacks/test_variables_callbacks.py b/tests/frontend/callbacks/test_variables_callbacks.py index 979b9274..3a589e81 100644 --- a/tests/frontend/callbacks/test_variables_callbacks.py +++ b/tests/frontend/callbacks/test_variables_callbacks.py @@ -10,8 +10,8 @@ import arrow import dash_bootstrap_components as dbc import pytest -from dataset import ObligatoryVariableWarning -from dataset import model +from dapla_metadata.datasets import ObligatoryVariableWarning +from dapla_metadata.datasets import model from pydantic_core import Url from datadoc import enums @@ -38,7 +38,7 @@ from datadoc.frontend.fields.display_variables import VariableIdentifiers if TYPE_CHECKING: - from dataset import Datadoc + from dapla_metadata.datasets import Datadoc from datadoc.frontend.callbacks.utils import MetadataInputTypes diff --git a/tests/frontend/components/test_build_dataset_edit_section.py b/tests/frontend/components/test_build_dataset_edit_section.py index 169ea272..d980b09e 100644 --- a/tests/frontend/components/test_build_dataset_edit_section.py +++ b/tests/frontend/components/test_build_dataset_edit_section.py @@ -3,8 +3,8 @@ import dash_bootstrap_components as dbc import pytest import ssb_dash_components as ssb # type: ignore[import-untyped] +from dapla_metadata.datasets import model from dash import html -from dataset import model from datadoc.frontend.components.builders import build_dataset_edit_section from datadoc.frontend.fields.display_base import FieldTypes diff --git a/tests/frontend/components/test_build_edit_section.py b/tests/frontend/components/test_build_edit_section.py index f5d6449d..1a4910ea 100644 --- a/tests/frontend/components/test_build_edit_section.py +++ b/tests/frontend/components/test_build_edit_section.py @@ -3,8 +3,8 @@ import dash_bootstrap_components as dbc import pytest import ssb_dash_components as ssb # type: ignore[import-untyped] +from dapla_metadata.datasets import model from dash import html -from dataset import model from datadoc.frontend.components.builders import build_edit_section from datadoc.frontend.fields.display_variables import OBLIGATORY_VARIABLES_METADATA diff --git a/tests/frontend/components/test_build_input_section.py b/tests/frontend/components/test_build_input_section.py index 199e6bac..1c628c38 100644 --- a/tests/frontend/components/test_build_input_section.py +++ b/tests/frontend/components/test_build_input_section.py @@ -3,7 +3,7 @@ import dash_bootstrap_components as dbc import pytest import ssb_dash_components as ssb # type: ignore[import-untyped] -from dataset import model +from dapla_metadata.datasets import model from datadoc.frontend.components.builders import build_input_field_section from datadoc.frontend.fields.display_base import MetadataCheckboxField diff --git a/tests/test_model.py b/tests/test_model.py index 74f396fe..6bcaedd7 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,6 +1,6 @@ """Verify that we are in sync with the Model.""" -from dataset import model +from dapla_metadata.datasets import model from datadoc.frontend.fields.display_dataset import DISPLAY_DATASET from datadoc.frontend.fields.display_dataset import DatasetIdentifiers