irepo-artifact 0.2.3.dev0__tar.gz → 0.2.4.dev0__tar.gz

{irepo_artifact-0.2.3.dev0/src/irepo_artifact.egg-info → irepo_artifact-0.2.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irepo-artifact
-Version: 0.2.3.dev0
+Version: 0.2.4.dev0
 Summary: Standalone HTTP artifact downloads
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -11,10 +11,10 @@ Python 3.10+ 的独立产物下载包。通过 AP 获取链接后 HTTP 下载，
 `instance-repo`、`ap-client`、`oss2` 或 STS。完整 SDK 与未来的 ap-client
 均可单向依赖此包。
 
-安装发布版本：
+发布后安装：
 
 ```bash
-python -m pip install 'irepo-artifact==0.2.3.dev0'
+python -m pip install 'irepo-artifact==0.2.4.dev0'
 ```
 
 源码开发安装：
@@ -65,8 +65,9 @@ group = client.download_group("group-a", output_dir="group-out")
 
 ## 传输与输出
 
-完整包先请求 `download_mode=oss`。取得 OSS 链接后探测内网端点；不可达时另行请求
-`download_mode=proxy`，可达时使用 OSS。OSS 实际下载发生远端故障时，为该 Job
+完整包先请求 `download_mode=oss`。OSS 链接签发返回 502/503 时按需请求
+`download_mode=proxy`；取得 OSS 链接后探测内网端点，不可达时也请求 proxy，
+可达时使用 OSS。OSS 实际下载发生远端故障时，为该 Job
 另行请求 proxy 链接并从头下载。单 Job 与批量下载使用相同策略。
 未返回 `downloads`（或为 null/空对象）时使用旧版单 `url`，也支持 dataplane 地址。
 单 URL 仅在 hostname 匹配标准 OSS 域名时标记 `channel='oss'`；其余返回

{irepo_artifact-0.2.3.dev0 → irepo_artifact-0.2.4.dev0}/README.md

@@ -4,10 +4,10 @@ Python 3.10+ 的独立产物下载包。通过 AP 获取链接后 HTTP 下载，
 `instance-repo`、`ap-client`、`oss2` 或 STS。完整 SDK 与未来的 ap-client
 均可单向依赖此包。
 
-安装发布版本：
+发布后安装：
 
 ```bash
-python -m pip install 'irepo-artifact==0.2.3.dev0'
+python -m pip install 'irepo-artifact==0.2.4.dev0'
 ```
 
 源码开发安装：
@@ -58,8 +58,9 @@ group = client.download_group("group-a", output_dir="group-out")
 
 ## 传输与输出
 
-完整包先请求 `download_mode=oss`。取得 OSS 链接后探测内网端点；不可达时另行请求
-`download_mode=proxy`，可达时使用 OSS。OSS 实际下载发生远端故障时，为该 Job
+完整包先请求 `download_mode=oss`。OSS 链接签发返回 502/503 时按需请求
+`download_mode=proxy`；取得 OSS 链接后探测内网端点，不可达时也请求 proxy，
+可达时使用 OSS。OSS 实际下载发生远端故障时，为该 Job
 另行请求 proxy 链接并从头下载。单 Job 与批量下载使用相同策略。
 未返回 `downloads`（或为 null/空对象）时使用旧版单 `url`，也支持 dataplane 地址。
 单 URL 仅在 hostname 匹配标准 OSS 域名时标记 `channel='oss'`；其余返回

{irepo_artifact-0.2.3.dev0 → irepo_artifact-0.2.4.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "irepo-artifact"
-version = "0.2.3.dev0"
+version = "0.2.4.dev0"
 description = "Standalone HTTP artifact downloads"
 readme = "README.md"
 requires-python = ">=3.10"

{irepo_artifact-0.2.3.dev0 → irepo_artifact-0.2.4.dev0}/src/irepo_artifact/client.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from copy import deepcopy
 import time
 
-from .api import APAPI, validate_id
+from .api import APAPI, _APStatus, validate_id
 from .download import download_archive, download_with_refresh
 from .errors import (ArtifactError, ArtifactNotFound, ConfigurationError,
                      DownloadError, HTTPStatusError, NoMatchingFiles)
@@ -37,6 +37,19 @@ def _deadline(targets):
     return time.monotonic() + max(0, expiry - min(30, max(1, expiry * 0.1)))
 
 
+def _archive_targets(api, job_ids, mode, metadata, *, tolerate_errors=False):
+    try:
+        targets = api.get_archive_targets(
+            job_ids, mode=mode, metadata=metadata, tolerate_errors=tolerate_errors)
+        return targets, mode
+    except _APStatus as exc:
+        if mode != 'oss' or exc.status not in (502, 503):
+            raise
+    targets = api.get_archive_targets(
+        job_ids, mode='proxy', metadata=metadata, tolerate_errors=tolerate_errors)
+    return targets, 'proxy'
+
+
 class ArtifactClient:
     """Download AP artifacts without a parent SDK or storage client.
 
@@ -89,7 +102,8 @@ class ArtifactClient:
             elif targets is None:
                 raw = {}
                 try:
-                    targets = self._api.get_archive_targets([job_id], mode=link_mode, metadata=raw)[job_id]
+                    signed, link_mode = _archive_targets(self._api, [job_id], link_mode, raw)
+                    targets = signed[job_id]
                 finally:
                     metadata['artifacts_response'] = raw.get(job_id)
             output = JobOutput(job_dir, overwrite,
@@ -102,10 +116,11 @@ class ArtifactClient:
                 if 'proxy' in targets and 'oss' not in targets:
                     link_mode = 'proxy'
                 refreshed_metadata = {}
-                def refresh():
+                def refresh(channel):
                     raw = {}
                     try:
-                        renewed = self._api.get_archive_targets([job_id], mode=link_mode, metadata=raw)[job_id]
+                        mode = channel if channel in ('oss', 'proxy') else link_mode
+                        renewed = self._api.get_archive_targets([job_id], mode=mode, metadata=raw)[job_id]
                     except ArtifactError as exc:
                         # A failed refresh must not replace the last usable response.
                         raise self._attach(exc, metadata) from None
@@ -194,8 +209,9 @@ class ArtifactClient:
             jid = ids[0]
             raw = {}
             try:
-                signed = self._api.get_archive_targets(
-                    [jid], mode='oss', metadata=raw, tolerate_errors=True)[jid]
+                signed_targets, link_mode = _archive_targets(
+                    self._api, [jid], 'oss', raw, tolerate_errors=True)
+                signed = signed_targets[jid]
             except ArtifactError as exc:
                 signed = exc.clone()
                 signed.artifacts_response = deepcopy(raw.get(jid))
@@ -215,8 +231,9 @@ class ArtifactClient:
                 if not (includes or excludes):
                     to_sign = [jid for jid in ready if jid not in prefetched]
                     try:
-                        targets.update(self._api.get_archive_targets(
-                            to_sign, mode=link_mode, metadata=raw, tolerate_errors=True))
+                        signed_targets, link_mode = _archive_targets(
+                            self._api, to_sign, link_mode, raw, tolerate_errors=True)
+                        targets.update(signed_targets)
                     except ArtifactError as exc:
                         if len(to_sign) > 1 and getattr(exc, '_request_status', None) in (403, 404):
                             # No links were issued. Let the existing workers

{irepo_artifact-0.2.3.dev0 → irepo_artifact-0.2.4.dev0}/src/irepo_artifact/download.py

@@ -108,7 +108,7 @@ def download_with_refresh(target: DownloadTarget, destination: Path,
 
 
 def download_archive(targets: dict[str, DownloadTarget], destination: Path,
-                     refresh_targets: Callable[[], dict[str, DownloadTarget]],
+                     refresh_targets: Callable[[str], dict[str, DownloadTarget]],
                      timeout: float = 30, *, on_refreshed=None, probe=None,
                      get_proxy_targets=None) -> Literal['oss', 'proxy'] | None:
     channel = next((kind for kind in ('oss', 'proxy', 'legacy') if kind in targets), None)
@@ -120,7 +120,7 @@ def download_archive(targets: dict[str, DownloadTarget], destination: Path,
     def refresh():
         nonlocal refresh_error, channel
         try:
-            renewed = dict(refresh_targets())
+            renewed = dict(refresh_targets(channel))
             if channel not in renewed:
                 if channel == 'legacy' and renewed:
                     channel = next((kind for kind in ('oss', 'proxy', 'legacy') if kind in renewed), None)

{irepo_artifact-0.2.3.dev0 → irepo_artifact-0.2.4.dev0/src/irepo_artifact.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irepo-artifact
-Version: 0.2.3.dev0
+Version: 0.2.4.dev0
 Summary: Standalone HTTP artifact downloads
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -11,10 +11,10 @@ Python 3.10+ 的独立产物下载包。通过 AP 获取链接后 HTTP 下载，
 `instance-repo`、`ap-client`、`oss2` 或 STS。完整 SDK 与未来的 ap-client
 均可单向依赖此包。
 
-安装发布版本：
+发布后安装：
 
 ```bash
-python -m pip install 'irepo-artifact==0.2.3.dev0'
+python -m pip install 'irepo-artifact==0.2.4.dev0'
 ```
 
 源码开发安装：
@@ -65,8 +65,9 @@ group = client.download_group("group-a", output_dir="group-out")
 
 ## 传输与输出
 
-完整包先请求 `download_mode=oss`。取得 OSS 链接后探测内网端点；不可达时另行请求
-`download_mode=proxy`，可达时使用 OSS。OSS 实际下载发生远端故障时，为该 Job
+完整包先请求 `download_mode=oss`。OSS 链接签发返回 502/503 时按需请求
+`download_mode=proxy`；取得 OSS 链接后探测内网端点，不可达时也请求 proxy，
+可达时使用 OSS。OSS 实际下载发生远端故障时，为该 Job
 另行请求 proxy 链接并从头下载。单 Job 与批量下载使用相同策略。
 未返回 `downloads`（或为 null/空对象）时使用旧版单 `url`，也支持 dataplane 地址。
 单 URL 仅在 hostname 匹配标准 OSS 域名时标记 `channel='oss'`；其余返回