nshtrainer 0.16.1__py3-none-any.whl → 0.17.1__py3-none-any.whl

nshtrainer/_checkpoint/metadata.py

@@ -10,6 +10,8 @@ import nshconfig as C
 import numpy as np
 import torch
 
+from ..util._environment_info import EnvironmentConfig
+
 if TYPE_CHECKING:
     from ..model import BaseConfig, LightningModuleBase
     from ..trainer.trainer import Trainer
@@ -36,13 +38,13 @@ class CheckpointMetadata(C.Config):
     global_step: int
     training_time: datetime.timedelta
     metrics: dict[str, Any]
-    environment: dict[str, Any]
+    environment: EnvironmentConfig
 
-    hparams: dict[str, Any] | None
+    hparams: Any
 
     @classmethod
     def from_file(cls, path: Path):
-        return cls.model_validate_json(path.read_text())
+        return cls.model_validate_json(path.read_text(encoding="utf-8"))
 
     @classmethod
     def from_ckpt_path(cls, checkpoint_path: Path):
@@ -89,8 +91,8 @@ def _generate_checkpoint_metadata(
         global_step=trainer.global_step,
         training_time=training_time,
         metrics=metrics,
-        environment=config.environment.model_dump(mode="json"),
-        hparams=config.model_dump(mode="json"),
+        environment=config.environment,
+        hparams=config.model_dump(),
     )
 
 
@@ -107,9 +109,9 @@ def _write_checkpoint_metadata(
 
     # Write the metadata to the checkpoint directory
     try:
-        metadata_path.write_text(metadata.model_dump_json(indent=4))
-    except Exception as e:
-        log.warning(f"Failed to write metadata to {checkpoint_path}: {e}")
+        metadata_path.write_text(metadata.model_dump_json(indent=4), encoding="utf-8")
+    except Exception:
+        log.exception(f"Failed to write metadata to {checkpoint_path}")
     else:
         log.debug(f"Checkpoint metadata written to {checkpoint_path}")
 
@@ -118,8 +120,8 @@ def _remove_checkpoint_metadata(checkpoint_path: Path):
     path = checkpoint_path.with_suffix(CheckpointMetadata.PATH_SUFFIX)
     try:
         path.unlink(missing_ok=True)
-    except Exception as e:
-        log.warning(f"Failed to remove {path}: {e}")
+    except Exception:
+        log.exception(f"Failed to remove {path}")
     else:
         log.debug(f"Removed {path}")
 
@@ -142,8 +144,8 @@ def _link_checkpoint_metadata(checkpoint_path: Path, linked_checkpoint_path: Pat
             # on Windows, special permissions are required to create symbolic links as a regular user
             # fall back to copying the file
             shutil.copy(path, linked_path)
-    except Exception as e:
-        log.warning(f"Failed to link {path} to {linked_path}: {e}")
+    except Exception:
+        log.exception(f"Failed to link {path} to {linked_path}")
     else:
         log.debug(f"Linked {path} to {linked_path}")
 

nshtrainer/util/_environment_info.py

@@ -429,12 +429,12 @@ class EnvironmentPackageConfig(C.Config):
                         version=clean_version,
                         path=Path(str(f)) if (f := dist.locate_file("")) else None,
                         summary=metadata["Summary"] if "Summary" in metadata else None,
-                        author=metadata["Author"] if "Summary" in metadata else None,
-                        license=metadata["License"] if "Summary" in metadata else None,
+                        author=metadata["Author"] if "Author" in metadata else None,
+                        license=metadata["License"] if "License" in metadata else None,
                         requires=requires,
                     )
-                except Exception as e:
-                    log.warning(f"Error processing package {dist.name}: {str(e)}")
+                except Exception:
+                    log.exception(f"Error processing package {dist.name}")
 
         except ImportError:
             log.warning(
@@ -672,8 +672,8 @@ class GitRepositoryConfig(C.Config):
             draft.is_dirty = repo.is_dirty()
         except git.InvalidGitRepositoryError:
             draft.is_git_repo = False
-        except Exception as e:
-            log.warning(f"Failed to get Git repository information: {e}")
+        except Exception:
+            log.exception("Failed to get Git repository information")
             draft.is_git_repo = None
 
         return draft.finalize()

{nshtrainer-0.16.1.dist-info → nshtrainer-0.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshtrainer
-Version: 0.16.1
+Version: 0.17.1
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com

{nshtrainer-0.16.1.dist-info → nshtrainer-0.17.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 nshtrainer/__init__.py,sha256=39loiLLXbaGiozEsAn8mPHopxaPsek8JsgR9DD2gxtY,583
 nshtrainer/_checkpoint/loader.py,sha256=myFObRsPdb8jBncMK73vjr5FDJIfKhF86Ec_kSjXtwg,13837
-nshtrainer/_checkpoint/metadata.py,sha256=z3gi_J_YDNNtBw1OZ08LBECkcoc9rIydnTKvFOOoG4c,5131
+nshtrainer/_checkpoint/metadata.py,sha256=FGVYqqHp5rCETcPfaoSZmGIPapE4kdYJCKSutTRERQI,5147
 nshtrainer/_checkpoint/saver.py,sha256=DkbCH0YeOJ71m32vAARiQdGBf0hvwwdoAV8LOFGy-0Y,1428
 nshtrainer/_experimental/__init__.py,sha256=pEXPyI184UuDHvfh4p9Kg9nQZQZI41e4_HvNd4BK-yg,81
 nshtrainer/callbacks/__init__.py,sha256=4qocBDzQbLLhhbIEfvbA3SQB_Dy9ZJH7keMwPay-ZS8,2359
@@ -77,13 +77,13 @@ nshtrainer/trainer/_runtime_callback.py,sha256=sd2cUdRJG-UCdQr9ruZvEYpNGNF1t2W2f
 nshtrainer/trainer/checkpoint_connector.py,sha256=F2tkHogbMAa5U7335sm77sZBkjEDa5v46XbJCH9Mg6c,2167
 nshtrainer/trainer/signal_connector.py,sha256=2EzkVktlasl8PgWAKNLDZRUMY__gRlDy1HdinAU-tfU,10740
 nshtrainer/trainer/trainer.py,sha256=jIqiNrq1I0f5pQP7lHshtgjCAYfpoWPoqwS74LHU9iM,17148
-nshtrainer/util/_environment_info.py,sha256=Nmhls6u5rtMWbeDLGCjEk58efUutc_ONSUg3fs59TSI,24210
+nshtrainer/util/_environment_info.py,sha256=gIdq9TJgzGCdcVzZxjHcwYasJ_HmEGVHbvE-KJVVtWs,24187
 nshtrainer/util/_useful_types.py,sha256=dwZokFkIe7M5i2GR3nQ9A1lhGw06DMAFfH5atyquqSA,8000
 nshtrainer/util/environment.py,sha256=AeW_kLl-N70wmb6L_JLz1wRj0kA70xs6RCmc9iUqczE,4159
 nshtrainer/util/seed.py,sha256=Or2wMPsnQxfnZ2xfBiyMcHFIUt3tGTNeMMyOEanCkqs,280
 nshtrainer/util/slurm.py,sha256=rofIU26z3SdL79SF45tNez6juou1cyDLz07oXEZb9Hg,1566
 nshtrainer/util/typed.py,sha256=NGuDkDzFlc1fAoaXjOFZVbmj0mRFjsQi1E_hPa7Bn5U,128
 nshtrainer/util/typing_utils.py,sha256=8ptjSSLZxlmy4FY6lzzkoGoF5fGNClo8-B_c0XHQaNU,385
-nshtrainer-0.16.1.dist-info/METADATA,sha256=SQ2uzBMs4f-pYgabVgI9EErqge_LtQ9-RTz2_mTskDU,885
-nshtrainer-0.16.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nshtrainer-0.16.1.dist-info/RECORD,,
+nshtrainer-0.17.1.dist-info/METADATA,sha256=yFOvBuWFb0naLc6p82HVodctRPi1AAzWIb3wwa5Vq-I,885
+nshtrainer-0.17.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nshtrainer-0.17.1.dist-info/RECORD,,