Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(sdk): clean partial archives when directory packing fails (#5557)

Zhenghan Songf28cafc8a292
diff --git a/sdk/python/openviking_sdk/client.py b/sdk/python/openviking_sdk/client.py
index b2ef5745c..0c4822f1a 100644
--- a/sdk/python/openviking_sdk/client.py
+++ b/sdk/python/openviking_sdk/client.py
@@ -8,8 +8,6 @@ import inspect
import mimetypes
import os
import tempfile
-import uuid
-import zipfile
from enum import Enum
from pathlib import Path
from typing import Any, Callable, Dict, List, Literal, Mapping, Optional, Type, Union
@@ -17,7 +15,7 @@ from urllib.parse import quote
import httpx
-from ._utils import _path_is_relative_to, run_async
+from ._utils import run_async
from .actor_peer import _request_actor_peer_headers
from .config import resolve_client_config
from .errors import (
@@ -69,6 +67,7 @@ from .options import (
UpdateSkillOptions,
WriteOptions,
)
+from .uploads import zip_directory
ERROR_CODE_TO_EXCEPTION = {
"INVALID_ARGUMENT": InvalidArgumentError,
@@ -683,24 +682,7 @@ class AsyncHTTPClient:
raise exc_class(message)
def _zip_directory(self, dir_path: str) -> str:
- dir_path = Path(dir_path)
- if not dir_path.is_dir():
- raise ValueError(f"Path {dir_path} is not a directory")
-
- root = dir_path.resolve()
- zip_path = Path(tempfile.gettempdir()) / f"temp_upload_{uuid.uuid4().hex}.zip"
- entry_count = 0
- with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
- for file_path in dir_path.rglob("*"):
- if file_path.is_symlink():
- continue
- if file_path.is_file():
- if not _path_is_relative_to(file_path.resolve(), root):
- continue
- arcname = str(file_path.relative_to(dir_path)).replace("\\", "/")
- zipf.write(file_path, arcname=arcname)
- entry_count += 1
- return str(zip_path)
+ return zip_directory(dir_path)
async def _upload_temp_file(self, file_path: str) -> str:
with open(file_path, "rb") as f:
diff --git a/sdk/python/openviking_sdk/uploads.py b/sdk/python/openviking_sdk/uploads.py
index 88dc4660b..a249f0e2b 100644
--- a/sdk/python/openviking_sdk/uploads.py
+++ b/sdk/python/openviking_sdk/uploads.py
@@ -19,14 +19,18 @@ def zip_directory(dir_path: str) -> str:
root = path.resolve()
zip_path = Path(tempfile.gettempdir()) / f"temp_upload_{uuid.uuid4().hex}.zip"
- with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
- for file_path in path.rglob("*"):
- if file_path.is_symlink():
- continue
- if file_path.is_file():
- if not _path_is_relative_to(file_path.resolve(), root):
+ try:
+ with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
+ for file_path in path.rglob("*"):
+ if file_path.is_symlink():
continue
- arcname = str(file_path.relative_to(path)).replace("\\", "/")
- zipf.write(file_path, arcname=arcname)
+ if file_path.is_file():
+ if not _path_is_relative_to(file_path.resolve(), root):
+ continue
+ arcname = str(file_path.relative_to(path)).replace("\\", "/")
+ zipf.write(file_path, arcname=arcname)
+ except BaseException:
+ zip_path.unlink(missing_ok=True)
+ raise
return str(zip_path)
diff --git a/sdk/python/tests/test_uploads.py b/sdk/python/tests/test_uploads.py
index def938ffa..a902f6153 100644
--- a/sdk/python/tests/test_uploads.py
+++ b/sdk/python/tests/test_uploads.py
@@ -6,7 +6,57 @@ import zipfile
from pathlib import Path
import pytest
-from openviking_sdk import AsyncHTTPClient
+from openviking_sdk import AsyncHTTPClient, SyncHTTPClient
+from openviking_sdk.uploads import zip_directory
+
+
+def interrupted_archive(tmp_path, monkeypatch):
+ source = tmp_path / "source"
+ source.mkdir()
+ (source / "first.txt").write_text("first", encoding="utf-8")
+ (source / "second.txt").write_text("second", encoding="utf-8")
+ archives = tmp_path / "archives"
+ archives.mkdir()
+ monkeypatch.setattr(tempfile, "gettempdir", lambda: str(archives))
+ original_write = zipfile.ZipFile.write
+ error = FileNotFoundError("source disappeared during packing")
+ writes = []
+
+ def fail_second_write(self, filename, *args, **kwargs):
+ writes.append(filename)
+ if len(writes) == 2:
+ raise error
+ return original_write(self, filename, *args, **kwargs)
+
+ monkeypatch.setattr(zipfile.ZipFile, "write", fail_second_write)
+ return source, archives, error
+
+
[email protected]("sync", [False, True])
[email protected]("method", ["add_resource", "add_skill", "update_skill"])
+async def test_directory_import_removes_partial_zip(interrupted_archive, sync, method):
+ source, archives, error = interrupted_archive
+ client = (SyncHTTPClient if sync else AsyncHTTPClient)(url="http://localhost:1933")
+ args = ("demo", str(source)) if method == "update_skill" else (str(source),)
+ with pytest.raises(FileNotFoundError) as raised:
+ if sync:
+ getattr(client, method)(*args)
+ else:
+ await getattr(client, method)(*args)
+ assert raised.value is error
+ assert list(archives.iterdir()) == []
+ assert (source / "first.txt").read_text(encoding="utf-8") == "first"
+ assert (source / "second.txt").read_text(encoding="utf-8") == "second"
+
+
+def test_zip_helper_removes_partial_zip(interrupted_archive):
+ source, archives, error = interrupted_archive
+ with pytest.raises(FileNotFoundError) as raised:
+ zip_directory(str(source))
+ assert raised.value is error
+ assert list(archives.iterdir()) == []
class _FakeHTTPClient: