kostyl-toolkit 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

kostyl/ml_core/{configs/config_base.py → clearml/config_mixin.py}

@@ -2,80 +2,17 @@ from pathlib import Path
 from typing import TypeVar
 
 import clearml
-import yaml
 from caseconverter import pascalcase
 from caseconverter import snakecase
 from pydantic import BaseModel as PydanticBaseModel
 
-from kostyl.utils import convert_to_flat_dict
-from kostyl.utils import flattened_dict_to_nested
+from kostyl.ml_core.configs.base import ConfigLoadingMixin
+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
 
 
-def load_config(path: Path | str) -> dict:
-    """Load a configuration from file."""
-    if isinstance(path, str):
-        path = Path(path)
-
-    if not path.is_file():
-        raise ValueError(f"Config file {path} does not exist or is not a file.")
-
-    match path.suffix:
-        case ".yaml" | ".yml":
-            config = yaml.safe_load(path.open("r"))
-        case _:
-            raise ValueError(f"Unsupported config file format: {path.suffix}")
-    return 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
-
-
-TModel = TypeVar("TModel", bound="ClearMLBaseModel")
+TModel = TypeVar("TModel", bound="_ClearMLBaseModel")
 
 
 class ClearMLConfigMixin(ConfigLoadingMixin):
@@ -155,7 +92,7 @@ class ClearMLConfigMixin(ConfigLoadingMixin):
         return model
 
 
-class ClearMLBaseModel(PydanticBaseModel, ClearMLConfigMixin):
+class _ClearMLBaseModel(PydanticBaseModel, ClearMLConfigMixin):
     """A Pydantic model class with ClearML configuration loading and syncing functionality."""
 
     pass

kostyl/ml_core/configs/__init__.py

@@ -1,4 +1,4 @@
-from .config_base import ConfigLoadingMixin
+from .base import ConfigLoadingMixin
 from .hyperparams import HyperparamsConfig
 from .hyperparams import Lr
 from .hyperparams import Optimizer

kostyl/ml_core/configs/base.py

@@ -0,0 +1,54 @@
+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

kostyl/ml_core/configs/hyperparams.py

@@ -4,7 +4,7 @@ from pydantic import model_validator
 
 from kostyl.utils.logging import setup_logger
 
-from .config_base import ClearMLBaseModel
+from .base import ClearMLBaseModel
 
 
 logger = setup_logger(fmt="only_message")

kostyl/ml_core/configs/training_params.py

@@ -3,10 +3,10 @@ from typing import Literal
 from pydantic import BaseModel
 from pydantic import Field
 
+from kostyl.ml_core.clearml.config_mixin import ClearMLConfigMixin
 from kostyl.utils.logging import setup_logger
 
-from .config_base import ClearMLBaseModel
-from .config_base import ConfigLoadingMixin
+from .base import ConfigLoadingMixin
 
 
 logger = setup_logger(fmt="only_message")
@@ -101,8 +101,8 @@ class TrainingParams(BaseModel, ConfigLoadingMixin):
 
 
 class ClearMLTrainingParameters(
+    ClearMLConfigMixin,
     TrainingParams,
-    ClearMLBaseModel,
 ):
     """Training parameters configuration with ClearML features support (config syncing, model identifiers tracking and etc)."""
 

kostyl/utils/fs.py

@@ -0,0 +1,19 @@
+from pathlib import Path
+
+import yaml
+
+
+def load_config(path: Path | str) -> dict:
+    """Load a configuration from file."""
+    if isinstance(path, str):
+        path = Path(path)
+
+    if not path.is_file():
+        raise ValueError(f"Config file {path} does not exist or is not a file.")
+
+    match path.suffix:
+        case ".yaml" | ".yml":
+            config = yaml.safe_load(path.open("r"))
+        case _:
+            raise ValueError(f"Unsupported config file format: {path.suffix}")
+    return config

{kostyl_toolkit-0.1.3.dist-info → kostyl_toolkit-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kostyl-toolkit
-Version: 0.1.3
+Version: 0.1.4
 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.3.dist-info → kostyl_toolkit-0.1.4.dist-info}/RECORD

@@ -1,12 +1,13 @@
 kostyl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kostyl/ml_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kostyl/ml_core/clearml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kostyl/ml_core/clearml/config_mixin.py,sha256=a3YO8kocbiJMSRKcnEIYZlHe_-jvozIh0t_CFcBd1MU,3610
 kostyl/ml_core/clearml/logging_utils.py,sha256=GBjIIZbH_itd5sj7XpvxjkyZwxxGOpEcQ3BiWaJTyq8,1210
 kostyl/ml_core/clearml/pulling_utils.py,sha256=Yf70ux8dS0_ENdvfbNQkXOrDxwd4ed2GnRCmOR2ppEk,3252
-kostyl/ml_core/configs/__init__.py,sha256=RKSHp5J8eksqMxFu5xkpSxyswSpgKhrHLjltLS3yZXc,896
-kostyl/ml_core/configs/config_base.py,sha256=ctjedEKZbwByUr5HA-Ic0dVCPWPAIPL9kK8T0S-BOvk,5276
-kostyl/ml_core/configs/hyperparams.py,sha256=iKzuFOAL3xSVGjXlvRX_mbSBt0pqh6RQAxyHPmN-Bik,2974
-kostyl/ml_core/configs/training_params.py,sha256=a8ewftu_xDatlbJ6qk_87WkuRpdThBGYQA2fHbjb9RU,2598
+kostyl/ml_core/configs/__init__.py,sha256=AcLsl_aGnUuhEtNxfZWYbrKMfJrCAf47laPNeOKPfT4,889
+kostyl/ml_core/configs/base.py,sha256=4trY_fO_VnguNrwT0BgSSoxmnG8BS_z9mEsgX6DmaNU,1467
+kostyl/ml_core/configs/hyperparams.py,sha256=36sJKOy5PzEFYuEOtmLfjvLUqKYoJqidIs3D2AkxbYA,2967
+kostyl/ml_core/configs/training_params.py,sha256=vYZUcOPNQNGLoMD9_-RCO9t72D8z7AwUU5JumkncYBk,2618
 kostyl/ml_core/dist_utils.py,sha256=G8atjzkRbXZZiZh9rdEYBmeXqX26rJdDDovft2n6xiU,3201
 kostyl/ml_core/lightning/__init__.py,sha256=-F3JAyq8KU1d-nACWryGu8d1CbvWbQ1rXFdeRwfE2X8,175
 kostyl/ml_core/lightning/callbacks/__init__.py,sha256=Vd-rozY4T9Prr3IMqbliXxj6sC6y9XsovHQqRwzc2HI,297
@@ -27,7 +28,8 @@ kostyl/ml_core/schedulers/composite.py,sha256=ee4xlMDMMtjKPkbTF2ue9GTr9DuGCGjZWf
 kostyl/ml_core/schedulers/cosine.py,sha256=jufULVHn_L_ZZEc3ZTG3QCY_pc0jlAMH5Aw496T31jo,8203
 kostyl/utils/__init__.py,sha256=hkpmB6c5pr4Ti5BshOROebb7cvjDZfNCw83qZ_FFKMM,240
 kostyl/utils/dict_manipulations.py,sha256=e3vBicID74nYP8lHkVTQc4-IQwoJimrbFELy5uSF6Gk,1073
+kostyl/utils/fs.py,sha256=gAQNIU4R_2DhwjgzOS8BOMe0gZymtY1eZwmdgOdDgqo,510
 kostyl/utils/logging.py,sha256=3MvfDPArZhwakHu5nMlp_LpOsWg0E0SP26y41clsBtA,5232
-kostyl_toolkit-0.1.3.dist-info/WHEEL,sha256=YUH1mBqsx8Dh2cQG2rlcuRYUhJddG9iClegy4IgnHik,79
-kostyl_toolkit-0.1.3.dist-info/METADATA,sha256=ey3tBiOwKHe8qqlcd6n_yx0p-bmkfIw09OAXcSevOmI,4268
-kostyl_toolkit-0.1.3.dist-info/RECORD,,
+kostyl_toolkit-0.1.4.dist-info/WHEEL,sha256=YUH1mBqsx8Dh2cQG2rlcuRYUhJddG9iClegy4IgnHik,79
+kostyl_toolkit-0.1.4.dist-info/METADATA,sha256=z6AS38rjYUVQ8fLML3yHP8LBlpTTBg8OOqYDQFjqBg8,4268
+kostyl_toolkit-0.1.4.dist-info/RECORD,,