kostyl-toolkit 0.1.11__tar.gz → 0.1.13__tar.gz

{kostyl_toolkit-0.1.11 → kostyl_toolkit-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kostyl-toolkit
-Version: 0.1.11
+Version: 0.1.13
 Summary: Kickass Orchestration System for Training, Yielding & Logging 
 Requires-Dist: case-converter>=1.2.0
 Requires-Dist: loguru>=0.7.3

{kostyl_toolkit-0.1.11 → kostyl_toolkit-0.1.13}/kostyl/ml/clearml/pulling_utils.py

@@ -1,9 +1,9 @@
 from pathlib import Path
+from typing import Any
 from typing import cast
 
 from clearml import InputModel
 from clearml import Task
-from transformers import Any
 from transformers import AutoModel
 from transformers import AutoTokenizer
 from transformers import PreTrainedModel

{kostyl_toolkit-0.1.11 → kostyl_toolkit-0.1.13}/kostyl/ml/configs/__init__.py

@@ -4,7 +4,6 @@ from .hyperparams import Lr
 from .hyperparams import Optimizer
 from .hyperparams import WeightDecay
 from .training_settings import CheckpointConfig
-from .training_settings import ClearMLTrainingSettings
 from .training_settings import DataConfig
 from .training_settings import DDPStrategyConfig
 from .training_settings import EarlyStoppingConfig
@@ -16,7 +15,6 @@ from .training_settings import TrainingSettings
 
 __all__ = [
     "CheckpointConfig",
-    "ClearMLTrainingSettings",
     "DDPStrategyConfig",
     "DataConfig",
     "EarlyStoppingConfig",

kostyl_toolkit-0.1.11/kostyl/ml/clearml/config_mixin.py → kostyl_toolkit-0.1.13/kostyl/ml/configs/base_model.py

@@ -1,29 +1,75 @@
 from pathlib import Path
+from typing import Self
 from typing import TypeVar
 
-import clearml
 from caseconverter import pascalcase
 from caseconverter import snakecase
+from clearml import Task
+from pydantic import BaseModel as PydanticBaseModel
 
-from kostyl.ml.configs.base_model import KostylBaseModel
 from kostyl.utils.dict_manipulations import convert_to_flat_dict
 from kostyl.utils.dict_manipulations import flattened_dict_to_nested
 from kostyl.utils.fs import load_config
 
 
-TModel = TypeVar("TModel", bound="KostylBaseModel")
+TConfig = TypeVar("TConfig", bound=PydanticBaseModel)
 
 
-class ClearMLConfigMixin:
-    """Pydantic mixin class providing ClearML configuration loading and syncing functionality."""
+class BaseModelWithConfigLoading(PydanticBaseModel):
+    """Pydantic class providing basic configuration loading functionality."""
+
+    @classmethod
+    def from_file(
+        cls: type[Self],  # pyright: ignore
+        path: str | Path,
+    ) -> Self:
+        """
+        Create an instance of the class from a configuration file.
+
+        Args:
+            cls_: The class type to instantiate.
+            path (str | Path): Path to the configuration file.
+
+        Returns:
+            An instance of the class created from the configuration file.
+
+        """
+        config = load_config(path)
+        instance = cls.model_validate(config)
+        return instance
+
+    @classmethod
+    def from_dict(
+        cls: type[Self],  # pyright: ignore
+        state_dict: dict,
+    ) -> Self:
+        """
+        Creates an instance from a dictionary.
+
+        Args:
+            cls_: The class type to instantiate.
+            state_dict (dict): A dictionary representing the state of the
+                class that must be validated and used for initialization.
+
+        Returns:
+            An initialized instance of the class based on the
+                provided state dictionary.
+
+        """
+        instance = cls.model_validate(state_dict)
+        return instance
+
+
+class BaseModelWithClearmlSyncing(BaseModelWithConfigLoading):
+    """Pydantic class providing ClearML configuration loading and syncing functionality."""
 
     @classmethod
     def connect_as_file(
-        cls: type[TModel],  # pyright: ignore
-        task: clearml.Task,
+        cls: type[Self],  # pyright: ignore
+        task: Task,
         path: str | Path,
         alias: str | None = None,
-    ) -> TModel:
+    ) -> Self:
         """
         Connects the configuration file to a ClearML task and creates an instance of the class from it.
 
@@ -58,11 +104,11 @@ class ClearMLConfigMixin:
 
     @classmethod
     def connect_as_dict(
-        cls: type[TModel],  # pyright: ignore
-        task: clearml.Task,
+        cls: type[Self],  # pyright: ignore
+        task: Task,
         path: str | Path,
         alias: str | None = None,
-    ) -> TModel:
+    ) -> Self:
         """
         Connects configuration from a file as a dictionary to a ClearML task and creates an instance of the class.
 
@@ -89,3 +135,9 @@ class ClearMLConfigMixin:
 
         model = cls.from_dict(state_dict=config)
         return model
+
+
+class KostylBaseModel(BaseModelWithClearmlSyncing):
+    """A Pydantic model class with basic configuration loading functionality."""
+
+    pass

{kostyl_toolkit-0.1.11 → kostyl_toolkit-0.1.13}/kostyl/ml/configs/hyperparams.py

@@ -2,9 +2,10 @@ from pydantic import BaseModel
 from pydantic import Field
 from pydantic import model_validator
 
-from kostyl.ml.clearml.config_mixin import ClearMLConfigMixin
 from kostyl.utils.logging import setup_logger
 
+from .base_model import KostylBaseModel
+
 
 logger = setup_logger(fmt="only_message")
 
@@ -74,7 +75,7 @@ class WeightDecay(BaseModel):
         return self
 
 
-class HyperparamsConfig(BaseModel, ClearMLConfigMixin):
+class HyperparamsConfig(KostylBaseModel):
     """Model training hyperparameters configuration."""
 
     grad_clip_val: float | None = Field(default=None, gt=0, validate_default=False)

{kostyl_toolkit-0.1.11 → kostyl_toolkit-0.1.13}/kostyl/ml/configs/training_settings.py

@@ -3,7 +3,6 @@ from typing import Literal
 from pydantic import BaseModel
 from pydantic import Field
 
-from kostyl.ml.clearml.config_mixin import ClearMLConfigMixin
 from kostyl.utils.logging import setup_logger
 
 from .base_model import KostylBaseModel
@@ -103,13 +102,3 @@ class TrainingSettings(KostylBaseModel):
     early_stopping: EarlyStoppingConfig | None = None
     checkpoint: CheckpointConfig
     data: DataConfig
-
-
-class ClearMLTrainingSettings(
-    TrainingSettings,
-    ClearMLConfigMixin,
-):
-    """Training parameters configuration with ClearML features support (config syncing, model identifiers tracking and etc)."""
-
-    model_id: str
-    tokenizer_id: str

{kostyl_toolkit-0.1.11 → kostyl_toolkit-0.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kostyl-toolkit"
-version = "0.1.11"
+version = "0.1.13"
 description = "Kickass Orchestration System for Training, Yielding & Logging "
 readme = "README.md"
 requires-python = ">=3.12"

kostyl_toolkit-0.1.11/kostyl/ml/configs/base_model.py

@@ -1,60 +0,0 @@
-from pathlib import Path
-from typing import TypeVar
-
-from pydantic import BaseModel as PydanticBaseModel
-
-from kostyl.utils.fs import load_config
-
-
-TConfig = TypeVar("TConfig", bound=PydanticBaseModel)
-
-
-class ConfigLoadingMixin:
-    """Pydantic mixin class providing basic configuration loading functionality."""
-
-    @classmethod
-    def from_file(
-        cls: type[TConfig],  # pyright: ignore
-        path: str | Path,
-    ) -> TConfig:
-        """
-        Create an instance of the class from a configuration file.
-
-        Args:
-            cls_: The class type to instantiate.
-            path (str | Path): Path to the configuration file.
-
-        Returns:
-            An instance of the class created from the configuration file.
-
-        """
-        config = load_config(path)
-        instance = cls.model_validate(config)
-        return instance
-
-    @classmethod
-    def from_dict(
-        cls: type[TConfig],  # pyright: ignore
-        state_dict: dict,
-    ) -> TConfig:
-        """
-        Creates an instance from a dictionary.
-
-        Args:
-            cls_: The class type to instantiate.
-            state_dict (dict): A dictionary representing the state of the
-                class that must be validated and used for initialization.
-
-        Returns:
-            An initialized instance of the class based on the
-                provided state dictionary.
-
-        """
-        instance = cls.model_validate(state_dict)
-        return instance
-
-
-class KostylBaseModel(PydanticBaseModel, ConfigLoadingMixin):
-    """A Pydantic model class with basic configuration loading functionality."""
-
-    pass