Skip to content

Commit

Permalink
MAINT: Move exceptions from _definitions to exceptions file (equinor#…
Browse files Browse the repository at this point in the history
  • Loading branch information
tnatt authored Feb 13, 2025
1 parent ee20cef commit 5aedcfb
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
8 changes: 0 additions & 8 deletions src/fmu/dataio/_definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
from typing import Final


class ValidationError(ValueError, KeyError):
"""Raise error while validating."""


class ConfigurationError(ValueError):
pass


class ValidFormats(Enum):
surface = {
"irap_binary": ".gri",
Expand Down
2 changes: 1 addition & 1 deletion src/fmu/dataio/dataio.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

from fmu.dataio.aggregation import AggregatedData

from ._definitions import ValidationError
from ._logging import null_logger
from ._metadata import generate_export_metadata
from ._models.fmu_results import enums, global_configuration
Expand All @@ -42,6 +41,7 @@
some_config_from_env,
)
from .case import CreateCaseMetadata
from .exceptions import ValidationError
from .preprocessed import ExportPreprocessedData
from .providers._filedata import FileDataProvider
from .providers._fmu import FmuProvider, get_fmu_context_from_environment
Expand Down
8 changes: 8 additions & 0 deletions src/fmu/dataio/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@

class InvalidMetadataError(Exception):
"""Raised when valid metadata cannot be generated or returned."""


class ValidationError(ValueError, KeyError):
"""Raise error while validating."""


class ConfigurationError(ValueError):
pass
3 changes: 2 additions & 1 deletion src/fmu/dataio/providers/objectdata/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from datetime import datetime
from typing import TYPE_CHECKING, Any, Final

from fmu.dataio._definitions import ConfigurationError, ValidFormats
from fmu.dataio._definitions import ValidFormats
from fmu.dataio._logging import null_logger
from fmu.dataio._models.fmu_results.data import AnyData, Time, Timestamp
from fmu.dataio._models.fmu_results.enums import Content
Expand All @@ -16,6 +16,7 @@
)
from fmu.dataio._models.fmu_results.product import Product
from fmu.dataio._utils import generate_description
from fmu.dataio.exceptions import ConfigurationError
from fmu.dataio.providers._base import Provider
from fmu.dataio.providers.objectdata._export_models import AllowedContent, UnsetData

Expand Down
3 changes: 2 additions & 1 deletion tests/test_units/test_objectdataprovider_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
import yaml

from fmu import dataio
from fmu.dataio._definitions import ConfigurationError, ValidFormats
from fmu.dataio._definitions import ValidFormats
from fmu.dataio._models.fmu_results.specification import FaultRoomSurfaceSpecification
from fmu.dataio.exceptions import ConfigurationError
from fmu.dataio.providers.objectdata._faultroom import FaultRoomSurfaceProvider
from fmu.dataio.providers.objectdata._provider import (
objectdata_provider_factory,
Expand Down

0 comments on commit 5aedcfb

Please sign in to comment.