aipmodel 0.2.69__tar.gz → 0.2.71__tar.gz

{aipmodel-0.2.69 → aipmodel-0.2.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aipmodel
-Version: 0.2.69
+Version: 0.2.71
 Summary: SDK for model registration, versioning, and storage
 Home-page: https://github.com/AIP-MLOPS/model-registry
 Author: AIP MLOPS Team

{aipmodel-0.2.69 → aipmodel-0.2.71}/aipmodel/CephS3Manager.py

@@ -81,17 +81,32 @@ class CephS3Manager:
             print(f"[SDK_INFO] Bucket: {self.bucket_name}")
             print("[SDK_DEBUG] Creating S3 client...")
 
+        _cfg = {
+            "retries": {
+                "max_attempts": int(os.environ.get("S3_BOTO_MAX_ATTEMPTS", 10)),
+                "mode": "adaptive",
+            }
+        }
+        try:
+            # boto3 >= 1.36 defaults to CRC32 checksums, which MinIO/Ceph RGW
+            # reject on DeleteObjects ("MissingContentMD5"). "when_required"
+            # restores the classic Content-MD5 behavior those backends expect.
+            client_config = Config(
+                request_checksum_calculation="when_required",
+                response_checksum_validation="when_required",
+                **_cfg,
+            )
+        except TypeError:
+            # older botocore (< 1.36) doesn't know the checksum params — and
+            # doesn't need them (it already sends Content-MD5).
+            client_config = Config(**_cfg)
+
         self.s3 = boto3.client(
             "s3",
             endpoint_url=CEPH_ENDPOINT_URL,
             aws_access_key_id=CEPH_ADMIN_ACCESS_KEY,
             aws_secret_access_key=CEPH_ADMIN_SECRET_KEY,
-            config=Config(
-                retries={
-                    "max_attempts": int(os.environ.get("S3_BOTO_MAX_ATTEMPTS", 10)),
-                    "mode": "adaptive",
-                }
-            ),
+            config=client_config,
         )
         
         if self.verbose:
@@ -832,7 +847,18 @@ class CephS3Manager:
 
             for i in range(0, len(objs), 1000):
                 chunk = objs[i:i+1000]
-                self.s3.delete_objects(Bucket=self.bucket_name, Delete={"Objects": chunk})
+                try:
+                    self.s3.delete_objects(Bucket=self.bucket_name, Delete={"Objects": chunk})
+                except ClientError as e:
+                    # boto3 >= 1.36 sends CRC32 checksums that MinIO/Ceph RGW
+                    # reject on the batch API ("MissingContentMD5"). Fall back
+                    # to per-object deletes, which need no checksum header.
+                    if e.response.get("Error", {}).get("Code") != "MissingContentMD5":
+                        raise
+                    if self.verbose:
+                        print("[SDK_WARN] Batch delete rejected (MissingContentMD5); falling back to per-object deletes")
+                    for obj in chunk:
+                        self.s3.delete_object(Bucket=self.bucket_name, Key=obj["Key"])
             
             if self.verbose:
                 print("[SDK_SUCCESS] Folder deleted")

{aipmodel-0.2.69 → aipmodel-0.2.71}/aipmodel/__init__.py

@@ -11,5 +11,5 @@ if _os.environ.get("AIPMODEL_UPDATE_CHECK", "").lower() in ("1", "true", "yes"):
 
 __all__ = ["MLOpsManager", "CephS3Manager"]
 
-__version__ = "0.2.69"
+__version__ = "0.2.71"
 __description__ = "SDK for model registration, versioning, and storage"

{aipmodel-0.2.69 → aipmodel-0.2.71}/aipmodel/model_registry.py

@@ -1772,6 +1772,70 @@ class MLOpsManager:
             pass
         return None
 
+    def remove_missing_version(self, model_name, version):
+        """
+        Sync-repair for a ZOMBIE version: the registry references `version` but
+        its S3 files are gone (e.g. deleted by hand in Ceph). Removes the version
+        from the registry so registry and storage agree again. Refuses to run if
+        the files actually still exist (use delete_model for a real delete).
+        """
+        report = self.verify_model_integrity(model_name=model_name)
+        entry = next((v for v in report["versions"] if v["version"] == version), None)
+        if entry is None:
+            raise ModelNotFoundError(f"Version '{version}' not found for model '{model_name}'")
+        if entry["files_exist"]:
+            raise ValueError(
+                f"Files for version '{version}' of '{model_name}' still exist in storage — "
+                f"this is not a zombie. Use delete_model to actually delete it."
+            )
+        # delete_model is metadata-first and its S3 delete is a no-op for an
+        # already-empty prefix, so it is exactly the sync we need.
+        self.delete_model(model_name=model_name, version=version)
+        print(f"[SDK_SUCCESS] Synced: removed zombie version '{version}' of '{model_name}' from registry.")
+
+    def purge_orphan_folders(self, model_name=None, model_id=None):
+        """
+        Sync-repair for ORPHAN folders inside a registered model: S3 folders
+        under the model that no registry version references (leftovers from an
+        interrupted operation). Deletes those folders. Returns the list purged.
+        """
+        report = self.verify_model_integrity(model_name=model_name, model_id=model_id)
+        mid = report["model_id"]
+        data = self.models.get_by_id(mid)
+        is_public = self._extract_metadata_value(data.get("metadata", {}), "public", "false").lower() == "true"
+        mgr = self._get_ceph_manager(is_public)
+        purged = []
+        for folder in report["orphan_folders"]:
+            prefix = f"_models/{mid}/{folder}/"
+            try:
+                mgr.delete_folder(prefix)
+                purged.append(folder)
+            except Exception as e:
+                print(f"[SDK_WARN] Could not purge orphan folder {prefix}: {e}")
+        print(f"[SDK_SUCCESS] Purged {len(purged)} orphan folder(s) for model '{report['model_name']}'.")
+        return purged
+
+    def purge_orphan_model(self, model_id):
+        """
+        Sync-repair for an ORPHAN model: an S3 model folder the registry does
+        not know about (e.g. the registry entry was deleted while storage
+        survived). Deletes the whole `_models/{model_id}/` folder. Refuses to
+        run if the id IS known to the registry (that would be a real delete —
+        use delete_model).
+        """
+        registry_ids = {m.get("id") for m in (self.models.get_all(self.project_id) or [])}
+        if model_id in registry_ids:
+            raise ValueError(
+                f"Model id '{model_id}' exists in the registry — not an orphan. "
+                f"Use delete_model to delete a registered model."
+            )
+        mgr = self._get_ceph_manager(False)
+        base = f"_models/{model_id}/"
+        if not mgr.check_if_exists(base):
+            raise ModelNotFoundError(f"No storage folder found at {base}")
+        mgr.delete_folder(base)
+        print(f"[SDK_SUCCESS] Purged orphan storage folder {base}.")
+
     def recover_model_from_storage(self, model_id):
         """
         Rebuild a registry (Mlops-Core) entry for a model that exists in S3 but

{aipmodel-0.2.69 → aipmodel-0.2.71}/aipmodel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aipmodel
-Version: 0.2.69
+Version: 0.2.71
 Summary: SDK for model registration, versioning, and storage
 Home-page: https://github.com/AIP-MLOPS/model-registry
 Author: AIP MLOPS Team

{aipmodel-0.2.69 → aipmodel-0.2.71}/setup.py

@@ -31,7 +31,7 @@ version, description = read_meta()
 
 setup(
     name="aipmodel",
-    version="0.2.69",
+    version="0.2.71",
     description=description,
     author="AIP MLOPS Team",
     author_email="mohmmadweb@gmail.com",