modelscope-hub 0.4.0__tar.gz → 0.4.2__tar.gz

{modelscope_hub-0.4.0/src/modelscope_hub.egg-info → modelscope_hub-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelscope-hub
-Version: 0.4.0
+Version: 0.4.2
 Summary: The official Python client to connect with ModelScope Hub.
 License: Apache-2.0
 Keywords: modelscope,hub,sdk,openapi,machine-learning

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2}/src/modelscope_hub/_upload.py

@@ -635,6 +635,42 @@ class UploadManager:
             revision=revision,
         )
 
+    # ------------------------------------------------------------------
+    # Public: delete_files
+    # ------------------------------------------------------------------
+    def delete_files(
+        self,
+        repo_id: str,
+        repo_type: str,
+        file_paths: list[str],
+        *,
+        commit_message: str = "Delete files",
+        revision: str = "master",
+    ) -> dict:
+        """Delete repository files through a commit operation.
+
+        The direct repository DELETE endpoints reject API-token authentication.
+        Commit ``delete`` actions use the same supported write path as uploads
+        and are applied atomically in a single commit.
+        """
+        paths = list(dict.fromkeys(path for path in file_paths if path))
+        if not paths:
+            raise InvalidParameter(
+                "file_paths must contain at least one non-empty path.")
+
+        self._commit_with_retry(
+            repo_id=repo_id,
+            repo_type=repo_type,
+            operations=self._build_delete_operations(paths),
+            commit_message=commit_message,
+            revision=revision,
+        )
+        return {
+            "deleted_files": paths,
+            "failed_files": [],
+            "total_files": len(paths),
+        }
+
     # ------------------------------------------------------------------
     # Public: upload_folder
     # ------------------------------------------------------------------

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2}/src/modelscope_hub/api.py

@@ -23,6 +23,7 @@ Design principles
 
 from __future__ import annotations
 
+import fnmatch
 import time
 from collections.abc import Iterable, Mapping
 from pathlib import Path
@@ -46,7 +47,6 @@ from .errors import (
     AuthenticationError,
     HubError,
     InvalidParameter,
-    NetworkError,
     NotExistError,
     NotSupportedError,
     PermissionDeniedError,
@@ -1670,17 +1670,18 @@ class HubApi:
         self,
         repo_id: str,
         repo_type: RepoTypeLike,
-        file_paths: Iterable[str],
+        file_paths: Iterable[str] | str | None = None,
         *,
+        delete_patterns: Iterable[str] | str | None = None,
         commit_message: str | None = None,
         revision: str | None = None,
     ) -> dict:
-        """Delete one or more files from a repository.
+        """Delete repository files selected by paths or glob patterns.
 
-        .. note::
-           File deletion is restricted by the server to cookie-based session
-           auth (interactive login). API tokens (``ms-...``) may receive a 401
-           "token no longer supports deletion operations" error.
+        The direct repository DELETE endpoints reject API-token authentication.
+        This method resolves optional glob patterns against the remote file list,
+        then sends commit ``delete`` actions through the same supported write
+        path as :meth:`upload_file` and :meth:`upload_folder`.
 
         Parameters
         ----------
@@ -1688,53 +1689,80 @@ class HubApi:
             Canonical ``owner/name`` identifier.
         repo_type : str or RepoType
             Repository type.
-        file_paths : iterable of str
-            Paths of files to remove. Empty entries are ignored.
+        file_paths : iterable of str or str, optional
+            Explicit repository-relative paths to remove.
+        delete_patterns : iterable of str or str, optional
+            Glob patterns matched against remote file paths. For example,
+            ``"*.json"`` matches JSON files at any repository depth.
         commit_message : str, optional
-            Unused (kept for API compatibility).
+            Message for the delete commit. Defaults to ``"Delete files"``.
         revision : str, optional
             Branch to delete from. Defaults to ``"master"``.
 
         Returns
         -------
         dict
-            Summary with ``deleted_files`` and ``failed_files`` lists.
-
-        Raises
-        ------
-        InvalidParameter
-            When ``file_paths`` resolves to an empty list.
-
-        Examples
-        --------
-        >>> api.delete_files(
-        ...     "alice/llama-7b",
-        ...     "model",
-        ...     ["old_weights.bin", "deprecated/config.json"],
-        ... )
+            Summary with ``deleted_files``, ``failed_files``, and ``total_files``.
+            A pattern with no remote matches returns an empty successful summary.
         """
         rt = self._normalize_repo_type(repo_type)
-        paths = [p for p in file_paths if p]
+        paths = self._normalize_delete_values(file_paths, "file_paths")
+        patterns = self._normalize_delete_values(
+            delete_patterns, "delete_patterns")
+        if not paths and not patterns:
+            raise InvalidParameter(
+                "Provide at least one file path or delete pattern.")
+
+        resolved_revision = revision or "master"
+        if patterns:
+            remote_paths = [
+                file.path
+                for file in self.list_repo_files(
+                    repo_id,
+                    rt,
+                    revision=resolved_revision,
+                    recursive=True,
+                )
+                if file.path and file.type != "tree"
+            ]
+            paths.extend(
+                path for path in remote_paths
+                if any(fnmatch.fnmatchcase(path, pattern)
+                       for pattern in patterns))
+
+        paths = list(dict.fromkeys(paths))
         if not paths:
-            raise InvalidParameter("file_paths must contain at least one non-empty path.")
+            return {
+                "deleted_files": [],
+                "failed_files": [],
+                "total_files": 0,
+            }
 
-        deleted, failed = [], []
-        for p in paths:
-            try:
-                self.legacy.delete_file(
-                    repo_id=repo_id,
-                    repo_type=str(rt),
-                    file_path=p,
-                    revision=revision or "master",
-                )
-                deleted.append(p)
-            except (AuthenticationError, NetworkError):
-                failed.append(p)
-                raise
-            except Exception:
-                failed.append(p)
+        return self.uploader.delete_files(
+            repo_id=repo_id,
+            repo_type=str(rt),
+            file_paths=paths,
+            commit_message=commit_message or "Delete files",
+            revision=resolved_revision,
+        )
 
-        return {"deleted_files": deleted, "failed_files": failed, "total_files": len(paths)}
+    @staticmethod
+    def _normalize_delete_values(
+        values: Iterable[str] | str | None,
+        parameter_name: str,
+    ) -> list[str]:
+        """Normalize a delete path or glob-pattern argument."""
+        if values is None:
+            return []
+        raw_values = [values] if isinstance(values, str) else list(values)
+        normalized: list[str] = []
+        for value in raw_values:
+            if not isinstance(value, str):
+                raise InvalidParameter(
+                    f"{parameter_name} must contain only strings.")
+            if value:
+                normalized.append(value)
+        return normalized
 
     # ==================================================================
     # Versioning

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2}/src/modelscope_hub/compat/hub_api.py

@@ -195,6 +195,36 @@ class LegacyHubApi:
             result = [f for f in result if f["Path"] == prefix or str(f["Path"]).startswith(prefix + "/")]
         return result
 
+    def delete_files(
+        self,
+        repo_id: str,
+        repo_type: str | RepoType = RepoType.MODEL,
+        delete_patterns: str | list[str] | None = None,
+        *,
+        file_paths: str | list[str] | None = None,
+        revision: str | None = DEFAULT_DATASET_REVISION,
+        commit_message: str | None = None,
+        endpoint: str | None = None,
+        token: str | None = None,
+    ) -> dict:
+        """Delete files selected by legacy glob patterns or explicit paths.
+
+        ``delete_patterns`` preserves the historical ``modelscope.hub.api``
+        contract. Patterns are resolved against the remote repository by the
+        modelscope-hub facade before it commits atomic delete actions.
+        """
+        api = self._api
+        if token or endpoint:
+            api = HubApi(endpoint=endpoint or self._endpoint, token=token)
+        return api.delete_files(
+            repo_id,
+            repo_type,
+            file_paths=file_paths,
+            delete_patterns=delete_patterns,
+            commit_message=commit_message,
+            revision=revision,
+        )
+
     def create_repo(
         self,
         repo_id: str,

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2}/src/modelscope_hub/version.py

@@ -1,3 +1,3 @@
 """Version information for modelscope_hub."""
 
-__version__ = "0.4.0"
+__version__ = "0.4.2"

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2/src/modelscope_hub.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelscope-hub
-Version: 0.4.0
+Version: 0.4.2
 Summary: The official Python client to connect with ModelScope Hub.
 License: Apache-2.0
 Keywords: modelscope,hub,sdk,openapi,machine-learning

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2}/src/modelscope_hub.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ src/modelscope_hub/utils/time_utils.py
 tests/test_agent_idp.py
 tests/test_agent_idp_keys.py
 tests/test_cache_verification.py
+tests/test_compat_delete_files.py
 tests/test_compat_get_model_files.py
 tests/test_compat_snapshot_download.py
 tests/test_compat_studio.py

modelscope_hub-0.4.2/tests/test_compat_delete_files.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+from unittest import mock
+
+from modelscope_hub.compat import LegacyHubApi
+from modelscope_hub.constants import RepoType
+
+
+def test_legacy_hub_api_preserves_delete_patterns_contract() -> None:
+    api = LegacyHubApi(endpoint="https://modelscope.cn", token="test-token")
+    expected = {
+        "deleted_files": ["config.json"],
+        "failed_files": [],
+        "total_files": 1,
+    }
+
+    with mock.patch.object(api._api, "delete_files", return_value=expected) as delete_files:
+        result = api.delete_files(
+            repo_id="owner/repo",
+            repo_type=RepoType.MODEL,
+            delete_patterns="*.json",
+            revision="main",
+            commit_message="Delete JSON files",
+        )
+
+    delete_files.assert_called_once_with(
+        "owner/repo",
+        RepoType.MODEL,
+        file_paths=None,
+        delete_patterns="*.json",
+        commit_message="Delete JSON files",
+        revision="main",
+    )
+    assert result == expected
+
+
+def test_legacy_hub_api_delete_files_supports_explicit_paths() -> None:
+    api = LegacyHubApi(token="test-token")
+
+    with mock.patch.object(api._api, "delete_files", return_value={}) as delete_files:
+        api.delete_files(
+            "owner/repo",
+            repo_type="dataset",
+            file_paths=["data/old.json"],
+        )
+
+    delete_files.assert_called_once_with(
+        "owner/repo",
+        "dataset",
+        file_paths=["data/old.json"],
+        delete_patterns=None,
+        commit_message=None,
+        revision="master",
+    )

{modelscope_hub-0.4.0 → modelscope_hub-0.4.2}/tests/test_upload_lfs_gate.py

@@ -4,11 +4,15 @@ import base64
 import hashlib
 import json
 from pathlib import Path
+from types import SimpleNamespace
 from unittest.mock import MagicMock
 
+import pytest
+
 import modelscope_hub._upload as upload_module
+from modelscope_hub import HubApi
 from modelscope_hub._upload import UploadManager
-from modelscope_hub.errors import NetworkError
+from modelscope_hub.errors import InvalidParameter, NetworkError
 
 
 def _make_manager() -> tuple[UploadManager, MagicMock]:
@@ -27,6 +31,142 @@ def _make_manager() -> tuple[UploadManager, MagicMock]:
     return UploadManager(client, MagicMock()), client
 
 
+@pytest.mark.parametrize("repo_type", ["model", "dataset"])
+def test_delete_files_commits_atomic_delete_actions(repo_type: str) -> None:
+    manager, client = _make_manager()
+
+    result = manager.delete_files(
+        repo_id="owner/repo",
+        repo_type=repo_type,
+        file_paths=["old.bin", "nested/deprecated.json", "old.bin"],
+        commit_message="Remove obsolete files",
+        revision="main",
+    )
+
+    client.create_commit.assert_called_once_with(
+        repo_id="owner/repo",
+        repo_type=repo_type,
+        operations=[
+            {
+                "action": "delete",
+                "path": "old.bin",
+                "type": "normal",
+                "size": 0,
+                "sha256": "",
+                "content": "",
+                "encoding": "",
+            },
+            {
+                "action": "delete",
+                "path": "nested/deprecated.json",
+                "type": "normal",
+                "size": 0,
+                "sha256": "",
+                "content": "",
+                "encoding": "",
+            },
+        ],
+        commit_message="Remove obsolete files",
+        revision="main",
+    )
+    assert result == {
+        "deleted_files": ["old.bin", "nested/deprecated.json"],
+        "failed_files": [],
+        "total_files": 2,
+    }
+
+
+def test_delete_files_rejects_empty_paths() -> None:
+    manager, client = _make_manager()
+
+    with pytest.raises(InvalidParameter, match="at least one"):
+        manager.delete_files(
+            repo_id="owner/repo", repo_type="model", file_paths=["", ""])
+
+    client.create_commit.assert_not_called()
+
+
+@pytest.mark.parametrize("repo_type", ["model", "dataset"])
+@pytest.mark.parametrize("file_paths", [["", "old.bin"], "old.bin"])
+def test_hub_api_delete_files_delegates_to_upload_manager(
+    repo_type: str, file_paths: list[str] | str
+) -> None:
+    api = HubApi(token="test-token")
+    api._uploader = MagicMock()
+    api._uploader.delete_files.return_value = {"deleted_files": ["old.bin"]}
+
+    result = api.delete_files(
+        "owner/repo",
+        repo_type,
+        file_paths,
+        commit_message="Remove obsolete files",
+        revision="main",
+    )
+
+    api._uploader.delete_files.assert_called_once_with(
+        repo_id="owner/repo",
+        repo_type=repo_type,
+        file_paths=["old.bin"],
+        commit_message="Remove obsolete files",
+        revision="main",
+    )
+    assert result == {"deleted_files": ["old.bin"]}
+
+
+@pytest.mark.parametrize("repo_type", ["model", "dataset"])
+def test_hub_api_delete_patterns_resolve_remote_paths(repo_type: str) -> None:
+    api = HubApi(token="test-token")
+    api._uploader = MagicMock()
+    api._uploader.delete_files.return_value = {
+        "deleted_files": ["config.json", "nested/metadata.json"],
+        "failed_files": [],
+        "total_files": 2,
+    }
+    api.list_repo_files = MagicMock(
+        return_value=[
+            SimpleNamespace(path="config.json", type="blob"),
+            SimpleNamespace(path="nested/metadata.json", type="blob"),
+            SimpleNamespace(path="weights.bin", type="blob"),
+            SimpleNamespace(path="nested", type="tree"),
+        ])
+
+    result = api.delete_files(
+        "owner/repo",
+        repo_type,
+        delete_patterns="*.json",
+        commit_message="Remove JSON files",
+        revision="main",
+    )
+
+    api.list_repo_files.assert_called_once_with(
+        "owner/repo", repo_type, revision="main", recursive=True)
+    api._uploader.delete_files.assert_called_once_with(
+        repo_id="owner/repo",
+        repo_type=repo_type,
+        file_paths=["config.json", "nested/metadata.json"],
+        commit_message="Remove JSON files",
+        revision="main",
+    )
+    assert result["total_files"] == 2
+
+
+def test_hub_api_delete_patterns_with_no_match_is_noop() -> None:
+    api = HubApi(token="test-token")
+    api._uploader = MagicMock()
+    api.list_repo_files = MagicMock(
+        return_value=[SimpleNamespace(path="weights.bin", type="blob")])
+
+    result = api.delete_files(
+        "owner/repo", "model", delete_patterns="*.json")
+
+    api._uploader.delete_files.assert_not_called()
+    assert result == {
+        "deleted_files": [],
+        "failed_files": [],
+        "total_files": 0,
+    }
+
+
 def test_upload_file_normal_commits_inline_without_blob_api() -> None:
     manager, client = _make_manager()