kostyl-toolkit 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

kostyl/ml/clearml/pulling_utils.py

@@ -15,7 +15,10 @@ from kostyl.ml.lightning.extenstions.pretrained_model import (
 
 
 def get_tokenizer_from_clearml(
-    model_id: str, task: Task | None = None, ignore_remote_overrides: bool = True
+    model_id: str,
+    task: Task | None = None,
+    ignore_remote_overrides: bool = True,
+    name: str | None = None,
 ) -> PreTrainedTokenizerBase:
     """
     Retrieve a Hugging Face tokenizer stored in a ClearML.
@@ -26,6 +29,8 @@ def get_tokenizer_from_clearml(
             the model. Defaults to None.
         ignore_remote_overrides (bool, optional): Whether to ignore remote hyperparameter
             overrides when connecting the ClearML task. Defaults to True.
+        name: The model name to be stored on the Task
+            (default to filename of the model weights, without the file extension, or to Input Model if that is not found)
 
     Returns:
         PreTrainedTokenizerBase: The instantiated tokenizer loaded from the local copy
@@ -34,7 +39,9 @@ def get_tokenizer_from_clearml(
     """
     clearml_tokenizer = InputModel(model_id=model_id)
     if task is not None:
-        clearml_tokenizer.connect(task, ignore_remote_overrides=ignore_remote_overrides)
+        clearml_tokenizer.connect(
+            task, ignore_remote_overrides=ignore_remote_overrides, name=name
+        )
 
     tokenizer = AutoTokenizer.from_pretrained(
         clearml_tokenizer.get_local_copy(raise_on_error=True)
@@ -49,6 +56,7 @@ def get_model_from_clearml[
     model: type[TModel],
     task: Task | None = None,
     ignore_remote_overrides: bool = True,
+    name: str | None = None,
     **kwargs: Any,
 ) -> TModel:
     """
@@ -59,8 +67,11 @@ def get_model_from_clearml[
         model: The model class that implements either PreTrainedModel or LightningCheckpointLoaderMixin.
         task: Optional ClearML task used to resolve the input model reference. If provided, the input model
             will be connected to this task, with remote overrides optionally ignored.
-        ignore_remote_overrides: When connecting the input model to the provided task, determines whether
+        ignore_remote_overrides: When connecting the input model to the provided task,
+        determines whether
             remote configuration overrides should be ignored.
+        name: The model name to be stored on the Task
+            (default to filename of the model weights, without the file extension, or to Input Model if that is not found)
         **kwargs: Additional keyword arguments to pass to the model loading method.
 
     Returns:
@@ -70,7 +81,11 @@ def get_model_from_clearml[
     input_model = InputModel(model_id=model_id)
 
     if task is not None:
-        input_model.connect(task, ignore_remote_overrides=ignore_remote_overrides)
+        input_model.connect(
+            task,
+            ignore_remote_overrides=ignore_remote_overrides,
+            name=name,
+        )
 
     local_path = Path(input_model.get_local_copy(raise_on_error=True))
 

kostyl/ml/configs/training_settings.py

@@ -100,5 +100,5 @@ class TrainingSettings(KostylBaseModel):
 
     trainer: LightningTrainerParameters
     early_stopping: EarlyStoppingConfig | None = None
-    checkpoint: CheckpointConfig
+    checkpoint: CheckpointConfig = CheckpointConfig()
     data: DataConfig

kostyl/ml/lightning/callbacks/registry_uploading.py

@@ -78,49 +78,41 @@ class ClearMLRegistryUploaderCallback(Callback):
         )
         return output_model
 
-    @override
-    def on_validation_epoch_end(
-        self, trainer: Trainer, pl_module: KostylLightningModule
-    ) -> None:
-        if (not trainer.is_global_zero) or (
-            self.uploading_frequency != "after-every-eval"
-        ):
-            return
+    def _upload_best_checkpoint(self, pl_module: KostylLightningModule) -> None:
         if self._output_model is None:
             self._output_model = self._create_output_model(pl_module)
 
-        if self.ckpt_callback.best_model_path != self._last_best_model_path:
+        if self.ckpt_callback.best_model_path == self._last_best_model_path:
+            if self.verbose and (self._last_best_model_path != ""):
+                logger.info("Best model unchanged since last upload")
+            elif self.verbose:
+                logger.info("No best model found yet to upload")
+        else:
             if self.verbose:
-                logger.info(f"Best model path: {self.ckpt_callback.best_model_path}")
+                logger.info(
+                    f"Uploading best model from {self.ckpt_callback.best_model_path}"
+                )
             self._output_model.update_weights(
                 self.ckpt_callback.best_model_path,
                 auto_delete_file=False,
-                async_enable=True,
+                async_enable=False,
             )
-            self._last_best_model_path = self.ckpt_callback.best_model_path
-        elif self.verbose:
-            logger.info("Best model path: unchanged since last upload, skipping...")
+        return
+
+    @override
+    def on_validation_epoch_end(
+        self, trainer: Trainer, pl_module: KostylLightningModule
+    ) -> None:
+        if (not trainer.is_global_zero) or (
+            self.uploading_frequency != "after-every-eval"
+        ):
+            return
+        self._upload_best_checkpoint(pl_module)
         return
 
     @override
     def on_train_end(self, trainer: Trainer, pl_module: KostylLightningModule) -> None:
         if not trainer.is_global_zero:
             return
-        if self._output_model is None:
-            self._output_model = self._create_output_model(pl_module)
-
-        if self.ckpt_callback.best_model_path != self._last_best_model_path:
-            if self.verbose:
-                logger.info(
-                    f"Best model path at the end of training: {self.ckpt_callback.best_model_path}"
-                )
-            self._output_model.update_weights(
-                self.ckpt_callback.best_model_path,
-                auto_delete_file=False,
-                async_enable=False,
-            )
-        elif self.verbose:
-            logger.info(
-                "Best model path at the end of training: unchanged since last upload, skipping..."
-            )
+        self._upload_best_checkpoint(pl_module)
         return

{kostyl_toolkit-0.1.14.dist-info → kostyl_toolkit-0.1.16.dist-info}/METADATA

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

@@ -3,17 +3,17 @@ kostyl/ml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kostyl/ml/clearml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kostyl/ml/clearml/dataset_utils.py,sha256=eij_sr2KDhm8GxEbVbK8aBjPsuVvLl9-PIGGaKVgXLA,1729
 kostyl/ml/clearml/logging_utils.py,sha256=GBjIIZbH_itd5sj7XpvxjkyZwxxGOpEcQ3BiWaJTyq8,1210
-kostyl/ml/clearml/pulling_utils.py,sha256=-9EIMUu3daWLj99s_G5rJ_omykz1nPLqxBzBJ8Am8aU,3520
+kostyl/ml/clearml/pulling_utils.py,sha256=zw3HuBdBc6F3VpQ3StaHGUurl9Hqy5cAcjCWqzo7r6I,4040
 kostyl/ml/configs/__init__.py,sha256=IetcivbqYGutowLqxdKp7QR4tkXKBr4m8t4Zkk9jHZU,911
 kostyl/ml/configs/base_model.py,sha256=Eofn14J9RsjpVx_J4rp6C19pDDCANU4hr3JtX-d0FpQ,4820
 kostyl/ml/configs/hyperparams.py,sha256=CaVNEvpW4LvlHhLsbe2FockIGI1mJufCqjH298nYgKE,2971
-kostyl/ml/configs/training_settings.py,sha256=CZBwVVmkpCUtXCnfC1RFGQGUemht5xbOI43rgg7cNeg,2535
+kostyl/ml/configs/training_settings.py,sha256=0cyKF6EuTv6KgXC1g0Oy9zbwnMkDP4uXTJJO1TRQ0aY,2556
 kostyl/ml/dist_utils.py,sha256=G8atjzkRbXZZiZh9rdEYBmeXqX26rJdDDovft2n6xiU,3201
 kostyl/ml/lightning/__init__.py,sha256=-F3JAyq8KU1d-nACWryGu8d1CbvWbQ1rXFdeRwfE2X8,175
 kostyl/ml/lightning/callbacks/__init__.py,sha256=Vd-rozY4T9Prr3IMqbliXxj6sC6y9XsovHQqRwzc2HI,297
 kostyl/ml/lightning/callbacks/checkpoint.py,sha256=FooGeeUz6TtoXQglpcK16NWAmSX3fbu6wntRtK3a_Io,1936
 kostyl/ml/lightning/callbacks/early_stopping.py,sha256=D5nyjktCJ9XYAf28-kgXG8jORvXLl1N3nbDQnvValPM,615
-kostyl/ml/lightning/callbacks/registry_uploading.py,sha256=um-fHQUp-TSD_76rVZoNV2IMi05RFjKajGvMV7SAb6s,4691
+kostyl/ml/lightning/callbacks/registry_uploading.py,sha256=AAohqTGigWMGLHt-yITAznIVsaDVXR_jisLDzFNzlu8,4275
 kostyl/ml/lightning/extenstions/__init__.py,sha256=OY6QGv1agYgqqKf1xJBrxgp_i8FunVfPzYezfaRrGXU,182
 kostyl/ml/lightning/extenstions/custom_module.py,sha256=nB5jW7cqRD1tyh-q5LD2EtiFQwFkLXpnS9Yu6c5xMRg,5987
 kostyl/ml/lightning/extenstions/pretrained_model.py,sha256=ZOKtrVl095cwvI43wAz-Xdzu4l0v0lHH2mfh4WXwxKQ,5059
@@ -30,6 +30,6 @@ 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.14.dist-info/WHEEL,sha256=3id4o64OvRm9dUknh3mMJNcfoTRK08ua5cU6DFyVy-4,79
-kostyl_toolkit-0.1.14.dist-info/METADATA,sha256=lOiHm_Bd3uf2eHv7unCgagPABhJUF793ZO3FtX5PWNc,4269
-kostyl_toolkit-0.1.14.dist-info/RECORD,,
+kostyl_toolkit-0.1.16.dist-info/WHEEL,sha256=3id4o64OvRm9dUknh3mMJNcfoTRK08ua5cU6DFyVy-4,79
+kostyl_toolkit-0.1.16.dist-info/METADATA,sha256=4KfwL5yViKVIG1ezvaCifG3Soo7PcdS6kYUD_Yl6ZSY,4269
+kostyl_toolkit-0.1.16.dist-info/RECORD,,