feat: move exceptions back to common package

Safe-DS · May 6, 2023 · 62ffa48 · 62ffa48
1 parent 56a1fc4
commit 62ffa48
Show file tree

Hide file tree

Showing 57 changed files with 107 additions and 125 deletions.
diff --git a/src/safeds/data/tabular/containers/_column.py b/src/safeds/data/tabular/containers/_column.py
@@ -12,7 +12,7 @@
 
 from safeds.data.image.containers import Image
 from safeds.data.image.typing import ImageFormat
-from safeds.data.tabular.exceptions import (
+from safeds.exceptions import (
     ColumnLengthMismatchError,
     ColumnSizeError,
     IndexOutOfBoundsError,

diff --git a/src/safeds/data/tabular/containers/_row.py b/src/safeds/data/tabular/containers/_row.py
@@ -5,7 +5,7 @@
 
 import pandas as pd
 
-from safeds.data.tabular.exceptions import UnknownColumnNameError
+from safeds.exceptions import UnknownColumnNameError
 from safeds.data.tabular.typing import ColumnType, Schema
 
 if TYPE_CHECKING:

diff --git a/src/safeds/data/tabular/containers/_table.py b/src/safeds/data/tabular/containers/_table.py
@@ -15,7 +15,7 @@
 
 from safeds.data.image.containers import Image
 from safeds.data.image.typing import ImageFormat
-from safeds.data.tabular.exceptions import (
+from safeds.exceptions import (
     ColumnLengthMismatchError,
     ColumnSizeError,
     DuplicateColumnNameError,

diff --git a/src/safeds/data/tabular/exceptions/__init__.py b/src/safeds/data/tabular/exceptions/__init__.py
diff --git a/src/safeds/data/tabular/transformation/_imputer.py b/src/safeds/data/tabular/transformation/_imputer.py
@@ -6,7 +6,7 @@
 from sklearn.impute import SimpleImputer as sk_SimpleImputer
 
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import TransformerNotFittedError, UnknownColumnNameError
+from safeds.exceptions import TransformerNotFittedError, UnknownColumnNameError
 from safeds.data.tabular.transformation._table_transformer import TableTransformer
 from safeds.data.tabular.typing import ImputerStrategy
 

diff --git a/src/safeds/data/tabular/transformation/_label_encoder.py b/src/safeds/data/tabular/transformation/_label_encoder.py
@@ -3,7 +3,7 @@
 from sklearn.preprocessing import OrdinalEncoder as sk_OrdinalEncoder
 
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import TransformerNotFittedError, UnknownColumnNameError
+from safeds.exceptions import TransformerNotFittedError, UnknownColumnNameError
 from safeds.data.tabular.transformation._table_transformer import (
     InvertibleTableTransformer,
 )

diff --git a/src/safeds/data/tabular/transformation/_one_hot_encoder.py b/src/safeds/data/tabular/transformation/_one_hot_encoder.py
@@ -4,7 +4,7 @@
 from sklearn.preprocessing import OneHotEncoder as sk_OneHotEncoder
 
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import TransformerNotFittedError, UnknownColumnNameError
+from safeds.exceptions import TransformerNotFittedError, UnknownColumnNameError
 from safeds.data.tabular.transformation._table_transformer import (
     InvertibleTableTransformer,
 )

diff --git a/src/safeds/data/tabular/typing/_schema.py b/src/safeds/data/tabular/typing/_schema.py
@@ -3,7 +3,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from safeds.data.tabular.exceptions import UnknownColumnNameError
+from safeds.exceptions import UnknownColumnNameError
 from safeds.data.tabular.typing._column_type import ColumnType
 
 if TYPE_CHECKING:

diff --git a/src/safeds/exceptions/__init__.py b/src/safeds/exceptions/__init__.py
@@ -0,0 +1,40 @@
+"""Custom exceptions that can be raised by Safe-DS."""
+
+from safeds.exceptions._data import (
+    ColumnLengthMismatchError,
+    ColumnSizeError,
+    DuplicateColumnNameError,
+    IndexOutOfBoundsError,
+    NonNumericColumnError,
+    SchemaMismatchError,
+    TransformerNotFittedError,
+    UnknownColumnNameError,
+)
+from safeds.exceptions._ml import (
+    DatasetContainsTargetError,
+    DatasetMissesFeaturesError,
+    LearningError,
+    ModelNotFittedError,
+    PredictionError,
+    UntaggedTableError,
+)
+
+__all__ = [
+    # Data exceptions
+    "ColumnLengthMismatchError",
+    "ColumnSizeError",
+    "DuplicateColumnNameError",
+    "IndexOutOfBoundsError",
+    "NonNumericColumnError",
+    "SchemaMismatchError",
+    "TransformerNotFittedError",
+    "UnknownColumnNameError",
+
+    # ML exceptions
+    "DatasetContainsTargetError",
+    "DatasetMissesFeaturesError",
+    "LearningError",
+    "ModelNotFittedError",
+    "PredictionError",
+    "UntaggedTableError",
+]
diff --git a/...ds/data/tabular/exceptions/_exceptions.py → src/safeds/exceptions/_data.py b/...ds/data/tabular/exceptions/_exceptions.py → src/safeds/exceptions/_data.py
diff --git a/src/safeds/ml/exceptions/_exceptions.py → src/safeds/exceptions/_ml.py b/src/safeds/ml/exceptions/_exceptions.py → src/safeds/exceptions/_ml.py
diff --git a/src/safeds/ml/classical/_util_sklearn.py b/src/safeds/ml/classical/_util_sklearn.py
@@ -2,7 +2,7 @@
 from typing import Any
 
 from safeds.data.tabular.containers import Table, TaggedTable
-from safeds.ml.exceptions import (
+from safeds.exceptions import (
     DatasetContainsTargetError,
     DatasetMissesFeaturesError,
     LearningError,

diff --git a/src/safeds/ml/classical/classification/_classifier.py b/src/safeds/ml/classical/classification/_classifier.py
@@ -6,7 +6,7 @@
 from sklearn.metrics import accuracy_score as sk_accuracy_score
 
 from safeds.data.tabular.containers import Table, TaggedTable
-from safeds.ml.exceptions import UntaggedTableError
+from safeds.exceptions import UntaggedTableError
 
 if TYPE_CHECKING:
     from typing import Any

diff --git a/src/safeds/ml/classical/regression/_regressor.py b/src/safeds/ml/classical/regression/_regressor.py
@@ -7,8 +7,8 @@
 from sklearn.metrics import mean_squared_error as sk_mean_squared_error
 
 from safeds.data.tabular.containers import Column, Table, TaggedTable
-from safeds.data.tabular.exceptions import ColumnLengthMismatchError
-from safeds.ml.exceptions import UntaggedTableError
+from safeds.exceptions import ColumnLengthMismatchError
+from safeds.exceptions import UntaggedTableError
 
 if TYPE_CHECKING:
     from sklearn.base import RegressorMixin

diff --git a/src/safeds/ml/exceptions/__init__.py b/src/safeds/ml/exceptions/__init__.py
diff --git a/tests/safeds/data/tabular/containers/_column/test_correlation_with.py b/tests/safeds/data/tabular/containers/_column/test_correlation_with.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import ColumnLengthMismatchError, NonNumericColumnError
+from safeds.exceptions import ColumnLengthMismatchError, NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_get_value.py b/tests/safeds/data/tabular/containers/_column/test_get_value.py
@@ -2,7 +2,7 @@
 
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import IndexOutOfBoundsError
+from safeds.exceptions import IndexOutOfBoundsError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_getitem.py b/tests/safeds/data/tabular/containers/_column/test_getitem.py
@@ -2,7 +2,7 @@
 
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import IndexOutOfBoundsError
+from safeds.exceptions import IndexOutOfBoundsError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_idness.py b/tests/safeds/data/tabular/containers/_column/test_idness.py
@@ -2,7 +2,7 @@
 
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import ColumnSizeError
+from safeds.exceptions import ColumnSizeError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_maximum.py b/tests/safeds/data/tabular/containers/_column/test_maximum.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_mean.py b/tests/safeds/data/tabular/containers/_column/test_mean.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_median.py b/tests/safeds/data/tabular/containers/_column/test_median.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_minimum.py b/tests/safeds/data/tabular/containers/_column/test_minimum.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_missing_value_ratio.py b/tests/safeds/data/tabular/containers/_column/test_missing_value_ratio.py
@@ -2,7 +2,7 @@
 
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import ColumnSizeError
+from safeds.exceptions import ColumnSizeError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_plot_boxplot.py b/tests/safeds/data/tabular/containers/_column/test_plot_boxplot.py
@@ -1,7 +1,7 @@
 import pytest
 from safeds.data.image.containers import Image
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 from tests.helpers import resolve_resource_path
 

diff --git a/tests/safeds/data/tabular/containers/_column/test_stability.py b/tests/safeds/data/tabular/containers/_column/test_stability.py
@@ -2,7 +2,7 @@
 
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import ColumnSizeError
+from safeds.exceptions import ColumnSizeError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_standard_deviation.py b/tests/safeds/data/tabular/containers/_column/test_standard_deviation.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_sum.py b/tests/safeds/data/tabular/containers/_column/test_sum.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_column/test_variance.py b/tests/safeds/data/tabular/containers/_column/test_variance.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column
-from safeds.data.tabular.exceptions import NonNumericColumnError
+from safeds.exceptions import NonNumericColumnError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_add_column.py b/tests/safeds/data/tabular/containers/_table/test_add_column.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column, Table
-from safeds.data.tabular.exceptions import ColumnSizeError, DuplicateColumnNameError
+from safeds.exceptions import ColumnSizeError, DuplicateColumnNameError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_add_columns.py b/tests/safeds/data/tabular/containers/_table/test_add_columns.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column, Table
-from safeds.data.tabular.exceptions import ColumnSizeError, DuplicateColumnNameError
+from safeds.exceptions import ColumnSizeError, DuplicateColumnNameError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_add_row.py b/tests/safeds/data/tabular/containers/_table/test_add_row.py
@@ -1,7 +1,7 @@
 import pytest
 from _pytest.python_api import raises
 from safeds.data.tabular.containers import Row, Table
-from safeds.data.tabular.exceptions import SchemaMismatchError
+from safeds.exceptions import SchemaMismatchError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_add_rows.py b/tests/safeds/data/tabular/containers/_table/test_add_rows.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Row, Table
-from safeds.data.tabular.exceptions import SchemaMismatchError
+from safeds.exceptions import SchemaMismatchError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_from_columns.py b/tests/safeds/data/tabular/containers/_table/test_from_columns.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column, Table
-from safeds.data.tabular.exceptions import ColumnLengthMismatchError
+from safeds.exceptions import ColumnLengthMismatchError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_from_dict.py b/tests/safeds/data/tabular/containers/_table/test_from_dict.py
@@ -2,7 +2,7 @@
 
 import pytest
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import ColumnLengthMismatchError
+from safeds.exceptions import ColumnLengthMismatchError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_from_rows.py b/tests/safeds/data/tabular/containers/_table/test_from_rows.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Row, Table
-from safeds.data.tabular.exceptions import SchemaMismatchError
+from safeds.exceptions import SchemaMismatchError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_get_column.py b/tests/safeds/data/tabular/containers/_table/test_get_column.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Column, Table
-from safeds.data.tabular.exceptions import UnknownColumnNameError
+from safeds.exceptions import UnknownColumnNameError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_get_row.py b/tests/safeds/data/tabular/containers/_table/test_get_row.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Row, Table
-from safeds.data.tabular.exceptions import IndexOutOfBoundsError
+from safeds.exceptions import IndexOutOfBoundsError
 
 
 @pytest.mark.parametrize(

diff --git a/tests/safeds/data/tabular/containers/_table/test_init.py b/tests/safeds/data/tabular/containers/_table/test_init.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import ColumnLengthMismatchError
+from safeds.exceptions import ColumnLengthMismatchError
 from safeds.data.tabular.typing import Integer, Schema
 
 

diff --git a/tests/safeds/data/tabular/containers/_table/test_inverse_transform_table.py b/tests/safeds/data/tabular/containers/_table/test_inverse_transform_table.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import TransformerNotFittedError
+from safeds.exceptions import TransformerNotFittedError
 from safeds.data.tabular.transformation import OneHotEncoder
 
 

diff --git a/tests/safeds/data/tabular/containers/_table/test_keep_only_columns.py b/tests/safeds/data/tabular/containers/_table/test_keep_only_columns.py
@@ -1,6 +1,6 @@
 import pytest
 from safeds.data.tabular.containers import Table
-from safeds.data.tabular.exceptions import UnknownColumnNameError
+from safeds.exceptions import UnknownColumnNameError
 
 
 @pytest.mark.parametrize(