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

mloda_plugins/feature_group/experimental/geo_distance/base.py

@@ -6,16 +6,19 @@ from __future__ import annotations
 
 from typing import Any, Optional, Set, Union
 
-from mloda_core.abstract_plugins.abstract_feature_group import AbstractFeatureGroup
-from mloda_core.abstract_plugins.components.feature import Feature
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.components.options import Options
-from mloda_core.abstract_plugins.components.feature_chainer.feature_chain_parser import FeatureChainParser
+from mloda import FeatureGroup
+from mloda import Feature
+from mloda.user import FeatureName
+from mloda.provider import FeatureSet
+from mloda import Options
+from mloda.provider import FeatureChainParser
+from mloda.provider import (
+    FeatureChainParserMixin,
+)
 from mloda_plugins.feature_group.experimental.default_options_key import DefaultOptionKeys
 
 
-class GeoDistanceFeatureGroup(AbstractFeatureGroup):
+class GeoDistanceFeatureGroup(FeatureChainParserMixin, FeatureGroup):
     """
     Base class for all geo distance feature groups.
 
@@ -92,18 +95,23 @@ class GeoDistanceFeatureGroup(AbstractFeatureGroup):
     # Define the prefix pattern for this feature group
     PREFIX_PATTERN = r".*__([\w]+)_distance$"
 
+    # In-feature configuration for FeatureChainParserMixin
+    # Geo distance requires exactly 2 point features
+    MIN_IN_FEATURES = 2
+    MAX_IN_FEATURES = 2
+
     # Property mapping for configuration-based features with group/context separation
     PROPERTY_MAPPING = {
         DISTANCE_TYPE: {
             **DISTANCE_TYPES,
-            DefaultOptionKeys.mloda_context: True,
-            DefaultOptionKeys.mloda_strict_validation: True,
+            DefaultOptionKeys.context: True,
+            DefaultOptionKeys.strict_validation: True,
         },
         DefaultOptionKeys.in_features: {
             "explanation": "Source features (exactly 2 point features required)",
-            DefaultOptionKeys.mloda_context: True,
-            DefaultOptionKeys.mloda_strict_validation: True,
-            DefaultOptionKeys.mloda_validation_function: lambda x: (
+            DefaultOptionKeys.context: True,
+            DefaultOptionKeys.strict_validation: True,
+            DefaultOptionKeys.validation_function: lambda x: (
                 # Accept individual strings (when parser iterates over list elements)
                 isinstance(x, str)
                 or
@@ -174,23 +182,6 @@ class GeoDistanceFeatureGroup(AbstractFeatureGroup):
 
         return point_parts[0], point_parts[1]
 
-    @classmethod
-    def match_feature_group_criteria(
-        cls,
-        feature_name: Union[FeatureName, str],
-        options: Options,
-        data_access_collection: Optional[Any] = None,
-    ) -> bool:
-        """Check if feature name matches the expected pattern for geo distance features."""
-
-        # Use the unified parser with property mapping for full configuration support
-        return FeatureChainParser.match_configuration_feature_chain_parser(
-            feature_name,
-            options,
-            property_mapping=cls.PROPERTY_MAPPING,
-            prefix_patterns=[cls.PREFIX_PATTERN],
-        )
-
     @classmethod
     def _supports_distance_type(cls, distance_type: str) -> bool:
         """Check if this feature group supports the given distance type."""
@@ -237,27 +228,44 @@ class GeoDistanceFeatureGroup(AbstractFeatureGroup):
         Raises:
             ValueError: If parameters cannot be extracted
         """
+        # Use the mixin method to extract source features
+        source_features = cls._extract_source_features(feature)
+
+        # Extract distance type
+        distance_type = cls._extract_distance_unit(feature)
+
+        if distance_type is None or len(source_features) != 2:
+            raise ValueError(f"Could not extract geo distance parameters from: {feature.name}")
+
+        return distance_type, source_features[0], source_features[1]
+
+    @classmethod
+    def _extract_distance_unit(cls, feature: Feature) -> Optional[str]:
+        """
+        Extract distance unit (distance type) from a feature.
+
+        Tries string-based parsing first, falls back to configuration-based approach.
+
+        Args:
+            feature: The feature to extract distance unit from
+
+        Returns:
+            Distance unit/type (haversine, euclidean, manhattan) or None
+
+        Raises:
+            ValueError: If distance type is invalid
+        """
         # Try string-based parsing first
         feature_name_str = feature.name.name if hasattr(feature.name, "name") else str(feature.name)
 
         if FeatureChainParser.is_chained_feature(feature_name_str):
             distance_type = cls.get_distance_type(feature_name_str)
-            point1_feature, point2_feature = cls.get_point_features(feature_name_str)
-            return distance_type, point1_feature, point2_feature
+            return distance_type
 
         # Fall back to configuration-based approach
-        source_features = feature.options.get_in_features()
-        if len(source_features) != 2:
-            raise ValueError(
-                f"Expected exactly 2 source features for geo distance, got {len(source_features)}: {source_features}"
-            )
-
-        source_feature_names = [sf.get_name() for sf in source_features]
-        point1_feature, point2_feature = source_feature_names
-
         distance_type = feature.options.get(cls.DISTANCE_TYPE)
         if distance_type is None:
-            raise ValueError(f"Could not extract distance_type from feature: {feature.name}")
+            return None
 
         # Validate distance type
         if distance_type not in cls.DISTANCE_TYPES:
@@ -265,7 +273,7 @@ class GeoDistanceFeatureGroup(AbstractFeatureGroup):
                 f"Unsupported distance type: {distance_type}. Supported types: {', '.join(cls.DISTANCE_TYPES.keys())}"
             )
 
-        return distance_type, point1_feature, point2_feature
+        return str(distance_type)
 
     @classmethod
     def _check_point_features_exist(cls, data: Any, point1_feature: str, point2_feature: str) -> None:

mloda_plugins/feature_group/experimental/geo_distance/pandas.py

@@ -9,7 +9,7 @@ from typing import Any, Set, Type, Union
 
 import numpy as np
 
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
+from mloda import ComputeFramework
 
 from mloda_plugins.compute_framework.base_implementations.pandas.dataframe import PandasDataFrame
 from mloda_plugins.feature_group.experimental.geo_distance.base import GeoDistanceFeatureGroup
@@ -17,7 +17,7 @@ from mloda_plugins.feature_group.experimental.geo_distance.base import GeoDistan
 
 class PandasGeoDistanceFeatureGroup(GeoDistanceFeatureGroup):
     @classmethod
-    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFrameWork]]]:
+    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFramework]]]:
         """Specify that this feature group works with Pandas."""
         return {PandasDataFrame}
 

mloda_plugins/feature_group/experimental/llm/cli.py

@@ -1,7 +1,7 @@
 import argparse
 from typing import Any
-from mloda_core.abstract_plugins.plugin_loader.plugin_loader import PluginLoader
-from mloda_core.api.request import mlodaAPI
+from mloda.user import PluginLoader
+import mloda
 
 import logging
 
@@ -25,7 +25,7 @@ def print_results(feature_group: str, results: Any) -> None:
 
 
 def main() -> None:
-    parser = argparse.ArgumentParser(description="Run mlodaAPI.run_all() with a specified feature group.")
+    parser = argparse.ArgumentParser(description="Run mloda.run_all() with a specified feature group.")
     parser.add_argument("feature_group", help="The feature group to process.")
     args = parser.parse_args()
 
@@ -33,5 +33,5 @@ def main() -> None:
 
     feature_group = args.feature_group
 
-    results = mlodaAPI.run_all(features=[feature_group])
+    results = mloda.run_all(features=[feature_group])
     print_results(feature_group, results)

mloda_plugins/feature_group/experimental/llm/cli_features/refactor_git_cached.py

@@ -3,13 +3,13 @@ import os
 import re
 from typing import Any, List, Optional, Set, Type, Union
 
-from mloda_core.abstract_plugins.abstract_feature_group import AbstractFeatureGroup
-from mloda_core.abstract_plugins.components.feature import Feature
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.components.input_data.base_input_data import BaseInputData
-from mloda_core.abstract_plugins.components.input_data.creator.data_creator import DataCreator
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
-from mloda_core.api.request import mlodaAPI
+from mloda import FeatureGroup
+from mloda import Feature
+from mloda.provider import FeatureSet
+from mloda.provider import BaseInputData
+from mloda.provider import DataCreator
+from mloda import ComputeFramework
+import mloda
 from mloda_plugins.compute_framework.base_implementations.pandas.dataframe import PandasDataFrame
 from mloda_plugins.feature_group.experimental.llm.llm_api.claude import ClaudeRequestLoop
 from mloda_plugins.feature_group.experimental.llm.llm_api.gemini import GeminiRequestLoop
@@ -38,7 +38,7 @@ class RunRefactorGeminiRequestLoop(GeminiRequestLoop):
 
 class RunRefactorDiffCached:
     def __init__(self) -> None:
-        self.compute_frameworks: Set[Type[ComputeFrameWork]] = {PandasDataFrame}
+        self.compute_frameworks: Set[Type[ComputeFramework]] = {PandasDataFrame}
 
     def run(self) -> None:
         # check tests are passing
@@ -140,7 +140,7 @@ class RunRefactorDiffCached:
             },
         )
 
-        results = mlodaAPI.run_all(
+        results = mloda.run_all(
             [feature],
             compute_frameworks=self.compute_frameworks,
         )
@@ -206,7 +206,7 @@ class RunRefactorDiffCached:
             },
         )
 
-        results = mlodaAPI.run_all(
+        results = mloda.run_all(
             [feature],
             compute_frameworks=self.compute_frameworks,
         )
@@ -217,9 +217,9 @@ class RunRefactorDiffCached:
             return res
         raise ValueError("Wrong type of result")
 
-    def get_tool_output_by_feature_group_(self, tool_feature_group: Type[AbstractFeatureGroup]) -> str:
+    def get_tool_output_by_feature_group_(self, tool_feature_group: Type[FeatureGroup]) -> str:
         _feature_name = tool_feature_group.get_class_name()
-        results = mlodaAPI.run_all(
+        results = mloda.run_all(
             [_feature_name],
             compute_frameworks=self.compute_frameworks,
         )
@@ -232,7 +232,7 @@ class RunRefactorDiffCached:
     def run_tox_feature_group(self) -> None:
         print("Start tox")
         _feature_name = ToxFeatureGroup.get_class_name()
-        mlodaAPI.run_all(
+        mloda.run_all(
             [_feature_name],
             compute_frameworks=self.compute_frameworks,
         )
@@ -255,7 +255,7 @@ class RunRefactorDiffCached:
 
         target_folder = [
             os.getcwd() + "/mloda_plugins",
-            os.getcwd() + "/mloda_core",
+            os.getcwd() + "/mloda/core",
             os.getcwd() + "/tests/test_plugins",
         ]
 
@@ -274,7 +274,7 @@ class RunRefactorDiffCached:
             },
         )
 
-        results = mlodaAPI.run_all(
+        results = mloda.run_all(
             [feature],
             compute_frameworks=self.compute_frameworks,
         )
@@ -332,7 +332,7 @@ class RunRefactorDiffCached:
         return ",".join(sorted(list(relevant_files)))
 
 
-class RunToolFeatureGroup(AbstractFeatureGroup):
+class RunToolFeatureGroup(FeatureGroup):
     _tool: Type[BaseTool] | None = None
 
     @classmethod
@@ -340,7 +340,7 @@ class RunToolFeatureGroup(AbstractFeatureGroup):
         return DataCreator({cls.get_class_name()})
 
     @classmethod
-    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFrameWork]]]:
+    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFramework]]]:
         return {PandasDataFrame}
 
     @classmethod
@@ -370,9 +370,9 @@ class DiffFeatureGroup(RunToolFeatureGroup):
     _tool = GitDiffTool
 
 
-class ToxFeatureGroup(AbstractFeatureGroup):
+class ToxFeatureGroup(FeatureGroup):
     @classmethod
-    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFrameWork]]]:
+    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFramework]]]:
         return {PandasDataFrame}
 
     @classmethod

mloda_plugins/feature_group/experimental/llm/installed_packages_feature_group.py

@@ -2,14 +2,14 @@ import subprocess  # nosec
 import sys
 from typing import Any, Set, Type, Union
 
-from mloda_core.abstract_plugins.abstract_feature_group import AbstractFeatureGroup
+from mloda import FeatureGroup
 
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
+from mloda.provider import FeatureSet
+from mloda import ComputeFramework
 from mloda_plugins.compute_framework.base_implementations.pandas.dataframe import PandasDataFrame
 
 
-class InstalledPackagesFeatureGroup(AbstractFeatureGroup):
+class InstalledPackagesFeatureGroup(FeatureGroup):
     """
     Base class for retrieving installed Python packages in the current environment.
 
@@ -38,7 +38,7 @@ class InstalledPackagesFeatureGroup(AbstractFeatureGroup):
     ### Basic String-Based Creation
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
+    from mloda import Feature
 
     # Create the feature
     feature = Feature(name="InstalledPackagesFeatureGroup")
@@ -50,8 +50,8 @@ class InstalledPackagesFeatureGroup(AbstractFeatureGroup):
     ### Configuration-Based Creation
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
-    from mloda_core.abstract_plugins.components.options import Options
+    from mloda import Feature
+    from mloda import Options
 
     feature = Feature(
         name="placeholder",
@@ -111,5 +111,5 @@ class InstalledPackagesFeatureGroup(AbstractFeatureGroup):
             return {"error": error_message}
 
     @classmethod
-    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFrameWork]]]:
+    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFramework]]]:
         return {PandasDataFrame}

mloda_plugins/feature_group/experimental/llm/list_directory_feature_group.py

@@ -2,15 +2,15 @@ import os
 from typing import Any, Dict, List, Set, Type, Union
 import logging
 
-from mloda_core.abstract_plugins.abstract_feature_group import AbstractFeatureGroup
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
+from mloda import FeatureGroup
+from mloda.provider import FeatureSet
+from mloda import ComputeFramework
 from mloda_plugins.compute_framework.base_implementations.pandas.dataframe import PandasDataFrame
 
 logger = logging.getLogger(__name__)
 
 
-class ListDirectoryFeatureGroup(AbstractFeatureGroup):
+class ListDirectoryFeatureGroup(FeatureGroup):
     """
     A Feature Group that generates a string representation of a directory's file structure.
 
@@ -139,5 +139,5 @@ class ListDirectoryFeatureGroup(AbstractFeatureGroup):
         return "\n".join(lines)
 
     @classmethod
-    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFrameWork]]]:
+    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFramework]]]:
         return {PandasDataFrame}

mloda_plugins/feature_group/experimental/llm/llm_api/claude.py

@@ -5,7 +5,7 @@ import time
 from typing import Any, Dict, List, Tuple, Union
 
 
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
+from mloda.provider import FeatureSet
 
 from mloda_plugins.feature_group.experimental.llm.llm_api.llm_base_request import LLMBaseApi
 from mloda_plugins.feature_group.experimental.llm.llm_api.request_loop import RequestLoop
@@ -247,8 +247,8 @@ class ClaudeRequestLoop(RequestLoop):
     ### Basic Text Generation
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
-    from mloda_core.abstract_plugins.components.options import Options
+    from mloda import Feature
+    from mloda import Options
 
     feature = Feature(
         name="ClaudeRequestLoop",

mloda_plugins/feature_group/experimental/llm/llm_api/gemini.py

@@ -4,7 +4,7 @@ import time
 from typing import Any, Dict, List, Tuple
 
 
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
+from mloda.provider import FeatureSet
 
 from mloda_plugins.feature_group.experimental.llm.llm_api.llm_base_request import LLMBaseApi
 
@@ -219,8 +219,8 @@ class GeminiRequestLoop(RequestLoop):
     ### Basic Text Generation
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
-    from mloda_core.abstract_plugins.components.options import Options
+    from mloda import Feature
+    from mloda import Options
 
     feature = Feature(
         name="GeminiRequestLoop",

mloda_plugins/feature_group/experimental/llm/llm_api/llm_base_request.py

@@ -2,9 +2,9 @@ from abc import ABC
 from typing import Any, Dict, Set, Type, Union, List
 
 
-from mloda_core.abstract_plugins.abstract_feature_group import AbstractFeatureGroup
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.compute_frame_work import ComputeFrameWork
+from mloda import FeatureGroup
+from mloda.provider import FeatureSet
+from mloda import ComputeFramework
 from mloda_plugins.compute_framework.base_implementations.pandas.dataframe import PandasDataFrame
 from mloda_plugins.feature_group.experimental.llm.tools.tool_collection import ToolCollection
 from mloda_plugins.feature_group.experimental.llm.tools.tool_data_classes import PytestResult, ToolFunctionDeclaration
@@ -69,7 +69,7 @@ class LLMBaseApi(ABC):
         return return_tool_result
 
 
-class LLMBaseRequest(AbstractFeatureGroup):
+class LLMBaseRequest(FeatureGroup):
     model = "model"
     prompt = "prompt"
     temperature = "temperature"
@@ -127,5 +127,5 @@ class LLMBaseRequest(AbstractFeatureGroup):
         return f"{option_prompt}\nContext:\n{data_prompt} End Context\n "
 
     @classmethod
-    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFrameWork]]]:
+    def compute_framework_rule(cls) -> Union[bool, Set[Type[ComputeFramework]]]:
         return {PandasDataFrame}

mloda_plugins/feature_group/experimental/llm/llm_api/openai.py

@@ -6,7 +6,7 @@ import time
 from typing import Any, Dict, List, Tuple, Union
 
 
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
+from mloda.provider import FeatureSet
 from mloda_plugins.feature_group.experimental.llm.llm_api.llm_base_request import LLMBaseApi
 from mloda_plugins.feature_group.experimental.llm.llm_api.request_loop import RequestLoop
 from mloda_plugins.feature_group.experimental.llm.tools.tool_collection import ToolCollection
@@ -249,8 +249,8 @@ class OpenAIRequestLoop(RequestLoop):
     ### Basic Chat Completion
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
-    from mloda_core.abstract_plugins.components.options import Options
+    from mloda import Feature
+    from mloda import Options
 
     feature = Feature(
         name="OpenAIRequestLoop",

mloda_plugins/feature_group/experimental/llm/llm_api/request_loop.py

@@ -2,12 +2,12 @@ from copy import copy
 from typing import Any, Set, Tuple
 
 
-from mloda_core.abstract_plugins.components.feature import Feature
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.components.index.index import Index
-from mloda_core.abstract_plugins.components.link import JoinSpec, Link
-from mloda_core.abstract_plugins.components.options import Options
+from mloda import Feature
+from mloda.user import FeatureName
+from mloda.provider import FeatureSet
+from mloda.user import Index
+from mloda.user import JoinSpec, Link
+from mloda import Options
 
 from mloda_plugins.feature_group.experimental.llm.installed_packages_feature_group import InstalledPackagesFeatureGroup
 from mloda_plugins.feature_group.experimental.llm.list_directory_feature_group import ListDirectoryFeatureGroup

mloda_plugins/feature_group/experimental/llm/llm_file_selector.py

@@ -2,11 +2,11 @@ import logging
 import os
 from typing import Any, Optional, Set
 
-from mloda_core.abstract_plugins.abstract_feature_group import AbstractFeatureGroup
-from mloda_core.abstract_plugins.components.feature import Feature
-from mloda_core.abstract_plugins.components.feature_name import FeatureName
-from mloda_core.abstract_plugins.components.feature_set import FeatureSet
-from mloda_core.abstract_plugins.components.options import Options
+from mloda import FeatureGroup
+from mloda import Feature
+from mloda.user import FeatureName
+from mloda.provider import FeatureSet
+from mloda import Options
 from mloda_plugins.feature_group.experimental.llm.llm_api.gemini import GeminiRequestLoop
 from mloda_plugins.feature_group.input_data.read_context_files import ConcatenatedFileContent
 from mloda_plugins.feature_group.experimental.default_options_key import DefaultOptionKeys
@@ -14,7 +14,7 @@ from mloda_plugins.feature_group.experimental.default_options_key import Default
 logger = logging.getLogger(__name__)
 
 
-class LLMFileSelector(AbstractFeatureGroup):
+class LLMFileSelector(FeatureGroup):
     """
     Base class for using LLMs to intelligently select relevant files from directories.
 
@@ -60,8 +60,8 @@ class LLMFileSelector(AbstractFeatureGroup):
     ### 2. Configuration-Based Creation
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
-    from mloda_core.abstract_plugins.components.options import Options
+    from mloda import Feature
+    from mloda import Options
 
     feature = Feature(
         name="LLMFileSelector",
@@ -81,8 +81,8 @@ class LLMFileSelector(AbstractFeatureGroup):
     ### Finding Feature Implementation Files
 
     ```python
-    from mloda_core.abstract_plugins.components.feature import Feature
-    from mloda_core.abstract_plugins.components.options import Options
+    from mloda import Feature
+    from mloda import Options
 
     feature = Feature(
         name="LLMFileSelector",

mloda_plugins/feature_group/experimental/llm/tools/tool_collection.py

@@ -1,7 +1,7 @@
 from typing import Dict
 import logging
 
-from mloda_core.abstract_plugins.components.utils import get_all_subclasses
+from mloda.provider import get_all_subclasses
 from mloda_plugins.feature_group.experimental.llm.tools.base_tool import BaseTool
 from mloda_plugins.feature_group.experimental.llm.tools.tool_data_classes import ToolFunctionDeclaration