refactor imports from dapla-toolbelt-metadata

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"

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

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
 

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):

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__)
 

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

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

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__)

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):

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

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

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

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

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"
 

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

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
 

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
 

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

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

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

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