mloda 0.3.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

mloda_plugins/compute_framework/base_implementations/duckdb/duckdb_framework.py

@@ -1,10 +1,10 @@
 import logging
 from typing import Any, Set, Type, Optional
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.provider import BaseMergeEngine
 from mloda_plugins.compute_framework.base_implementations.duckdb.duckdb_merge_engine import DuckDBMergeEngine
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
-from mloda_core.filter.filter_engine import BaseFilterEngine
+from mloda.user import FeatureName
+from mloda import ComputeFramework
+from mloda.provider import BaseFilterEngine
 from mloda_plugins.compute_framework.base_implementations.duckdb.duckdb_filter_engine import DuckDBFilterEngine
 
 try:
@@ -15,8 +15,8 @@ except ImportError:
 logger = logging.getLogger(__name__)
 
 
-class DuckDBFramework(ComputeFrameWork):
-    """DuckDB framework implementation for ComputeFrameWork.
+class DuckDBFramework(ComputeFramework):
+    """DuckDB framework implementation for ComputeFramework.
 
     This framework does not support multiprocessing, so it should not be used with multiprocessing.
     """
@@ -43,11 +43,12 @@ class DuckDBFramework(ComputeFrameWork):
         except ImportError:
             return False
 
-    @staticmethod
-    def expected_data_framework() -> Any:
-        return DuckDBFramework.duckdb_relation()
+    @classmethod
+    def expected_data_framework(cls) -> Any:
+        return cls.duckdb_relation()
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         return DuckDBMergeEngine
 
     def select_data_by_column_names(self, data: Any, selected_feature_names: Set[FeatureName]) -> Any:
@@ -61,8 +62,8 @@ class DuckDBFramework(ComputeFrameWork):
     def set_column_names(self) -> None:
         self.column_names = set(self.data.columns)
 
-    @staticmethod
-    def duckdb_relation() -> Any:
+    @classmethod
+    def duckdb_relation(cls) -> Any:
         if duckdb is None:
             raise ImportError("DuckDB is not installed. To be able to use this framework, please install duckdb.")
         return duckdb.DuckDBPyRelation
@@ -117,5 +118,6 @@ class DuckDBFramework(ComputeFrameWork):
 
         raise ValueError(f"Data {type(data)} is not supported by {self.__class__.__name__}")
 
-    def filter_engine(self) -> Type[BaseFilterEngine]:
+    @classmethod
+    def filter_engine(cls) -> Type[BaseFilterEngine]:
         return DuckDBFilterEngine

mloda_plugins/compute_framework/base_implementations/duckdb/duckdb_merge_engine.py

@@ -1,8 +1,8 @@
 from typing import Any
 
-from mloda_core.abstract_plugins.components.index.index import Index
-from mloda_core.abstract_plugins.components.link import JoinType
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.user import Index
+from mloda.user import JoinType
+from mloda.provider import BaseMergeEngine
 
 try:
     import duckdb

mloda_plugins/compute_framework/base_implementations/duckdb/duckdb_pyarrow_transformer.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from mloda_core.abstract_plugins.components.framework_transformer.base_transformer import BaseTransformer
+from mloda.provider import BaseTransformer
 
 try:
     import duckdb

mloda_plugins/compute_framework/base_implementations/iceberg/iceberg_filter_engine.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional, Type
-from mloda_core.filter.filter_engine import BaseFilterEngine
-from mloda_core.filter.single_filter import SingleFilter
+from mloda.provider import BaseFilterEngine
+from mloda.user import SingleFilter
 
 try:
     from pyiceberg.table import Table as IcebergTable

mloda_plugins/compute_framework/base_implementations/iceberg/iceberg_framework.py

@@ -1,8 +1,8 @@
 from typing import Any, Set, Type, Optional
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
-from mloda_core.filter.filter_engine import BaseFilterEngine
+from mloda.provider import BaseMergeEngine
+from mloda.user import FeatureName
+from mloda import ComputeFramework
+from mloda.provider import BaseFilterEngine
 from mloda_plugins.compute_framework.base_implementations.iceberg.iceberg_filter_engine import IcebergFilterEngine
 
 try:
@@ -15,7 +15,7 @@ except ImportError:
     pa = None
 
 
-class IcebergFramework(ComputeFrameWork):
+class IcebergFramework(ComputeFramework):
     """
     Iceberg compute framework implementation.
 
@@ -60,17 +60,18 @@ class IcebergFramework(ComputeFrameWork):
         except ImportError:
             return False
 
-    @staticmethod
-    def expected_data_framework() -> Any:
+    @classmethod
+    def expected_data_framework(cls) -> Any:
         """Return the expected Iceberg table type."""
         if IcebergTable is None:
             raise ImportError("PyIceberg is not installed. To use this framework, please install pyiceberg.")
         return IcebergTable
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         """Iceberg tables don't support direct merging in this framework context."""
         raise NotImplementedError(
-            f"Merge functionality is not implemented for {self.__class__.__name__}. "
+            f"Merge functionality is not implemented for {cls.__name__}. "
             "Iceberg tables are typically used for data lake scenarios where merging "
             "is handled at the catalog/table/engine level, not at the compute framework level."
         )
@@ -163,6 +164,7 @@ class IcebergFramework(ComputeFrameWork):
 
         raise ValueError(f"Data type {type(self.data)} is not supported by {self.__class__.__name__}")
 
-    def filter_engine(self) -> Type[BaseFilterEngine]:
+    @classmethod
+    def filter_engine(cls) -> Type[BaseFilterEngine]:
         """Return the Iceberg filter engine."""
         return IcebergFilterEngine

mloda_plugins/compute_framework/base_implementations/iceberg/iceberg_pyarrow_transformer.py

@@ -1,5 +1,5 @@
 from typing import Any, Optional
-from mloda_core.abstract_plugins.components.framework_transformer.base_transformer import BaseTransformer
+from mloda.provider import BaseTransformer
 
 try:
     from pyiceberg.table import Table as IcebergTable

mloda_plugins/compute_framework/base_implementations/pandas/dataframe.py

@@ -1,9 +1,9 @@
 from typing import Any, Set, Type
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.provider import BaseMergeEngine
 from mloda_plugins.compute_framework.base_implementations.pandas.pandas_merge_engine import PandasMergeEngine
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
-from mloda_core.filter.filter_engine import BaseFilterEngine
+from mloda.user import FeatureName
+from mloda import ComputeFramework
+from mloda.provider import BaseFilterEngine
 from mloda_plugins.compute_framework.base_implementations.pandas.pandas_filter_engine import PandasFilterEngine
 
 try:
@@ -12,7 +12,7 @@ except ImportError:
     pd = None
 
 
-class PandasDataFrame(ComputeFrameWork):
+class PandasDataFrame(ComputeFramework):
     @staticmethod
     def is_available() -> bool:
         """Check if Pandas is installed and available."""
@@ -23,11 +23,12 @@ class PandasDataFrame(ComputeFrameWork):
         except ImportError:
             return False
 
-    @staticmethod
-    def expected_data_framework() -> Any:
-        return PandasDataFrame.pd_dataframe()
+    @classmethod
+    def expected_data_framework(cls) -> Any:
+        return cls.pd_dataframe()
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         return PandasMergeEngine
 
     def select_data_by_column_names(self, data: Any, selected_feature_names: Set[FeatureName]) -> Any:
@@ -38,20 +39,20 @@ class PandasDataFrame(ComputeFrameWork):
     def set_column_names(self) -> None:
         self.column_names = set(self.data.columns)
 
-    @staticmethod
-    def pd_dataframe() -> Any:
+    @classmethod
+    def pd_dataframe(cls) -> Any:
         if pd is None:
             raise ImportError("Pandas is not installed. To be able to use this framework, please install pandas.")
         return pd.DataFrame
 
-    @staticmethod
-    def pd_series() -> Any:
+    @classmethod
+    def pd_series(cls) -> Any:
         if pd is None:
             raise ImportError("Pandas is not installed. To be able to use this framework, please install pandas.")
         return pd.Series
 
-    @staticmethod
-    def pd_merge() -> Any:
+    @classmethod
+    def pd_merge(cls) -> Any:
         if pd is None:
             raise ImportError("Pandas is not installed. To be able to use this framework, please install pandas.")
         return pd.merge
@@ -83,5 +84,6 @@ class PandasDataFrame(ComputeFrameWork):
 
         raise ValueError(f"Data {type(data)} is not supported by {self.__class__.__name__}")
 
-    def filter_engine(self) -> Type[BaseFilterEngine]:
+    @classmethod
+    def filter_engine(cls) -> Type[BaseFilterEngine]:
         return PandasFilterEngine

mloda_plugins/compute_framework/base_implementations/pandas/pandas_filter_engine.py

@@ -1,6 +1,6 @@
 from typing import Any
-from mloda_core.filter.filter_engine import BaseFilterEngine
-from mloda_core.filter.single_filter import SingleFilter
+from mloda.provider import BaseFilterEngine
+from mloda.user import SingleFilter
 
 
 class PandasFilterEngine(BaseFilterEngine):
@@ -23,11 +23,19 @@ class PandasFilterEngine(BaseFilterEngine):
 
     @classmethod
     def do_min_filter(cls, data: Any, filter_feature: SingleFilter) -> Any:
-        return data[data[filter_feature.name] >= filter_feature.parameter]
+        value = filter_feature.parameter.value
+        if value is None:
+            raise ValueError(f"Filter parameter 'value' not found in {filter_feature.parameter}")
+        return data[data[filter_feature.name] >= value]
 
     @classmethod
     def do_max_filter(cls, data: Any, filter_feature: SingleFilter) -> Any:
-        if isinstance(filter_feature.parameter, tuple):
+        # Check if this is a complex parameter with max/max_exclusive or a simple one with value
+        has_max = filter_feature.parameter.max_value is not None
+        has_value = filter_feature.parameter.value is not None
+
+        if has_max:
+            # Complex parameter - use get_min_max_operator
             min_parameter, max_parameter, max_operator = cls.get_min_max_operator(filter_feature)
 
             if min_parameter is not None:
@@ -40,21 +48,36 @@ class PandasFilterEngine(BaseFilterEngine):
                     f"Filter parameter {filter_feature.parameter} is None although expected: {filter_feature.name}"
                 )
 
-            return (
-                data[data[filter_feature.name] < max_parameter]
-                if max_operator
-                else data[data[filter_feature.name] <= max_parameter]
-            )
-        return data[data[filter_feature.name] <= filter_feature.parameter]
+            if max_operator is True:
+                return data[data[filter_feature.name] < max_parameter]
+            else:
+                return data[data[filter_feature.name] <= max_parameter]
+        elif has_value:
+            # Simple parameter - extract the value
+            value = filter_feature.parameter.value
+            if value is None:
+                raise ValueError(f"Filter parameter 'value' not found in {filter_feature.parameter}")
+            return data[data[filter_feature.name] <= value]
+        else:
+            raise ValueError(f"No valid filter parameter found in {filter_feature.parameter}")
 
     @classmethod
     def do_equal_filter(cls, data: Any, filter_feature: SingleFilter) -> Any:
-        return data[data[filter_feature.name] == filter_feature.parameter]
+        value = filter_feature.parameter.value
+        if value is None:
+            raise ValueError(f"Filter parameter 'value' not found in {filter_feature.parameter}")
+        return data[data[filter_feature.name] == value]
 
     @classmethod
     def do_regex_filter(cls, data: Any, filter_feature: SingleFilter) -> Any:
-        return data[data[filter_feature.name].astype(str).str.match(filter_feature.parameter)]
+        value = filter_feature.parameter.value
+        if value is None:
+            raise ValueError(f"Filter parameter 'value' not found in {filter_feature.parameter}")
+        return data[data[filter_feature.name].astype(str).str.match(value)]
 
     @classmethod
     def do_categorical_inclusion_filter(cls, data: Any, filter_feature: SingleFilter) -> Any:
-        return data[data[filter_feature.name].isin(filter_feature.parameter)]
+        values = filter_feature.parameter.values
+        if values is None:
+            raise ValueError(f"Filter parameter 'values' not found in {filter_feature.parameter}")
+        return data[data[filter_feature.name].isin(values)]

mloda_plugins/compute_framework/base_implementations/pandas/pandas_merge_engine.py

@@ -1,8 +1,8 @@
 from typing import Any, Union
 
-from mloda_core.abstract_plugins.components.index.index import Index
-from mloda_core.abstract_plugins.components.link import JoinType
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.user import Index
+from mloda.user import JoinType
+from mloda.provider import BaseMergeEngine
 
 try:
     import pandas as pd
@@ -49,14 +49,14 @@ class PandasMergeEngine(BaseMergeEngine):
         left_data = self.pd_merge()(left_data, right_data, left_on=left_idx, right_on=right_idx, how=join_type)
         return left_data
 
-    @staticmethod
-    def pd_merge() -> Any:
+    @classmethod
+    def pd_merge(cls) -> Any:
         if pd is None:
             raise ImportError("Pandas is not installed. To be able to use this framework, please install pandas.")
         return pd.merge
 
-    @staticmethod
-    def pd_concat() -> Any:
+    @classmethod
+    def pd_concat(cls) -> Any:
         if pd is None:
             raise ImportError("Pandas is not installed. To be able to use this framework, please install pandas.")
         return pd.concat

mloda_plugins/compute_framework/base_implementations/pandas/pandaspyarrowtransformer.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from mloda_core.abstract_plugins.components.framework_transformer.base_transformer import BaseTransformer
+from mloda.provider import BaseTransformer
 
 try:
     import pandas as pd

mloda_plugins/compute_framework/base_implementations/polars/dataframe.py

@@ -1,9 +1,9 @@
 from typing import Any, Set, Type
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.provider import BaseMergeEngine
 from mloda_plugins.compute_framework.base_implementations.polars.polars_merge_engine import PolarsMergeEngine
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
-from mloda_core.filter.filter_engine import BaseFilterEngine
+from mloda.user import FeatureName
+from mloda import ComputeFramework
+from mloda.provider import BaseFilterEngine
 from mloda_plugins.compute_framework.base_implementations.polars.polars_filter_engine import PolarsFilterEngine
 
 try:
@@ -12,7 +12,7 @@ except ImportError:
     pl = None  # type: ignore[assignment]
 
 
-class PolarsDataFrame(ComputeFrameWork):
+class PolarsDataFrame(ComputeFramework):
     @staticmethod
     def is_available() -> bool:
         """Check if Polars is installed and available."""
@@ -23,11 +23,12 @@ class PolarsDataFrame(ComputeFrameWork):
         except ImportError:
             return False
 
-    @staticmethod
-    def expected_data_framework() -> Any:
-        return PolarsDataFrame.pl_dataframe()
+    @classmethod
+    def expected_data_framework(cls) -> Any:
+        return cls.pl_dataframe()
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         return PolarsMergeEngine
 
     def select_data_by_column_names(self, data: Any, selected_feature_names: Set[FeatureName]) -> Any:
@@ -38,14 +39,14 @@ class PolarsDataFrame(ComputeFrameWork):
     def set_column_names(self) -> None:
         self.column_names = set(self.data.columns)
 
-    @staticmethod
-    def pl_dataframe() -> Any:
+    @classmethod
+    def pl_dataframe(cls) -> Any:
         if pl is None:
             raise ImportError("Polars is not installed. To be able to use this framework, please install polars.")
         return pl.DataFrame
 
-    @staticmethod
-    def pl_series() -> Any:
+    @classmethod
+    def pl_series(cls) -> Any:
         if pl is None:
             raise ImportError("Polars is not installed. To be able to use this framework, please install polars.")
         return pl.Series
@@ -77,5 +78,6 @@ class PolarsDataFrame(ComputeFrameWork):
 
         raise ValueError(f"Data {type(data)} is not supported by {self.__class__.__name__}")
 
-    def filter_engine(self) -> Type[BaseFilterEngine]:
+    @classmethod
+    def filter_engine(cls) -> Type[BaseFilterEngine]:
         return PolarsFilterEngine

mloda_plugins/compute_framework/base_implementations/polars/lazy_dataframe.py

@@ -1,7 +1,7 @@
 from typing import Any, Set, Type
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
+from mloda.user import FeatureName
 from mloda_plugins.compute_framework.base_implementations.polars.dataframe import PolarsDataFrame
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.provider import BaseMergeEngine
 from mloda_plugins.compute_framework.base_implementations.polars.polars_lazy_merge_engine import PolarsLazyMergeEngine
 
 try:
@@ -18,11 +18,12 @@ class PolarsLazyDataFrame(PolarsDataFrame):
     requested, enabling query optimization and reduced memory usage for large datasets.
     """
 
-    @staticmethod
-    def expected_data_framework() -> Any:
-        return PolarsLazyDataFrame.pl_lazy_frame()
+    @classmethod
+    def expected_data_framework(cls) -> Any:
+        return cls.pl_lazy_frame()
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         return PolarsLazyMergeEngine
 
     def select_data_by_column_names(self, data: Any, selected_feature_names: Set[FeatureName]) -> Any:
@@ -39,20 +40,20 @@ class PolarsLazyDataFrame(PolarsDataFrame):
         else:
             raise ValueError("Data does not have a collect_schema method, cannot set column names.")
 
-    @staticmethod
-    def pl_lazy_frame() -> Any:
+    @classmethod
+    def pl_lazy_frame(cls) -> Any:
         if pl is None:
             raise ImportError("Polars is not installed. To be able to use this framework, please install polars.")
         return pl.LazyFrame
 
-    @staticmethod
-    def pl_dataframe() -> Any:
+    @classmethod
+    def pl_dataframe(cls) -> Any:
         if pl is None:
             raise ImportError("Polars is not installed. To be able to use this framework, please install polars.")
         return pl.DataFrame
 
-    @staticmethod
-    def pl_series() -> Any:
+    @classmethod
+    def pl_series(cls) -> Any:
         if pl is None:
             raise ImportError("Polars is not installed. To be able to use this framework, please install polars.")
         return pl.Series

mloda_plugins/compute_framework/base_implementations/polars/polars_filter_engine.py

@@ -1,6 +1,6 @@
 from typing import Any
-from mloda_core.filter.filter_engine import BaseFilterEngine
-from mloda_core.filter.single_filter import SingleFilter
+from mloda.provider import BaseFilterEngine
+from mloda.user import SingleFilter
 
 try:
     import polars as pl

mloda_plugins/compute_framework/base_implementations/polars/polars_lazy_pyarrow_transformer.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from mloda_core.abstract_plugins.components.framework_transformer.base_transformer import BaseTransformer
+from mloda.provider import BaseTransformer
 
 try:
     import polars as pl

mloda_plugins/compute_framework/base_implementations/polars/polars_merge_engine.py

@@ -1,8 +1,8 @@
 from typing import Any, Union
 
-from mloda_core.abstract_plugins.components.index.index import Index
-from mloda_core.abstract_plugins.components.link import JoinType
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.user import Index
+from mloda.user import JoinType
+from mloda.provider import BaseMergeEngine
 
 try:
     import polars as pl

mloda_plugins/compute_framework/base_implementations/polars/polars_pyarrow_transformer.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from mloda_core.abstract_plugins.components.framework_transformer.base_transformer import BaseTransformer
+from mloda.provider import BaseTransformer
 
 try:
     import polars as pl

mloda_plugins/compute_framework/base_implementations/pyarrow/pyarrow_filter_engine.py

@@ -2,8 +2,8 @@ from typing import Any
 import pyarrow as pa
 import pyarrow.compute as pc
 
-from mloda_core.filter.filter_engine import BaseFilterEngine
-from mloda_core.filter.single_filter import SingleFilter
+from mloda.provider import BaseFilterEngine
+from mloda.user import SingleFilter
 
 
 class PyArrowFilterEngine(BaseFilterEngine):

mloda_plugins/compute_framework/base_implementations/pyarrow/pyarrow_merge_engine.py

@@ -3,9 +3,9 @@ from typing import Any
 import pyarrow as pa
 import pyarrow.compute as pc
 
-from mloda_core.abstract_plugins.components.index.index import Index
-from mloda_core.abstract_plugins.components.link import JoinType
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.user import Index
+from mloda.user import JoinType
+from mloda.provider import BaseMergeEngine
 
 
 class PyArrowMergeEngine(BaseMergeEngine):

mloda_plugins/compute_framework/base_implementations/pyarrow/table.py

@@ -1,13 +1,13 @@
 from typing import Any, Optional, Set, Type
-from mloda_core.abstract_plugins.components.data_access_collection import DataAccessCollection
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
-from mloda_core.filter.filter_engine import BaseFilterEngine
+from mloda.user import DataAccessCollection
+from mloda.provider import BaseMergeEngine
+from mloda.provider import BaseFilterEngine
 from mloda_plugins.compute_framework.base_implementations.pyarrow.pyarrow_merge_engine import PyArrowMergeEngine
 from mloda_plugins.compute_framework.base_implementations.pyarrow.pyarrow_filter_engine import PyArrowFilterEngine
 import pyarrow as pa
 
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
+from mloda.user import FeatureName
+from mloda import ComputeFramework
 
 
 try:
@@ -16,7 +16,7 @@ except ImportError:
     pd = None
 
 
-class PyArrowTable(ComputeFrameWork):
+class PyArrowTable(ComputeFramework):
     @staticmethod
     def is_available() -> bool:
         """Check if PyArrow is installed and available."""
@@ -27,14 +27,16 @@ class PyArrowTable(ComputeFrameWork):
         except ImportError:
             return False
 
-    @staticmethod
-    def expected_data_framework() -> Any:
+    @classmethod
+    def expected_data_framework(cls) -> Any:
         return pa.Table
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         return PyArrowMergeEngine
 
-    def filter_engine(self) -> Type[BaseFilterEngine]:
+    @classmethod
+    def filter_engine(cls) -> Type[BaseFilterEngine]:
         return PyArrowFilterEngine
 
     def select_data_by_column_names(self, data: Any, selected_feature_names: Set[FeatureName]) -> Any:

mloda_plugins/compute_framework/base_implementations/python_dict/python_dict_filter_engine.py

@@ -1,7 +1,7 @@
 import re
 from typing import Any
-from mloda_core.filter.filter_engine import BaseFilterEngine
-from mloda_core.filter.single_filter import SingleFilter
+from mloda.provider import BaseFilterEngine
+from mloda.user import SingleFilter
 
 
 class PythonDictFilterEngine(BaseFilterEngine):

mloda_plugins/compute_framework/base_implementations/python_dict/python_dict_framework.py

@@ -1,17 +1,17 @@
 from typing import Any, Set, Type, List, Dict
-from mloda_core.abstract_plugins.components.merge.base_merge_engine import BaseMergeEngine
+from mloda.provider import BaseMergeEngine
 from mloda_plugins.compute_framework.base_implementations.python_dict.python_dict_merge_engine import (
     PythonDictMergeEngine,
 )
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
-from mloda_core.filter.filter_engine import BaseFilterEngine
+from mloda.user import FeatureName
+from mloda import ComputeFramework
+from mloda.provider import BaseFilterEngine
 from mloda_plugins.compute_framework.base_implementations.python_dict.python_dict_filter_engine import (
     PythonDictFilterEngine,
 )
 
 
-class PythonDictFramework(ComputeFrameWork):
+class PythonDictFramework(ComputeFramework):
     """
     PythonDict Compute Framework
 
@@ -29,11 +29,12 @@ class PythonDictFramework(ComputeFrameWork):
         ]
     """
 
-    @staticmethod
-    def expected_data_framework() -> Any:
+    @classmethod
+    def expected_data_framework(cls) -> Any:
         return list
 
-    def merge_engine(self) -> Type[BaseMergeEngine]:
+    @classmethod
+    def merge_engine(cls) -> Type[BaseMergeEngine]:
         return PythonDictMergeEngine
 
     def select_data_by_column_names(
@@ -118,7 +119,8 @@ class PythonDictFramework(ComputeFrameWork):
 
         raise ValueError(f"Data type {type(data)} is not supported by {self.__class__.__name__}")
 
-    def filter_engine(self) -> Type[BaseFilterEngine]:
+    @classmethod
+    def filter_engine(cls) -> Type[BaseFilterEngine]:
         """
         Returns the filter engine for PythonDict framework.