修：draw-ui / oil-motion 原被当子模块指针收录 ⇒ 改为正常文件入库（两份内容原先对别人是空的）
一、问题（本轮实测）
`draw-ui` 与 `oil-motion` 目录里**各自带一个内嵌 `.git`** ⇒ 上一次提交把它们记成了 **gitlink（子模块指针）**
⇒ 仓库里只存了一个不属于任何远端的 commit id，**别人克隆下来这两份是空的** ✗（`git status` 显示 ` m draw-ui` / ` m oil-motion` ＝ 子模块内容有改动）。
二、处置（可回退）
· 把两处的 `.git` **挪走**（⛔ 不是删除）⇒ `归档/内嵌git-20261008/{draw-ui,oil-motion}.git`；
· `git rm --cached` 掉那两个 gitlink，再 `git add` 两个目录 ⇒ **按正常文件入库**（内容才真的进仓库）。
三、副作用（如实记）
挪走 `.git` 后，这两个技能**不能再原地 `git pull` 取上游更新**（要更新得重新拉一份覆盖）；
如需恢复其本地仓库，把 `归档/内嵌git-20261008/` 里的 `.git` 挪回原处即可。
This commit is contained in:
admin committed
1 parent
e03465c398
commit
237a09a5b0
161 files changed
+19429
-2
No files matched your search
@@ -0,0 +1,170 @@
|
||||
#!/usr/bin/env python3
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import importlib.util
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest import mock
|
||||
|
||||
|
||||
SCRIPT_PATH = Path(__file__).resolve().parents[1] / "scripts" / "generate_image.py"
|
||||
SPEC = importlib.util.spec_from_file_location("generate_image", SCRIPT_PATH)
|
||||
assert SPEC and SPEC.loader
|
||||
generate_image = importlib.util.module_from_spec(SPEC)
|
||||
SPEC.loader.exec_module(generate_image)
|
||||
|
||||
|
||||
class FakeResponse:
|
||||
def __init__(self, payload: dict):
|
||||
self._body = json.dumps(payload).encode("utf-8")
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc, traceback):
|
||||
return False
|
||||
|
||||
def read(self) -> bytes:
|
||||
return self._body
|
||||
|
||||
|
||||
class GenerateImageTests(unittest.TestCase):
|
||||
def test_provider_specific_model_resolution(self):
|
||||
self.assertEqual(generate_image.resolve_codex_model("gpt-5.6-sol"), "gpt-5.6-sol")
|
||||
self.assertEqual(generate_image.resolve_codex_model(), generate_image.DEFAULT_CODEX_MODEL)
|
||||
|
||||
def test_openai_base_url_is_explicit_and_normalized(self):
|
||||
with mock.patch.dict(os.environ, {"OPENAI_IMAGE_BASE_URL": "https://example.com"}, clear=False):
|
||||
self.assertEqual(generate_image.resolve_codex_base_url(), "https://example.com/v1")
|
||||
with mock.patch.dict(
|
||||
os.environ, {"OPENAI_IMAGE_BASE_URL": "https://example.com/custom/v1/"}, clear=False
|
||||
):
|
||||
self.assertEqual(generate_image.resolve_codex_base_url(), "https://example.com/custom/v1")
|
||||
|
||||
def test_codex_request_uses_selected_model_and_forces_image_tool(self):
|
||||
captured = {}
|
||||
png = b"\x89PNG\r\n\x1a\nfixture"
|
||||
response_payload = {
|
||||
"output": [
|
||||
{
|
||||
"type": "image_generation_call",
|
||||
"result": base64.b64encode(png).decode("ascii"),
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
def fake_urlopen(request, timeout):
|
||||
captured["request"] = request
|
||||
captured["timeout"] = timeout
|
||||
return FakeResponse(response_payload)
|
||||
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
output = Path(temp_dir) / "result.png"
|
||||
with (
|
||||
mock.patch.dict(os.environ, {"OPENAI_IMAGE_API_KEY": "test-key"}, clear=False),
|
||||
mock.patch.object(generate_image.urllib.request, "urlopen", side_effect=fake_urlopen),
|
||||
):
|
||||
final_path = generate_image.request_codex_image(
|
||||
prompt="draw a test",
|
||||
refs=[],
|
||||
image_type="wide",
|
||||
model="gpt-5.6-sol",
|
||||
output_path=output,
|
||||
)
|
||||
|
||||
request_payload = json.loads(captured["request"].data)
|
||||
self.assertEqual(request_payload["model"], "gpt-5.6-sol")
|
||||
self.assertEqual(request_payload["tool_choice"], "required")
|
||||
self.assertIs(request_payload["store"], False)
|
||||
self.assertEqual(request_payload["tools"][0]["size"], "1536x864")
|
||||
self.assertEqual(final_path.read_bytes(), png)
|
||||
self.assertEqual(captured["request"].headers["Authorization"], "Bearer test-key")
|
||||
|
||||
def test_main_rejects_existing_output_before_resolving_refs_or_calling_provider(self):
|
||||
image_bytes = b"keep-image"
|
||||
metadata_bytes = b"keep-metadata"
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
output = Path(temp_dir) / "result.png"
|
||||
metadata = generate_image.metadata_path_for(output)
|
||||
output.write_bytes(image_bytes)
|
||||
metadata.write_bytes(metadata_bytes)
|
||||
argv = [
|
||||
"generate_image.py",
|
||||
"--provider",
|
||||
"codex",
|
||||
"--prompt",
|
||||
"draw a test",
|
||||
"--ref",
|
||||
"https://example.test/reference.png",
|
||||
"--output",
|
||||
str(output),
|
||||
]
|
||||
with (
|
||||
mock.patch.object(sys, "argv", argv),
|
||||
mock.patch.object(generate_image, "resolve_ref", side_effect=AssertionError("reference resolved")),
|
||||
mock.patch.object(generate_image, "request_codex_image", side_effect=AssertionError("provider called")),
|
||||
):
|
||||
with self.assertRaises(FileExistsError):
|
||||
generate_image.main()
|
||||
|
||||
self.assertEqual(output.read_bytes(), image_bytes)
|
||||
self.assertEqual(metadata.read_bytes(), metadata_bytes)
|
||||
|
||||
def test_main_writes_new_image_and_metadata(self):
|
||||
image_bytes = b"new-image"
|
||||
|
||||
def fake_request_codex_image(**kwargs):
|
||||
output = kwargs["output_path"]
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
output.write_bytes(image_bytes)
|
||||
return output
|
||||
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
output = Path(temp_dir) / "result.png"
|
||||
argv = [
|
||||
"generate_image.py",
|
||||
"--provider",
|
||||
"codex",
|
||||
"--prompt",
|
||||
"draw a test",
|
||||
"--output",
|
||||
str(output),
|
||||
]
|
||||
with (
|
||||
mock.patch.object(sys, "argv", argv),
|
||||
mock.patch.object(generate_image, "request_codex_image", side_effect=fake_request_codex_image),
|
||||
):
|
||||
self.assertEqual(generate_image.main(), 0)
|
||||
|
||||
self.assertEqual(output.read_bytes(), image_bytes)
|
||||
metadata = generate_image.metadata_path_for(output)
|
||||
self.assertTrue(metadata.exists())
|
||||
self.assertEqual(json.loads(metadata.read_text(encoding="utf-8"))["output_path"], str(output.resolve()))
|
||||
|
||||
def test_render_response_rejects_existing_mime_inferred_suffix(self):
|
||||
original = b"keep-jpeg"
|
||||
generated = b"new-jpeg"
|
||||
inline_data = mock.Mock(
|
||||
data=base64.b64encode(generated).decode("ascii"),
|
||||
mime_type="image/jpeg",
|
||||
)
|
||||
response = mock.Mock(parts=[mock.Mock(text=None, inline_data=inline_data)])
|
||||
|
||||
with tempfile.TemporaryDirectory() as temp_dir:
|
||||
output_base = Path(temp_dir) / "result"
|
||||
inferred_output = output_base.with_suffix(".jpg")
|
||||
inferred_output.write_bytes(original)
|
||||
|
||||
with self.assertRaises(FileExistsError):
|
||||
generate_image.render_response(response=response, output_path=output_base)
|
||||
|
||||
self.assertEqual(inferred_output.read_bytes(), original)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user