From 7358d3cbf0bc46c830f55e76e2ef578ead862f19 Mon Sep 17 00:00:00 2001 From: wuli666 <421774554@qq.com> Date: Sun, 8 Nov 2026 12:12:34 +0800 Subject: [PATCH 01/61] [bugfix] providers: treat chatgpt-image models as gpt-image (#221) ## summary - Match chatgpt-image-* model ids in the openai-gpt-image profile. Image tools stop sending response_format, which OpenAI rejects for these models, and reference edits use image[] parts with the documented 16-image limit. - Parametrize the profile and adapter tests over gpt-image-1 and chatgpt-image-latest. ## validation - pytest tests/test_openai_images.py: 16 passed; the two new chatgpt-image-latest cases fail without the fix. - pytest tests: 1098 passed, 6 skipped. - lint-imports: 4 kept; generate_contracts.py --check: verified. - npm test: 675 passed. Fixes: #219 --- packages/core/src/opendirector/domain/input_rules.py | 5 +++-- tests/test_openai_images.py | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/core/src/opendirector/domain/input_rules.py b/packages/core/src/opendirector/domain/input_rules.py index eb618ee2b..5989181c7 100644 --- a/packages/core/src/opendirector/domain/input_rules.py +++ b/packages/core/src/opendirector/domain/input_rules.py @@ -95,8 +95,9 @@ def _adapter_rules(config): # Self-hosted vLLM-Omni text-to-image: it draws from the prompt alone, so # documents are inlined as text and reference images are not accepted. rules.update(profile='vllm-omni-image', allowedKinds=['text'], maxImages=0) - if kind == 'image' and config.get('protocol') in {None, 'openai'} and name.startswith('gpt-image'): - # OpenAI gpt-image: documented text-to-image plus reference editing with at + if kind == 'image' and config.get('protocol') in {None, 'openai'} and name.startswith(('gpt-image', 'chatgpt-image')): + # OpenAI gpt-image (and the chatgpt-image-* aliases on the same Images API): + # documented text-to-image plus reference editing with at # most 16 images, each under 25 MB and under 50 MB for the whole request. rules.update(profile='openai-gpt-image', allowedKinds=['text', 'image'], maxImages=16, imageBytes=25 * 1024 * 1024, requestBytes=50 * 1024 * 1024) diff --git a/tests/test_openai_images.py b/tests/test_openai_images.py index ebc5471cb..3d9e1be67 100644 --- a/tests/test_openai_images.py +++ b/tests/test_openai_images.py @@ -33,8 +33,9 @@ def png(): return out.getvalue() -def test_gpt_image_profile_declares_the_documented_limits(): - rules = input_rules(GPT_IMAGE) +@pytest.mark.parametrize('model', ['gpt-image-1', 'chatgpt-image-latest']) +def test_gpt_image_profile_declares_the_documented_limits(model): + rules = input_rules({**GPT_IMAGE, 'modelId': model}) assert rules['profile'] == 'openai-gpt-image' assert rules['allowedKinds'] == ['text', 'image'] and rules['maxImages'] == 16 assert rules['imageBytes'] == 25 * 1024 * 1024 and rules['requestBytes'] == 50 * 1024 * 1024 @@ -44,8 +45,10 @@ def test_gpt_image_profile_declares_the_documented_limits(): assert input_rules({**GPT_IMAGE, 'kind': 'video'})['profile'] != 'openai-gpt-image' -def test_adapter_drops_response_format_only_for_gpt_image(): - adapter = adapter_for(GPT_IMAGE) +@pytest.mark.parametrize('model', ['gpt-image-1', 'chatgpt-image-latest']) +def test_adapter_drops_response_format_only_for_gpt_image(model): + # chatgpt-image-* rejects `response_format` exactly like gpt-image (#219). + adapter = adapter_for({**GPT_IMAGE, 'modelId': model}) assert isinstance(adapter, OpenAIImages) and adapter.response_format is False assert adapter.reference_field == 'image[]' and adapter.max_images == 16 assert adapter.capabilities == {'image.generate', 'image.edit', 'image.cutout'} From abf3db37d0e07ce1c510c511a94a16bffe2d7285 Mon Sep 17 00:00:00 2001 From: Hongsheng Liu Date: Sun, 8 Nov 2026 14:28:31 +0800 Subject: [PATCH 02/61] [refactor] projects: split oversized storage and tool modules (#217) ## summary - Split creation project storage into commit documents, catalog scans, commit-log reads, and publication. Lifecycle commands stay on CreationProjects. - Keep command routing in application.creation_commands. execute() still delegates there and does not import application services. - Split canvas tool recipes into context, image edits, segmentation, and video. The catalog still exports TOOLS, Source, ToolContext, Output, and select_image_objects. - Point storage tests at the module that now owns each patched helper. ## validation - lint-imports kept all four layer contracts. - pytest on creation, tool, agent, canvas-source, library, and moss modules: 679 passed, 3 skipped. - test_rejects_removed_runtime_and_invalid_selection_before_acceptance also fails on main in this environment with 503 because the bundled agent CLI is not installed. The full tests tree was not run. Fixes: #177 Co-authored-by: Cursor Agent --- .../opendirector/application/tool_context.py | 195 ++++ .../application/tool_image_edits.py | 254 +++++ .../application/tool_image_segments.py | 113 +++ .../application/tool_operations.py | 808 +--------------- .../application/tool_video_recipes.py | 212 +++++ .../infrastructure/creation_catalog.py | 187 ++++ .../infrastructure/creation_commit_log.py | 376 ++++++++ .../infrastructure/creation_projects.py | 897 +----------------- .../infrastructure/creation_publication.py | 252 +++++ .../infrastructure/creation_records.py | 119 +++ tests/test_creation_storage.py | 24 +- 11 files changed, 1757 insertions(+), 1680 deletions(-) create mode 100644 packages/core/src/opendirector/application/tool_context.py create mode 100644 packages/core/src/opendirector/application/tool_image_edits.py create mode 100644 packages/core/src/opendirector/application/tool_image_segments.py create mode 100644 packages/core/src/opendirector/application/tool_video_recipes.py create mode 100644 packages/core/src/opendirector/infrastructure/creation_catalog.py create mode 100644 packages/core/src/opendirector/infrastructure/creation_commit_log.py create mode 100644 packages/core/src/opendirector/infrastructure/creation_publication.py create mode 100644 packages/core/src/opendirector/infrastructure/creation_records.py diff --git a/packages/core/src/opendirector/application/tool_context.py b/packages/core/src/opendirector/application/tool_context.py new file mode 100644 index 000000000..703609d36 --- /dev/null +++ b/packages/core/src/opendirector/application/tool_context.py @@ -0,0 +1,195 @@ +"""Inputs and model capabilities a canvas tool recipe may use. + +Recipes never see a model name, protocol, or endpoint. The context serves each +capability through whichever configured model offers it. +""" +import io +import math +import re +from dataclasses import dataclass + +from PIL import Image + +from opendirector.domain.capabilities import ( + ChatRequest, CutoutRequest, DepthRequest, ImageRequest, SegmentRequest, TrackRequest, + Tracks, VideoEditRequest, VideoRequest, +) +from opendirector.domain.projects import ProjectError +from opendirector.media import processing as media + + +@dataclass(frozen=True) +class Source: + kind: str + data: bytes + name: str + +@dataclass(frozen=True) +class Output: + kind: str + data: bytes + suffix: str + title: str + +class ToolContext: + """What a recipe may use: inputs, model capabilities and progress reporting.""" + + def __init__(self, *, sources, mask, boxes, parameters, image_model, video_model, progress, video_submitted=None, cutout_model=None, + edit_model=None, edit_seconds=(4.0, 15.0), chat_model=None, segment_model=None, track_model=None, + edit_keeps_layout=True, annotation=None, edit_max_images=1, segment_available=False, depth_model=None): + self.sources: list[Source] = sources + self.mask: bytes | None = mask + self.annotation: bytes | None = annotation + self.edit_max_images = edit_max_images + self.segment_available = segment_available + self.boxes: list[dict] = boxes + self.parameters: dict = parameters + self._image, self._video, self._cutout, self._edit = image_model, video_model, cutout_model, edit_model + self._segment, self._track, self._depth = segment_model, track_model, depth_model + # img2img models redraw in place by strength; instruction editors recompose the picture. + self.edit_keeps_layout = edit_keeps_layout + # Shortest and longest clip one redraw accepts; longer sources are processed piecewise. + self.edit_seconds = edit_seconds + # Optional: a chat model only improves prompts; tools never require it. + self._chat = chat_model + self._progress, self._video_submitted = progress, video_submitted + + def text(self, key, default=''): + value = self.parameters.get(key, default) + return value.strip() if isinstance(value, str) else default + + def number(self, key, default, low=None, high=None): + value = self.parameters.get(key, default) + if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value): + raise ProjectError(f'参数 {key} 无效。', 422) + if (low is not None and value < low) or (high is not None and value > high): + raise ProjectError(f'参数 {key} 超出范围。', 422) + return value + + def choice(self, key, options, default=None): + value = self.parameters.get(key, default) + if value not in options: + raise ProjectError(f'参数 {key} 不在可选范围内。', 422) + return value + + async def progress(self, message): + await self._progress(message) + + async def edit(self, image: Image.Image, prompt: str, strength: float, *, references=()) -> Image.Image: + """Image-to-image at the source's aspect; the result is resampled back to the source size.""" + result = await self._image(ImageRequest(prompt=prompt, width=image.width, height=image.height, + image=media.rgb_png(image), strength=strength, references=tuple(references))) + return media.resize(media.open_image(result.data), image.width, image.height) + + async def reframe(self, image: Image.Image, width: int, height: int, prompt: str) -> Image.Image: + """An instruction edit of image rendered on a width x height frame.""" + result = await self._image(ImageRequest(prompt=prompt, width=width, height=height, image=media.rgb_png(image))) + return media.resize(media.open_image(result.data), width, height) + + async def cutout(self, image: Image.Image, subject: str = '') -> Image.Image: + """The subject on transparency, at the source size.""" + result = await self._cutout(CutoutRequest(image=media.rgb_png(image), width=image.width, height=image.height, subject=subject)) + return media.resize(media.open_image(result.data), image.width, image.height) + + async def segment(self, image: Image.Image, concept: str = '', boxes=()) -> list[tuple[Image.Image, float, tuple]]: + """Instances of an English concept or of exemplar boxes: (mask at the image size, score, box).""" + segments = await self._segment(SegmentRequest(image=media.rgb_png(image), concept=concept, boxes=tuple(boxes))) + return [(media.resize(media.open_image(item.mask).convert('L'), image.width, image.height), item.score, item.box) + for item in segments] + + async def track(self, clip: bytes, concepts: tuple[str, ...]) -> Tracks: + return await self._track(TrackRequest(video=clip, concepts=concepts)) + + async def depth(self, clip: bytes) -> bytes: + """A grayscale depth video of clip at its size and rate; near is bright.""" + return (await self._depth(DepthRequest(video=clip))).data + + async def concepts(self, text: str, default: tuple[str, ...]) -> list[tuple[str, str]]: + """(English concept, label) pairs from a comma-separated description; segmentation models read English.""" + parts = list(dict.fromkeys(item.strip() for item in re.split(r'[,,、;;\n]+', text) if item.strip())) + if not parts: + return [(CONCEPTS.get(item, item), item) for item in default] + pairs = [] + for part in parts[:16]: + english = CONCEPTS.get(part) or (part if part.isascii() else None) + if english is None and self._chat is not None: + try: + english = (await self._chat(ChatRequest(messages=( + {'role': 'system', 'content': 'Name the visual object the user describes as a short English noun phrase, ' + 'such as "red car" or "person". Output only the phrase.'}, + {'role': 'user', 'content': part + ' /no_think'}), max_tokens=40))).strip().strip('."\'').lower() + except ProjectError: + english = None + if not english or not english.isascii(): + raise ProjectError(f'无法识别「{part}」,请改用英文描述,或在“模型接入”中添加对话模型以自动翻译。', 422) + pairs.append((english, part)) + return pairs + + async def english(self, text: str) -> str: + """Video models render non-English prompt text as burnt-in subtitles; translate when a chat model is connected.""" + if not text or text.isascii() or self._chat is None: + return text + try: + translated = await self._chat(ChatRequest(messages=( + {'role': 'system', 'content': 'Translate the user text into concise English for a video generation prompt. ' + 'Output only the translation.'}, + {'role': 'user', 'content': text + ' /no_think'}), max_tokens=400)) + except ProjectError: + return text + return translated.strip() or text + + async def video_prompt(self, user: str, instruction: str) -> str: + user = await self.english(user) + return f'{user}. {instruction}' if user else instruction + + async def redraw(self, clip: bytes, seconds: float, width: int, height: int, prompt: str, picture=None, sound=None) -> bytes: + result = await self._edit(VideoEditRequest(prompt=f'{prompt} {CLEAN_PICTURE}', source=clip, seconds=seconds, width=width, + height=height, picture=picture, sound=sound, avoid=NO_TEXT), self._video_submitted) + return result.data + + async def video_from_frame(self, frame: Image.Image, prompt: str, seconds: float) -> bytes: + ratio = frame.width / frame.height + aspect = min(('16:9', '9:16', '1:1', '4:3', '3:4'), key=lambda item: abs(eval_ratio(item) - ratio)) + frame = media.scale_to_long_edge(frame, 1280) if max(frame.size) > 1280 else frame + result = await self._video(VideoRequest(prompt=f'{prompt} {CLEAN_PICTURE}', seconds=seconds, aspect_ratio=aspect, + first_frame=media.rgb_png(frame), avoid=NO_TEXT), + self._video_submitted) + return result.data + +# Common subjects map to SAM 3 concepts without a chat model; other words are translated. +CONCEPTS = { + '人': 'person', '人物': 'person', '人像': 'person', '人群': 'person', '主体': 'person', '男人': 'man', '女人': 'woman', + '小孩': 'child', '孩子': 'child', '儿童': 'child', '脸': 'face', '手': 'hand', '头发': 'hair', + '动物': 'animal', '猫': 'cat', '狗': 'dog', '鸟': 'bird', '马': 'horse', '鱼': 'fish', + '车': 'car', '汽车': 'car', '车辆': 'vehicle', '交通工具': 'vehicle', '自行车': 'bicycle', '摩托车': 'motorcycle', + '船': 'boat', '飞机': 'airplane', '树': 'tree', '花': 'flower', '植物': 'plant', '建筑': 'building', '房子': 'house', + '天空': 'sky', '桌子': 'table', '椅子': 'chair', '沙发': 'sofa', '家具': 'furniture', '杯子': 'cup', '瓶子': 'bottle', + '包': 'bag', '鞋': 'shoe', '衣服': 'clothing', '帽子': 'hat', '手机': 'phone', '电脑': 'computer', '食物': 'food', + '商品': 'product', '产品': 'product', '文字': 'text', '标志': 'logo', +} + +# Naming text in a positive prompt invites it; the negative prompt carries the exclusion. +CLEAN_PICTURE = 'Clean picture.' + +NO_TEXT = 'subtitles, captions, on-screen text, letters, words, watermark, logo' + +def eval_ratio(text): + width, height = text.split(':') + return int(width) / int(height) + +def image_output(image: Image.Image, title: str) -> Output: + data = media.png(image) + if len(data) > 48 * 1024 * 1024: + # Very large renders are stored as high-quality JPEG to stay under the asset limit. + buffer = io.BytesIO() + image.convert('RGB').save(buffer, 'JPEG', quality=94) + return Output('image', buffer.getvalue(), 'jpg', title) + return Output('image', data, 'png', title) + +def _source_image(ctx: ToolContext, index=0) -> Image.Image: + if len(ctx.sources) <= index or ctx.sources[index].kind != 'image': + raise ProjectError('请提供图片素材。', 422) + return media.open_image(ctx.sources[index].data) + +def _with(prompt: str, instruction: str) -> str: + return f'{prompt}。{instruction}' if prompt else instruction diff --git a/packages/core/src/opendirector/application/tool_image_edits.py b/packages/core/src/opendirector/application/tool_image_edits.py new file mode 100644 index 000000000..75976817d --- /dev/null +++ b/packages/core/src/opendirector/application/tool_image_edits.py @@ -0,0 +1,254 @@ +"""Image edit recipes: reframing, cleanup, presets, and poster motion.""" +import json +from dataclasses import dataclass + +from PIL import Image + +from opendirector.application.tool_context import Output, ToolContext, _source_image, _with, image_output +from opendirector.domain.projects import ProjectError +from opendirector.media import processing as media + + +def _placement(pads, width, height) -> str: + """Where the original sits in the extended frame, and which sides grow, in words.""" + left, top, right, bottom = pads + total_width, total_height = width + left + right, height + top + bottom + horizontal = '左侧' if not left and right else '右侧' if left and not right else '' + vertical = '上方' if not top and bottom else '下方' if top and not bottom else '' + where = f'{vertical}{horizontal}'.replace('上方左侧', '左上角').replace('上方右侧', '右上角') \ + .replace('下方左侧', '左下角').replace('下方右侧', '右下角') or '中央' + sides = '、'.join(name for name, pad in (('左侧', left), ('上方', top), ('右侧', right), ('下方', bottom)) if pad) + return (f'原画面约占新画面宽度的 {width / total_width:.0%}、高度的 {height / total_height:.0%},位于新画面的{where},' + f'在{sides}新增与原场景连续的内容') + +async def _extend(ctx: ToolContext, image: Image.Image, pads, prompt: str) -> Image.Image: + """Outpainting: soft border, image-to-image, original pixels kept inside a feathered seam. + + Instruction editors ignore strength and recompose a padded canvas instead of + filling it, so they are asked to pull the camera back over the original. + """ + if not ctx.edit_keeps_layout: + await ctx.progress('正在扩展画面') + width, height = image.width + pads[0] + pads[2], image.height + pads[1] + pads[3] + return await ctx.reframe(image, width, height, _with(prompt, ( + f'镜头拉远,扩展画面:{_placement(pads, image.width, image.height)}。保持原图中的人物、物体、服饰、场景、色调与光线完全一致,' + '延续原有的透视与风格,画面完整自然,不要边框、白边或拼接痕迹'))) + canvas, _ = media.extend_canvas(image, *pads) + await ctx.progress('正在扩展画面') + drawn = await ctx.edit(canvas, _with(prompt, '自然延展画面四周,与原图内容、风格、透视和光线保持一致,无边框无拼接痕迹'), 0.9) + # The redraw shifts tone slightly; a wide ramp inside the original hides the seam. + inset = max(8, min(image.size) // 8) + left, top, right, bottom = pads + keep = (left + (inset if left else 0), top + (inset if top else 0), + left + image.width - (inset if right else 0), top + image.height - (inset if bottom else 0)) + seam = Image.new('L', canvas.size, 255) + seam.paste(0, keep) + return media.blend(canvas, drawn, media.feather(seam, inset / 2)) + +async def smart_edit(ctx: ToolContext): + image = _source_image(ctx) + mode = ctx.choice('editMode', ('annotation', 'selection', 'combined'), 'combined') + if mode == 'selection' and not ctx.mask: + raise ProjectError('请先涂抹或识别需要修改的区域。', 422) + prompt = ctx.text('prompt') + notes = [] + if mode != 'selection': + try: + document = json.loads(ctx.parameters.get('annotationDocument') or '{}') + notes = [stroke.get('text', '').strip() for stroke in document.get('strokes', []) if stroke.get('tool') == 'text'] + except (ValueError, AttributeError): + pass + instruction = ';'.join(item for item in [prompt, *notes] if item) + if not instruction: + raise ProjectError('请描述要如何修改图片。', 422) + await ctx.progress('正在按描述改图') + input_image, references = image, () + if mode != 'selection' and ctx.annotation: + marked = media.open_image(ctx.annotation) + if marked.size != image.size: + raise ProjectError('标注图片尺寸必须与原图一致。', 422) + if ctx.edit_max_images > 1: + references = (media.rgb_png(marked),) + instruction += '。第二张图是第一张图上的编辑标记,请根据标记理解位置与意图' + else: + input_image = marked + instruction += '。图上的笔画、箭头与文字是编辑指示' + instruction += ',完成修改后移除这些辅助标记' + edited = await ctx.edit(input_image, instruction + '。保持未提及的内容不变', 0.78, references=references) + if mode != 'annotation' and ctx.mask: + # A selection is an exact editing boundary: pixels outside it stay original. + edited = media.blend(image, edited, media.mask_from(ctx.mask, image.size)) + return [image_output(edited, '智能改图')] + +async def outpaint(ctx: ToolContext): + image = _source_image(ctx) + sides = [ctx.number(key, 0, 0, 4) for key in ('left', 'top', 'right', 'bottom')] + if not any(sides): + raise ProjectError('请至少向一个方向扩展。', 422) + pads = [round(sides[0] * image.width), round(sides[1] * image.height), round(sides[2] * image.width), round(sides[3] * image.height)] + result = await _extend(ctx, image, pads, ctx.text('prompt')) + width, height = ctx.parameters.get('outputWidth'), ctx.parameters.get('outputHeight') + if isinstance(width, (int, float)) and isinstance(height, (int, float)) and width > 0 and height > 0: + result = media.resize(result, int(width), int(height)) + return [image_output(result, '扩图')] + +HD_EDGES = {'2K': 2048, '4K': 4096, '8K': 8192} + +async def image_hd(ctx: ToolContext): + outputs = [] + edge = HD_EDGES[ctx.choice('resolution', HD_EDGES, '4K')] + pro = ctx.choice('kind', ('normal', 'pro'), 'normal') == 'pro' + for index, source in enumerate(ctx.sources): + image = media.open_image(source.data) + if pro: + await ctx.progress(f'正在增强细节({index + 1}/{len(ctx.sources)})') + detail = ctx.number('detailStrength', 0.5, 0.01, 1) + base = media.scale_to_long_edge(image, 1536) if max(image.size) > 1536 else image + image = await ctx.edit(base, '高清摄影,细节丰富,纹理锐利清晰,保持构图、主体和颜色完全不变', 0.12 + 0.3 * detail) + await ctx.progress(f'正在放大到 {edge}px') + outputs.append(image_output(media.scale_to_long_edge(image, edge), f'超清 {ctx.parameters.get("resolution", "4K")}')) + return outputs + +async def inpainting_remove(ctx: ToolContext): + image = _source_image(ctx) + if not ctx.mask: + raise ProjectError('请先涂抹需要消除的区域。', 422) + mask = media.mask_from(ctx.mask, image.size) + await ctx.progress('正在消除并填补') + drawn = await ctx.edit(media.soften_region(image, mask), '移除涂抹区域中的物体与文字,用周围环境自然填补,画面干净完整', 0.8) + return [image_output(media.blend(image, drawn, media.feather(mask, max(3, min(image.size) / 120))), '消除')] + +def _yaw_text(yaw): + names = ['正面', '右前方', '右侧面', '右后方', '背面', '左后方', '左侧面', '左前方'] + return names[round((yaw % 360) / 45) % 8] + +async def view_control(ctx: ToolContext): + image = _source_image(ctx) + yaw = ctx.number('yaw', 0, -360, 360) + pitch = ctx.number('pitch', 0, -90, 90) + distance = ctx.parameters.get('distancePreset') or ctx.parameters.get('distance') or 'standard' + shot = {'near': '近景特写', 'standard': '中景', 'far': '远景全身'}.get(distance, '中景') + angle = '俯视' if pitch > 20 else '仰视' if pitch < -10 else '平视' + await ctx.progress('正在生成新视角') + edited = await ctx.edit(image, _with(ctx.text('prompt'), f'同一主体从{_yaw_text(yaw)}{angle}角度拍摄的{shot},' + '保持主体外观、服装、颜色和场景风格完全一致'), 0.8) + return [image_output(edited, f'多角度 · {_yaw_text(yaw)}')] + +async def lighting(ctx: ToolContext): + image = _source_image(ctx) + yaw = ctx.number('yaw', 0, -360, 360) + pitch = ctx.number('pitch', 30, -90, 90) + # The lighting editor sends brightnessPercent; the catalog field is brightness. + brightness = ctx.number('brightnessPercent' if 'brightnessPercent' in ctx.parameters else 'brightness', 60, 0, 100) + texture = '柔和漫射' if ctx.parameters.get('texture', 'soft') == 'soft' else '硬朗强烈' + color = ctx.text('lightColor', '#ffffff') or '#ffffff' + height = '顶光' if pitch > 50 else '高位' if pitch > 15 else '底光' if pitch < -15 else '平射' + level = '明亮' if brightness > 66 else '中等亮度' if brightness > 33 else '昏暗低调' + await ctx.progress('正在重新布光') + edited = await ctx.edit(image, _with(ctx.text('prompt'), f'重新布光:主光来自{_yaw_text(yaw)}{height},{texture}的光质,' + f'光色 {color},整体{level},阴影和高光随光源变化,保持主体和构图不变'), 0.72) + return [image_output(edited, '智能打光')] + +async def panorama(ctx: ToolContext): + image = _source_image(ctx) + width = max(image.width, image.height * 2) + height = width // 2 + pads = ((width - image.width) // 2, (height - image.height) // 2) + pads = (pads[0], pads[1], width - image.width - pads[0], height - image.height - pads[1]) + result = await _extend(ctx, image, pads, _with(ctx.text('prompt'), '360度等距柱状投影全景图,左右边缘可无缝衔接')) + edge = {'4K': 4096, '2K': 2048}.get(ctx.parameters.get('resolution'), 2048) + return [image_output(media.resize(result, edge, edge // 2), '720 全景')] + +@dataclass(frozen=True) +class ImagePreset: + title: str + prompts: tuple[str, ...] + size: tuple[int, int] = (2048, 1152) + +PRESETS = { + # Written as edit instructions: editing models follow imperatives, not captions. + 'three-view': ImagePreset('人物三视图', ( + '以参考图中的人物为唯一身份依据,生成同一人物的全身三视图设定板。' + '横版画面分为三个等宽区域,从左至右严格排列:正面全身、右侧90度全身、背面全身。' + '三个视图保持同一身份、年龄、体型、头身比、发型、服装、配色、材质及配饰,衣服结构与细节相互对应。' + '全部自然站立、双臂放松,同一高度与地面基线,完整呈现头顶到鞋底,不裁头、不切脚、不遮挡、不重叠。' + '若原图仅有半身,依据可见服装合理补全下半身,补全部分在三个视角保持一致。' + '保持参考图画风,纯净浅灰背景、均匀柔光、弱透视,无剧情场景、文字、标签、水印、分割线或额外视图。',)), + 'face-three-view': ImagePreset('面部三视图', ( + '以参考图人物的面部为唯一身份依据,生成同一人物的面部三视图参考板。' + '超宽横版画面分为三个等宽区域,从左至右严格排列:正面、左侧90度、右侧90度。' + '每个视图只呈现完整头部至肩颈,头顶、下巴、耳朵均完整,不出现背面或全身视图。' + '保持同一身份、年龄、脸型、骨相、五官比例、肤色、发际线、发型及识别性细节,左右侧面符合真实结构。' + '三个头部大小一致、眼睛基线对齐、中性表情、视线随朝向自然变化,面部不被头发遮挡。' + '保持参考图画风,纯净浅灰背景、均匀柔光,无美颜改脸、夸张透视、文字、标签、水印或额外人物。',), (2688, 1152)), + 'product-three-view': ImagePreset('产品三视图', ( + '以参考图中的产品为唯一设计依据,生成同一产品的工业设计三视图参考板。' + '横版画面分为三个等宽区域,从左至右严格排列:正视图、右侧90度侧视图、后视图。' + '采用近正交投影、无广角畸变,同一比例尺、同一高度与底部基线,完整展示产品外轮廓,不裁切、不重叠。' + '三个视图保持结构、尺寸关系、材质、颜色、表面纹理、接口、按钮、接缝及标识一致,细节在视角之间符合物理对应关系。' + '不可见部位依据已知结构作合理且一致的补全,不增加功能件或改变产品设计。' + '产品独立展示,纯白背景、均匀棚拍光,无人物、手、包装道具、剧情场景、说明文字、尺寸标注、水印或额外视图;保留原有品牌标识。',)), + 'storyboard': ImagePreset('分镜', ('把镜头拉远成远景建立镜头,完整交代周围环境,主体在画面中较小', + '改为中景镜头,主体占画面一半高度,动作清晰', + '改为近景镜头,镜头推近到主体胸口以上,突出表情', + '改为特写镜头,只拍主体面部或关键细节,背景虚化')), + 'multi-camera': ImagePreset('多机位', ('把机位移到主体正前方,平视拍摄', + '把机位向左绕到主体左前方约45度,从左侧斜角拍摄,透视随之改变', + '把机位向右绕到主体右前方约45度,从右侧斜角拍摄,透视随之改变', + '把机位升高到主体上方,高角度俯拍')), +} + +async def image_presets(ctx: ToolContext): + image = _source_image(ctx) + preset = PRESETS[ctx.choice('preset', PRESETS)] + title, prompts = preset.title, preset.prompts + outputs = [] + for index, instruction in enumerate(prompts, 1): + await ctx.progress(f'正在生成{title}({index}/{len(prompts)})') + edited = await ctx.reframe(image, *preset.size, instruction + ',保持主体外观与风格一致') + outputs.append(image_output(edited, f'{title} {index}' if len(prompts) > 1 else title)) + return outputs + +async def multi_size(ctx: ToolContext): + image = _source_image(ctx) + width = int(ctx.number('outputWidth', image.width, 64, 8192)) + height = int(ctx.number('outputHeight', image.height, 64, 8192)) + target, current = width / height, image.width / image.height + if abs(target - current) < 0.01: + return [image_output(media.resize(image, width, height), f'{width}×{height}')] + if target > current: + extra = round(image.height * target) - image.width + pads = (extra // 2, 0, extra - extra // 2, 0) + else: + extra = round(image.width / target) - image.height + pads = (0, extra // 2, 0, extra - extra // 2) + result = await _extend(ctx, image, pads, ctx.text('prompt')) + return [image_output(media.resize(result, width, height), f'{width}×{height}')] + +async def product_replacement(ctx: ToolContext): + scene, product = _source_image(ctx, 0), _source_image(ctx, 1) + if not ctx.boxes: + raise ProjectError('请先框选商品区域。', 422) + box = ctx.boxes[0] + x, y, width, height = (int(round(box[key])) for key in ('x', 'y', 'width', 'height')) + if width < 8 or height < 8 or x < 0 or y < 0 or x + width > scene.width or y + height > scene.height: + raise ProjectError('商品区域超出原图或尺寸不正确。', 422) + layer = media.cover_box(product, (x, y, width, height)) + placed = scene.copy() + placed.paste(layer, (x, y), layer) + await ctx.progress('正在融合商品与场景') + drawn = await ctx.edit(placed, _with(ctx.text('prompt'), '商品自然融入场景,光影、透视和色调一致,保留商品外观和文字'), 0.42) + region = Image.new('L', scene.size, 0) + region.paste(255, (x, y, x + width, y + height)) + result = media.blend(scene, drawn, media.feather(region, max(4, min(width, height) / 12))) + edge = {'4K': 4096, '2K': 2048}.get(ctx.parameters.get('resolution')) + if edge and max(result.size) < edge: + result = media.scale_to_long_edge(result, edge) + return [image_output(result, '商品替换')] + +async def dynamic_poster(ctx: ToolContext): + image = _source_image(ctx) + await ctx.progress('正在生成动态海报') + prompt = await ctx.video_prompt(ctx.text('prompt'), 'The poster comes gently alive with subtle natural motion; the subject and its text stay stable.') + data = await ctx.video_from_frame(image, prompt, 5) + return [Output('video', data, 'mp4', '动态海报')] diff --git a/packages/core/src/opendirector/application/tool_image_segments.py b/packages/core/src/opendirector/application/tool_image_segments.py new file mode 100644 index 000000000..c9384e43b --- /dev/null +++ b/packages/core/src/opendirector/application/tool_image_segments.py @@ -0,0 +1,113 @@ +"""Image segmentation recipes for cutout, layer split, and editor previews.""" +from PIL import Image, ImageChops, ImageFilter + +from opendirector.application.tool_context import ToolContext, _source_image, image_output +from opendirector.domain.projects import ProjectError +from opendirector.media import processing as media + + +async def cutout(ctx: ToolContext): + image = _source_image(ctx) + if ctx.mask: + await ctx.progress('正在应用选区') + alpha = media.mask_from(ctx.mask, image.size) + elif ctx.segment_available: + found = await select_image_objects(ctx, image, ctx.text('prompt'), ctx.boxes) + alpha = Image.new('L', image.size, 0) + for mask, _, _, _ in found: + alpha = ImageChops.lighter(alpha, mask) + else: + await ctx.progress('正在识别并抠出主体') + lifted = await ctx.cutout(image, ctx.text('prompt')) + alpha = lifted.getchannel('A') + if alpha.getextrema()[1] < 16: + raise ProjectError('没有识别到可抠出的主体,请换一张图或涂抹主体所在区域后重试。', 422) + # Keep the original pixels; the model contributes only the matte. + result = image.copy() + result.putalpha(ImageChops.multiply(alpha, image.getchannel('A'))) + return [image_output(result, '抠图')] + +SMART_LAYERS = ('人物', '动物', '交通工具', '商品', '家具', '植物', '食物', '文字') + +def _overlap(box, target): + """Intersection over union of two (x0, y0, x1, y1) boxes.""" + width = max(0.0, min(box[2], target[2]) - max(box[0], target[0])) + height = max(0.0, min(box[3], target[3]) - max(box[1], target[1])) + inner = width * height + union = (box[2] - box[0]) * (box[3] - box[1]) + (target[2] - target[0]) * (target[3] - target[1]) - inner + return inner / union if union > 0 else 0.0 + +def _area(mask: Image.Image) -> int: + return mask.histogram()[255] + +def _distinct(found, size, limit=16, *, with_scores=False, preserve_order=False): + """Highest-scoring instances first; one that mostly repeats a kept layer or is a speck is dropped.""" + kept = [] + for mask, score, label in (found if preserve_order else sorted(found, key=lambda item: -item[1])): + mask = mask.point(lambda value: 255 if value >= 128 else 0) + area = _area(mask) + if area < size[0] * size[1] * 0.002: + continue + if any(_area(ImageChops.multiply(mask, other)) > 0.6 * min(area, other_area) for other, other_area, _, _ in kept): + continue + kept.append((mask, area, label, score)) + if len(kept) == limit: + break + return [(mask, score, label) if with_scores else (mask, label) for mask, _, label, score in kept] + +async def select_image_objects(ctx: ToolContext, image: Image.Image, prompt='', boxes=()): + """Reusable SAM instances for editor previews and automatic cutout. + + Exemplar boxes can match similar objects elsewhere, so only the best overlapping + instance is selected for each user box. No point-prompt semantics are invented. + """ + found = [] + if boxes: + for index, item in enumerate(boxes, 1): + target = (item['x'], item['y'], item['x'] + item['width'], item['y'] + item['height']) + if target[0] < 0 or target[1] < 0 or target[2] > image.width or target[3] > image.height: + raise ProjectError('选框必须位于原图内。', 422) + await ctx.progress(f'正在识别框选对象({index}/{len(boxes)})') + instances = await ctx.segment(image, boxes=(target,)) + best = max(instances, key=lambda item: _overlap(item[2], target), default=None) + if best is not None and _overlap(best[2], target) >= 0.3: + found.append((best[0], best[1], f'对象 {index}')) + else: + for concept, label in await ctx.concepts(prompt, SMART_LAYERS): + await ctx.progress(f'正在识别「{label}」') + found += [(mask, score, label) for mask, score, _ in await ctx.segment(image, concept)] + return [(mask, score, label, mask.getbbox()) + for mask, score, label in _distinct(found, image.size, with_scores=True, preserve_order=bool(boxes))] + +async def layer_decompose(ctx: ToolContext): + image = _source_image(ctx) + mode = ctx.choice('mode', ('smart', 'boxes', 'description'), 'smart') + if mode == 'boxes' and not ctx.boxes: + raise ProjectError('框选拆分需要提供原图中的矩形选区。', 422) + text = ctx.text('prompt') if mode == 'description' else '' + if mode == 'description' and not text: + raise ProjectError('按描述拆分需要填写拆分描述。', 422) + found = await select_image_objects(ctx, image, text, ctx.boxes if mode == 'boxes' else ()) + layers = [(mask, label) for mask, _, label, _ in found] + if not layers: + raise ProjectError('没有识别到可分离的对象,请换一种描述或框选对象后重试。', 422) + holes = Image.new('L', image.size, 0) + for mask, _ in layers: + holes = ImageChops.lighter(holes, mask) + await ctx.progress('正在补全背景') + # Without an image editor the background keeps transparent holes where the layers were. + grown = holes.filter(ImageFilter.MaxFilter(max(3, (min(image.size) // 100) | 1))) + try: + drawn = await ctx.edit(media.soften_region(image, grown), '移除画面中被涂抹区域的主体,用周围背景自然补全,画面干净完整', 0.85) + background, title = media.blend(image, drawn, media.feather(grown, max(3, min(image.size) / 150))), '背景' + except ProjectError: + background, title = image.convert('RGBA'), '背景(未补全)' + background.putalpha(ImageChops.multiply(ImageChops.invert(holes), background.getchannel('A'))) + outputs = [image_output(background, title)] + alpha = image.convert('RGBA').getchannel('A') + for index, (mask, label) in enumerate(layers, 1): + # Layers keep the source canvas so stacking them over the background rebuilds the image. + layer = image.convert('RGBA') + layer.putalpha(ImageChops.multiply(mask, alpha)) + outputs.append(image_output(layer, f'图层 {index} · {label}')) + return outputs diff --git a/packages/core/src/opendirector/application/tool_operations.py b/packages/core/src/opendirector/application/tool_operations.py index 28b162b9d..755bc5ccf 100644 --- a/packages/core/src/opendirector/application/tool_operations.py +++ b/packages/core/src/opendirector/application/tool_operations.py @@ -4,807 +4,26 @@ them through whichever configured model offers them. Recipes never see a model name, protocol or endpoint, so swapping or adding models does not touch them. """ - -import io -import json -import math -import re from dataclasses import dataclass, field from typing import Awaitable, Callable -from PIL import Image, ImageChops, ImageFilter - -from opendirector.domain.capabilities import (ChatRequest, CutoutRequest, DepthRequest, EditMask, ImageRequest, SegmentRequest, TrackRequest, - Tracks, VideoEditRequest, VideoRequest) -from opendirector.domain.projects import ProjectError -from opendirector.media import processing as media -from opendirector.media.async_work import blocking - - -@dataclass(frozen=True) -class Source: - kind: str - data: bytes - name: str - - -@dataclass(frozen=True) -class Output: - kind: str - data: bytes - suffix: str - title: str - - -class ToolContext: - """What a recipe may use: inputs, model capabilities and progress reporting.""" - - def __init__(self, *, sources, mask, boxes, parameters, image_model, video_model, progress, video_submitted=None, cutout_model=None, - edit_model=None, edit_seconds=(4.0, 15.0), chat_model=None, segment_model=None, track_model=None, - edit_keeps_layout=True, annotation=None, edit_max_images=1, segment_available=False, depth_model=None): - self.sources: list[Source] = sources - self.mask: bytes | None = mask - self.annotation: bytes | None = annotation - self.edit_max_images = edit_max_images - self.segment_available = segment_available - self.boxes: list[dict] = boxes - self.parameters: dict = parameters - self._image, self._video, self._cutout, self._edit = image_model, video_model, cutout_model, edit_model - self._segment, self._track, self._depth = segment_model, track_model, depth_model - # img2img models redraw in place by strength; instruction editors recompose the picture. - self.edit_keeps_layout = edit_keeps_layout - # Shortest and longest clip one redraw accepts; longer sources are processed piecewise. - self.edit_seconds = edit_seconds - # Optional: a chat model only improves prompts; tools never require it. - self._chat = chat_model - self._progress, self._video_submitted = progress, video_submitted - - def text(self, key, default=''): - value = self.parameters.get(key, default) - return value.strip() if isinstance(value, str) else default - - def number(self, key, default, low=None, high=None): - value = self.parameters.get(key, default) - if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value): - raise ProjectError(f'参数 {key} 无效。', 422) - if (low is not None and value < low) or (high is not None and value > high): - raise ProjectError(f'参数 {key} 超出范围。', 422) - return value - - def choice(self, key, options, default=None): - value = self.parameters.get(key, default) - if value not in options: - raise ProjectError(f'参数 {key} 不在可选范围内。', 422) - return value - - async def progress(self, message): - await self._progress(message) - - async def edit(self, image: Image.Image, prompt: str, strength: float, *, references=()) -> Image.Image: - """Image-to-image at the source's aspect; the result is resampled back to the source size.""" - result = await self._image(ImageRequest(prompt=prompt, width=image.width, height=image.height, - image=media.rgb_png(image), strength=strength, references=tuple(references))) - return media.resize(media.open_image(result.data), image.width, image.height) - - async def reframe(self, image: Image.Image, width: int, height: int, prompt: str) -> Image.Image: - """An instruction edit of image rendered on a width x height frame.""" - result = await self._image(ImageRequest(prompt=prompt, width=width, height=height, image=media.rgb_png(image))) - return media.resize(media.open_image(result.data), width, height) - - async def cutout(self, image: Image.Image, subject: str = '') -> Image.Image: - """The subject on transparency, at the source size.""" - result = await self._cutout(CutoutRequest(image=media.rgb_png(image), width=image.width, height=image.height, subject=subject)) - return media.resize(media.open_image(result.data), image.width, image.height) - - async def segment(self, image: Image.Image, concept: str = '', boxes=()) -> list[tuple[Image.Image, float, tuple]]: - """Instances of an English concept or of exemplar boxes: (mask at the image size, score, box).""" - segments = await self._segment(SegmentRequest(image=media.rgb_png(image), concept=concept, boxes=tuple(boxes))) - return [(media.resize(media.open_image(item.mask).convert('L'), image.width, image.height), item.score, item.box) - for item in segments] - - async def track(self, clip: bytes, concepts: tuple[str, ...]) -> Tracks: - return await self._track(TrackRequest(video=clip, concepts=concepts)) - - async def depth(self, clip: bytes) -> bytes: - """A grayscale depth video of clip at its size and rate; near is bright.""" - return (await self._depth(DepthRequest(video=clip))).data - - async def concepts(self, text: str, default: tuple[str, ...]) -> list[tuple[str, str]]: - """(English concept, label) pairs from a comma-separated description; segmentation models read English.""" - parts = list(dict.fromkeys(item.strip() for item in re.split(r'[,,、;;\n]+', text) if item.strip())) - if not parts: - return [(CONCEPTS.get(item, item), item) for item in default] - pairs = [] - for part in parts[:16]: - english = CONCEPTS.get(part) or (part if part.isascii() else None) - if english is None and self._chat is not None: - try: - english = (await self._chat(ChatRequest(messages=( - {'role': 'system', 'content': 'Name the visual object the user describes as a short English noun phrase, ' - 'such as "red car" or "person". Output only the phrase.'}, - {'role': 'user', 'content': part + ' /no_think'}), max_tokens=40))).strip().strip('."\'').lower() - except ProjectError: - english = None - if not english or not english.isascii(): - raise ProjectError(f'无法识别「{part}」,请改用英文描述,或在“模型接入”中添加对话模型以自动翻译。', 422) - pairs.append((english, part)) - return pairs - - async def english(self, text: str) -> str: - """Video models render non-English prompt text as burnt-in subtitles; translate when a chat model is connected.""" - if not text or text.isascii() or self._chat is None: - return text - try: - translated = await self._chat(ChatRequest(messages=( - {'role': 'system', 'content': 'Translate the user text into concise English for a video generation prompt. ' - 'Output only the translation.'}, - {'role': 'user', 'content': text + ' /no_think'}), max_tokens=400)) - except ProjectError: - return text - return translated.strip() or text - - async def video_prompt(self, user: str, instruction: str) -> str: - user = await self.english(user) - return f'{user}. {instruction}' if user else instruction - - async def redraw(self, clip: bytes, seconds: float, width: int, height: int, prompt: str, picture=None, sound=None) -> bytes: - result = await self._edit(VideoEditRequest(prompt=f'{prompt} {CLEAN_PICTURE}', source=clip, seconds=seconds, width=width, - height=height, picture=picture, sound=sound, avoid=NO_TEXT), self._video_submitted) - return result.data - - async def video_from_frame(self, frame: Image.Image, prompt: str, seconds: float) -> bytes: - ratio = frame.width / frame.height - aspect = min(('16:9', '9:16', '1:1', '4:3', '3:4'), key=lambda item: abs(eval_ratio(item) - ratio)) - frame = media.scale_to_long_edge(frame, 1280) if max(frame.size) > 1280 else frame - result = await self._video(VideoRequest(prompt=f'{prompt} {CLEAN_PICTURE}', seconds=seconds, aspect_ratio=aspect, - first_frame=media.rgb_png(frame), avoid=NO_TEXT), - self._video_submitted) - return result.data - - -# Common subjects map to SAM 3 concepts without a chat model; other words are translated. -CONCEPTS = { - '人': 'person', '人物': 'person', '人像': 'person', '人群': 'person', '主体': 'person', '男人': 'man', '女人': 'woman', - '小孩': 'child', '孩子': 'child', '儿童': 'child', '脸': 'face', '手': 'hand', '头发': 'hair', - '动物': 'animal', '猫': 'cat', '狗': 'dog', '鸟': 'bird', '马': 'horse', '鱼': 'fish', - '车': 'car', '汽车': 'car', '车辆': 'vehicle', '交通工具': 'vehicle', '自行车': 'bicycle', '摩托车': 'motorcycle', - '船': 'boat', '飞机': 'airplane', '树': 'tree', '花': 'flower', '植物': 'plant', '建筑': 'building', '房子': 'house', - '天空': 'sky', '桌子': 'table', '椅子': 'chair', '沙发': 'sofa', '家具': 'furniture', '杯子': 'cup', '瓶子': 'bottle', - '包': 'bag', '鞋': 'shoe', '衣服': 'clothing', '帽子': 'hat', '手机': 'phone', '电脑': 'computer', '食物': 'food', - '商品': 'product', '产品': 'product', '文字': 'text', '标志': 'logo', -} - - -# Naming text in a positive prompt invites it; the negative prompt carries the exclusion. -CLEAN_PICTURE = 'Clean picture.' -NO_TEXT = 'subtitles, captions, on-screen text, letters, words, watermark, logo' - - -def eval_ratio(text): - width, height = text.split(':') - return int(width) / int(height) - - -def image_output(image: Image.Image, title: str) -> Output: - data = media.png(image) - if len(data) > 48 * 1024 * 1024: - # Very large renders are stored as high-quality JPEG to stay under the asset limit. - buffer = io.BytesIO() - image.convert('RGB').save(buffer, 'JPEG', quality=94) - return Output('image', buffer.getvalue(), 'jpg', title) - return Output('image', data, 'png', title) - - -def _source_image(ctx: ToolContext, index=0) -> Image.Image: - if len(ctx.sources) <= index or ctx.sources[index].kind != 'image': - raise ProjectError('请提供图片素材。', 422) - return media.open_image(ctx.sources[index].data) - - -def _with(prompt: str, instruction: str) -> str: - return f'{prompt}。{instruction}' if prompt else instruction - - -def _placement(pads, width, height) -> str: - """Where the original sits in the extended frame, and which sides grow, in words.""" - left, top, right, bottom = pads - total_width, total_height = width + left + right, height + top + bottom - horizontal = '左侧' if not left and right else '右侧' if left and not right else '' - vertical = '上方' if not top and bottom else '下方' if top and not bottom else '' - where = f'{vertical}{horizontal}'.replace('上方左侧', '左上角').replace('上方右侧', '右上角') \ - .replace('下方左侧', '左下角').replace('下方右侧', '右下角') or '中央' - sides = '、'.join(name for name, pad in (('左侧', left), ('上方', top), ('右侧', right), ('下方', bottom)) if pad) - return (f'原画面约占新画面宽度的 {width / total_width:.0%}、高度的 {height / total_height:.0%},位于新画面的{where},' - f'在{sides}新增与原场景连续的内容') - - -async def _extend(ctx: ToolContext, image: Image.Image, pads, prompt: str) -> Image.Image: - """Outpainting: soft border, image-to-image, original pixels kept inside a feathered seam. - - Instruction editors ignore strength and recompose a padded canvas instead of - filling it, so they are asked to pull the camera back over the original. - """ - if not ctx.edit_keeps_layout: - await ctx.progress('正在扩展画面') - width, height = image.width + pads[0] + pads[2], image.height + pads[1] + pads[3] - return await ctx.reframe(image, width, height, _with(prompt, ( - f'镜头拉远,扩展画面:{_placement(pads, image.width, image.height)}。保持原图中的人物、物体、服饰、场景、色调与光线完全一致,' - '延续原有的透视与风格,画面完整自然,不要边框、白边或拼接痕迹'))) - canvas, _ = media.extend_canvas(image, *pads) - await ctx.progress('正在扩展画面') - drawn = await ctx.edit(canvas, _with(prompt, '自然延展画面四周,与原图内容、风格、透视和光线保持一致,无边框无拼接痕迹'), 0.9) - # The redraw shifts tone slightly; a wide ramp inside the original hides the seam. - inset = max(8, min(image.size) // 8) - left, top, right, bottom = pads - keep = (left + (inset if left else 0), top + (inset if top else 0), - left + image.width - (inset if right else 0), top + image.height - (inset if bottom else 0)) - seam = Image.new('L', canvas.size, 255) - seam.paste(0, keep) - return media.blend(canvas, drawn, media.feather(seam, inset / 2)) - - -# Image recipes --------------------------------------------------------------- - -async def smart_edit(ctx: ToolContext): - image = _source_image(ctx) - mode = ctx.choice('editMode', ('annotation', 'selection', 'combined'), 'combined') - if mode == 'selection' and not ctx.mask: - raise ProjectError('请先涂抹或识别需要修改的区域。', 422) - prompt = ctx.text('prompt') - notes = [] - if mode != 'selection': - try: - document = json.loads(ctx.parameters.get('annotationDocument') or '{}') - notes = [stroke.get('text', '').strip() for stroke in document.get('strokes', []) if stroke.get('tool') == 'text'] - except (ValueError, AttributeError): - pass - instruction = ';'.join(item for item in [prompt, *notes] if item) - if not instruction: - raise ProjectError('请描述要如何修改图片。', 422) - await ctx.progress('正在按描述改图') - input_image, references = image, () - if mode != 'selection' and ctx.annotation: - marked = media.open_image(ctx.annotation) - if marked.size != image.size: - raise ProjectError('标注图片尺寸必须与原图一致。', 422) - if ctx.edit_max_images > 1: - references = (media.rgb_png(marked),) - instruction += '。第二张图是第一张图上的编辑标记,请根据标记理解位置与意图' - else: - input_image = marked - instruction += '。图上的笔画、箭头与文字是编辑指示' - instruction += ',完成修改后移除这些辅助标记' - edited = await ctx.edit(input_image, instruction + '。保持未提及的内容不变', 0.78, references=references) - if mode != 'annotation' and ctx.mask: - # A selection is an exact editing boundary: pixels outside it stay original. - edited = media.blend(image, edited, media.mask_from(ctx.mask, image.size)) - return [image_output(edited, '智能改图')] - - -async def outpaint(ctx: ToolContext): - image = _source_image(ctx) - sides = [ctx.number(key, 0, 0, 4) for key in ('left', 'top', 'right', 'bottom')] - if not any(sides): - raise ProjectError('请至少向一个方向扩展。', 422) - pads = [round(sides[0] * image.width), round(sides[1] * image.height), round(sides[2] * image.width), round(sides[3] * image.height)] - result = await _extend(ctx, image, pads, ctx.text('prompt')) - width, height = ctx.parameters.get('outputWidth'), ctx.parameters.get('outputHeight') - if isinstance(width, (int, float)) and isinstance(height, (int, float)) and width > 0 and height > 0: - result = media.resize(result, int(width), int(height)) - return [image_output(result, '扩图')] - - -HD_EDGES = {'2K': 2048, '4K': 4096, '8K': 8192} - - -async def image_hd(ctx: ToolContext): - outputs = [] - edge = HD_EDGES[ctx.choice('resolution', HD_EDGES, '4K')] - pro = ctx.choice('kind', ('normal', 'pro'), 'normal') == 'pro' - for index, source in enumerate(ctx.sources): - image = media.open_image(source.data) - if pro: - await ctx.progress(f'正在增强细节({index + 1}/{len(ctx.sources)})') - detail = ctx.number('detailStrength', 0.5, 0.01, 1) - base = media.scale_to_long_edge(image, 1536) if max(image.size) > 1536 else image - image = await ctx.edit(base, '高清摄影,细节丰富,纹理锐利清晰,保持构图、主体和颜色完全不变', 0.12 + 0.3 * detail) - await ctx.progress(f'正在放大到 {edge}px') - outputs.append(image_output(media.scale_to_long_edge(image, edge), f'超清 {ctx.parameters.get("resolution", "4K")}')) - return outputs - - -async def cutout(ctx: ToolContext): - image = _source_image(ctx) - if ctx.mask: - await ctx.progress('正在应用选区') - alpha = media.mask_from(ctx.mask, image.size) - elif ctx.segment_available: - found = await select_image_objects(ctx, image, ctx.text('prompt'), ctx.boxes) - alpha = Image.new('L', image.size, 0) - for mask, _, _, _ in found: - alpha = ImageChops.lighter(alpha, mask) - else: - await ctx.progress('正在识别并抠出主体') - lifted = await ctx.cutout(image, ctx.text('prompt')) - alpha = lifted.getchannel('A') - if alpha.getextrema()[1] < 16: - raise ProjectError('没有识别到可抠出的主体,请换一张图或涂抹主体所在区域后重试。', 422) - # Keep the original pixels; the model contributes only the matte. - result = image.copy() - result.putalpha(ImageChops.multiply(alpha, image.getchannel('A'))) - return [image_output(result, '抠图')] - - -SMART_LAYERS = ('人物', '动物', '交通工具', '商品', '家具', '植物', '食物', '文字') - - -def _overlap(box, target): - """Intersection over union of two (x0, y0, x1, y1) boxes.""" - width = max(0.0, min(box[2], target[2]) - max(box[0], target[0])) - height = max(0.0, min(box[3], target[3]) - max(box[1], target[1])) - inner = width * height - union = (box[2] - box[0]) * (box[3] - box[1]) + (target[2] - target[0]) * (target[3] - target[1]) - inner - return inner / union if union > 0 else 0.0 - - -def _area(mask: Image.Image) -> int: - return mask.histogram()[255] - - -def _distinct(found, size, limit=16, *, with_scores=False, preserve_order=False): - """Highest-scoring instances first; one that mostly repeats a kept layer or is a speck is dropped.""" - kept = [] - for mask, score, label in (found if preserve_order else sorted(found, key=lambda item: -item[1])): - mask = mask.point(lambda value: 255 if value >= 128 else 0) - area = _area(mask) - if area < size[0] * size[1] * 0.002: - continue - if any(_area(ImageChops.multiply(mask, other)) > 0.6 * min(area, other_area) for other, other_area, _, _ in kept): - continue - kept.append((mask, area, label, score)) - if len(kept) == limit: - break - return [(mask, score, label) if with_scores else (mask, label) for mask, _, label, score in kept] - - -async def select_image_objects(ctx: ToolContext, image: Image.Image, prompt='', boxes=()): - """Reusable SAM instances for editor previews and automatic cutout. - - Exemplar boxes can match similar objects elsewhere, so only the best overlapping - instance is selected for each user box. No point-prompt semantics are invented. - """ - found = [] - if boxes: - for index, item in enumerate(boxes, 1): - target = (item['x'], item['y'], item['x'] + item['width'], item['y'] + item['height']) - if target[0] < 0 or target[1] < 0 or target[2] > image.width or target[3] > image.height: - raise ProjectError('选框必须位于原图内。', 422) - await ctx.progress(f'正在识别框选对象({index}/{len(boxes)})') - instances = await ctx.segment(image, boxes=(target,)) - best = max(instances, key=lambda item: _overlap(item[2], target), default=None) - if best is not None and _overlap(best[2], target) >= 0.3: - found.append((best[0], best[1], f'对象 {index}')) - else: - for concept, label in await ctx.concepts(prompt, SMART_LAYERS): - await ctx.progress(f'正在识别「{label}」') - found += [(mask, score, label) for mask, score, _ in await ctx.segment(image, concept)] - return [(mask, score, label, mask.getbbox()) - for mask, score, label in _distinct(found, image.size, with_scores=True, preserve_order=bool(boxes))] - +from opendirector.application.tool_context import Output, Source, ToolContext +from opendirector.application.tool_image_edits import ( + PRESETS, dynamic_poster, image_hd, image_presets, inpainting_remove, lighting, multi_size, + outpaint, panorama, product_replacement, smart_edit, view_control, +) +from opendirector.application.tool_image_segments import cutout, layer_decompose, select_image_objects +from opendirector.application.tool_video_recipes import ( + AUDIO_MODES, audio_separation, depth_capture, frame_interpolation, partial_reshoot, + subtitle_erasure, video_edit, video_matting, video_upscale, +) -async def layer_decompose(ctx: ToolContext): - image = _source_image(ctx) - mode = ctx.choice('mode', ('smart', 'boxes', 'description'), 'smart') - if mode == 'boxes' and not ctx.boxes: - raise ProjectError('框选拆分需要提供原图中的矩形选区。', 422) - text = ctx.text('prompt') if mode == 'description' else '' - if mode == 'description' and not text: - raise ProjectError('按描述拆分需要填写拆分描述。', 422) - found = await select_image_objects(ctx, image, text, ctx.boxes if mode == 'boxes' else ()) - layers = [(mask, label) for mask, _, label, _ in found] - if not layers: - raise ProjectError('没有识别到可分离的对象,请换一种描述或框选对象后重试。', 422) - holes = Image.new('L', image.size, 0) - for mask, _ in layers: - holes = ImageChops.lighter(holes, mask) - await ctx.progress('正在补全背景') - # Without an image editor the background keeps transparent holes where the layers were. - grown = holes.filter(ImageFilter.MaxFilter(max(3, (min(image.size) // 100) | 1))) - try: - drawn = await ctx.edit(media.soften_region(image, grown), '移除画面中被涂抹区域的主体,用周围背景自然补全,画面干净完整', 0.85) - background, title = media.blend(image, drawn, media.feather(grown, max(3, min(image.size) / 150))), '背景' - except ProjectError: - background, title = image.convert('RGBA'), '背景(未补全)' - background.putalpha(ImageChops.multiply(ImageChops.invert(holes), background.getchannel('A'))) - outputs = [image_output(background, title)] - alpha = image.convert('RGBA').getchannel('A') - for index, (mask, label) in enumerate(layers, 1): - # Layers keep the source canvas so stacking them over the background rebuilds the image. - layer = image.convert('RGBA') - layer.putalpha(ImageChops.multiply(mask, alpha)) - outputs.append(image_output(layer, f'图层 {index} · {label}')) - return outputs +# Editor previews and tool tasks import this helper from the catalog module. +__all__ = ['Output', 'Source', 'TOOLS', 'ToolContext', 'select_image_objects'] -async def inpainting_remove(ctx: ToolContext): - image = _source_image(ctx) - if not ctx.mask: - raise ProjectError('请先涂抹需要消除的区域。', 422) - mask = media.mask_from(ctx.mask, image.size) - await ctx.progress('正在消除并填补') - drawn = await ctx.edit(media.soften_region(image, mask), '移除涂抹区域中的物体与文字,用周围环境自然填补,画面干净完整', 0.8) - return [image_output(media.blend(image, drawn, media.feather(mask, max(3, min(image.size) / 120))), '消除')] - - -def _yaw_text(yaw): - names = ['正面', '右前方', '右侧面', '右后方', '背面', '左后方', '左侧面', '左前方'] - return names[round((yaw % 360) / 45) % 8] - - -async def view_control(ctx: ToolContext): - image = _source_image(ctx) - yaw = ctx.number('yaw', 0, -360, 360) - pitch = ctx.number('pitch', 0, -90, 90) - distance = ctx.parameters.get('distancePreset') or ctx.parameters.get('distance') or 'standard' - shot = {'near': '近景特写', 'standard': '中景', 'far': '远景全身'}.get(distance, '中景') - angle = '俯视' if pitch > 20 else '仰视' if pitch < -10 else '平视' - await ctx.progress('正在生成新视角') - edited = await ctx.edit(image, _with(ctx.text('prompt'), f'同一主体从{_yaw_text(yaw)}{angle}角度拍摄的{shot},' - '保持主体外观、服装、颜色和场景风格完全一致'), 0.8) - return [image_output(edited, f'多角度 · {_yaw_text(yaw)}')] - - -async def lighting(ctx: ToolContext): - image = _source_image(ctx) - yaw = ctx.number('yaw', 0, -360, 360) - pitch = ctx.number('pitch', 30, -90, 90) - # The lighting editor sends brightnessPercent; the catalog field is brightness. - brightness = ctx.number('brightnessPercent' if 'brightnessPercent' in ctx.parameters else 'brightness', 60, 0, 100) - texture = '柔和漫射' if ctx.parameters.get('texture', 'soft') == 'soft' else '硬朗强烈' - color = ctx.text('lightColor', '#ffffff') or '#ffffff' - height = '顶光' if pitch > 50 else '高位' if pitch > 15 else '底光' if pitch < -15 else '平射' - level = '明亮' if brightness > 66 else '中等亮度' if brightness > 33 else '昏暗低调' - await ctx.progress('正在重新布光') - edited = await ctx.edit(image, _with(ctx.text('prompt'), f'重新布光:主光来自{_yaw_text(yaw)}{height},{texture}的光质,' - f'光色 {color},整体{level},阴影和高光随光源变化,保持主体和构图不变'), 0.72) - return [image_output(edited, '智能打光')] - - -async def panorama(ctx: ToolContext): - image = _source_image(ctx) - width = max(image.width, image.height * 2) - height = width // 2 - pads = ((width - image.width) // 2, (height - image.height) // 2) - pads = (pads[0], pads[1], width - image.width - pads[0], height - image.height - pads[1]) - result = await _extend(ctx, image, pads, _with(ctx.text('prompt'), '360度等距柱状投影全景图,左右边缘可无缝衔接')) - edge = {'4K': 4096, '2K': 2048}.get(ctx.parameters.get('resolution'), 2048) - return [image_output(media.resize(result, edge, edge // 2), '720 全景')] - - -@dataclass(frozen=True) -class ImagePreset: - title: str - prompts: tuple[str, ...] - size: tuple[int, int] = (2048, 1152) - - -PRESETS = { - # Written as edit instructions: editing models follow imperatives, not captions. - 'three-view': ImagePreset('人物三视图', ( - '以参考图中的人物为唯一身份依据,生成同一人物的全身三视图设定板。' - '横版画面分为三个等宽区域,从左至右严格排列:正面全身、右侧90度全身、背面全身。' - '三个视图保持同一身份、年龄、体型、头身比、发型、服装、配色、材质及配饰,衣服结构与细节相互对应。' - '全部自然站立、双臂放松,同一高度与地面基线,完整呈现头顶到鞋底,不裁头、不切脚、不遮挡、不重叠。' - '若原图仅有半身,依据可见服装合理补全下半身,补全部分在三个视角保持一致。' - '保持参考图画风,纯净浅灰背景、均匀柔光、弱透视,无剧情场景、文字、标签、水印、分割线或额外视图。',)), - 'face-three-view': ImagePreset('面部三视图', ( - '以参考图人物的面部为唯一身份依据,生成同一人物的面部三视图参考板。' - '超宽横版画面分为三个等宽区域,从左至右严格排列:正面、左侧90度、右侧90度。' - '每个视图只呈现完整头部至肩颈,头顶、下巴、耳朵均完整,不出现背面或全身视图。' - '保持同一身份、年龄、脸型、骨相、五官比例、肤色、发际线、发型及识别性细节,左右侧面符合真实结构。' - '三个头部大小一致、眼睛基线对齐、中性表情、视线随朝向自然变化,面部不被头发遮挡。' - '保持参考图画风,纯净浅灰背景、均匀柔光,无美颜改脸、夸张透视、文字、标签、水印或额外人物。',), (2688, 1152)), - 'product-three-view': ImagePreset('产品三视图', ( - '以参考图中的产品为唯一设计依据,生成同一产品的工业设计三视图参考板。' - '横版画面分为三个等宽区域,从左至右严格排列:正视图、右侧90度侧视图、后视图。' - '采用近正交投影、无广角畸变,同一比例尺、同一高度与底部基线,完整展示产品外轮廓,不裁切、不重叠。' - '三个视图保持结构、尺寸关系、材质、颜色、表面纹理、接口、按钮、接缝及标识一致,细节在视角之间符合物理对应关系。' - '不可见部位依据已知结构作合理且一致的补全,不增加功能件或改变产品设计。' - '产品独立展示,纯白背景、均匀棚拍光,无人物、手、包装道具、剧情场景、说明文字、尺寸标注、水印或额外视图;保留原有品牌标识。',)), - 'storyboard': ImagePreset('分镜', ('把镜头拉远成远景建立镜头,完整交代周围环境,主体在画面中较小', - '改为中景镜头,主体占画面一半高度,动作清晰', - '改为近景镜头,镜头推近到主体胸口以上,突出表情', - '改为特写镜头,只拍主体面部或关键细节,背景虚化')), - 'multi-camera': ImagePreset('多机位', ('把机位移到主体正前方,平视拍摄', - '把机位向左绕到主体左前方约45度,从左侧斜角拍摄,透视随之改变', - '把机位向右绕到主体右前方约45度,从右侧斜角拍摄,透视随之改变', - '把机位升高到主体上方,高角度俯拍')), -} - - -async def image_presets(ctx: ToolContext): - image = _source_image(ctx) - preset = PRESETS[ctx.choice('preset', PRESETS)] - title, prompts = preset.title, preset.prompts - outputs = [] - for index, instruction in enumerate(prompts, 1): - await ctx.progress(f'正在生成{title}({index}/{len(prompts)})') - edited = await ctx.reframe(image, *preset.size, instruction + ',保持主体外观与风格一致') - outputs.append(image_output(edited, f'{title} {index}' if len(prompts) > 1 else title)) - return outputs - - -async def multi_size(ctx: ToolContext): - image = _source_image(ctx) - width = int(ctx.number('outputWidth', image.width, 64, 8192)) - height = int(ctx.number('outputHeight', image.height, 64, 8192)) - target, current = width / height, image.width / image.height - if abs(target - current) < 0.01: - return [image_output(media.resize(image, width, height), f'{width}×{height}')] - if target > current: - extra = round(image.height * target) - image.width - pads = (extra // 2, 0, extra - extra // 2, 0) - else: - extra = round(image.width / target) - image.height - pads = (0, extra // 2, 0, extra - extra // 2) - result = await _extend(ctx, image, pads, ctx.text('prompt')) - return [image_output(media.resize(result, width, height), f'{width}×{height}')] - - -async def product_replacement(ctx: ToolContext): - scene, product = _source_image(ctx, 0), _source_image(ctx, 1) - if not ctx.boxes: - raise ProjectError('请先框选商品区域。', 422) - box = ctx.boxes[0] - x, y, width, height = (int(round(box[key])) for key in ('x', 'y', 'width', 'height')) - if width < 8 or height < 8 or x < 0 or y < 0 or x + width > scene.width or y + height > scene.height: - raise ProjectError('商品区域超出原图或尺寸不正确。', 422) - layer = media.cover_box(product, (x, y, width, height)) - placed = scene.copy() - placed.paste(layer, (x, y), layer) - await ctx.progress('正在融合商品与场景') - drawn = await ctx.edit(placed, _with(ctx.text('prompt'), '商品自然融入场景,光影、透视和色调一致,保留商品外观和文字'), 0.42) - region = Image.new('L', scene.size, 0) - region.paste(255, (x, y, x + width, y + height)) - result = media.blend(scene, drawn, media.feather(region, max(4, min(width, height) / 12))) - edge = {'4K': 4096, '2K': 2048}.get(ctx.parameters.get('resolution')) - if edge and max(result.size) < edge: - result = media.scale_to_long_edge(result, edge) - return [image_output(result, '商品替换')] - - -async def dynamic_poster(ctx: ToolContext): - image = _source_image(ctx) - await ctx.progress('正在生成动态海报') - prompt = await ctx.video_prompt(ctx.text('prompt'), 'The poster comes gently alive with subtle natural motion; the subject and its text stay stable.') - data = await ctx.video_from_frame(image, prompt, 5) - return [Output('video', data, 'mp4', '动态海报')] - - -# Video recipes --------------------------------------------------------------- - -def _source_video(ctx: ToolContext) -> Source: - if not ctx.sources or ctx.sources[0].kind != 'video': - raise ProjectError('请提供视频素材。', 422) - return ctx.sources[0] - - -async def _redraw_pieces(ctx: ToolContext, source: Source, prompt: str, picture, sound, *, window=None): - """Redraw a clip within the model's per-request length: the whole clip in even pieces, or only - the stretch around `window` (seconds), spliced back. Output keeps the source size and rate.""" - low, high = ctx.edit_seconds - with media.Workspace() as work: - path = work.write('source.mp4', source.data) - info = await blocking(media.video_info, path) - duration = info['duration'] - if duration < low: - raise ProjectError(f'视频至少需要 {low:g} 秒。', 422) - if window: - start, end = window - if end - start > high: - raise ProjectError(f'一次最多重绘 {high:g} 秒,请缩短区间。', 422) - length = min(duration, max(low, min(high, end - start + 2))) - first = min(max(0.0, (start + end - length) / 2), duration - length) - pieces = [(first, first + length)] - else: - count = math.ceil(duration / high) - pieces = [(duration * index / count, duration * (index + 1) / count) for index in range(count)] - done = [] - for index, (first, last) in enumerate(pieces): - await ctx.progress(f'正在重绘({index + 1}/{len(pieces)})' if len(pieces) > 1 else '正在重绘') - clip = await blocking(media.conform, path, work.path / f'in-{index}.mp4', width=info['width'], height=info['height'], - fps=info['fps'], start=first, end=last) - local = (lambda mask: mask and EditMask(mask.level, mask.region, None if mask.start is None else mask.start - first, - None if mask.end is None else mask.end - first)) - drawn = await ctx.redraw(clip.read_bytes(), last - first, info['width'], info['height'], prompt, local(picture), local(sound)) - done.append(await blocking(media.conform, work.write(f'drawn-{index}.mp4', drawn), work.path / f'out-{index}.mp4', - width=info['width'], height=info['height'], fps=info['fps'], end=last - first)) - await ctx.progress('正在合成结果') - if window: - return await blocking(media.splice, work, path, pieces[0][0], pieces[0][1], done[0]) - return await blocking(media.concat, work, done) - - -def _box_region(ctx: ToolContext, width, height, rows=36, columns=64): - """Selection boxes (source pixels) as a 0/1 grid over the frame, or None without boxes.""" - if not ctx.boxes: - return None - grid = [[0.0] * columns for _ in range(rows)] - for box in ctx.boxes: - x0, y0 = box['x'] / width, box['y'] / height - x1, y1 = (box['x'] + box['width']) / width, (box['y'] + box['height']) / height - for row in range(rows): - for column in range(columns): - if x0 <= (column + 0.5) / columns <= x1 and y0 <= (row + 0.5) / rows <= y1: - grid[row][column] = 1.0 - return tuple(tuple(row) for row in grid) - - -async def _video_size(source: Source): - with media.Workspace() as work: - info = await blocking(media.video_info, work.write('probe.mp4', source.data)) - return info['width'], info['height'] - - -async def partial_reshoot(ctx: ToolContext): - source = _source_video(ctx) - prompt = ctx.text('prompt') - if not prompt: - raise ProjectError('请描述重拍片段的内容。', 422) - start = ctx.number('startMs', 0, 0) / 1000 - end = ctx.number('endMs', 0, 0) / 1000 - if end - start < 0.5: - raise ProjectError('重拍区间至少 0.5 秒。', 422) - # Only the chosen stretch is redrawn, picture and sound; the rest of the clip stays the source. - window = EditMask(1.0, None, start, end) - prompt = await ctx.video_prompt(prompt, 'Keep the people, setting, lighting and camera continuous with the surrounding footage.') - data = await _redraw_pieces(ctx, source, prompt, window, window, window=(start, end)) - return [Output('video', data, 'mp4', '局部重拍')] - - -MATTE_MAX_FRAMES = 2048 - - -def _write_mattes(tracks: Tracks, folder): - folder.mkdir() - for index, frame in enumerate(tracks.frames): - matte = Image.new('L', (tracks.width, tracks.height), 0) - for counts in frame: - matte = ImageChops.lighter(matte, media.rle_mask(counts, tracks.width, tracks.height)) - # A one-pixel blur anti-aliases the hard mask edge. - matte.filter(ImageFilter.GaussianBlur(0.8)).save(folder / f'{index:05d}.png', compress_level=1) - - -async def video_matting(ctx: ToolContext): - source = _source_video(ctx) - background = ctx.choice('background', ('black', 'green', 'transparent'), 'green') - pairs = await ctx.concepts(ctx.text('prompt'), ('人物',)) - with media.Workspace() as work: - raw = work.write('source', source.data) - info = await blocking(media.video_info, raw) - if info['duration'] * info['fps'] > MATTE_MAX_FRAMES: - raise ProjectError(f'视频抠像单次最多处理 {MATTE_MAX_FRAMES} 帧(约 {MATTE_MAX_FRAMES / info["fps"]:.0f} 秒),请先裁剪视频。', 422) - await ctx.progress('正在整理视频') - # A constant-rate, even-sized clip decodes to the same frames for the tracker and ffmpeg. - clip = await blocking(media.conform, raw, work.path / 'clip.mp4', width=info['width'] - info['width'] % 2, - height=info['height'] - info['height'] % 2, fps=info['fps']) - await ctx.progress(f"正在识别并跟踪「{'、'.join(label for _, label in pairs)}」") - tracks = await ctx.track(clip.read_bytes(), tuple(concept for concept, _ in pairs)) - if not any(tracks.frames): - raise ProjectError(f"视频中没有识别到「{'、'.join(label for _, label in pairs)}」,请换一种描述后重试。", 422) - await ctx.progress('正在合成抠像视频') - await blocking(_write_mattes, tracks, work.path / 'mattes') - data, suffix = await blocking(media.matte, clip, str(work.path / 'mattes' / '%05d.png'), info['fps'], - work.path / 'matted', background=background) - return [Output('video', data, suffix, '视频抠像')] - - -DEPTH_MAX_SECONDS = 30 -DEPTH_MAX_FRAMES = 2048 -DEPTH_SHORT_EDGES = {'480P': 480, '720P': 720} - - -def _depth_size(width, height, short_edge): - """The source size scaled down so its short side is at most short_edge, on even pixels.""" - scale = min(1.0, short_edge / min(width, height)) - return max(2, round(width * scale / 2) * 2), max(2, round(height * scale / 2) * 2) - - -async def depth_capture(ctx: ToolContext): - source = _source_video(ctx) - resolution = ctx.choice('resolution', tuple(DEPTH_SHORT_EDGES), '480P') - with media.Workspace() as work: - raw = work.write('source', source.data) - info = await blocking(media.video_info, raw) - if not 0 < info['duration'] <= DEPTH_MAX_SECONDS + 0.05: - raise ProjectError(f'深度动作捕捉需要不超过 {DEPTH_MAX_SECONDS} 秒的素材,请先裁剪视频。', 422) - if info['duration'] * info['fps'] > DEPTH_MAX_FRAMES: - raise ProjectError(f'深度动作捕捉单次最多处理 {DEPTH_MAX_FRAMES} 帧,请先裁剪视频或降低帧率。', 422) - await ctx.progress('正在整理视频') - # The depth service returns the size it receives, so the clip is sized here; every - # source frame is kept so depth frame i lines up with source frame i. - width, height = _depth_size(info['width'], info['height'], DEPTH_SHORT_EDGES[resolution]) - clip = await blocking(media.picture, raw, work.path / 'clip.mp4', width=width, height=height) - await ctx.progress('正在估计每一帧的深度') - data = await ctx.depth(clip.read_bytes()) - return [Output('video', data, 'mp4', f'深度动作捕捉 {resolution}')] - - -async def video_edit(ctx: ToolContext): - source = _source_video(ctx) - prompt = ctx.text('prompt') - if not prompt: - raise ProjectError('请描述要如何修改视频。', 422) - width, height = await _video_size(source) - region = _box_region(ctx, width, height) - # Masked redraw regenerates a region; a whole-frame restyle would discard the source entirely. - if region is None: - raise ProjectError('请先框选要重绘的区域。', 422) - prompt = await ctx.video_prompt(prompt, 'The rest of the picture, its light and motion stay as they are.') - data = await _redraw_pieces(ctx, source, prompt, EditMask(1.0, region), None) - return [Output('video', data, 'mp4', '视频编辑')] - - -SUBTITLE_BAND = tuple((1.0,) if row >= 39 else (0.0,) for row in range(50)) # Bottom 22% of the frame. - - -async def subtitle_erasure(ctx: ToolContext): - source = _source_video(ctx) - width, height = await _video_size(source) - picture = EditMask(1.0, _box_region(ctx, width, height) or SUBTITLE_BAND) - prompt = await ctx.video_prompt(ctx.text('prompt'), 'This part of the frame continues the surrounding scene naturally, ' - 'matching its texture, light and motion.') - data = await _redraw_pieces(ctx, source, prompt, picture, None) - return [Output('video', data, 'mp4', '字幕擦除')] - - -AUDIO_MODES = {'all': '完整音轨', 'voice': '人声(近似)', 'backgroundSound': '背景声(近似)'} - - -async def audio_separation(ctx: ToolContext): - if not ctx.sources or ctx.sources[0].kind not in {'video', 'audio'}: - raise ProjectError('请提供视频或音频素材。', 422) - source = ctx.sources[0] - mode = ctx.choice('mode', AUDIO_MODES, 'all') - outputs = [] - with media.Workspace() as work: - suffix = source.name.rsplit('.', 1)[-1].lower() if '.' in source.name else ('mp4' if source.kind == 'video' else 'mp3') - path = work.write(f'source.{suffix}', source.data) - if mode == 'backgroundSound' and not await blocking(media.is_stereo_with_side, path): - raise ProjectError('单声道音频无法在本地估计背景声,需要接入具备音轨分离能力的模型。', 422) - await ctx.progress('正在分离音轨') - audio = await blocking(media.audio_track, path, work.path / 'track.mp3', - mode={'all': 'all', 'voice': 'voice', 'backgroundSound': 'background'}[mode]) - outputs.append(Output('audio', audio, 'mp3', AUDIO_MODES[mode])) - if mode == 'all' and source.kind == 'video': - # Splitting a clip yields both halves: its soundtrack and the silent picture. - outputs.append(Output('video', await blocking(media.without_audio, path, work.path / 'silent.mp4'), 'mp4', '无声视频')) - return outputs - - -async def video_upscale(ctx: ToolContext): - source = _source_video(ctx) - edge = {'2K': 2560, '4K': 3840}[ctx.choice('resolution', ('2K', '4K'), '4K')] - await ctx.progress('正在放大视频') - with media.Workspace() as work: - data = await blocking(media.upscale, work.write('source.mp4', source.data), edge, work.path / 'out.mp4') - return [Output('video', data, 'mp4', f'超清 {ctx.parameters.get("resolution", "4K")}')] - - -async def frame_interpolation(ctx: ToolContext): - source = _source_video(ctx) - fps = int(ctx.choice('fps', (30, 60, '30', '60'), 60)) - await ctx.progress(f'正在补帧到 {fps} fps') - with media.Workspace() as work: - data = await blocking(media.interpolate, work.write('source.mp4', source.data), fps, work.path / 'out.mp4') - return [Output('video', data, 'mp4', f'补帧 {fps}fps')] - - -# Catalog --------------------------------------------------------------------- - Recipe = Callable[[ToolContext], Awaitable[list[Output]]] - @dataclass(frozen=True) class ToolSpec: id: str @@ -815,11 +34,9 @@ class ToolSpec: fields: tuple[dict, ...] = field(default_factory=tuple) note: str = '' - def _needs(*capabilities): return lambda parameters: capabilities - def _select(key, label, options, default=None, required=True): value = {'key': key, 'label': label, 'type': 'select', 'required': required, 'options': [{'value': option, 'label': text} for option, text in options]} @@ -827,7 +44,6 @@ def _select(key, label, options, default=None, required=True): value['default'] = default return value - TOOLS: dict[str, ToolSpec] = {item.id: item for item in [ ToolSpec('smart-edit', ('image',), _needs('image.edit'), smart_edit), ToolSpec('outpaint', ('image',), _needs('image.edit'), outpaint), diff --git a/packages/core/src/opendirector/application/tool_video_recipes.py b/packages/core/src/opendirector/application/tool_video_recipes.py new file mode 100644 index 000000000..81bc21eba --- /dev/null +++ b/packages/core/src/opendirector/application/tool_video_recipes.py @@ -0,0 +1,212 @@ +"""Video recipes over local media steps and video-model capabilities.""" +import math + +from PIL import Image, ImageChops, ImageFilter + +from opendirector.application.tool_context import Output, Source, ToolContext +from opendirector.domain.capabilities import EditMask, Tracks +from opendirector.domain.projects import ProjectError +from opendirector.media import processing as media +from opendirector.media.async_work import blocking + + +def _source_video(ctx: ToolContext) -> Source: + if not ctx.sources or ctx.sources[0].kind != 'video': + raise ProjectError('请提供视频素材。', 422) + return ctx.sources[0] + +async def _redraw_pieces(ctx: ToolContext, source: Source, prompt: str, picture, sound, *, window=None): + """Redraw a clip within the model's per-request length: the whole clip in even pieces, or only + the stretch around `window` (seconds), spliced back. Output keeps the source size and rate.""" + low, high = ctx.edit_seconds + with media.Workspace() as work: + path = work.write('source.mp4', source.data) + info = await blocking(media.video_info, path) + duration = info['duration'] + if duration < low: + raise ProjectError(f'视频至少需要 {low:g} 秒。', 422) + if window: + start, end = window + if end - start > high: + raise ProjectError(f'一次最多重绘 {high:g} 秒,请缩短区间。', 422) + length = min(duration, max(low, min(high, end - start + 2))) + first = min(max(0.0, (start + end - length) / 2), duration - length) + pieces = [(first, first + length)] + else: + count = math.ceil(duration / high) + pieces = [(duration * index / count, duration * (index + 1) / count) for index in range(count)] + done = [] + for index, (first, last) in enumerate(pieces): + await ctx.progress(f'正在重绘({index + 1}/{len(pieces)})' if len(pieces) > 1 else '正在重绘') + clip = await blocking(media.conform, path, work.path / f'in-{index}.mp4', width=info['width'], height=info['height'], + fps=info['fps'], start=first, end=last) + local = (lambda mask: mask and EditMask(mask.level, mask.region, None if mask.start is None else mask.start - first, + None if mask.end is None else mask.end - first)) + drawn = await ctx.redraw(clip.read_bytes(), last - first, info['width'], info['height'], prompt, local(picture), local(sound)) + done.append(await blocking(media.conform, work.write(f'drawn-{index}.mp4', drawn), work.path / f'out-{index}.mp4', + width=info['width'], height=info['height'], fps=info['fps'], end=last - first)) + await ctx.progress('正在合成结果') + if window: + return await blocking(media.splice, work, path, pieces[0][0], pieces[0][1], done[0]) + return await blocking(media.concat, work, done) + +def _box_region(ctx: ToolContext, width, height, rows=36, columns=64): + """Selection boxes (source pixels) as a 0/1 grid over the frame, or None without boxes.""" + if not ctx.boxes: + return None + grid = [[0.0] * columns for _ in range(rows)] + for box in ctx.boxes: + x0, y0 = box['x'] / width, box['y'] / height + x1, y1 = (box['x'] + box['width']) / width, (box['y'] + box['height']) / height + for row in range(rows): + for column in range(columns): + if x0 <= (column + 0.5) / columns <= x1 and y0 <= (row + 0.5) / rows <= y1: + grid[row][column] = 1.0 + return tuple(tuple(row) for row in grid) + +async def _video_size(source: Source): + with media.Workspace() as work: + info = await blocking(media.video_info, work.write('probe.mp4', source.data)) + return info['width'], info['height'] + +async def partial_reshoot(ctx: ToolContext): + source = _source_video(ctx) + prompt = ctx.text('prompt') + if not prompt: + raise ProjectError('请描述重拍片段的内容。', 422) + start = ctx.number('startMs', 0, 0) / 1000 + end = ctx.number('endMs', 0, 0) / 1000 + if end - start < 0.5: + raise ProjectError('重拍区间至少 0.5 秒。', 422) + # Only the chosen stretch is redrawn, picture and sound; the rest of the clip stays the source. + window = EditMask(1.0, None, start, end) + prompt = await ctx.video_prompt(prompt, 'Keep the people, setting, lighting and camera continuous with the surrounding footage.') + data = await _redraw_pieces(ctx, source, prompt, window, window, window=(start, end)) + return [Output('video', data, 'mp4', '局部重拍')] + +MATTE_MAX_FRAMES = 2048 + +def _write_mattes(tracks: Tracks, folder): + folder.mkdir() + for index, frame in enumerate(tracks.frames): + matte = Image.new('L', (tracks.width, tracks.height), 0) + for counts in frame: + matte = ImageChops.lighter(matte, media.rle_mask(counts, tracks.width, tracks.height)) + # A one-pixel blur anti-aliases the hard mask edge. + matte.filter(ImageFilter.GaussianBlur(0.8)).save(folder / f'{index:05d}.png', compress_level=1) + +async def video_matting(ctx: ToolContext): + source = _source_video(ctx) + background = ctx.choice('background', ('black', 'green', 'transparent'), 'green') + pairs = await ctx.concepts(ctx.text('prompt'), ('人物',)) + with media.Workspace() as work: + raw = work.write('source', source.data) + info = await blocking(media.video_info, raw) + if info['duration'] * info['fps'] > MATTE_MAX_FRAMES: + raise ProjectError(f'视频抠像单次最多处理 {MATTE_MAX_FRAMES} 帧(约 {MATTE_MAX_FRAMES / info["fps"]:.0f} 秒),请先裁剪视频。', 422) + await ctx.progress('正在整理视频') + # A constant-rate, even-sized clip decodes to the same frames for the tracker and ffmpeg. + clip = await blocking(media.conform, raw, work.path / 'clip.mp4', width=info['width'] - info['width'] % 2, + height=info['height'] - info['height'] % 2, fps=info['fps']) + await ctx.progress(f"正在识别并跟踪「{'、'.join(label for _, label in pairs)}」") + tracks = await ctx.track(clip.read_bytes(), tuple(concept for concept, _ in pairs)) + if not any(tracks.frames): + raise ProjectError(f"视频中没有识别到「{'、'.join(label for _, label in pairs)}」,请换一种描述后重试。", 422) + await ctx.progress('正在合成抠像视频') + await blocking(_write_mattes, tracks, work.path / 'mattes') + data, suffix = await blocking(media.matte, clip, str(work.path / 'mattes' / '%05d.png'), info['fps'], + work.path / 'matted', background=background) + return [Output('video', data, suffix, '视频抠像')] + +DEPTH_MAX_SECONDS = 30 + +DEPTH_MAX_FRAMES = 2048 + +DEPTH_SHORT_EDGES = {'480P': 480, '720P': 720} + +def _depth_size(width, height, short_edge): + """The source size scaled down so its short side is at most short_edge, on even pixels.""" + scale = min(1.0, short_edge / min(width, height)) + return max(2, round(width * scale / 2) * 2), max(2, round(height * scale / 2) * 2) + +async def depth_capture(ctx: ToolContext): + source = _source_video(ctx) + resolution = ctx.choice('resolution', tuple(DEPTH_SHORT_EDGES), '480P') + with media.Workspace() as work: + raw = work.write('source', source.data) + info = await blocking(media.video_info, raw) + if not 0 < info['duration'] <= DEPTH_MAX_SECONDS + 0.05: + raise ProjectError(f'深度动作捕捉需要不超过 {DEPTH_MAX_SECONDS} 秒的素材,请先裁剪视频。', 422) + if info['duration'] * info['fps'] > DEPTH_MAX_FRAMES: + raise ProjectError(f'深度动作捕捉单次最多处理 {DEPTH_MAX_FRAMES} 帧,请先裁剪视频或降低帧率。', 422) + await ctx.progress('正在整理视频') + # The depth service returns the size it receives, so the clip is sized here; every + # source frame is kept so depth frame i lines up with source frame i. + width, height = _depth_size(info['width'], info['height'], DEPTH_SHORT_EDGES[resolution]) + clip = await blocking(media.picture, raw, work.path / 'clip.mp4', width=width, height=height) + await ctx.progress('正在估计每一帧的深度') + data = await ctx.depth(clip.read_bytes()) + return [Output('video', data, 'mp4', f'深度动作捕捉 {resolution}')] + +async def video_edit(ctx: ToolContext): + source = _source_video(ctx) + prompt = ctx.text('prompt') + if not prompt: + raise ProjectError('请描述要如何修改视频。', 422) + width, height = await _video_size(source) + region = _box_region(ctx, width, height) + # Masked redraw regenerates a region; a whole-frame restyle would discard the source entirely. + if region is None: + raise ProjectError('请先框选要重绘的区域。', 422) + prompt = await ctx.video_prompt(prompt, 'The rest of the picture, its light and motion stay as they are.') + data = await _redraw_pieces(ctx, source, prompt, EditMask(1.0, region), None) + return [Output('video', data, 'mp4', '视频编辑')] + +SUBTITLE_BAND = tuple((1.0,) if row >= 39 else (0.0,) for row in range(50)) # Bottom 22% of the frame. + +async def subtitle_erasure(ctx: ToolContext): + source = _source_video(ctx) + width, height = await _video_size(source) + picture = EditMask(1.0, _box_region(ctx, width, height) or SUBTITLE_BAND) + prompt = await ctx.video_prompt(ctx.text('prompt'), 'This part of the frame continues the surrounding scene naturally, ' + 'matching its texture, light and motion.') + data = await _redraw_pieces(ctx, source, prompt, picture, None) + return [Output('video', data, 'mp4', '字幕擦除')] + +AUDIO_MODES = {'all': '完整音轨', 'voice': '人声(近似)', 'backgroundSound': '背景声(近似)'} + +async def audio_separation(ctx: ToolContext): + if not ctx.sources or ctx.sources[0].kind not in {'video', 'audio'}: + raise ProjectError('请提供视频或音频素材。', 422) + source = ctx.sources[0] + mode = ctx.choice('mode', AUDIO_MODES, 'all') + outputs = [] + with media.Workspace() as work: + suffix = source.name.rsplit('.', 1)[-1].lower() if '.' in source.name else ('mp4' if source.kind == 'video' else 'mp3') + path = work.write(f'source.{suffix}', source.data) + if mode == 'backgroundSound' and not await blocking(media.is_stereo_with_side, path): + raise ProjectError('单声道音频无法在本地估计背景声,需要接入具备音轨分离能力的模型。', 422) + await ctx.progress('正在分离音轨') + audio = await blocking(media.audio_track, path, work.path / 'track.mp3', + mode={'all': 'all', 'voice': 'voice', 'backgroundSound': 'background'}[mode]) + outputs.append(Output('audio', audio, 'mp3', AUDIO_MODES[mode])) + if mode == 'all' and source.kind == 'video': + # Splitting a clip yields both halves: its soundtrack and the silent picture. + outputs.append(Output('video', await blocking(media.without_audio, path, work.path / 'silent.mp4'), 'mp4', '无声视频')) + return outputs + +async def video_upscale(ctx: ToolContext): + source = _source_video(ctx) + edge = {'2K': 2560, '4K': 3840}[ctx.choice('resolution', ('2K', '4K'), '4K')] + await ctx.progress('正在放大视频') + with media.Workspace() as work: + data = await blocking(media.upscale, work.write('source.mp4', source.data), edge, work.path / 'out.mp4') + return [Output('video', data, 'mp4', f'超清 {ctx.parameters.get("resolution", "4K")}')] + +async def frame_interpolation(ctx: ToolContext): + source = _source_video(ctx) + fps = int(ctx.choice('fps', (30, 60, '30', '60'), 60)) + await ctx.progress(f'正在补帧到 {fps} fps') + with media.Workspace() as work: + data = await blocking(media.interpolate, work.write('source.mp4', source.data), fps, work.path / 'out.mp4') + return [Output('video', data, 'mp4', f'补帧 {fps}fps')] diff --git a/packages/core/src/opendirector/infrastructure/creation_catalog.py b/packages/core/src/opendirector/infrastructure/creation_catalog.py new file mode 100644 index 000000000..fc2c64c33 --- /dev/null +++ b/packages/core/src/opendirector/infrastructure/creation_catalog.py @@ -0,0 +1,187 @@ +"""Project directory scan, catalog listing, and unreadable-folder cleanup.""" +import time +from pathlib import Path + +from opendirector.domain.projects import ProjectError, identifier, project_name +from opendirector.infrastructure import recycle +from opendirector.infrastructure.creation_records import Manifest +from opendirector.infrastructure.directories import directory, sync_directory +from opendirector.infrastructure.local_projects import child, read_json + + +class ProjectCatalog: + """Find project directories and list the ones a catalog read can open.""" + + @staticmethod + def _parse_manifest(raw): + if not isinstance(raw, dict) or raw.get('format') != 'opendirector-project' or raw.get('formatVersion') != 2: + raise ProjectError('不支持该工程格式;请创建新工程,旧文件不会自动转换。', 409, code='unsupported_format') + try: + value = Manifest.model_validate(raw) + project_name(value.name) + return value + except (ValueError, TypeError): + raise ProjectError('工程清单无效,原文件已保留。', 409, code='storage_unavailable') from None + + @classmethod + def _manifest(cls, path): + directory(path) + return cls._parse_manifest(read_json(child(path, 'project.json'))) + + def _scan(self): + self.local._check_root() + grouped, manifests, unsupported, warnings = {}, {}, set(), list(self._warnings) + self._invalid = [] + if self.root.is_dir(): + for path in sorted(self.root.iterdir()): + if path.is_symlink() or not path.is_dir() or path.name.startswith('.opendirector-'): + continue + manifest_path = path / 'project.json' + if not manifest_path.exists() and not manifest_path.is_symlink(): + continue + try: + project_name(path.name) + raw = read_json(child(path, 'project.json')) + project_id = identifier(raw['id']) + grouped.setdefault(project_id, []).append(path) + if raw.get('format') != 'opendirector-project' or raw.get('formatVersion') != 2: + unsupported.add(project_id) + else: + # Parsed once per scan; callers never reread project.json. + manifests[project_id] = raw + except (OSError, ValueError, TypeError, KeyError, ProjectError): + warning = f'工程“{path.name}”的清单无法读取,原文件已保留。' + warnings.append(warning) + self._invalid.append((path, warning)) + conflicts = {key for key, paths in grouped.items() if len(paths) > 1} + for key in sorted(conflicts): + warnings.append(f'工程标识重复:{key};请移走重复目录后重试。') + return grouped, manifests, unsupported, conflicts, warnings + + def _find(self, db, project_id): + project_id = identifier(str(project_id)) + if project_id in self._blocked: + raise ProjectError('工程提交需要恢复;请检查磁盘及工程文件后重试。', 409, code='storage_unavailable') + grouped, manifests, unsupported, conflicts, _ = self._scan() + if project_id in conflicts: + raise ProjectError('projects 中存在同标识工程,请移走重复目录后重试。', 409) + if project_id in unsupported: + raise ProjectError('不支持该工程格式;请创建新工程,旧文件不会自动转换。', 409, code='unsupported_format') + if project_id not in grouped: + raise ProjectError('工程不在 projects 中或清单无法读取,请刷新工程列表。', 404) + path = grouped[project_id][0] + raw = manifests.get(project_id) + if raw is None: + # The manifest is present but invalid; report the precise reason. + return path, self._manifest(path) + return path, self._parse_manifest(raw) + + @staticmethod + def _unreadable_item(path, reason, project_id=None): + return dict(id=project_id, name=path.name, path=str(path), reason=reason) + + def _catalog(self, db): + # One directory scan for the whole listing: resolving each project with + # _find() reread every project.json once per project (O(N^2)). + grouped, manifests, unsupported, conflicts, warnings = self._scan() + invalid = list(self._invalid) + projects = [] + unreadable = [self._unreadable_item(path, reason) for path, reason in invalid] + for project_id in sorted(grouped): + paths = grouped[project_id] + if project_id in unsupported: + reason = f'工程 {project_id} 使用旧格式,统一工程接口不支持读取或转换。' + warnings.append(reason) + unreadable.extend(self._unreadable_item(path, reason, project_id) for path in paths) + continue + if project_id in conflicts: + reason = f'工程标识重复:{project_id};请移走重复目录后重试。' + unreadable.extend(self._unreadable_item(path, reason, project_id) for path in paths) + continue + try: + if project_id in self._blocked: + raise ProjectError('工程提交需要恢复;请检查磁盘及工程文件后重试。', + 409, code='storage_unavailable') + path = paths[0] + raw = manifests.get(project_id) + manifest = self._manifest(path) if raw is None else self._parse_manifest(raw) + # Parsing the head alone proves the project still opens, and the + # manifest already carries the name it must agree with; a full + # chain replay just to list a name cost about a second. + record = self._record(path, manifest.head) + if record.snapshot.project.name != manifest.name: + raise ProjectError('工程提交历史与清单不一致,原文件已保留。', 409, code='storage_unavailable') + projects.append(dict(id=project_id, name=manifest.name, path=str(path))) + except (ProjectError, OSError): + reason = f'工程 {project_id} 需要恢复,原文件已保留。' + warnings.append(reason) + unreadable.append(self._unreadable_item(paths[0], reason, project_id)) + projects.sort(key=lambda item: (item['name'].casefold(), item['name'])) + unreadable.sort(key=lambda item: (item['name'].casefold(), item['name'])) + return dict(projects=projects, unreadable=unreadable, warnings=warnings) + + def list_projects(self): + with self.local.transaction() as db: + self._recover() + return self._catalog(db) + + @staticmethod + def _cleanup_blocker(db, project_id, path): + active = db.execute('SELECT 1 FROM sessions WHERE expires>? AND (path=? OR project_id=?)', + (time.time(), str(path), project_id or '')).fetchone() + if active: + return '工程仍在其他窗口中打开,请关闭后再清理。' + tools = path / 'tool-tasks' + if tools.exists() or tools.is_symlink(): + try: + directory(tools) + tasks = [read_json(child(tools, item.name)) for item in tools.glob('*.json')] + if any(not isinstance(task, dict) for task in tasks): + raise ValueError('Invalid tool task') + except (OSError, ValueError, TypeError, KeyError, ProjectError): + return '无法确认工具任务状态,请检查工程文件后再清理。' + if any(task.get('status') in {'queued', 'running'} for task in tasks): + return '工程仍有工具任务,请等待或取消任务后再清理。' + return None + + def cleanup_unreadable(self): + """Remove only directories that a fresh catalog read still cannot open.""" + with self.local.transaction() as db: + self._recover() + candidates = self._catalog(db)['unreadable'] + removed, failed = [], [] + for candidate in candidates: + with self.local.transaction() as db: + self._recover() + current = next((item for item in self._catalog(db)['unreadable'] + if item['path'] == candidate['path']), None) + if current is None: + continue + path = Path(current['path']) + blocker = self._cleanup_blocker(db, current['id'], path) + if blocker: + failed.append(dict(name=current['name'], message=blocker)) + continue + if not path.exists() and not path.is_symlink(): + continue + try: + directory(path) + recycle.remove(path, recoverable=self.delete_mode == 'recycle_bin') + except (OSError, ProjectError) as error: + failed.append(dict(name=current['name'], message=str(error))) + continue + removed.append(current['name']) + if current['id']: + journal = self._journal(current['id']) + if journal.exists(): + # The project is gone; its pending recovery must not recreate + # a permanent catalog warning on the next read. + journal.unlink() + sync_directory(self.intents) + with self.local.transaction() as db: + db.execute('DELETE FROM sessions WHERE path=?', (str(path),)) + if current['id']: + db.execute('DELETE FROM sessions WHERE project_id=?', (current['id'],)) + if removed: + sync_directory(self.root) + return dict(removed=removed, failed=failed) diff --git a/packages/core/src/opendirector/infrastructure/creation_commit_log.py b/packages/core/src/opendirector/infrastructure/creation_commit_log.py new file mode 100644 index 000000000..dff7c067f --- /dev/null +++ b/packages/core/src/opendirector/infrastructure/creation_commit_log.py @@ -0,0 +1,376 @@ +"""Read and cache the immutable commit chain. + +Opening a project serves the head commit. Ancestry is proved by history reads +and by a bounded background warm, never by trusting a bare timestamp. +""" +import threading +from hashlib import sha256 + +from opendirector.domain.projects import ProjectError +from opendirector.infrastructure.creation_records import CommitRecord +from opendirector.infrastructure.directories import directory +from opendirector.infrastructure.local_projects import child, read_json + + +# Every history read validates the whole commit chain, and each record holds a +# full project snapshot. The cache must fit a long project's history: below +# that, each read reparses every record from disk and holds the catalog lock +# long enough to expire sessions and interrupt running jobs. +RECORD_CACHE_ENTRIES = 4096 +RECORD_CACHE_BYTES = 512 * 1024 * 1024 +# Only the validated head of each open project is kept, so this stays small. +CURRENT_CACHE_ENTRIES = 16 +# A head served without replaying its ancestry is validated in the background +# so the first autosave after a cold open reuses the parsed chain. At most a +# couple of warms run at once; more projects simply keep the lazy path. +WARM_CONCURRENCY = 2 +WARM_ATTEMPTS = 64 + + +def _file_signature(file): + stat = file.stat(follow_symlinks=False) + return stat.st_dev, stat.st_ino, stat.st_size, stat.st_mtime_ns, stat.st_ctime_ns + + +def _head_signature(path, head, verify_bytes=False): + """Cheap identity of a commit file, or None when it cannot be read.""" + file = child(directory(child(path, 'commits')), f'{head}.json') + try: + signature = _file_signature(file) + if verify_bytes: + content = sha256(file.read_bytes()).digest() + if _file_signature(file) != signature: + return None + return (*signature, content) + return signature + except OSError: + return None + + +class CommitLog: + """Validated commit records, the head cache, and history queries.""" + + def _record(self, path, head): + file = child(directory(child(path, 'commits')), f'{head}.json') + try: + before = _file_signature(file) + with self._cache_lock: + cached = self._records_cache.get(file) + if cached is not None: + self._records_cache.move_to_end(file) + # On platforms with reliable change times, a rewrite changes the + # signature (ctime/mtime/size/inode). Re-reading and re-hashing every + # historical commit on each read cost ~13 s per history query for a + # project with hundreds of commits, holding the catalog lock past the + # 15 s contention budget of unrelated saves. On Windows, verify bytes + # because the file signature can remain unchanged after a rewrite. + if cached and cached[0] == before and not self._verify_record_bytes: + # Private repository records are read-only. Public query + # boundaries copy returned values, not every historical snapshot. + return cached[1] + if cached and cached[0] == before and cached[2] is not None: + # Windows: ctime is creation time and mtime can be restored by + # an outside writer, so the recorded bytes are verified too. + content = sha256(file.read_bytes()).digest() + if _file_signature(file) != before: + raise ValueError('Commit changed during read') + if content != cached[2]: + raise ValueError('Commit content changed') + return cached[1] + raw = file.read_bytes() if self._verify_record_bytes else None + content = sha256(raw).digest() if raw is not None else None + if raw is not None and _file_signature(file) != before: + raise ValueError('Commit changed during read') + if cached and cached[0] == before and cached[2] == content: + self._records_cache.move_to_end(file) + return cached[1] + if cached: + with self._cache_lock: + removed = self._records_cache.pop(file, None) + if removed is not None: + self._records_cache_bytes -= removed[0][2] + record = CommitRecord.model_validate_json(raw) if raw is not None else CommitRecord.model_validate(read_json(file)) + if _file_signature(file) != before: + raise ValueError('Commit changed during read') + if before[2] <= 8 * 1024 * 1024: + with self._cache_lock: + # Another reader (a warm or a caught-up changes() poll) may + # have installed this record while we parsed it; replacing + # it must subtract the replaced size or the budget drifts. + replaced = self._records_cache.pop(file, None) + if replaced is not None: + self._records_cache_bytes -= replaced[0][2] + self._records_cache[file] = (before, record, content) + self._records_cache_bytes += before[2] + while len(self._records_cache) > RECORD_CACHE_ENTRIES or self._records_cache_bytes > RECORD_CACHE_BYTES: + _, removed = self._records_cache.popitem(last=False) + self._records_cache_bytes -= removed[0][2] + return record + except (ValueError, TypeError, KeyError, FileNotFoundError): + raise ProjectError('工程提交记录缺失或损坏,已阻止自动覆盖。', 409, code='storage_unavailable') from None + + def _history(self, path, manifest): + records, seen, head = [], set(), manifest.head + while head is not None: + if head in seen: + raise ProjectError('工程提交历史存在循环,原文件已保留。', 409, code='storage_unavailable') + seen.add(head) + record = self._record(path, head) + if record.command.commandId != head or record.snapshot.project.id != manifest.id: + raise ProjectError('工程提交身份不一致,原文件已保留。', 409, code='storage_unavailable') + if records: + newer = records[-1] + if newer.snapshot.eventCursor != record.snapshot.eventCursor + (1 if newer.event else 0): + raise ProjectError('工程变更游标不连续,原文件已保留。', 409, code='storage_unavailable') + records.append(record) + head = record.previousHead + if (not records or records[-1].command.type != 'project.create' or records[-1].snapshot.eventCursor != 1 + or records[0].snapshot.project.name != manifest.name): + raise ProjectError('工程提交历史与清单不一致,原文件已保留。', 409, code='storage_unavailable') + # The chain behind this head is now proven; a head served earlier by + # the head-only fast path may be reused by caught-up change polling. + self._mark_validated(path, records[0].command.commandId) + return records + + def _load(self, db, project_id): + path, manifest = self._find(db, project_id) + records = self._history(path, manifest) + return path, manifest, records + + def _remember_current(self, path, record): + signature = _head_signature(path, record.command.commandId, self._verify_record_bytes) + if signature is None: + return + key = (str(path), str(record.command.commandId), signature) + with self._cache_lock: + self._current_cache[key] = (record, True) + self._current_cache.move_to_end(key) + while len(self._current_cache) > CURRENT_CACHE_ENTRIES: + self._current_cache.popitem(last=False) + + def _mark_validated(self, path, head): + """A full replay proved this head; caught-up polling may now trust it.""" + prefix = (str(path), str(head)) + with self._cache_lock: + for key, value in list(self._current_cache.items()): + if key[0] == prefix[0] and key[1] == prefix[1] and not value[1]: + self._current_cache[key] = (value[0], True) + + def _schedule_warm(self, path, manifest): + """Validate the ancestry behind a head that was served without replay. + + The first autosave after a cold open replays the chain; warming it in + the background right after the open read keeps that save cheap. The + work is coalesced per (project, head) and bounded, never holds the + catalog lock and never changes a read result: a failed warm just + leaves the lazy path, and is not remembered as a successful proof. + """ + key = (str(manifest.id), str(manifest.head)) + with self._warm_lock: + if key in self._warming or key in self._warmed or len(self._warming) >= WARM_CONCURRENCY: + return + event = threading.Event() + self._warming[key] = event + thread = threading.Thread(target=self._warm, args=(path, manifest, key, event), + name='creation-history-warm', daemon=True) + try: + thread.start() + except BaseException: + # A start failure must not leave a key that every later await waits + # out. Anyone who already observed this event is released too. + with self._warm_lock: + if self._warming.get(key) is event: + self._warming.pop(key, None) + event.set() + raise + + def _await_warm(self, project_id, head, timeout=30): + """Join validation of this head instead of replaying its chain twice. + + A warm of a different head is ignored. The wait stays outside the + catalog lock, so a first autosave races one validation rather than + parsing every snapshot twice at once. + """ + if head is None: + return + with self._warm_lock: + event = self._warming.get((str(project_id), str(head))) + if event is not None: + event.wait(timeout) + + def _await_current_warm(self, project_id, timeout=30): + """Wait for a warm of the head this caller is about to read. + + When nothing is in flight this returns without taking the catalog + lock. A missing project is left for the caller's own transaction. + """ + project = str(project_id) + with self._warm_lock: + inflight = any(key[0] == project for key in self._warming) + if not inflight: + return + try: + head = self.head(project_id) + except ProjectError: + return + self._await_warm(project_id, head, timeout) + + def _warm(self, path, manifest, key, event): + validated = False + try: + self._history(path, manifest) + validated = True + except BaseException: + # Reads stay correct: every path that needs the chain replays it + # itself and reports the integrity failure there. Leaving the key + # out of _warmed lets the next open retry a transient failure. + pass + finally: + with self._warm_lock: + if self._warming.get(key) is event: + self._warming.pop(key, None) + if validated: + self._warmed[key] = True + self._warmed.move_to_end(key) + while len(self._warmed) > WARM_ATTEMPTS: + self._warmed.popitem(last=False) + event.set() + + def _current_record(self, db, project_id, path, manifest): + """The head commit and whether its ancestry has been replayed. + + Opening a canvas must not parse every historical snapshot: a commit + leaves the old files alone (a commit file is immutable) and rewrites the + manifest, so the head file signature plus the manifest decides whether + the cached head is still current. Missing, corrupt or rewritten heads + still fail here; ancestors are proven by commit/history/receipt/changes + reads and by the background warm an open read schedules. + """ + signature = _head_signature(path, manifest.head, self._verify_record_bytes) + key = (str(path), str(manifest.head), signature) + if signature is not None: + with self._cache_lock: + cached = self._current_cache.get(key) + if cached is not None: + self._current_cache.move_to_end(key) + return cached + record = self._record(path, manifest.head) + if (record.command.commandId != manifest.head or record.snapshot.project.id != manifest.id + or record.snapshot.project.name != manifest.name): + raise ProjectError('工程提交身份不一致,原文件已保留。', 409, code='storage_unavailable') + if record.previousHead is None: + # A single-commit project's whole history is this record; validate + # the creation invariants that a full replay would check. + if record.command.type != 'project.create' or record.snapshot.eventCursor != 1: + raise ProjectError('工程提交历史与清单不一致,原文件已保留。', 409, code='storage_unavailable') + validated = True + else: + validated = False + if signature is not None: + with self._cache_lock: + self._current_cache[key] = (record, validated) + self._current_cache.move_to_end(key) + while len(self._current_cache) > CURRENT_CACHE_ENTRIES: + self._current_cache.popitem(last=False) + return record, validated + + def _current(self, db, project_id, path, manifest): + """The head commit, reused while its file is untouched. + + Replaying and re-validating the whole chain for every read made opening + a canvas take about a second. A commit leaves the old files alone and + moves the head, and an outside rewrite changes the head file's + signature, so both are noticed without trusting a bare timestamp. + """ + return self._current_record(db, project_id, path, manifest)[0] + + def snapshot(self, project_id): + with self.local.transaction() as db: + self._recover() + path, manifest = self._find(db, project_id) + return self._current(db, project_id, path, manifest).snapshot.model_copy(deep=True) + + def head(self, project_id): + """The current head commit, cheap enough to gate content-addressed caches. + + It skips the journal recovery that snapshot() runs: a caller only uses + this to notice that a cached read is stale. + """ + with self.local.transaction() as db: + return self._find(db, project_id)[1].head + + def _read_manifest(self, project_id): + """Resolve the current head under the catalog lock. + + Commit files are immutable once published, so the chain behind this head + can be walked without holding the lock: a slow read only delays itself, + not the saves and status polls that share the catalog. + """ + with self.local.transaction() as db: + self._recover() + return self._find(db, project_id) + + def records(self, project_id): + """Private commit records for read-only scans; callers must not mutate them. + + history() deep-copies every snapshot for callers that keep the records + around. Scans that only count versions or owners would copy hundreds of + megabytes for long histories, so they read the shared records directly. + """ + path, manifest = self._read_manifest(project_id) + return tuple(self._history(path, manifest)) + + def history(self, project_id): + records = self.records(project_id) + # Private records are never mutated. Copy for the public caller after + # releasing the global lock so large history reads do not block saves. + return tuple(record.model_copy(deep=True) for record in records) + + def history_index(self, project_id): + """Small detached event metadata; toolbar queries need no snapshots.""" + path, manifest = self._read_manifest(project_id) + records = self._history(path, manifest) + return records[0].snapshot.undoClearedThrough, tuple(dict( + commandId=r.command.commandId, type=r.command.type, + cursor=r.event.cursor, source=r.event.source, + targetCommandId=getattr(r.command.payload, 'targetCommandId', None), + ) for r in records if r.event is not None) + + def receipt(self, project_id, command_id): + with self.local.transaction() as db: + self._recover() + records = self._load(db, project_id)[2] + found = next((record.receipt for record in records if str(record.command.commandId) == str(command_id)), None) + if found is None: + raise ProjectError('没有该命令的已提交回执。', 404) + return found.model_copy(deep=True) + + def changes(self, project_id, *, after=0, limit=100): + if type(after) is not int or after < 0 or type(limit) is not int or not 1 <= limit <= 200: + raise ProjectError('变更游标或分页大小无效。') + # open() may already be proving this head. Joining that warm before the + # catalog lock keeps a caught-up subscriber from replaying the same + # chain while the lock is held. + self._await_current_warm(project_id) + with self.local.transaction() as db: + self._recover() + path, manifest = self._find(db, project_id) + # A subscriber that is already caught up is the common polling + # path. Replaying the commit chain here held the catalog lock for + # about a second per poll on Windows and starved saves/heartbeats. + head, validated = self._current_record(db, project_id, path, manifest) + cursor = head.snapshot.eventCursor + if after > cursor: + raise ProjectError('变更游标超出当前工程,请重新读取快照。', 409) + if after == cursor: + if not validated: + # A head served by the fast path has not proven its ancestry + # yet; the outbox is derived from the chain, so validate it + # before claiming there are no events. + self._history(path, manifest) + return dict(events=[], nextCursor=after, currentCursor=cursor, hasMore=False) + records = self._history(path, manifest) + events = [record.event for record in reversed(records) if record.event and record.event.cursor > after][:limit] + events = [event.model_copy(deep=True) for event in events] + return dict(events=events, nextCursor=events[-1].cursor if events else after, + currentCursor=cursor, hasMore=bool(events and events[-1].cursor < cursor)) diff --git a/packages/core/src/opendirector/infrastructure/creation_projects.py b/packages/core/src/opendirector/infrastructure/creation_projects.py index 48fd50fe2..b02a3e8ba 100644 --- a/packages/core/src/opendirector/infrastructure/creation_projects.py +++ b/packages/core/src/opendirector/infrastructure/creation_projects.py @@ -4,168 +4,44 @@ A durable intent precedes every filesystem mutation. Publishing project.json is the commit point; reads first finish pending intents under the catalog lock. SQLite coordinates leases only and is never used to roll back file writes. + +Catalog scans, commit history, and publication live in sibling modules. +Command dispatch lives in ``application.creation_commands``. ``execute`` delegates +there so this module does not import application services. """ -from collections.abc import Callable -from collections import OrderedDict -from pathlib import Path -from typing import Literal -from uuid import UUID -from hashlib import sha256 import os import threading import time +from collections import OrderedDict +from uuid import UUID -from pydantic import Field, ValidationError, model_validator - -from opendirector.domain.creation.base import Contract, Digest, ObjectVersion, digest -from opendirector.domain.creation.commands import Command, CommandReceipt, ProjectEvent, command_fingerprint +from opendirector.domain.creation.base import digest +from opendirector.domain.creation.commands import Command from opendirector.domain.creation.index import object_index from opendirector.domain.creation.project import Project, ProjectSnapshot, ViewState from opendirector.domain.creation.validation import ContractError, validate_command from opendirector.domain.projects import ProjectError, identifier, project_name -from opendirector.ports.dispatch import command_dispatcher -from opendirector.infrastructure.local_projects import LocalProjects, child, read_json, write_json from opendirector.infrastructure import recycle +from opendirector.infrastructure.creation_catalog import ProjectCatalog +from opendirector.infrastructure.creation_commit_log import CommitLog +from opendirector.infrastructure.creation_publication import CommitPublication +from opendirector.infrastructure.creation_records import CommitIntent, CommitRecord, durable_json, object_changes from opendirector.infrastructure.directories import directory, sync_directory -from opendirector.infrastructure.rename import rename_path -from opendirector.infrastructure.creation_files import cleanup_staging, delete_files, install_files -from opendirector.ports.files import AssetFileDelete, AssetFileWrite - - -class Manifest(Contract): - format: Literal['opendirector-project'] = Field(default='opendirector-project', description='Serialized format identifier.') - formatVersion: Literal[2] = Field(default=2, description='Project format version.') - id: UUID = Field(description='Stable object ID.') - name: str = Field(description='User-visible name.') - head: UUID = Field(description='Current committed command ID.') - - -class CommitRecord(Contract): - schemaVersion: Literal[1] = Field(default=1, description='Record schema version.') - command: Command = Field(description='Immutable command recorded in this commit.') - previousHead: UUID | None = Field(description='Previous commit ID, or null for project creation.') - snapshot: ProjectSnapshot = Field(description='Authoritative project snapshot.') - receipt: CommandReceipt = Field(description='Immutable command execution receipt.') - event: ProjectEvent | None = Field(description='Project change event, if emitted.') - - @model_validator(mode='after') - def consistent(self): - if (self.command.projectId != self.snapshot.project.id - or self.receipt.projectId != self.command.projectId - or self.receipt.commandId != self.command.commandId - or self.receipt.inputFingerprint != command_fingerprint(self.command) - or self.receipt.eventCursor != self.snapshot.eventCursor): - raise ValueError('Commit identity is inconsistent') - applied = self.receipt.status in {'applied', 'accepted'} - if applied != (self.event is not None): - raise ValueError('Only applied commits have outbox events') - if self.event is not None: - if (self.event.projectId != self.command.projectId or self.event.commandId != self.command.commandId - or self.event.cursor != self.snapshot.eventCursor or self.event.jobIds != self.receipt.jobIds - or tuple(change.version for change in self.event.changed) != self.receipt.changed): - raise ValueError('Outbox event differs from the committed receipt') - return self - - -class CommitIntent(Contract): - schemaVersion: Literal[1] = Field(default=1, description='Record schema version.') - fromName: str | None = Field(description='Original project directory name.') - toName: str = Field(description='Destination project directory name.') - beforeFingerprint: Digest | None = Field(description='Fingerprint of the project before this commit.') - record: CommitRecord = Field(description='Immutable commit awaiting publication.') - files: tuple[AssetFileWrite, ...] = Field(default=(), description='Staged asset files installed before commit publication.') - deletes: tuple[AssetFileDelete, ...] = Field(default=(), description='Asset file removals performed after publication.') - - @model_validator(mode='after') - def consistent(self): - project_name(self.toName) - if self.fromName is not None: - project_name(self.fromName) - creating = self.fromName is None - if creating != (self.record.previousHead is None) or creating != (self.beforeFingerprint is None): - raise ValueError('Creation intent has no prior project') - if creating and self.record.command.type != 'project.create': - raise ValueError('First commit must create a project') - ids = [write.assetId for write in self.files] - if len(ids) != len(set(ids)): - raise ValueError('File destinations must be unique') - assets = {asset.id: asset for asset in self.record.snapshot.assets} - created = {version.id for version in self.record.receipt.changed if version.objectType == 'asset'} - for write in self.files: - asset = assets.get(write.assetId) - if (asset is None or asset.id not in created or asset.fingerprint != write.fingerprint - or asset.metadata.size != write.size): - raise ValueError('File write must match its committed asset') - deleted = {change.version.id for change in self.record.event.changed if change.change == 'deleted' and change.version.objectType == 'asset'} if self.record.event else set() - if any(value.assetId not in deleted or value.assetId in assets for value in self.deletes): - raise ValueError('Deleted files must have committed asset deletions') - return self - - -def durable_json(path: Path, value): - write_json(path, value) - sync_directory(path.parent) - - -def object_changes(before, after, command): - """The storage boundary also checks revisions on trusted service writes.""" - old = object_index(before) if before else {} - new = object_index(after) - expected = {(item.objectType, item.id): item.revision for item in command.expectedVersions} - changed = [] - for key in sorted(old.keys() | new.keys(), key=lambda item: (item[0], str(item[1]))): - previous, current = old.get(key), new.get(key) - if previous == current: - continue - kind, object_id = key - if previous is not None and expected.get(key) != previous.revision: - raise ContractError('revision_conflict', 'Every changed object requires its current version', object_id) - if current is not None and current.revision != (previous.revision + 1 if previous else 1): - raise ContractError('revision_conflict', 'Object revisions must advance exactly once', object_id) - change = 'created' if previous is None else 'deleted' if current is None else 'updated' - if kind == 'canvas_item' and previous and current and previous.visible and not current.visible: - change = 'hidden' - changed.append(dict(version=ObjectVersion(objectType=kind, id=object_id, - revision=current.revision if current else previous.revision), change=change)) - return changed - - -# Every history read validates the whole commit chain, and each record holds a -# full project snapshot. The cache must fit a long project's history: below -# that, each read reparses every record from disk and holds the catalog lock -# long enough to expire sessions and interrupt running jobs. -RECORD_CACHE_ENTRIES = 4096 -RECORD_CACHE_BYTES = 512 * 1024 * 1024 -# Only the validated head of each open project is kept, so this stays small. -CURRENT_CACHE_ENTRIES = 16 -# A head served without replaying its ancestry is validated in the background -# so the first autosave after a cold open reuses the parsed chain. At most a -# couple of warms run at once; more projects simply keep the lazy path. -WARM_CONCURRENCY = 2 -WARM_ATTEMPTS = 64 - - -def _file_signature(file): - stat = file.stat(follow_symlinks=False) - return stat.st_dev, stat.st_ino, stat.st_size, stat.st_mtime_ns, stat.st_ctime_ns +from opendirector.infrastructure.local_projects import LocalProjects, child, read_json +from opendirector.ports.dispatch import command_dispatcher -def _head_signature(path, head, verify_bytes=False): - """Cheap identity of a commit file, or None when it cannot be read.""" - file = child(directory(child(path, 'commits')), f'{head}.json') - try: - signature = _file_signature(file) - if verify_bytes: - content = sha256(file.read_bytes()).digest() - if _file_signature(file) != signature: - return None - return (*signature, content) - return signature - except OSError: - return None +__all__ = [ + 'CommitRecord', + 'CreationProjects', + 'directory', + 'durable_json', + 'object_index', + 'sync_directory', +] -class CreationProjects: +class CreationProjects(ProjectCatalog, CommitLog, CommitPublication): """Authoritative repository for project commits and lifecycle storage. commit() is an internal application-service boundary; @@ -173,6 +49,7 @@ class CreationProjects: Command routing lives in application.creation_commands. execute() delegates there so this module does not import application services. """ + def __init__(self, local: LocalProjects): self.local = local self.root = local.root @@ -203,304 +80,6 @@ def __init__(self, local: LocalProjects): def _checkpoint(self, stage): """Fault-injection boundary. Never participates in production decisions.""" - @staticmethod - def _parse_manifest(raw): - if not isinstance(raw, dict) or raw.get('format') != 'opendirector-project' or raw.get('formatVersion') != 2: - raise ProjectError('不支持该工程格式;请创建新工程,旧文件不会自动转换。', 409, code='unsupported_format') - try: - value = Manifest.model_validate(raw) - project_name(value.name) - return value - except (ValueError, TypeError): - raise ProjectError('工程清单无效,原文件已保留。', 409, code='storage_unavailable') from None - - @classmethod - def _manifest(cls, path): - directory(path) - return cls._parse_manifest(read_json(child(path, 'project.json'))) - - def _scan(self): - self.local._check_root() - grouped, manifests, unsupported, warnings = {}, {}, set(), list(self._warnings) - self._invalid = [] - if self.root.is_dir(): - for path in sorted(self.root.iterdir()): - if path.is_symlink() or not path.is_dir() or path.name.startswith('.opendirector-'): - continue - manifest_path = path / 'project.json' - if not manifest_path.exists() and not manifest_path.is_symlink(): - continue - try: - project_name(path.name) - raw = read_json(child(path, 'project.json')) - project_id = identifier(raw['id']) - grouped.setdefault(project_id, []).append(path) - if raw.get('format') != 'opendirector-project' or raw.get('formatVersion') != 2: - unsupported.add(project_id) - else: - # Parsed once per scan; callers never reread project.json. - manifests[project_id] = raw - except (OSError, ValueError, TypeError, KeyError, ProjectError): - warning = f'工程“{path.name}”的清单无法读取,原文件已保留。' - warnings.append(warning) - self._invalid.append((path, warning)) - conflicts = {key for key, paths in grouped.items() if len(paths) > 1} - for key in sorted(conflicts): - warnings.append(f'工程标识重复:{key};请移走重复目录后重试。') - return grouped, manifests, unsupported, conflicts, warnings - - def _find(self, db, project_id): - project_id = identifier(str(project_id)) - if project_id in self._blocked: - raise ProjectError('工程提交需要恢复;请检查磁盘及工程文件后重试。', 409, code='storage_unavailable') - grouped, manifests, unsupported, conflicts, _ = self._scan() - if project_id in conflicts: - raise ProjectError('projects 中存在同标识工程,请移走重复目录后重试。', 409) - if project_id in unsupported: - raise ProjectError('不支持该工程格式;请创建新工程,旧文件不会自动转换。', 409, code='unsupported_format') - if project_id not in grouped: - raise ProjectError('工程不在 projects 中或清单无法读取,请刷新工程列表。', 404) - path = grouped[project_id][0] - raw = manifests.get(project_id) - if raw is None: - # The manifest is present but invalid; report the precise reason. - return path, self._manifest(path) - return path, self._parse_manifest(raw) - - def _record(self, path, head): - file = child(directory(child(path, 'commits')), f'{head}.json') - try: - before = _file_signature(file) - with self._cache_lock: - cached = self._records_cache.get(file) - if cached is not None: - self._records_cache.move_to_end(file) - # On platforms with reliable change times, a rewrite changes the - # signature (ctime/mtime/size/inode). Re-reading and re-hashing every - # historical commit on each read cost ~13 s per history query for a - # project with hundreds of commits, holding the catalog lock past the - # 15 s contention budget of unrelated saves. On Windows, verify bytes - # because the file signature can remain unchanged after a rewrite. - if cached and cached[0] == before and not self._verify_record_bytes: - # Private repository records are read-only. Public query - # boundaries copy returned values, not every historical snapshot. - return cached[1] - if cached and cached[0] == before and cached[2] is not None: - # Windows: ctime is creation time and mtime can be restored by - # an outside writer, so the recorded bytes are verified too. - content = sha256(file.read_bytes()).digest() - if _file_signature(file) != before: - raise ValueError('Commit changed during read') - if content != cached[2]: - raise ValueError('Commit content changed') - return cached[1] - raw = file.read_bytes() if self._verify_record_bytes else None - content = sha256(raw).digest() if raw is not None else None - if raw is not None and _file_signature(file) != before: - raise ValueError('Commit changed during read') - if cached and cached[0] == before and cached[2] == content: - self._records_cache.move_to_end(file) - return cached[1] - if cached: - with self._cache_lock: - removed = self._records_cache.pop(file, None) - if removed is not None: - self._records_cache_bytes -= removed[0][2] - record = CommitRecord.model_validate_json(raw) if raw is not None else CommitRecord.model_validate(read_json(file)) - if _file_signature(file) != before: - raise ValueError('Commit changed during read') - if before[2] <= 8 * 1024 * 1024: - with self._cache_lock: - # Another reader (a warm or a caught-up changes() poll) may - # have installed this record while we parsed it; replacing - # it must subtract the replaced size or the budget drifts. - replaced = self._records_cache.pop(file, None) - if replaced is not None: - self._records_cache_bytes -= replaced[0][2] - self._records_cache[file] = (before, record, content) - self._records_cache_bytes += before[2] - while len(self._records_cache) > RECORD_CACHE_ENTRIES or self._records_cache_bytes > RECORD_CACHE_BYTES: - _, removed = self._records_cache.popitem(last=False) - self._records_cache_bytes -= removed[0][2] - return record - except (ValueError, TypeError, KeyError, FileNotFoundError): - raise ProjectError('工程提交记录缺失或损坏,已阻止自动覆盖。', 409, code='storage_unavailable') from None - - def _history(self, path, manifest): - records, seen, head = [], set(), manifest.head - while head is not None: - if head in seen: - raise ProjectError('工程提交历史存在循环,原文件已保留。', 409, code='storage_unavailable') - seen.add(head) - record = self._record(path, head) - if record.command.commandId != head or record.snapshot.project.id != manifest.id: - raise ProjectError('工程提交身份不一致,原文件已保留。', 409, code='storage_unavailable') - if records: - newer = records[-1] - if newer.snapshot.eventCursor != record.snapshot.eventCursor + (1 if newer.event else 0): - raise ProjectError('工程变更游标不连续,原文件已保留。', 409, code='storage_unavailable') - records.append(record) - head = record.previousHead - if (not records or records[-1].command.type != 'project.create' or records[-1].snapshot.eventCursor != 1 - or records[0].snapshot.project.name != manifest.name): - raise ProjectError('工程提交历史与清单不一致,原文件已保留。', 409, code='storage_unavailable') - # The chain behind this head is now proven; a head served earlier by - # the head-only fast path may be reused by caught-up change polling. - self._mark_validated(path, records[0].command.commandId) - return records - - def _load(self, db, project_id): - path, manifest = self._find(db, project_id) - records = self._history(path, manifest) - return path, manifest, records - - def _remember_current(self, path, record): - signature = _head_signature(path, record.command.commandId, self._verify_record_bytes) - if signature is None: - return - key = (str(path), str(record.command.commandId), signature) - with self._cache_lock: - self._current_cache[key] = (record, True) - self._current_cache.move_to_end(key) - while len(self._current_cache) > CURRENT_CACHE_ENTRIES: - self._current_cache.popitem(last=False) - - def _mark_validated(self, path, head): - """A full replay proved this head; caught-up polling may now trust it.""" - prefix = (str(path), str(head)) - with self._cache_lock: - for key, value in list(self._current_cache.items()): - if key[0] == prefix[0] and key[1] == prefix[1] and not value[1]: - self._current_cache[key] = (value[0], True) - - def _schedule_warm(self, path, manifest): - """Validate the ancestry behind a head that was served without replay. - - The first autosave after a cold open replays the chain; warming it in - the background right after the open read keeps that save cheap. The - work is coalesced per (project, head) and bounded, never holds the - catalog lock and never changes a read result: a failed warm just - leaves the lazy path, and is not remembered as a successful proof. - """ - key = (str(manifest.id), str(manifest.head)) - with self._warm_lock: - if key in self._warming or key in self._warmed or len(self._warming) >= WARM_CONCURRENCY: - return - event = threading.Event() - self._warming[key] = event - thread = threading.Thread(target=self._warm, args=(path, manifest, key, event), - name='creation-history-warm', daemon=True) - try: - thread.start() - except BaseException: - # A start failure must not leave a key that every later await waits - # out. Anyone who already observed this event is released too. - with self._warm_lock: - if self._warming.get(key) is event: - self._warming.pop(key, None) - event.set() - raise - - def _await_warm(self, project_id, head, timeout=30): - """Join validation of this head instead of replaying its chain twice. - - A warm of a different head is ignored. The wait stays outside the - catalog lock, so a first autosave races one validation rather than - parsing every snapshot twice at once. - """ - if head is None: - return - with self._warm_lock: - event = self._warming.get((str(project_id), str(head))) - if event is not None: - event.wait(timeout) - - def _await_current_warm(self, project_id, timeout=30): - """Wait for a warm of the head this caller is about to read. - - When nothing is in flight this returns without taking the catalog - lock. A missing project is left for the caller's own transaction. - """ - project = str(project_id) - with self._warm_lock: - inflight = any(key[0] == project for key in self._warming) - if not inflight: - return - try: - head = self.head(project_id) - except ProjectError: - return - self._await_warm(project_id, head, timeout) - - def _warm(self, path, manifest, key, event): - validated = False - try: - self._history(path, manifest) - validated = True - except BaseException: - # Reads stay correct: every path that needs the chain replays it - # itself and reports the integrity failure there. Leaving the key - # out of _warmed lets the next open retry a transient failure. - pass - finally: - with self._warm_lock: - if self._warming.get(key) is event: - self._warming.pop(key, None) - if validated: - self._warmed[key] = True - self._warmed.move_to_end(key) - while len(self._warmed) > WARM_ATTEMPTS: - self._warmed.popitem(last=False) - event.set() - - def _current_record(self, db, project_id, path, manifest): - """The head commit and whether its ancestry has been replayed. - - Opening a canvas must not parse every historical snapshot: a commit - leaves the old files alone (a commit file is immutable) and rewrites the - manifest, so the head file signature plus the manifest decides whether - the cached head is still current. Missing, corrupt or rewritten heads - still fail here; ancestors are proven by commit/history/receipt/changes - reads and by the background warm an open read schedules. - """ - signature = _head_signature(path, manifest.head, self._verify_record_bytes) - key = (str(path), str(manifest.head), signature) - if signature is not None: - with self._cache_lock: - cached = self._current_cache.get(key) - if cached is not None: - self._current_cache.move_to_end(key) - return cached - record = self._record(path, manifest.head) - if (record.command.commandId != manifest.head or record.snapshot.project.id != manifest.id - or record.snapshot.project.name != manifest.name): - raise ProjectError('工程提交身份不一致,原文件已保留。', 409, code='storage_unavailable') - if record.previousHead is None: - # A single-commit project's whole history is this record; validate - # the creation invariants that a full replay would check. - if record.command.type != 'project.create' or record.snapshot.eventCursor != 1: - raise ProjectError('工程提交历史与清单不一致,原文件已保留。', 409, code='storage_unavailable') - validated = True - else: - validated = False - if signature is not None: - with self._cache_lock: - self._current_cache[key] = (record, validated) - self._current_cache.move_to_end(key) - while len(self._current_cache) > CURRENT_CACHE_ENTRIES: - self._current_cache.popitem(last=False) - return record, validated - - def _current(self, db, project_id, path, manifest): - """The head commit, reused while its file is untouched. - - Replaying and re-validating the whole chain for every read made opening - a canvas take about a second. A commit leaves the old files alone and - moves the head, and an outside rewrite changes the head file's - signature, so both are noticed without trusting a bare timestamp. - """ - return self._current_record(db, project_id, path, manifest)[0] - def _lease(self, db, project_id, path, session): if session is None: raise ProjectError('修改工程需要已打开的会话。', 409) @@ -522,168 +101,6 @@ def _closed(self, db, project_id, snapshot, verb='重命名'): if tools.exists() and any(read_json(child(tools, item.name)).get('status') in {'queued', 'running'} for item in tools.glob('*.json')): raise ProjectError(f'工程仍有工具任务,请等待或取消任务后再{verb}。', 409) - @staticmethod - def _unreadable_item(path, reason, project_id=None): - return dict(id=project_id, name=path.name, path=str(path), reason=reason) - - def _catalog(self, db): - # One directory scan for the whole listing: resolving each project with - # _find() reread every project.json once per project (O(N^2)). - grouped, manifests, unsupported, conflicts, warnings = self._scan() - invalid = list(self._invalid) - projects = [] - unreadable = [self._unreadable_item(path, reason) for path, reason in invalid] - for project_id in sorted(grouped): - paths = grouped[project_id] - if project_id in unsupported: - reason = f'工程 {project_id} 使用旧格式,统一工程接口不支持读取或转换。' - warnings.append(reason) - unreadable.extend(self._unreadable_item(path, reason, project_id) for path in paths) - continue - if project_id in conflicts: - reason = f'工程标识重复:{project_id};请移走重复目录后重试。' - unreadable.extend(self._unreadable_item(path, reason, project_id) for path in paths) - continue - try: - if project_id in self._blocked: - raise ProjectError('工程提交需要恢复;请检查磁盘及工程文件后重试。', - 409, code='storage_unavailable') - path = paths[0] - raw = manifests.get(project_id) - manifest = self._manifest(path) if raw is None else self._parse_manifest(raw) - # Parsing the head alone proves the project still opens, and the - # manifest already carries the name it must agree with; a full - # chain replay just to list a name cost about a second. - record = self._record(path, manifest.head) - if record.snapshot.project.name != manifest.name: - raise ProjectError('工程提交历史与清单不一致,原文件已保留。', 409, code='storage_unavailable') - projects.append(dict(id=project_id, name=manifest.name, path=str(path))) - except (ProjectError, OSError): - reason = f'工程 {project_id} 需要恢复,原文件已保留。' - warnings.append(reason) - unreadable.append(self._unreadable_item(paths[0], reason, project_id)) - projects.sort(key=lambda item: (item['name'].casefold(), item['name'])) - unreadable.sort(key=lambda item: (item['name'].casefold(), item['name'])) - return dict(projects=projects, unreadable=unreadable, warnings=warnings) - - def list_projects(self): - with self.local.transaction() as db: - self._recover() - return self._catalog(db) - - @staticmethod - def _cleanup_blocker(db, project_id, path): - active = db.execute('SELECT 1 FROM sessions WHERE expires>? AND (path=? OR project_id=?)', - (time.time(), str(path), project_id or '')).fetchone() - if active: - return '工程仍在其他窗口中打开,请关闭后再清理。' - tools = path / 'tool-tasks' - if tools.exists() or tools.is_symlink(): - try: - directory(tools) - tasks = [read_json(child(tools, item.name)) for item in tools.glob('*.json')] - if any(not isinstance(task, dict) for task in tasks): - raise ValueError('Invalid tool task') - except (OSError, ValueError, TypeError, KeyError, ProjectError): - return '无法确认工具任务状态,请检查工程文件后再清理。' - if any(task.get('status') in {'queued', 'running'} for task in tasks): - return '工程仍有工具任务,请等待或取消任务后再清理。' - return None - - def cleanup_unreadable(self): - """Remove only directories that a fresh catalog read still cannot open.""" - with self.local.transaction() as db: - self._recover() - candidates = self._catalog(db)['unreadable'] - removed, failed = [], [] - for candidate in candidates: - with self.local.transaction() as db: - self._recover() - current = next((item for item in self._catalog(db)['unreadable'] - if item['path'] == candidate['path']), None) - if current is None: - continue - path = Path(current['path']) - blocker = self._cleanup_blocker(db, current['id'], path) - if blocker: - failed.append(dict(name=current['name'], message=blocker)) - continue - if not path.exists() and not path.is_symlink(): - continue - try: - directory(path) - recycle.remove(path, recoverable=self.delete_mode == 'recycle_bin') - except (OSError, ProjectError) as error: - failed.append(dict(name=current['name'], message=str(error))) - continue - removed.append(current['name']) - if current['id']: - journal = self._journal(current['id']) - if journal.exists(): - # The project is gone; its pending recovery must not recreate - # a permanent catalog warning on the next read. - journal.unlink() - sync_directory(self.intents) - with self.local.transaction() as db: - db.execute('DELETE FROM sessions WHERE path=?', (str(path),)) - if current['id']: - db.execute('DELETE FROM sessions WHERE project_id=?', (current['id'],)) - if removed: - sync_directory(self.root) - return dict(removed=removed, failed=failed) - - def snapshot(self, project_id): - with self.local.transaction() as db: - self._recover() - path, manifest = self._find(db, project_id) - return self._current(db, project_id, path, manifest).snapshot.model_copy(deep=True) - - def head(self, project_id): - """The current head commit, cheap enough to gate content-addressed caches. - - It skips the journal recovery that snapshot() runs: a caller only uses - this to notice that a cached read is stale. - """ - with self.local.transaction() as db: - return self._find(db, project_id)[1].head - - def _read_manifest(self, project_id): - """Resolve the current head under the catalog lock. - - Commit files are immutable once published, so the chain behind this head - can be walked without holding the lock: a slow read only delays itself, - not the saves and status polls that share the catalog. - """ - with self.local.transaction() as db: - self._recover() - return self._find(db, project_id) - - def records(self, project_id): - """Private commit records for read-only scans; callers must not mutate them. - - history() deep-copies every snapshot for callers that keep the records - around. Scans that only count versions or owners would copy hundreds of - megabytes for long histories, so they read the shared records directly. - """ - path, manifest = self._read_manifest(project_id) - return tuple(self._history(path, manifest)) - - def history(self, project_id): - records = self.records(project_id) - # Private records are never mutated. Copy for the public caller after - # releasing the global lock so large history reads do not block saves. - return tuple(record.model_copy(deep=True) for record in records) - - def history_index(self, project_id): - """Small detached event metadata; toolbar queries need no snapshots.""" - path, manifest = self._read_manifest(project_id) - records = self._history(path, manifest) - return records[0].snapshot.undoClearedThrough, tuple(dict( - commandId=r.command.commandId, type=r.command.type, - cursor=r.event.cursor, source=r.event.source, - targetCommandId=getattr(r.command.payload, 'targetCommandId', None), - ) for r in records if r.event is not None) - def view(self, project_id, client_id, value=None, *, session=None, missing_ok=False): with self.local.transaction() as db: self._recover() @@ -717,65 +134,10 @@ def open(self, project_id, session): def heartbeat(self, session, project_id): self.open(project_id, session) - def receipt(self, project_id, command_id): - with self.local.transaction() as db: - self._recover() - records = self._load(db, project_id)[2] - found = next((record.receipt for record in records if str(record.command.commandId) == str(command_id)), None) - if found is None: - raise ProjectError('没有该命令的已提交回执。', 404) - return found.model_copy(deep=True) - - def changes(self, project_id, *, after=0, limit=100): - if type(after) is not int or after < 0 or type(limit) is not int or not 1 <= limit <= 200: - raise ProjectError('变更游标或分页大小无效。') - # open() may already be proving this head. Joining that warm before the - # catalog lock keeps a caught-up subscriber from replaying the same - # chain while the lock is held. - self._await_current_warm(project_id) - with self.local.transaction() as db: - self._recover() - path, manifest = self._find(db, project_id) - # A subscriber that is already caught up is the common polling - # path. Replaying the commit chain here held the catalog lock for - # about a second per poll on Windows and starved saves/heartbeats. - head, validated = self._current_record(db, project_id, path, manifest) - cursor = head.snapshot.eventCursor - if after > cursor: - raise ProjectError('变更游标超出当前工程,请重新读取快照。', 409) - if after == cursor: - if not validated: - # A head served by the fast path has not proven its ancestry - # yet; the outbox is derived from the chain, so validate it - # before claiming there are no events. - self._history(path, manifest) - return dict(events=[], nextCursor=after, currentCursor=cursor, hasMore=False) - records = self._history(path, manifest) - events = [record.event for record in reversed(records) if record.event and record.event.cursor > after][:limit] - events = [event.model_copy(deep=True) for event in events] - return dict(events=events, nextCursor=events[-1].cursor if events else after, - currentCursor=cursor, hasMore=bool(events and events[-1].cursor < cursor)) - def execute(self, command: Command, *, session=None, source='ui', imported_from=None): return command_dispatcher().execute( self, command, session=session, source=source, imported_from=imported_from) - @staticmethod - def _replay(records, command): - record = next((item for item in records if item.command.commandId == command.commandId), None) - if record is None: - return None - if record.receipt.inputFingerprint != command_fingerprint(command): - raise ProjectError('该 commandId 已用于不同输入,请使用新的命令标识。', 409, code='command_conflict') - return record.receipt.model_copy(deep=True) - - def replay(self, command): - """Resolve an already committed command before reading upload handles.""" - self._await_current_warm(command.projectId) - with self.local.transaction() as db: - self._recover() - return self._replay(self._load(db, command.projectId)[2], command) - def _create(self, command, source): name = project_name(command.payload.name) with self.local.transaction() as db: @@ -870,214 +232,3 @@ def _trash(self, command, source): raise ProjectError(str(error), 409, code='storage_unavailable') from error sync_directory(self.root) return receipt - - def commit(self, command: Command, - apply: Callable[[ProjectSnapshot], ProjectSnapshot] | Callable[[ProjectSnapshot, tuple[CommitRecord, ...]], ProjectSnapshot], *, - session=None, source='ui', files=(), deletes=(), with_history=False): - if source not in {'ui', 'agent', 'background', 'external'}: - raise ProjectError('无效的命令来源。') - self._await_current_warm(command.projectId) - with self.local.transaction() as db: - self._recover() - path, manifest, records = self._load(db, command.projectId) - replay = self._replay(records, command) - if replay: - return replay - before = records[0].snapshot - if command.type == 'project.rename': - self._closed(db, command.projectId, before) - elif command.type == 'project.trash': - self._closed(db, command.projectId, before, '删除') - elif source not in {'background', 'external'}: - # Only trusted server entrypoints select these sources. A - # completed job must be able to save after its window closes. - self._lease(db, command.projectId, path, session) - issue, changed, snapshot = None, [], before - try: - validate_command(command, before) - # Revalidate the whole graph, even if an internal caller used model_copy. - draft = ProjectSnapshot.model_validate(before.model_dump(mode='json')) - edited = apply(draft, tuple(records)) if with_history else apply(draft) - snapshot = ProjectSnapshot.model_validate(edited.model_dump(mode='json')) - if snapshot.project.id != before.project.id or snapshot.eventCursor != before.eventCursor: - raise ContractError('invalid_input', 'Services cannot replace project identity or event cursors') - if snapshot.project.name != before.project.name and command.type != 'project.rename': - raise ContractError('invalid_input', 'Only the rename command can rename a project') - changed = object_changes(before, snapshot, command) - if command.type == 'project.rename': - self.local._conflict(self.root, snapshot.project.name, path) - except ContractError as error: - issue = error.issue - except ValidationError as error: - failures = error.errors(include_input=False, include_url=False, include_context=False) - paths = ['.'.join(str(part) for part in failure['loc']) for failure in failures] - issue = dict(code='invalid_input', field=paths[0][:200] or None, - message='; '.join(f"{path}: {failure['msg']}" if path else failure['msg'] - for path, failure in zip(paths, failures))[:500]) - except (ValueError, ProjectError) as error: - issue = dict(code='invalid_input', message=str(error)[:500]) - if issue is not None: - snapshot, changed = before, [] - elif changed: - snapshot = ProjectSnapshot.model_validate({**snapshot.model_dump(), 'eventCursor': before.eventCursor + 1}) - record = self._make_record(command, manifest.head, snapshot, changed, source, issue) - to_name = snapshot.project.name if command.type == 'project.rename' and changed else path.name - return self._publish(CommitIntent(fromName=path.name, toName=to_name, - beforeFingerprint=digest(before), record=record, files=files if changed and issue is None else (), - deletes=deletes if changed and issue is None else ()), validated_history=True) - - @staticmethod - def _make_record(command, head, snapshot, changed, source, issue=None): - job_ids = tuple(item['version'].id for item in changed if item['version'].objectType == 'job' and item['change'] == 'created' - and next(job for job in snapshot.jobs if job.id == item['version'].id).status == 'queued') - event = ProjectEvent(projectId=command.projectId, cursor=snapshot.eventCursor, commandId=command.commandId, - source=source, changed=changed, jobIds=job_ids) if changed else None - receipt = CommandReceipt(commandId=command.commandId, projectId=command.projectId, - inputFingerprint=command_fingerprint(command), status='rejected' if issue else 'accepted' if job_ids else 'applied' if changed else 'noop', - changed=[item['version'] for item in changed], jobIds=job_ids, issues=[issue] if issue else [], eventCursor=snapshot.eventCursor) - return CommitRecord(command=command, previousHead=head, snapshot=snapshot, receipt=receipt, event=event) - - def _journal(self, project_id): - return child(directory(self.intents), f'{project_id}.json') - - def _temporary(self, intent): - # Compact UUIDs retain both identities while keeping Windows staging - # paths short enough for the longer application name. - return child(self.root, f'.opendirector-creation-{intent.record.command.projectId.hex}-{intent.record.command.commandId.hex}') - - def _publish(self, intent, *, validated_history=False): - self.intents.mkdir(exist_ok=True) - sync_directory(self.state_dir) - temporary = self._temporary(intent) - if temporary.exists(): - raise ProjectError('提交临时目录已被占用,原目录未修改。', 409, code='storage_unavailable') - journal = self._journal(intent.record.command.projectId) - if journal.exists(): - raise ProjectError('工程已有待恢复的提交。', 409, code='storage_unavailable') - durable_json(journal, intent.model_dump(mode='json')) - self._checkpoint('journaled') - self._finish(intent, validated_history=validated_history) - return intent.record.receipt - - def _location(self, intent): - target = child(self.root, intent.toName) - temporary = self._temporary(intent) - candidates = [temporary, target] - if intent.fromName: - candidates.append(child(self.root, intent.fromName)) - # Path.exists also accepts aliases on case-insensitive filesystems. - existing_names = {entry.name for entry in self.root.iterdir()} - locations = [] - for path in candidates: - if path.name not in existing_names or not path.exists(): - continue - directory(path) - if any(path.samefile(other) for other in locations): - continue - manifest_path = child(path, 'project.json') - if manifest_path.exists(): - manifest = self._manifest(path) - if manifest.id == intent.record.command.projectId and manifest.head in {intent.record.previousHead, intent.record.command.commandId}: - locations.append(path) - elif path == temporary and intent.fromName is None: - # A new directory can be interrupted before its first file is - # installed. The durable intent owns only this reserved name. - if any(item.name not in {'commits'} and not item.name.startswith('.opendirector-') for item in path.iterdir()): - raise ProjectError('工程临时目录包含未知文件,已保留待检查。', 409) - locations.append(path) - if not locations and intent.fromName is None and not target.exists(): - temporary.mkdir() - sync_directory(self.root) - return temporary - if len(locations) != 1: - raise ProjectError('无法唯一定位待提交工程,原文件已保留。', 409, code='storage_unavailable') - return locations[0] - - def _finish(self, intent, *, validated_history=False): - self.local._check_root() - path = self._location(intent) - record = intent.record - manifest_path = child(path, 'project.json') - if manifest_path.exists(): - manifest = self._manifest(path) - if manifest.head == record.previousHead: - # Normal commits already verified ancestry under this lock. - # Recovery still checks the full chain before publishing. - previous = (self._record(path, manifest.head) if validated_history - else self._history(path, manifest)[0]) - current = previous.snapshot - if (previous.command.commandId != manifest.head or current.project.id != manifest.id - or current.project.name != manifest.name or digest(current) != intent.beforeFingerprint): - raise ProjectError('工程在提交期间被外部修改,已阻止覆盖。', 409, code='storage_unavailable') - elif manifest.name != record.snapshot.project.name: - raise ProjectError('已发布清单被外部修改,已阻止覆盖。', 409, code='storage_unavailable') - self._checkpoint('directory_ready') - install_files(path, record.command.projectId, intent.files, self.state_dir, self._checkpoint) - if intent.files: - self._checkpoint('files_installed') - commits = directory(child(path, 'commits')) - commits.mkdir(exist_ok=True) - sync_directory(path) - file = child(commits, f'{record.command.commandId}.json') - if file.exists(): - if self._record(path, record.command.commandId) != record: - raise ProjectError('已存在不同内容的提交记录,未覆盖。', 409, code='storage_unavailable') - else: - durable_json(file, record.model_dump(mode='json')) - self._checkpoint('bundle_written') - if intent.fromName is None: - # Install identity before exposing a newly built directory. A crash - # immediately after the move can then locate it unambiguously. - manifest = Manifest(id=record.command.projectId, name=record.snapshot.project.name, head=record.command.commandId) - durable_json(child(path, 'project.json'), manifest.model_dump(mode='json')) - target, temporary = child(self.root, intent.toName), self._temporary(intent) - if path.name != target.name: - self.local._conflict(self.root, target.name, path) - if path != temporary: - rename_path(path, temporary) - sync_directory(self.root) - self._checkpoint('directory_staged') - path = temporary - self.local._conflict(self.root, target.name, path) - rename_path(path, target) - sync_directory(self.root) - path = target - self._checkpoint('directory_moved') - manifest = Manifest(id=record.command.projectId, name=record.snapshot.project.name, head=record.command.commandId) - durable_json(child(path, 'project.json'), manifest.model_dump(mode='json')) - self._checkpoint('published') - delete_files(path, intent.deletes) - if intent.deletes: - self._checkpoint('files_deleted') - self._journal(record.command.projectId).unlink() - sync_directory(self.intents) - self._checkpoint('finished') - # The record just published is the new head, so the read that follows a - # save does not need to replay and re-parse the whole chain. - self._remember_current(path, record) - try: - cleanup_staging(record.command.projectId, intent.files, self.state_dir) - except (OSError, ProjectError): - # Publication is already durable. Retained staging can be cleaned - # by explicit upload cancellation without resubmitting the command. - pass - - def _recover(self): - self._blocked, self._warnings = {}, [] - directory(self.intents) - if not self.intents.exists(): - return - for file in sorted(self.intents.glob('*.json')): - try: - project_id = identifier(file.stem) - except ProjectError: - self._warnings.append('发现无法识别的提交日志,文件已保留。') - continue - try: - intent = CommitIntent.model_validate(read_json(child(self.intents, file.name))) - if str(intent.record.command.projectId) != project_id: - raise ValueError('Journal filename differs from its project') - self._finish(intent) - except (OSError, ValueError, TypeError, KeyError, ProjectError): - self._blocked[project_id] = True - self._warnings.append(f'工程 {project_id} 的提交需要恢复,相关文件已保留。') diff --git a/packages/core/src/opendirector/infrastructure/creation_publication.py b/packages/core/src/opendirector/infrastructure/creation_publication.py new file mode 100644 index 000000000..da71c78aa --- /dev/null +++ b/packages/core/src/opendirector/infrastructure/creation_publication.py @@ -0,0 +1,252 @@ +"""Publish one already-decided commit and finish a pending journal on read. + +The journal is written before any project file changes. ``project.json`` is the +commit point. Recovery finishes that intent; it does not choose a new command. +""" +from collections.abc import Callable + +from pydantic import ValidationError + +from opendirector.domain.creation.base import digest +from opendirector.domain.creation.commands import Command, CommandReceipt, ProjectEvent, command_fingerprint +from opendirector.domain.creation.project import ProjectSnapshot +from opendirector.domain.creation.validation import ContractError, validate_command +from opendirector.domain.projects import ProjectError, identifier +from opendirector.infrastructure.creation_files import cleanup_staging, delete_files, install_files +from opendirector.infrastructure.creation_records import ( + CommitIntent, CommitRecord, Manifest, durable_json, object_changes, +) +from opendirector.infrastructure.directories import directory, sync_directory +from opendirector.infrastructure.local_projects import child, read_json +from opendirector.infrastructure.rename import rename_path + + +class CommitPublication: + """Idempotent commit publication and journal recovery.""" + + @staticmethod + def _replay(records, command): + record = next((item for item in records if item.command.commandId == command.commandId), None) + if record is None: + return None + if record.receipt.inputFingerprint != command_fingerprint(command): + raise ProjectError('该 commandId 已用于不同输入,请使用新的命令标识。', 409, code='command_conflict') + return record.receipt.model_copy(deep=True) + + def replay(self, command): + """Resolve an already committed command before reading upload handles.""" + self._await_current_warm(command.projectId) + with self.local.transaction() as db: + self._recover() + return self._replay(self._load(db, command.projectId)[2], command) + + def commit(self, command: Command, + apply: Callable[[ProjectSnapshot], ProjectSnapshot] | Callable[[ProjectSnapshot, tuple[CommitRecord, ...]], ProjectSnapshot], *, + session=None, source='ui', files=(), deletes=(), with_history=False): + if source not in {'ui', 'agent', 'background', 'external'}: + raise ProjectError('无效的命令来源。') + self._await_current_warm(command.projectId) + with self.local.transaction() as db: + self._recover() + path, manifest, records = self._load(db, command.projectId) + replay = self._replay(records, command) + if replay: + return replay + before = records[0].snapshot + if command.type == 'project.rename': + self._closed(db, command.projectId, before) + elif command.type == 'project.trash': + self._closed(db, command.projectId, before, '删除') + elif source not in {'background', 'external'}: + # Only trusted server entrypoints select these sources. A + # completed job must be able to save after its window closes. + self._lease(db, command.projectId, path, session) + issue, changed, snapshot = None, [], before + try: + validate_command(command, before) + # Revalidate the whole graph, even if an internal caller used model_copy. + draft = ProjectSnapshot.model_validate(before.model_dump(mode='json')) + edited = apply(draft, tuple(records)) if with_history else apply(draft) + snapshot = ProjectSnapshot.model_validate(edited.model_dump(mode='json')) + if snapshot.project.id != before.project.id or snapshot.eventCursor != before.eventCursor: + raise ContractError('invalid_input', 'Services cannot replace project identity or event cursors') + if snapshot.project.name != before.project.name and command.type != 'project.rename': + raise ContractError('invalid_input', 'Only the rename command can rename a project') + changed = object_changes(before, snapshot, command) + if command.type == 'project.rename': + self.local._conflict(self.root, snapshot.project.name, path) + except ContractError as error: + issue = error.issue + except ValidationError as error: + failures = error.errors(include_input=False, include_url=False, include_context=False) + paths = ['.'.join(str(part) for part in failure['loc']) for failure in failures] + issue = dict(code='invalid_input', field=paths[0][:200] or None, + message='; '.join(f"{path}: {failure['msg']}" if path else failure['msg'] + for path, failure in zip(paths, failures))[:500]) + except (ValueError, ProjectError) as error: + issue = dict(code='invalid_input', message=str(error)[:500]) + if issue is not None: + snapshot, changed = before, [] + elif changed: + snapshot = ProjectSnapshot.model_validate({**snapshot.model_dump(), 'eventCursor': before.eventCursor + 1}) + record = self._make_record(command, manifest.head, snapshot, changed, source, issue) + to_name = snapshot.project.name if command.type == 'project.rename' and changed else path.name + return self._publish(CommitIntent(fromName=path.name, toName=to_name, + beforeFingerprint=digest(before), record=record, files=files if changed and issue is None else (), + deletes=deletes if changed and issue is None else ()), validated_history=True) + + @staticmethod + def _make_record(command, head, snapshot, changed, source, issue=None): + job_ids = tuple(item['version'].id for item in changed if item['version'].objectType == 'job' and item['change'] == 'created' + and next(job for job in snapshot.jobs if job.id == item['version'].id).status == 'queued') + event = ProjectEvent(projectId=command.projectId, cursor=snapshot.eventCursor, commandId=command.commandId, + source=source, changed=changed, jobIds=job_ids) if changed else None + receipt = CommandReceipt(commandId=command.commandId, projectId=command.projectId, + inputFingerprint=command_fingerprint(command), status='rejected' if issue else 'accepted' if job_ids else 'applied' if changed else 'noop', + changed=[item['version'] for item in changed], jobIds=job_ids, issues=[issue] if issue else [], eventCursor=snapshot.eventCursor) + return CommitRecord(command=command, previousHead=head, snapshot=snapshot, receipt=receipt, event=event) + + def _journal(self, project_id): + return child(directory(self.intents), f'{project_id}.json') + + def _temporary(self, intent): + # Compact UUIDs retain both identities while keeping Windows staging + # paths short enough for the longer application name. + return child(self.root, f'.opendirector-creation-{intent.record.command.projectId.hex}-{intent.record.command.commandId.hex}') + + def _publish(self, intent, *, validated_history=False): + self.intents.mkdir(exist_ok=True) + sync_directory(self.state_dir) + temporary = self._temporary(intent) + if temporary.exists(): + raise ProjectError('提交临时目录已被占用,原目录未修改。', 409, code='storage_unavailable') + journal = self._journal(intent.record.command.projectId) + if journal.exists(): + raise ProjectError('工程已有待恢复的提交。', 409, code='storage_unavailable') + durable_json(journal, intent.model_dump(mode='json')) + self._checkpoint('journaled') + self._finish(intent, validated_history=validated_history) + return intent.record.receipt + + def _location(self, intent): + target = child(self.root, intent.toName) + temporary = self._temporary(intent) + candidates = [temporary, target] + if intent.fromName: + candidates.append(child(self.root, intent.fromName)) + # Path.exists also accepts aliases on case-insensitive filesystems. + existing_names = {entry.name for entry in self.root.iterdir()} + locations = [] + for path in candidates: + if path.name not in existing_names or not path.exists(): + continue + directory(path) + if any(path.samefile(other) for other in locations): + continue + manifest_path = child(path, 'project.json') + if manifest_path.exists(): + manifest = self._manifest(path) + if manifest.id == intent.record.command.projectId and manifest.head in {intent.record.previousHead, intent.record.command.commandId}: + locations.append(path) + elif path == temporary and intent.fromName is None: + # A new directory can be interrupted before its first file is + # installed. The durable intent owns only this reserved name. + if any(item.name not in {'commits'} and not item.name.startswith('.opendirector-') for item in path.iterdir()): + raise ProjectError('工程临时目录包含未知文件,已保留待检查。', 409) + locations.append(path) + if not locations and intent.fromName is None and not target.exists(): + temporary.mkdir() + sync_directory(self.root) + return temporary + if len(locations) != 1: + raise ProjectError('无法唯一定位待提交工程,原文件已保留。', 409, code='storage_unavailable') + return locations[0] + + def _finish(self, intent, *, validated_history=False): + self.local._check_root() + path = self._location(intent) + record = intent.record + manifest_path = child(path, 'project.json') + if manifest_path.exists(): + manifest = self._manifest(path) + if manifest.head == record.previousHead: + # Normal commits already verified ancestry under this lock. + # Recovery still checks the full chain before publishing. + previous = (self._record(path, manifest.head) if validated_history + else self._history(path, manifest)[0]) + current = previous.snapshot + if (previous.command.commandId != manifest.head or current.project.id != manifest.id + or current.project.name != manifest.name or digest(current) != intent.beforeFingerprint): + raise ProjectError('工程在提交期间被外部修改,已阻止覆盖。', 409, code='storage_unavailable') + elif manifest.name != record.snapshot.project.name: + raise ProjectError('已发布清单被外部修改,已阻止覆盖。', 409, code='storage_unavailable') + self._checkpoint('directory_ready') + install_files(path, record.command.projectId, intent.files, self.state_dir, self._checkpoint) + if intent.files: + self._checkpoint('files_installed') + commits = directory(child(path, 'commits')) + commits.mkdir(exist_ok=True) + sync_directory(path) + file = child(commits, f'{record.command.commandId}.json') + if file.exists(): + if self._record(path, record.command.commandId) != record: + raise ProjectError('已存在不同内容的提交记录,未覆盖。', 409, code='storage_unavailable') + else: + durable_json(file, record.model_dump(mode='json')) + self._checkpoint('bundle_written') + if intent.fromName is None: + # Install identity before exposing a newly built directory. A crash + # immediately after the move can then locate it unambiguously. + manifest = Manifest(id=record.command.projectId, name=record.snapshot.project.name, head=record.command.commandId) + durable_json(child(path, 'project.json'), manifest.model_dump(mode='json')) + target, temporary = child(self.root, intent.toName), self._temporary(intent) + if path.name != target.name: + self.local._conflict(self.root, target.name, path) + if path != temporary: + rename_path(path, temporary) + sync_directory(self.root) + self._checkpoint('directory_staged') + path = temporary + self.local._conflict(self.root, target.name, path) + rename_path(path, target) + sync_directory(self.root) + path = target + self._checkpoint('directory_moved') + manifest = Manifest(id=record.command.projectId, name=record.snapshot.project.name, head=record.command.commandId) + durable_json(child(path, 'project.json'), manifest.model_dump(mode='json')) + self._checkpoint('published') + delete_files(path, intent.deletes) + if intent.deletes: + self._checkpoint('files_deleted') + self._journal(record.command.projectId).unlink() + sync_directory(self.intents) + self._checkpoint('finished') + # The record just published is the new head, so the read that follows a + # save does not need to replay and re-parse the whole chain. + self._remember_current(path, record) + try: + cleanup_staging(record.command.projectId, intent.files, self.state_dir) + except (OSError, ProjectError): + # Publication is already durable. Retained staging can be cleaned + # by explicit upload cancellation without resubmitting the command. + pass + + def _recover(self): + self._blocked, self._warnings = {}, [] + directory(self.intents) + if not self.intents.exists(): + return + for file in sorted(self.intents.glob('*.json')): + try: + project_id = identifier(file.stem) + except ProjectError: + self._warnings.append('发现无法识别的提交日志,文件已保留。') + continue + try: + intent = CommitIntent.model_validate(read_json(child(self.intents, file.name))) + if str(intent.record.command.projectId) != project_id: + raise ValueError('Journal filename differs from its project') + self._finish(intent) + except (OSError, ValueError, TypeError, KeyError, ProjectError): + self._blocked[project_id] = True + self._warnings.append(f'工程 {project_id} 的提交需要恢复,相关文件已保留。') diff --git a/packages/core/src/opendirector/infrastructure/creation_records.py b/packages/core/src/opendirector/infrastructure/creation_records.py new file mode 100644 index 000000000..c759fbd8b --- /dev/null +++ b/packages/core/src/opendirector/infrastructure/creation_records.py @@ -0,0 +1,119 @@ +"""Commit documents published by project storage. + +A commit record fixes the command, snapshot, receipt, and optional outbox +event. ``object_changes`` checks revisions when a service hands storage a new +snapshot. Choosing which service runs a command stays in the application layer. +""" +from pathlib import Path +from typing import Literal +from uuid import UUID + +from pydantic import Field, model_validator + +from opendirector.domain.creation.base import Contract, Digest, ObjectVersion +from opendirector.domain.creation.commands import Command, CommandReceipt, ProjectEvent, command_fingerprint +from opendirector.domain.creation.index import object_index +from opendirector.domain.creation.project import ProjectSnapshot +from opendirector.domain.creation.validation import ContractError +from opendirector.domain.projects import project_name +from opendirector.infrastructure.directories import sync_directory +from opendirector.infrastructure.local_projects import write_json +from opendirector.ports.files import AssetFileDelete, AssetFileWrite + + +class Manifest(Contract): + format: Literal['opendirector-project'] = Field(default='opendirector-project', description='Serialized format identifier.') + formatVersion: Literal[2] = Field(default=2, description='Project format version.') + id: UUID = Field(description='Stable object ID.') + name: str = Field(description='User-visible name.') + head: UUID = Field(description='Current committed command ID.') + + +class CommitRecord(Contract): + schemaVersion: Literal[1] = Field(default=1, description='Record schema version.') + command: Command = Field(description='Immutable command recorded in this commit.') + previousHead: UUID | None = Field(description='Previous commit ID, or null for project creation.') + snapshot: ProjectSnapshot = Field(description='Authoritative project snapshot.') + receipt: CommandReceipt = Field(description='Immutable command execution receipt.') + event: ProjectEvent | None = Field(description='Project change event, if emitted.') + + @model_validator(mode='after') + def consistent(self): + if (self.command.projectId != self.snapshot.project.id + or self.receipt.projectId != self.command.projectId + or self.receipt.commandId != self.command.commandId + or self.receipt.inputFingerprint != command_fingerprint(self.command) + or self.receipt.eventCursor != self.snapshot.eventCursor): + raise ValueError('Commit identity is inconsistent') + applied = self.receipt.status in {'applied', 'accepted'} + if applied != (self.event is not None): + raise ValueError('Only applied commits have outbox events') + if self.event is not None: + if (self.event.projectId != self.command.projectId or self.event.commandId != self.command.commandId + or self.event.cursor != self.snapshot.eventCursor or self.event.jobIds != self.receipt.jobIds + or tuple(change.version for change in self.event.changed) != self.receipt.changed): + raise ValueError('Outbox event differs from the committed receipt') + return self + + +class CommitIntent(Contract): + schemaVersion: Literal[1] = Field(default=1, description='Record schema version.') + fromName: str | None = Field(description='Original project directory name.') + toName: str = Field(description='Destination project directory name.') + beforeFingerprint: Digest | None = Field(description='Fingerprint of the project before this commit.') + record: CommitRecord = Field(description='Immutable commit awaiting publication.') + files: tuple[AssetFileWrite, ...] = Field(default=(), description='Staged asset files installed before commit publication.') + deletes: tuple[AssetFileDelete, ...] = Field(default=(), description='Asset file removals performed after publication.') + + @model_validator(mode='after') + def consistent(self): + project_name(self.toName) + if self.fromName is not None: + project_name(self.fromName) + creating = self.fromName is None + if creating != (self.record.previousHead is None) or creating != (self.beforeFingerprint is None): + raise ValueError('Creation intent has no prior project') + if creating and self.record.command.type != 'project.create': + raise ValueError('First commit must create a project') + ids = [write.assetId for write in self.files] + if len(ids) != len(set(ids)): + raise ValueError('File destinations must be unique') + assets = {asset.id: asset for asset in self.record.snapshot.assets} + created = {version.id for version in self.record.receipt.changed if version.objectType == 'asset'} + for write in self.files: + asset = assets.get(write.assetId) + if (asset is None or asset.id not in created or asset.fingerprint != write.fingerprint + or asset.metadata.size != write.size): + raise ValueError('File write must match its committed asset') + deleted = {change.version.id for change in self.record.event.changed if change.change == 'deleted' and change.version.objectType == 'asset'} if self.record.event else set() + if any(value.assetId not in deleted or value.assetId in assets for value in self.deletes): + raise ValueError('Deleted files must have committed asset deletions') + return self + + +def durable_json(path: Path, value): + write_json(path, value) + sync_directory(path.parent) + + +def object_changes(before, after, command): + """The storage boundary also checks revisions on trusted service writes.""" + old = object_index(before) if before else {} + new = object_index(after) + expected = {(item.objectType, item.id): item.revision for item in command.expectedVersions} + changed = [] + for key in sorted(old.keys() | new.keys(), key=lambda item: (item[0], str(item[1]))): + previous, current = old.get(key), new.get(key) + if previous == current: + continue + kind, object_id = key + if previous is not None and expected.get(key) != previous.revision: + raise ContractError('revision_conflict', 'Every changed object requires its current version', object_id) + if current is not None and current.revision != (previous.revision + 1 if previous else 1): + raise ContractError('revision_conflict', 'Object revisions must advance exactly once', object_id) + change = 'created' if previous is None else 'deleted' if current is None else 'updated' + if kind == 'canvas_item' and previous and current and previous.visible and not current.visible: + change = 'hidden' + changed.append(dict(version=ObjectVersion(objectType=kind, id=object_id, + revision=current.revision if current else previous.revision), change=change)) + return changed diff --git a/tests/test_creation_storage.py b/tests/test_creation_storage.py index 28471f09b..03d556bcb 100644 --- a/tests/test_creation_storage.py +++ b/tests/test_creation_storage.py @@ -399,7 +399,7 @@ def test_symlinks_and_missing_commit_records_are_not_followed_or_replaced(projec @pytest.mark.parametrize('change', ['in_place', 'replacement', 'missing']) @pytest.mark.skipif(os.name == 'nt', reason='Commit signature caching requires POSIX change time') def test_cached_history_still_detects_changed_ancestor_with_same_size_and_mtime(projects, monkeypatch, change): - from opendirector.infrastructure import creation_projects as module + from opendirector.infrastructure import creation_commit_log as module created = create(projects) projects.execute(rename(created)) projects.changes(created.projectId) @@ -434,7 +434,7 @@ def reading(path): def test_long_history_is_validated_from_disk_only_once(projects, monkeypatch): # Each read validates the whole chain; a cache smaller than the history # would reparse every record on every read of a long project. - from opendirector.infrastructure import creation_projects as module + from opendirector.infrastructure import creation_commit_log as module created = create(projects) for revision in range(1, 200): assert projects.execute(rename(created, f'Renamed {revision}', revision)).status == 'applied' @@ -472,9 +472,10 @@ def test_byte_verified_cache_detects_rewrites_with_unchanged_file_signature(proj projects.execute(renamed) key = renamed.commandId if victim == 'head' else created.commandId file = projects.root / 'Renamed' / 'commits' / f'{key}.json' - signature = creation_projects._file_signature(file) - original_signature = creation_projects._file_signature - monkeypatch.setattr(creation_projects, '_file_signature', + from opendirector.infrastructure import creation_commit_log + signature = creation_commit_log._file_signature(file) + original_signature = creation_commit_log._file_signature + monkeypatch.setattr(creation_commit_log, '_file_signature', lambda path: signature if path == file else original_signature(path)) projects.history_index(created.projectId) original = creation_projects.CommitRecord.model_validate_json @@ -584,20 +585,20 @@ def test_paginated_outbox_has_no_duplicate_or_skipped_events(projects): @pytest.mark.parametrize('file_kind', ['journal', 'bundle', 'manifest']) def test_real_file_write_failure_preserves_recoverable_intent(projects, monkeypatch, file_kind): - from opendirector.infrastructure import creation_projects + from opendirector.infrastructure import creation_records created = create(projects) command = rename(created) - original = creation_projects.write_json + original = creation_records.write_json def fail_write(path, value): matches = (path.parent == projects.intents if file_kind == 'journal' else path.name == f'{command.commandId}.json' if file_kind == 'bundle' else path.name == 'project.json') if matches: raise OSError('simulated disk full') original(path, value) - monkeypatch.setattr(creation_projects, 'write_json', fail_write) + monkeypatch.setattr(creation_records, 'write_json', fail_write) with pytest.raises(OSError): projects.execute(command) - monkeypatch.setattr(creation_projects, 'write_json', original) + monkeypatch.setattr(creation_records, 'write_json', original) restored = restarted(projects) if file_kind == 'journal': assert restored.snapshot(created.projectId).project.name == 'Example' @@ -754,8 +755,9 @@ def test_list_projects_scans_directories_and_manifests_once(projects, monkeypatc for index in range(8): create(projects, f'Project {index}') scans, manifests = [], [] + from opendirector.infrastructure import creation_catalog original_scan = creation_projects.CreationProjects._scan - original_read = creation_projects.read_json + original_read = creation_catalog.read_json def scanning(self): scans.append(1) @@ -767,7 +769,7 @@ def reading(path): return original_read(path) monkeypatch.setattr(creation_projects.CreationProjects, '_scan', scanning) - monkeypatch.setattr(creation_projects, 'read_json', reading) + monkeypatch.setattr(creation_catalog, 'read_json', reading) first = projects.list_projects() assert len(first['projects']) == 8 # One directory scan and one manifest read per project, never per project pair. From d0d60255f8f5ec982e93a871330c836d5f949bbb Mon Sep 17 00:00:00 2001 From: wuli666 <421774554@qq.com> Date: Sun, 8 Nov 2026 14:55:57 +0800 Subject: [PATCH 03/61] [bugfix] providers: stop offering gpt-image as a cutout matte (#223) ## summary - gpt-image models no longer declare image.cutout. Their edits redraw and move the subject, so the returned alpha does not line up with the source pixels, and gpt-image-2 rejects transparent backgrounds. Cutout without a selection or segmentation model now reports the missing model instead of calling OpenAI. - Add a regression test and update the gpt-image capability assertion. ## validation - New test_gpt_image_is_never_used_as_a_cutout_matte fails without the fix and passes with it; tests/test_openai_images.py passes. - pytest tests: 1097 passed, 6 skipped. - lint-imports: 4 kept; generate_contracts.py --check: verified. - npm test: 675 passed. Fixes: #222 --- .../opendirector/integrations/model_adapters.py | 5 ++++- tests/test_openai_images.py | 2 +- tests/test_tool_tasks.py | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/core/src/opendirector/integrations/model_adapters.py b/packages/core/src/opendirector/integrations/model_adapters.py index ce2338272..669571e11 100644 --- a/packages/core/src/opendirector/integrations/model_adapters.py +++ b/packages/core/src/opendirector/integrations/model_adapters.py @@ -676,7 +676,10 @@ def adapter_for(config, transport=None, poll_interval=3) -> ModelAdapter | None: return ArkImageEdits(transport, poll_interval) if kind == 'image' and profile == 'openai-gpt-image': # gpt-image: base64 answers only, 16 reference images, documented sizes. - return OpenAIImages(transport, poll_interval, max_images=16, transparent=True, + # No subject cutout: its edits redraw and move the subject, so a returned + # alpha does not line up with the source pixels, and gpt-image-2 rejects + # transparent backgrounds outright. + return OpenAIImages(transport, poll_interval, max_images=16, response_format=False, reference_field='image[]') if kind == 'image' and protocol == 'openai': return OpenAIImages(transport, poll_interval) diff --git a/tests/test_openai_images.py b/tests/test_openai_images.py index 3d9e1be67..d91c42bf9 100644 --- a/tests/test_openai_images.py +++ b/tests/test_openai_images.py @@ -51,7 +51,7 @@ def test_adapter_drops_response_format_only_for_gpt_image(model): adapter = adapter_for({**GPT_IMAGE, 'modelId': model}) assert isinstance(adapter, OpenAIImages) and adapter.response_format is False assert adapter.reference_field == 'image[]' and adapter.max_images == 16 - assert adapter.capabilities == {'image.generate', 'image.edit', 'image.cutout'} + assert adapter.capabilities == {'image.generate', 'image.edit'} assert adapter.size(1600, 900) == (1536, 1024) # OpenAI-compatible services keep the vLLM-Omni request shape. compatible = adapter_for({**GPT_IMAGE, 'modelId': 'Tongyi-MAI/Z-Image-Turbo', 'url': 'http://gpu-box:8200/v1'}) diff --git a/tests/test_tool_tasks.py b/tests/test_tool_tasks.py index 94ab9d62d..0f066ab29 100644 --- a/tests/test_tool_tasks.py +++ b/tests/test_tool_tasks.py @@ -624,6 +624,23 @@ def test_cutout_applies_exact_user_mask_without_any_model(project): assert result.getpixel((9, 8))[3] == 0 and result.getpixel((30, 20))[3] == 0 +def test_gpt_image_is_never_used_as_a_cutout_matte(project): + # gpt-image edits redraw and move the subject, so its alpha would not match the source pixels. + store, project_id, session = project + configs = ModelConfigs(store.local.repository) + configs.save('image', 'https://api.openai.com/v1', 'gpt-image-2', 'sk-test', protocol='openai') + source = upload(store, project_id, session, 'blue.png', png()) + calls = [] + transport = httpx.MockTransport(lambda request: calls.append(request) or httpx.Response(500)) + with pytest.raises(ProjectError, match='主体抠图'): + run(store, configs, transport, project_id, session, {'tool': 'cutout', 'sourceAssetIds': [source]}) + # A painted selection still cuts out locally, without calling the image service. + mask = upload(store, project_id, session, 'mask.png', base64.b64decode(box_mask((64, 48), (10, 8, 30, 32)))) + task = run(store, configs, transport, project_id, session, + {'tool': 'cutout', 'sourceAssetIds': [source], 'maskAssetId': mask}) + assert task['status'] == 'succeeded' and task['requires'] == [] and not calls + + def test_cutout_uses_sam_when_no_rgba_editor_is_configured(project): store, project_id, session = project source = upload(store, project_id, session, 'blue.png', png()) From d96324dbec4b990888f9a26d6283b68aedc25a6e Mon Sep 17 00:00:00 2001 From: Hongsheng Liu Date: Sun, 8 Nov 2026 18:07:31 +0800 Subject: [PATCH 04/61] [docs] add an animated GitHub star call-to-action (#227) ## summary Add a linked star demonstration to both READMEs with a reduced-motion still image and a reproducible Pillow generator. The original repository illustration contains no adoption counters or actual GitHub actions. ## validation - Decode the GIF: 960x560, 5.6 seconds, infinite loop, matching seam. - Inspect rendered still, pointer, click, and hold frames. - Regenerate both assets and compare bytes; verify README asset links. - npm run check:i18n and git diff --staged --check pass. --- README.md | 11 ++ README.zh-CN.md | 11 ++ docs/guides/assets/star-opendirector.gif | Bin 0 -> 76655 bytes docs/guides/assets/star-opendirector.png | Bin 0 -> 117199 bytes scripts/generate_star_cta.py | 148 +++++++++++++++++++++++ 5 files changed, 170 insertions(+) create mode 100644 docs/guides/assets/star-opendirector.gif create mode 100644 docs/guides/assets/star-opendirector.png create mode 100644 scripts/generate_star_cta.py diff --git a/README.md b/README.md index fd4234be5..a6f6560fe 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,17 @@ Join the **OpenDirector with vLLM-Omni (2)** WeChat group to discuss OpenDirecto

+If OpenDirector is useful to you, [give it a star on GitHub](https://github.com/ThinkFlowLab/OpenDirector) to support the project and help others discover it. + +

+ + + + Illustrated guide: open ThinkFlowLab/OpenDirector on GitHub and click Star + + +

+ ## Contributing We welcome bug reports and suggestions through [Issues](https://github.com/ThinkFlowLab/OpenDirector/issues), and code and documentation contributions through pull requests. See the [validation guide (Chinese)](docs/development/validation.md) for development checks. diff --git a/README.zh-CN.md b/README.zh-CN.md index 667ae880b..0240e7ca5 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -101,6 +101,17 @@ opendirector serve

+如果 OpenDirector 对你有帮助,欢迎[在 GitHub 上点亮 Star](https://github.com/ThinkFlowLab/OpenDirector),支持项目,也让更多人发现它。 + +

+ + + + 操作示意:打开 GitHub 上的 ThinkFlowLab/OpenDirector,点击 Star 支持项目 + + +

+ ## 参与贡献 欢迎通过 [Issues](https://github.com/ThinkFlowLab/OpenDirector/issues) 反馈问题或提出建议,通过 Pull Request 贡献代码与文档。开发检查见[验证指南](docs/development/validation.md)。 diff --git a/docs/guides/assets/star-opendirector.gif b/docs/guides/assets/star-opendirector.gif new file mode 100644 index 0000000000000000000000000000000000000000..56f973c4bb30a485f516649605ea9c82c60af01b GIT binary patch literal 76655 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 $3 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 literal 0 HcmV?d00001 diff --git a/docs/guides/assets/star-opendirector.png b/docs/guides/assets/star-opendirector.png new file mode 100644 index 0000000000000000000000000000000000000000..51d4cdc2e013607e0f505fb1a3c2e92b20c6b840 GIT binary patch literal 117199 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%0Ai_+k4nfB=s{?a8 zTSyk<-_uK-r7@8EJCy$JRUso|7aDGV>t7)(_=qwG<-ZpeXtG4{ zIFGJ2J{+=T@BJrBR<))K_(?@&EcEYoU&k5B>dkjSCI40O0*?z)Dk{CgjQ^Cq-~?}3 zx&xv2|7x87s0@q@_RB$uGgyvqk+J-@qwfl`7I6GnM`O%L-2V>P_VI}eAqAbf)LUGf ze?P*Ys-2&!UZ?-xeSOJbm!SD?kb*r+(LprALy_v8bKLYKI2Y^E``=L26}Lk2f8`Lt z!2Ak9=@;aGm}Q?dZbUxg zon8WPYzT`|mU2$%C3PWVb}rzg(+Qtdct@C8KIn(w&5eb_g?^}XP;@Nt2AAei!`|(s zN3V2YW!#Lc*P+PVP+3TL)_v5r+I=AH(Fm!|h~JYUsUuwsxmgS-@KD^vdW!{o^BI_! zA_`d|40~SiqM{t5DZOM%o{Cq#oZh`eo4NGHjrJ_)O0uOaqc0XOzOzO!|0)amL^Bc9 zP9Kq}sra>a4Y_fTmUpzQyWP#^z9LREg~P|?OdmdN9nnAme$=jhJmISg+<==?JsA?H zxGosQ1!8X0?|rc$<)39BA{d+KAy#yJ8^6hMlZZASHMFg=_&JOJ7GBjos>k&T`^zc0 zOWV`p&b{5y(|&#(Me5*vHP((}Px&J;W^m0iuBwopJT?AJ1P%>te?-7m|0)f+PV%V=}P zx6cEdv!1p#kJp*DjK<%;^?7X0NK}TpB<@?`wOno-Qr`l4uV#un&}u^4895f=r;Ko( z-hpN+pr2)XQuf^c_bT5)`060Go3@S>f@$aZso&j8E^xtIG;M7)id!ANzCJShle#ZW zKPTeJLP85n!?#mSJ_$NuppZkRq2Q>FuG2- z_Ny|xZiIiyq#xq%(Jh`pQ1x4#j}|*O9AzeE@S)~+lWivCU8I>*1hsWke4A6k;TFt< zz%psqn`7oE;(bJH%TL!$Y5F%}1W*pU6myFFT>MeFTN$<~xf_8-kY0-cAvY80ZyfA} zx#yul9hIEyZ{QE(3sbndA~u979kGLm z8((GY8KcXT83+;W_q$yWfYX>Z+Jlp?Sv*=kmI!jzxYy_uCBx9|!K9<3!$}so8v3lj z{k1GAnWs;Hojr1A;%6<FhoE+He8Ck=I4vrp(MA7<<+u5W|eD|wk=c?!T+p^c;^!WN`DY%Hmx&GYMRbvjm z({#GjL6^v7pl__5&r+DXkxUr)t=&Jh9EZ-YZ02<%Q~Pq2S-{oRgfj^_X|9!Jn%lGt zHukA@tazWBN#4xs=FfGWe25=ulT&UsJ(Cr#4MdQK@cX;o$EFSEcoZ)UmXp#0Ehj27 z<>NK4Ve`9y`Gwaj$)!%)U`rVdl5gL;UhE=oaZR)#)vfMPFx;7O)q7;AXAt%Aur7(&tgYh)3t=xxn00 zuE#y|p~1fU<4WJ>r<_4*s{6WI<6hg1&J1S!8&wLW`fVP?!xf0R^F(IWyAyda#hjne z#rpg~e^&V(Zw$v-o^~2-=f(1S%pVJjR)U^GfkU6xg9mMe~RdLNjYz=~!hy6d_l=#^_{j%pzpo_gYX&2l3$GKN~0S^glm$(V? zY(^Cl=^{y-yG@Jp*LSlgzFiwf3hxJFmj{}aJ+CB!R3rJG|E3U)N#+ZPVC=#H*=ue< z#N^%Eu7`I14S$ZfGjJ#g?(5ZFKVOZo=o4psL6_gjfl{&!7bSA{OW!emt(rR4Z}=xN zsXKkF?)t;i+o2w712#PoR&|w*_T!m{fsy__5ls7gM~m*Olb5+oVyQ`WU;XWNy|ojU z0;qhtKgyi?L@lT*@L_izeO1l4_ZFG9jV7=8> zqO6W6O24yWuZzQ!4QB&DF3qEBknq^!ZWON`9I8PM70D>cXfS^4PT9qAn>;AuKzrb| zN>VUDyQSxsCw3a=*WXtg-Q5lhPUqpo|60 z@x$)nok$Bg#fUg2m%jJ$BzNGO(l1Y{-TuKBJuGONsdQR;0YCYoVPodnYJ$70T%uJK zIH5X4TYcGSd3v*qys-Id169yuiHAY#W@^sgx!UwyIL2BrcT0Cys>}$sdd+=PDNn(F zL}39M`6vLUG+xZ&!I&5b{V!?+N0Ej{gFq_3{i}Aj&CU6<=Qh($(_SARcWtB027dI# zQf;c^r~FJ)uk%X^3v?+_E^34;8eSXTon0so8KkJF@gvn(NY=Dq(XgY(?$JIi{TQo^f3f8 z0qkC0&t$E?*z7bqj#u>+#!<5JHeGCH)r|z_TdEUsywXuY7{^ zB5z-N<}(^33Ol3t87M|QvNYnBDL;CwD5uB9rVV84h#KhXaePEKY6%unIEs3jlvmLmn~hIL$1-zB|)bt9=$rXBNvdIZo* z7Iqp6aWcH`)I2JTI3^J>1ov=OdbnReu29DOi|~s5Lm}Yzus-~2eWdDI{8++&Iwa}p ztV^v)^~~q6lN9^Z@2E=hoMdr@wQxMwF$^%VqbdD-SCAk(@yx!ZLQTS-PEQ;@o7z=Y z<}<|H;VP!LAz}OTQ%NI5csxtQx)A<~G8#{jNoR-$1$qjxRw_drT?b-eni+N}$hG+A zXpbH^B_vE79WEUakijHGfE7%^(0p1$Zd^nyg37PXxAam4);3?+Z0=dS5|dsdlUG-W zAR%qMnt2qK?mIdgv(Q_!n6hQ`B;aHj*T?TwuIk0p82N)uzAr1RZv|A&*XsJ1{Vx>; zuiFT)=WxgugS8A~u>>6l&Ps!tp0UWl9wJC&z!FJQ^I$yan)l@a<*z*n@BLHo{ww@P zreofR*jP87^V8_%PC9{N?52>X7*z~uh+?dy@w>sP};J_1IgIw@)UwwmNu{r4A zw4Wz{bw8Bo_vdmg9S<1|CB=w~!?Jiqq=R3Y5%iNAv$$L=kH>B{F;^>mK^)EeE~x3)ThU=f=1-UFj$qjottgf?5Fu9av7fON6!T9FWCT}%6P@4sV{eOl1x0d zz+*ZALJ_3$zUo;uovy#XnX|Xnb&v}bI_HwOP;H&5Z-HCg5`m(}EpBHA)PD|wu8x~U zoyovDEypI+t-0MnxA{u(GA=F`7m!(YO4sxRLa!*TUgwX*1A7JmJK{dC1qA#~9 z$Sga?o@7~KoJrYSf#}9b4|F}CTxmF8cSDqh&-e>16e9gP|AFzP_pwXS!V4E( zW&vFBnGq603D|yVP{m8JZK0hn=Ho z>J&vdUw&+6RO)TYlG-Wc^?({`IpJwKy^T^aa_KceKgnV`q~_;EU@Y7-2Tq}x`AgIW zBm4-Lz-^~SGrLqb7%Q{)%%_vVWWL^@jUcuAu;h)$X!Ep{un?q+S`uffQF7CY(4YJp zRO5A4ZU(^;sh2cXMZWJjQQ*{F=!K-SXr;5?`S&CV-<_?>t?_7DKR`zPeBLHOH&Y!r z)s`Lz329O2N?q|`EwJmmI9{6131uU2KYrUWG-`~x0$xrd@7b1Z72VE`1gho;w zZOyEleL{-wv?u|t;k_)M2V04CSH0rLS;sT9LYB7IZyHSf&a;-3$UplvGvTdMOI#mx zq*4xXPNbZ6INPL)p7l0e70Yxb0*A|DqbjcZ$?ApFs1_eLX2kV!rvta|L4l3m(KdCY zjFzUR+S<&{do>B4h4$-QE9+AOg6qYO2ttKe;|{yQdJo`(TlKP=i?x==3>y9VT@Ank?DYjfNIU#`fhf{sn^}|fKI^l0NhIWz_7kP5Z&4HsT^0Y_d*Enb zy_bf1LDW(D=T}PP{hK#%IR8NgWYy4GbMNz8QkmTcA?PC0@BVA^f@T4wdNYA_URxaL zRQ-J-b0WQ*Xp_e0+o|Gyo?40?Q}QZG+$vtLcn&wIGu+%fP29$0l8ggKen4AOo;V=w z$AR8Q;?iZgf;A4|f-0hHGV?l>(VKB`iw2(7cofwhUCY-O8#z^`e(j#%F1$USGBG|` zeGQfBt6Lo;Pd`WJ;!!&_E}Y3{|JKus7IWFD{qCSDep!Ue)qu&Mt*`#gaU=9_%prb( z$@PIJFnCv)G00GgZfr%R&Y>Nr5q4UEXSyR5!xa^C7QN~oZ#AhnSpzq6Z0?6w6V5lF zul%-|(C%wvUR@}Up}ecqltd`}1F7T6QE|!D$}S&w{rq;*H8Jta3Egev*87znMhdUB z0k757vOOEs^TRx6cLo>rM~4=!r%R8G??U-a00~DASou~>pWBL&T{;fJL)>f_9|&^* zXSl8^Sx{rsqJTN?@(wp#U1w_}dO9L8-q?SnCnDD;%3*97lxjaCYV9t^1+R|}#>h=P zI=>K!Rylus>NsCRZuXWpk+CM9XXg@~K2sILhYbs~iIaUL)^wo^48y+Dzcun7r$*D;fS@1H~(4yvU(5 zGuQa_dG4nUsXAW!2sLqZ%Spcex5Bt^9wN12Az~<-%F-5UVfQ&tHuXQvzg<&f=U+%9 zRHci8%Xu%92SsZU6Z=ACz*a)Sq@H8jZ41x_s6#*(eDTg*Cz8I|lt7Tx|f;{#pY z_t0>|Pz&`K-2TBMyw3kzA~?5=rTO&ifn=!5&b**?jFQd0;~vW> zUTXv|AUS9Wt;EQ?vcw1TymF*A-z1o$=|G(aP9KM7Mr8i3)bUK>g|#TRMM|op@p@}M zzN7NiC4XToL=FW)u6;Wx328>_) zhw#L8+6`j-aE=u+6%% zI0iU`Q#8AXm5uXSsOAFLAY4bCM-5QKWrx?)k0aSCAE1&yM9jVLE^F^hd%HJrCnpu) z#o^LoYoo7T%OWc(Zcnx?YO%oygY|sXZeFId(s{L1hQYZa+Drk-W;$gPyH7>A@J-Qg z9g#;mbYYGfaiXRRI0c2r@Dyc=6f)rTx01`Ic!oy6U`g@^Io{=>Z}(wqOg3^)Jh z=!tH(z+R8n3VmWH>yw!e}xcL7#(Yn;;p-XTMl5Rr~LojL@5O-^5^De zZ~t|q1lzqXB;aeM#O=?@n^wQ(xQlhl_Gcx0P`=9 ztzzf$LM?y2I5AQusm^%tCCD%hA<(vrM>@^Pe0lRMszKaX7o5%mx z(-Fdg;{R_a$-mGF{tp;=fB&Vf(zM)fe(PZSpFu3>)`{bB5{e9(Z%RkzJpK1e7&N5V z9QL}fgfNBw8fqA?iGk$(8h8%;tfl;7%oM*gLStP41kZsZ_|lJ< zfQ=UjarB|FT&yMh4#)bf*TmMg#&PNUfpYTScgq0GR`9XerIzd-vGNzao1=-!4`+YJl~-tX>T`X^2<4HvEy;NfrPIJ`*qIv~C@K;f%nVjX+{&cWKSj5chE4V&Pjn%Ep9pe?O+o(Mt8x1UHw2eDOZpv%Z@tj>ZB4 zMLIIQ7#K#>roJJ^!ALy_fE80d_)&C&D*ah$LOdrU!BG8S=E*eCb_e?3Kmpsg`~QY7 zCtd(g9*(^9-`T5UsjI$ws5Tgf0hO#7K{%f(rO$>TG)Przh~FwFCHejp-4BPGZDZJH zriu6MFY#sYvx1j))PjB~3k=2^oZ_jS87vi%*|b- z>u&TfgRDx6E!T3vFfB6k3vXf;5TzTnl~##6R0v7QSj%f8zL@6-$~Qj(mmUI5twKbh zhT`RCaWv2$WZD-N-h~pjAWHT5=@mfJ2uDaG(oerj`8j-;!O`#L;$2BYG7>*h@U9Q* z7N^M2Cl>u=Kp`A1=H2Q%w}!QQ(EUDs^scSnINqywQtXSV#WKQO27{#_&mcZ&kKjLm ziEj(s1?8X6O(A8)422U~D7!@Q0F-NAOmS`MSgb!2dDJOtb|G{{t(db%PmN(8a~CDx zQb7p%+K)nBqbLX{L<*fQW#J$y42?8x^tm)tNEAmq_U9|0(*j6kIJc;H()K&z#p}Ej zBIbovqZ@B)Y7W_4J{`NRtVsPQ5+J~iE6bbub+7Ei$h2-E?a%P2k43Ed$91~UB?hct z+4d)06vvZ?`ntxx2kc%LfXcUIQM#s%4c%Wod2kD9$##o)USAhY8-RVEos3&u;3onM zf0y7N$>b0$xz8fKhtk>E`a_2z9*;xu=`Odg8_0Mt6>y_Cl!D#1nJtC2h7RX5>0$3O z3sZR&3#<&%HbS*D{n^#T$lOc>Dem&3EDdx8@Sv7Pi5p;GPVrbO%%^_JRVc{b@O}2I zktp9G#rh!yKjy8D%77lQ0@0AoqB>)zlb1?AG2aBPx9>nbD&R0MURiulB!Zp^bWXn| zb>nDO0^mnb|3>kWElogxsb%4Yjj78RC~OR>0;QVXDJ2@@tA z=Cls|`D<${rXtG+`w*s^^m$RwEuUsmwAap5Uu8F{$MD|FweWj1RWR>FW$n>Ay2g)gqVnN4@V@*Jehb?6xF-s<{EcPyX)P-s zS^e&IN2}at`-#Ml?+6||wIA=6(X!#7;J2){W2Uf(7TfI;R!R&!IrXY^jHYp02R#bS zp}`lt$Mv|}rr*ucdmf)q2yt<;$g>Oyz&r|H36OXoEudRvyT*cqia7P5wtV_b9Vp^0XM*a8-27&wEl6N zsxZ~j>8-Ia;LE*yypXhOs7Qrc1eJ2rLG6U8_gRK`jWET60DIDX#ZUas-|a3983RMl?2C|dIsBOBsZiB0h4=uFNlw0}qu(P05Pa0N~N(uoO@JS35c zZS?JM;E(_ourBlUe|V3Kofnf`3)V7X=TFdP{_8@$v*x$!4p&EzQXM1gdS{K46bsTV z^}C4^N!%uThveyL0o&L~W*+9PvMR_rzyjkKEz|i_C2^7Ih9+azdl|StLSA>g>Tx!< z5E@PEw)43v@N~eaFgHXCm}JBnpWzSUF)#_(Vqq2*I_alhE`Kda^_t6JEy%D^N>n*N zBxfMhZ{jl2AW2@wQpFJ9#6Nwg5%T(}0_wnu_caeJmhlw#1Z!`rzC!s;M443(4bfzl z*Y&0VJMez@?v>HI+-ucKTOoq+K;Jz7Dc{2rY(DWg=yYylyWt#wLvAZ4C6+Sb9htyn zY<)1R4`fA;SL|@GucJJ^ZV0|?smY(0&QzXvlNmrZu5k<3RSLcw<`@6kTNdJ$#Qjm? z?7)q$e0^zY*?)KLx;>Mq&&}xjn)h-@63DXgk@6H0a0E^Jze{e_WWD;8TDy-QTVZ*N5SrNVF9MBD>*a&nJTk%&;;|k5HzceYNc2J89O{J zfIm~Sau@BPqhi$Xs-15v`m-nS!;L&(dQblJx|;#=%l_dPdnyhlEc?8dWFwkwIuRS4 z(L%e}`~X^NGp=&J&hXd}Q0~hg`le96({!N@reJGCPIgXu(CMK(1om#Drs;Cef3rjZ5#-^Vvwrhu%G$#})PyyJ00y z$3K_vpNU>Qv0SX?mhfdSS8aG-Qsc8*Z_uQY){nG6vpd~nltwn@-K-GRCoQKbC(}F)SJ#0(D<##n8PTt*Q?iktgpg8@xq5yVxmPjK zJ5u?D_SV)95T%6jXb*u808cSSWAF31(A(L&+vct+^79K97`}IlNsO^$o;P}8*%hm8 zmnxzB&0@mD_uyC8)OY*S`HRm+N!)2OSvwfbK32t%L@j|;^wl3otu~hNq8vT8r}F?w zfjyDygVpKm0M?~dFhw0w)MNg{1VnWiS6QErssIJngU5&Y7#P1I6r`VNo7TEGZEu@& zk@fy6G)e~)Bo)7oN@kUl&dP4#p**BvrTPf}EsbrktW$-+2`T1yE!4oVQ>hrcwQ{;8 zT3?GX2p2d9X;?pTI({2i#IgI*ELKiN!1j1h_&}#lQbdetCSrkxr7MLs`V@u zQ8&&68-DQzV!)lgK4DTwJ3KELdK8!!GPL7A8_vgFJ->f!CI`_{REoIUbamp0N|v~K zg857ZEehHX_wr1=+Yd1_&hV(v1v5P24D4j@UmzgRcug1+T7XGGvG1qx;~+A6?T5hc zq`PfBL8-6dU>)R`RXL9T&gzrog6}lfUx!1WscsS=IVhPIC9Efacc+cg?WNHOzeH*U zAtp3qLzbSl1M)S+X~L6(3JRB8xtaUu>lcB~M4tHq3ItD=D~GxDibWIBe{gw#!>Y)` z82R+D;umq_?#uz~oz@wF|8)=g1(T1s@8KOR_X$~Q!6LctUegBq{#mW{(XTUwDihe{ zxjB}@8RS9Cm}*N=e(|9B~O=z*vi?mo-NwHVxzQjx!d6FETYv3z#Ue9v;j!1MS$r(>XBmd`Ak<{T?r8yyz(v zX`!j|ZPWsGX*wlWDWpm)2_yz%WxSvGMv+>A6OV~ncJ=u+j0xY9`K5_2ckdT478^F| zk9zciwUvyH9+$y$ie|jAuf{-cu($sW0_{wf2d2fyojb+(g-suEqdMn*CtYvSu`9gl z?RE56A5rToimUR=LsD}ZRaJ4me|L&sSNx-kr92}GgI39_er&oN($S(U(zCc@B|IhHu z&Z4}!N|IGO1Pdfp42DLgFsn%yRM>8JdpPKMZjG%(P;YxL$N14q+zoB{_3&9Jk-8#r z*+Ur}kEy@UedO09?wYyYb3HDj_>{!77#;FN8BnRFQn;Yp8Tx}}XT8NL9|;Bx_7QVT zkhQnNKiF!_fnLvQe}M&$Er^e{?Ms`K&jt~>XjA`2jksJrQ$HyVvdfcJ?(6eStx|nu z^kF3RD1h=q(9_-yO}E}U)n0DL&S%nfTwnac*|~h`_=<%oU_UpKV9E~;0sd?7bW zReWpg5#0{xQ=yjMq%!ajS=%9wNu*Z$CXhr-BQ9}#a9cXCZ3K{Kkx&vHbvzRD0$ph zjyS=5t*+fu*}Ysm{={MIEZQsxiT>tVWqL^>vrDd~u1MaUHVs};7xj~1AoKV9QE3OT z{pY&lG*Jt~Jf!%BpnWh8u#ge7Ss5o)x{zk8bQE+N%~U8)+_$*|9lKO5MaKzybg2V) zVNZ9@PzgH5C}-2dzi1l@d7*MaWa$(8aX{?)*rf6z4ed4iO@KX-jBF7KuRY!-XXP?X zZ@3Eu*^*)L!xc=p%O?fxexPZVudqMDo=6Deg|a7h9}}~;aDzKGYun%r)>nC|t=5y} zZdJ}77PDT||DZUpaTZ<)_ZAawW`RG1uhzb~<7tBSpqb*~0kppQ>}(-UP7~euw~U(M z9mXAap|HS~H`4Ux6rtu6G4gHv#2*bj7!|<=q%jk$YXx*v_%LswDDJno(s*}ad|%8{ zG-jXv)}{WU;^(jFhe>1fafRO==XlSSuuIIgk@r8friXTw6|n@4J9fAlci>}5rER3> z!dzm+KGH(GkxB*e{1_HMVOY+oC5TyRRfBxXrnIzG8?{kgYknd~c;^jorQ>_RTRhL% zBZKi_Mr8V?S$xbTg1kWVNKbMTLM;uLnTC(IU0!~2&9(F0GZaH>@b@@FwisrI~AZbeOctSWW=D zOFAn})SnQ(_|`dp@jT8-gqiT(S#MjQU^YucI)zN^5{Urkm?i~S{AA|CzE}z_dMUpG zVMo?jm=rkJY(~w-NM!?E5*f~fpH|d5IvoJpvog@t`Q8!^)}xGJn%YfTxL8uZF!2~Z zTomOOrn|HGa0Vi!5v7vylFwBE+(L}45F1yLcK7b|@fQ{&N^T~d?*BDQNW-bIO9k22+vmqq@fvG3zlKnQucS8%h;bjCtW(F^8-jb-Fw52JDyb+;u z?{-y?8YpFhx6D*?thVc7-j^*6o~P%-@^l;j?4`5Er(WFk1^C`;V#ICt&84Qo_5Had z-Qu^mW~B%FbvEDNR}hC{{3Wb|Lg^Q13~zsR#mJjuuz5q4;P_^M{if;$%OQu5%6wzV zx2XRBWmPt;r`accq@LL1|NRz(pP{|={s#>F@e7`x5sH#Clf-oi{*PZC5L znc}MMg${wJ5!So^18HKcpAzy{061JyiuNy94jv`=(ERf^{~eU7%P+roG;I)-s8<2a zSpQ+0!y-L=$#oAy{VPE*G*4x zboweCA7z#{G)iGoW_&1Q`;q~UtI#=|hZwkrew9@psj$2b=dDy3dP4k0Jz4&Kp=T2t z=xFN1T6QUGpNS_hN{ze(f$}4$Wktq$q+^(-W|uR;KT^nzTI6l2vuy3Y6O5-6VMQ6( z;5qXzO_pcm=z4N*iszm|V!*&A=*gw*dK)KNweqm!AWDhr1b9%T`rW+6ijzycvJ@7| zEKKo=Wx!Qcnsq5vuP~Gsm1yO)K0MdWhw?F9`}0pDJFh(W{_^f!wR>v8dO^NZrgAx~9u|9*OAASJ-%wywgq5e|0%t zQxA^Qe5P~s(gnv|X+UX8jiMlafwB-k$M^nIu##SVeFUV?6tZ9HP44LM3K|`e7N*Iv zl9n#LR~+?hD%URC4_r~fXM5+!e1=akSnJr~EOGtXE$Ys$v7R8}xas4?FTawYyA+Qr?_1fze~iUdo?h?FZl_(a~K)S8z@aZImo!V zxO&GL0Qbf5^c0(kiKw+-K*a)~=bZ+DRyumE|K6Qzn$ih8AK&!oO5{X)GU-bV z00Rs#z)(XE?B(-5`^!Gw%?Ceuz%g^*YprWt*Y7+}q<+lWFZ)L8Z9Oc~zbg^AVD-b>k83#Z{aJ9W~Nhg6BEPXYWS14k!unTZ?;kWl;>QvuQk zYH#AuV?J$9+7#d!v>wboi5?Ure)y|onomZO2o(Umj3^j*v!XQ*`eu;Ki6h|~W>ORQ zQ-6*~Fq$sBVoJpC0M|$=Um2Y^NM`MG6tG=rAThuU=A#=*nPjU6)>d$b92=Ncfe!iT zmoJBs=Dgd<&vk3D5Pr+oS?{?h-_WOh1v-J)*yGJn#FEz@1&6n`r_2gO;E|)DU{INn z=r8&FDT@elS0s5Ivv&D1V0O~DJ)B1Ax|2qM1y}1qsb|=A|?*sO){oUtlO=>N4au=(!WNHmA^MJ>W@uql5qRK ze4%-TlRz}+vY6FzN0F~!hYe6g8Y%!t}>zPag==j?N&k?XD{QvVBrF2AX?KQSRD9y-Y4hW8SP_|^;C6to*Z zmzHs2$5tyoH$@t-HSJ9eEqa2qcgxO3eh-sI?h`h9;n`PdCDD{u(wE+jUBn`RwmX+qV%u z3SzBa^_1&VOh}7svhH17KnP%JI+Ym< zlm~lNr%Q=^D7@ZUG`Pmfm$p{C5=9?nSiDJYbU_5^l?ewEUaZa=d0(&G_#9lP6h2S- zro9vEE6&z>kvFv~=$>BpWu-X^4s}6X@WjyO=UFsgkGcUqUG)`d^X6YNGabVkn}ZZK ztaX2oOK1`9ZP(2ohT>?gKeDtx8FT6A=<1f7j*f0TI;!1Ox|FOw86?zHp0i5-l;{wL z7>8%61mj=*7O4yBU_4zqaX;ke|N}SRCG^+v0%@q@rmVs#vYx0 zqt>~HEdE8VRaLe^RvxvxaRwo#^Cwg~<58Q7UD7#ViWX_{BM8|D3g7#nL5|?dAlcYU z6tF!kAI*nd4gE?-$b_oqMkqiu#^YI2gV_PFybwzF5SJ>?lK1n(T5Nl#s3(fJeevC^ z#F&^M_7el5>yw!_KvJC}>M}rUe}~UqqOHACWEkV`o%l@xye&rVsBxJb)4yE@@n#ru z{xzerW;Zm87Hc9V*lP1stJ;uR3>bJa|cun?>z=C zQFoP7VOu;^H;IB47u=E>Latk*KUIFj$v*=FCdP)^p;tV6O%Wy~7mD^=rX0Lh!3T2!d>Ux{w!Y7P4dh)+NQLompfa(6H(Op8i{cYv??t#@!0Z=&I&;G|1`_#> z>Q2&{c&!$8!tmf7qyRwo=1YvN<_08WkGb#?IE5{YJlHJ28`gHEJ$)B3)cVsTVGq`_ zby$)zed)RUm&}fh@l7iKHIs(MaPxAd7p2Dr8=v7De(~~K2c}aa8ZR9yA)m!$XbH)A zoVvJ_MPJCfr#>_~Qjz11VAhKlaa+3T=;-*!KGLFBr>3;kE#UNW*vLeM)Wxo8r4oah zZoAsHwk#}M*P>EyY#xY8L@*8I@Rlek;N86I(RLynV8ueDWx&`D@a#(ww15A6{Fb0>mn%mZfViU5L0vS~XRg&jXXvMwqrHEh{1Vr$lf z5*WLlTpYf|yI<;jo;Pn)G*uk;moGuoZOdy^gP|S1XCM7Hx|$~eo>-iM^yuBNqo_9n zb2S1Rk$|qjuKfy&d*Y1a`AX{5Bh`JP=`JhlpdLB%IaDr8cD;3*rC$!v*2jfykDhyM z-?wk+B6YK|{{3CW?`TU6_8#Ija3q|74{8`NF$LYW^fL*qrrb`>wL!ARGr~?cy`8=<8%Ror`l#UwgIlIloh>D5P#WaGl^_;Ln zTQgQV-QysOsWjyZ!Pn$!qxE;85;qrwr77RETNpUZ&X-*w2T5)QNyTM0r9j4v2>!9Y zR{YvRYTD_7w+GaYb#;nS99-Q~!>*kWx#RROw9)i1989V7GEO$fVS59XF~!2}(~n29 zyaPzZHtCq#u*f#@%cxgtGs!)8no#t`Bgu}`T-aE^ z)e0;t0b3nSN5_gRh9F~go-Jke_oUqj$6iO^{9sJlN;h)^cs>jc`FT@{;mD7%1h4`FUcA}fmY*C`u>Q*4wBiy+ZHJ8;5_`|bY?ji0Bl~BZBsLEi6hgl50}cehaoMYBqUJmedh>c96n(>Dk)xr@Y@HmJHB5< z_h)`2&<|wA#Kb%Z1eKOHT?4p{k2QVkEM#0KF}fIk0SbDTmJbXCD9_6DJj*zVP*d4M zw(?Il)5*0UsG0szxU+1$vIt_~`S|M+LqQT1+k;fghZ{qr&KE$VcH#UVV((hqL2Q#! z4NBoP^&eIr~Zh{d2TH5$klG%FT^hZcy|Q|90|Ihbkq|?*O8QW7#SPw){yH; zS1TyH7NvGluTs4><80ntp%TN2wMuJy-25D>a1*-j#P4}5x{N`it7~O=8=`!KKFek#=t_;kI|P4v7Lvug%XG@$jd9+PiOX90PEaRTRqP0DUocYt=;c)Pf;(JFZmLAba$eKZ{25}o#Ep@#9wBad~nmc|;kZw+QBSai`y+tTUGFSeG{>2jsN#0f?x`!rEojfPa(WUOgVXhapxJXWsG!6dZhs#5;mF?#yv`@3Qe zN=kb>0?u#GHW8D*G=n==u-!~_U6r=OM;FIiKHG_-22HM(WA%>wbm0V%64YRUB(;59 z!FvkTZ?JM<$7etXx4?J+cejlD6lz%h@qPbP30vE7R;G9`x8(wkNi{v2{Yr-KEYA|NGm1!c9%8Wfy}n36g9xW=%Vhj4u~eb(3L|7-*s~g&*~20xHZo3k z2kZq#t)oXe!~0;QGm0!|NT3WX3ZaJtxWQ^eLg?al|9il;xfF`^^!@n3f#REl+s;CT zCuVN83OSH0LQfHupPvu+nFjM1AUfde>5u3->n1Un$(6Uz(CGKpT>w_41vxo6HcI}< zd3_C}{6B9JIkFqS?2Q#Tb~-Qw-~$6WA=e%4)=%p>vOg>a)8!$oXqgrm&Tp&QM_+<( zIdlNCFNG?Nl#^XS7d>J7smZ#fGP2uT1o;83JG0rKzu3^^W~{ot^VC8CIOfSe+t^v) z^&Z&bdab-Uk}I8Zl6HeRg9~p^iAf}tydYpCeLzA&%&|crra!Df#G|XaGxLlp!1>vO ze9v%~-PtT-~i z%c&o!RM3e@LY}Kx^+BUJ;$^x(_@~ru8vIyVFpIX2E}+GcCUx$?ClqrCuQ$fIJ~?Z< zz6BsLcjzH`;*u!j2D;jx095L0usR9Ll^j8;@FrKerg+iolZY* zfGRD%#Q;X1xxE5q%8M-%fvX=D7Sr$z$XZTYVG5PZptex?IR> zJsi6+(11*JI+TSxgj1v*eW$t+F+aRn@)G5u?^PcEvCyhxxMu{zV%vi=j9`P^xhlb` zau8kv$FY&88L$Jo{%Ru0LSCKuxjmCU2JS4vAcb3!yzW z$CX9#g6p1^#g2hVHs}f5-)p;!{h_SHRS@fNC-jfHF2x1R5D z4YzE17&?s_DheR-lrscAkNmu8!OAsFokzYa4Z{~3OyNUKUw$R9c+z&#s0TYc=yl-N zzkI?e)b&^j`D% z+{Dzzpb@**iOtPy_8iA>qCisu5{fwwCZDgZ7O1qPn39D;TW_dMw2EV!6{NE(j60PY zjv`Y$F~T3({}B8+`ram6Wv*k;R7>u(v%+TpI|t4Cn}c9Vm+cAQe~2GSuYKq= zoXGFh#YmJEV>2tc*@T8NFftyTnsdL{oyqJJ$6MrE3qbh4a3pYAJT$DV;u3VT^XcHY zTh?%K2#4Mrwco#~^6n1(z_5l6Nj@>_Q3kuF<8CL#w z+USt`ciKB6DXwNO?I&5cXl36pu{=NOWy_D`XZs#6u>8klb@b11AHrqPp=8yREySzh zGZ5watM)nCXiWZnDMX~CratKQSR&i3(b)T9359OE7OPs=NOh*FhgHaRWdZ0H{1;Q6 zl`dMvu~Q9j!%LKey?rn9cb?Hf%Lo<-JC{_c|gP$B5MquS{&Vy`4t z4+`+XIikicMfc4keOZ`^p6>-CBE02`@}xMlK5cY=}RYI@l#Y_~Je%IrPe(wq}*@?7Hwlhv5e~{mXnLDyb%J>khU;4Z!FbwkqI=@>^fE*pV656$*@fnp9GBH&iAo5HP-V^@{ZJm9E#&#goj=9 zZz9%8^%$dN7ND0U89rC8Wfb>&5O$6e-=u8EtFi8Q!-&y>ss@G)_XRj2ydokc^r0MK zH(i{(D{(?{O4uj8P{hA~v&s1Mnvr>iS@y8@ zp%7t!+>yobpFaa{?KaEZbu7Va^NyX{bSCNgUJNq{$+LkB5tBdVRfoxSGtG92?LjqQ z($z&;XE*QrK@c_+?x1^to1aP$B^COxj!;2K5Nk8-Ov09$&0sa=L4^}z>M?cP=lkw# zz?scaKR>6S9GnM7&1)`fF1H(L`?>Oz9_8m|I2>-}(n*3G29}xn*7^c=wl)o2&!GK< z=BsDm^@mIQR9S5`D_X}R>pm~$!;Lkm-$NuJ9Mc-=lP-&uSuAF`bc{!mAu@E`-C-m{ zz6++*@WiKFI(@=k&KYf)hR10 zpTff*Qh{~-O?y0VaD=;MPTE*QBY{P))f1CkY9N%DCl5KOCwaiI*yu{mXD7xVK3eNy z&X9DB+=;e0&zh*UrTSoQ{++{gKAl;FzKjcU z9Q_X|$ZGO(-TWTD7%s_dEfSd-*1fwh@Ea6eo(RRd3jz|%{yOY((TyY>Rth`sByD1~ zn$0qsceOEaCKU>L6AjYFejYCY*i%Q+#K0BI|NGhB|&a%3A4GouCyy*%P zxqQjFQl=7nk$|hetD&ogiR*vH0=fu)QD}9ZT`XUEXX4rP$MA2ovZ-7m_^G^>J8O>F z_Fl_v26)1sL3w^RO87O`FCA*bbQUGZ@gCE#FlO#P8j6`u6os*}uqyTc;rHB^Rils4 z<9FLQW_;RnjX_1Yi7u@Frm)s3-JGn08%vX)ZpbT_=(YTX*f1IY5dh{M;e|h-SKEmG zvbGYvDF0^zX@x}~q5RStyX6H7zX;k`du@-uPIe=-)x`F;c`IG|g8c30(dOC2W!C%0 zn^P^P;F#bA1d3a#k=g%!k6^?c>2z5V`7PIW|pT^5*i>YE= z&~}mbIbtM~i7^c)c-`fk2AYDHJ}o$GYmu$@>Y&PwR6Hn(VXkrgvg~a<@pD`iMy{VQ zo}l%)<$$F!!0~&WpATxp>Bfg~tmw-SvNA8|e)#a6SyLVOA^5TM>sC0KMcoymy?T?Y z|A%yaef`0Zm0&je25QO{y7P^mUNPAZ{{?^f4fb>?E+Ydu6Rv8NY?pFX+|SywmhOd~ z<{mUMa__`UW45PS%Ln4kLh+?S;I6$`blYjB**t`*lbynIzZF&1L``u@D<}VS$t*#C z9}$)PS|OF_(LL+rGP9;2s^R38j|(#giOZm-|FSb87|mdGp5V~^^SwW~xhjko$L?pc z-qBTwrIU{*wqdbZ5(Zjrkif1mzE*3iJDe)u9BjB-luazg5SqmhTD)BHpBWr>Gkk#| zGnL(*%kAt@Ofi*}qa6SRQyocc1;<$) zSs8k&BCaf5fTWSNM89F9f<8T2&_$4NbwvDf$qQ`&IuEtX%JI3CoR?pRN%An@c){dpxop$`!5*?%_HaMN*H)-XLi*vrxZremcAv-J<6$Q)y{`fU;AqVF)?=3hMYjgYIbbw)Xy60x3d}+&hdGtNG6@NG{fvTKqm|w)) zSvD*D;Q0Gtk5ES2Ne7eVU?s5zhWLc$#^VaSRy#{AVU~@l2i4_*PHQ0tPhU^*&i=gG zyLsDmw0D^`3OQ}AgL|NVv59UiRJ53Rk(vyPHwX;s)>-ku+WpdqM+&l>jKNQTyg=WM zOJ(@j__($YNi|2$BZG8)%L|w3#d_~$_4()n%b}k!9n2ND_+^4uy@n(_y zsDWn!me3^9p@ve~Fp@G-$CGnlfy41e^JS@a#bJUG6ni{Aj7#VHvAn+iOf*V_Y9Qu^ zvM4fqJUEv%JDf$mFGF5@$agNyy$95A3?8+u7FRMtyTG6>D{M~*T=tJ)h zQ>LTNryma=-C3!oY&|aipjzI#~#en`<1n`>xd7%sxQ7tDsCX~&X7zw)Gib09yIk|xAWdUTy6*>al zdM2ZyK9pqi?E@YTwOMXL1nIV5Bmv~LmOq55_58RcqwP{`lABh7n!-(A2p>WnKqq^# zcZ3JlRRnE+ty%In2~VjFBxUou5P2f9^?d9HW!vSOOm&BL0pvo1%^I+LxszFrY%I!C zd@gF<6Z=g!PA;HAM#qUZ9aU6RYlr#UFO|MF6W@0GWyW%FDRc124?XtWxM>!ys7Z(K_HC*tO4xZ-^pXAgubvR|)y01XOx zR3n%ipxr(j+U2ngL8$UNd&9|7k`hwV(JeTC{N7ka3t#;)kxyV9>>C8;VDV;>Djh2yH8rOy*ZUKgb@CV<^zi5F zfEEuQ3roq^*YUBj>gt8m)YP3r(LqyLPQ@x%o4Awnm_foh%G~e8`E{_$jZ#|jj|?Ow z-e58kdx@T)gk1>~5VS2MAP*K&2gLEVtdli0kUlK&2c3hrZ_OaNt3#xy)g``uJ${LwrwdGFZW_u-D*s_~Dk*HWz; zOYh$)MI@U0Ia55yKhG_}%KUi;Qoc(qUkBj(euQLhlbD~a6ZmC*$M4{L8i`;idczb7 zSE2(Pq8NLu6r@6Nyp}~rLwx1fv^kUj!rn6=afj;Vqd?n!aGxYDbt~EmLhzeY8_(z6 zWTJgpPaPf_S^mOie}4d=i7MNJPudVu(tEi%c?v{; zy{GFOVM-dUwC!=99G8Uz5G23#X*4>a_8@R1x3~y@ZjtWUe1nS=#{Uk6rJ{~wv_0BL z)-?6dPsPpG8K_W_bgx>gK9Hl6jk|#?JrRyhNJxoGt8v{GRL`X)Mk*xa06e>RLT9AXfb%a3^&0JatedyWha0_Uai`0@BUHDIx+lI9ixVx)b?E zs)-n_*p(6o6>US7pqWgcVNr&PWPeR~PNdYmliLyXX{Mz|PvC4g)e@E}D$$5oWO^4V zM^I%|mCGXg;Hp)JD^rK^(cxjDOkqa&2Ne~9BI?B}+7VuHy;`E2d+rb__FTQXXM%Um zTOd@X;hdafSYd0OB%Q)fAcY-5I%yympjWXor)6Tf!aX#tuBvja*2**zO3d^_QZN7? zLNi}`enPI1!q^b$$(OIAq+}O~jO(@ks9=*~KdbuA8e&(7Eeho@zcZLp_YR^y*wkiF zp{kpVY)DFao}BlZu9!J9?w4kAp3ZJu1(cUSOeQ8ZuEsVs0KcC=@4*9FS-EF#ms8c= z*v_hc6kyX;Q(QAa!_WjZ<<5kqt(C8uU`E#UgF6D_FO6!TpScYl$eWx%1Zw!d* za9VJZ1u10))t;CavhlwfMX}NjQ5sKv{r)H2QdQ?aX@Q8H)zmQY#F$UeG3co9)Xeqz z0BKpKws0#}?Y4P1&mWg}F`q39J`UY2@!}KFHev(+R=Q#Kyrs;_}3bum(*iG9^-gsho`?7 z`dgRzpS}|qk&3qZeO)qKU)O`dD)j8sysotaX+JVEOPEfq|7DRIW zfB!0xL9L*6Qp_tcPDwKTe?J{|QRUDG=P=RFVjy~?`DUqI0PmhZ;Xz9j5mgs~ zTwOk={eb*>>iethJ2g70x@wH%bij2W!ljo*HE*VBqvt4mi$3rY2)^xsUXFW z2WV-AC$*Xnz7P#`));+lGSMpTMJrK6O;1{9KOL{R`9>^cJxh^{Pc~+)aW5!>Os88O zMir1XQr3Fm*|8~F{)}+)p2a29tVevy661Wj7t3&*(0cwijzd#dw+MCNJS^<-p{z8z zK%TMid*InT8pf{pYfhN3>H1dnLruA9?wXvO>hkgegQi<1&|JdN5^H30Gq^vMjB~SK zX8X#bI!Vjuerv0f_QLr!IP4edIiAyZl8&1diU*%uuc{c~T;7+uJlXw%OGh{`%>EaD zuH4u}#BcO}K)}!ZEfvl$l4C7WtbdCtj=UE8Q+YKx4JVSefn!2ATn*wAQqHfAlr7B6 zz`dy277$a@F7k46B2gj-U9cy+^E7sz>lOH<4}C>1uO7BJ8Bek@(8UKU2}2#E%)#`~ zXA2|}fb(;?y*Js=W9A;Xk}ERnSIflEN~)L-r4n;J&yC5bqxu;WO(TsjQsQy6A>iRL z=;WNTzOk{kzRqi(o{#}&=Idp@6J)%$!B-|-eK15A*4^AS<>yz@-QE37LM%Q9ai8)O z>t>WL;^fY)S(+}=Blh0o?}P`qp_woc6}RxZi!7%yC2QI<$r5I&zhPlXHVknuM zs~^sFHcCRD#?6fn(T-=4jbWCJH~Y`OJySf0zgYNnx+#O zDzA;}j;H8XX9@^umH8m_rZcKj5Yv2U`lBMi?fBM^!%mCGR$vs zb_$1joaZ9DS6S(BsMb7~X&7!eJUa?hM1wmst<0!TY5Z(ftu@B{PT??I;QCrlSM>o{f!bkrPsQGt}J;1c@RmOuYk_ zHy50T-)??y&HTW?!jc-DzCrIY<>K@2BO!;zYYt-r9s5ykpUc3FJIvWoU0q*WeL$cM zQ1EyHInoP<-uBg{(O@(-l*FYq&HaBM-}1UwyYxqE`lLYzAQ|bU)1UU>Q=x)_fq2?) z_%Fj678_kWcjNNqcQY)80y|i9(UV`w;xBSpFxC ztA}Bi$6F%C9kk&i#=&^PIre4l3p4?-(p8Y-_WKz#k=a{`F8QEx2Cyq?*@T(&BpJI52C^-rJ=WNsRB?QgJadoZPy+X%A$1hxWQtg z*eleJ;Z`U3?zE)BhR1-TekVlOeVB!B(V@jM894RFKNjaQU4syX38?fJ>MqgoB$=@= zJ+y{PsW0Dfy>NNM5>hOq8%!+8X==GrsZqD!It&iXQcaQRil({Ve-cJ?V_X1!-6GUt zo)=&xbEW*-AHxZHDiY^&<%9j7>@3?OsAAbY27t;z@mrlHuie7&=_ZU-03Cj3Jeq+H zM=xHU5#ziTc&9SY5}06n@V~rX=~ZEC_Wonbr*HV;)LZlm^~#gYX=K4|AHZb1JE*^5 z1wl%jet*Z=TCgVF))5m6xh@r;%mF`-i_+c1#N{uezVRcI^K56Tw+0B1!pFaTK*V)z z=Fb3s;V8!;?1Xu%LQbrzoC~pI0QA~qVexdK&9rYUdBRzBlOgo@?CFij`PvU9(ewJ4 zMASntw-b|y`Rw_QOk@u}Z`Y<4las@+no1UQFk_IoeAd-VntAc$bRy2g4slK=9G#K_%z|L5)W zcX{0c$b)*~^#x@!7TH*Q!l`xjql?j_8=u3Z^u;F1g^TC4Nday@#%cVpH=d()xk2lVNj;b}`Lw{Gnm(V`4@cUyMSzi|gD`C=bi zwk4NPs*y$Xls2tw0Q7L9*;$IhagCrsKp^P-dZ?{%05e%!eEjuW44kd)Y6EEmMW#-c zrmF-7H`Ui4cRXY@yxi=hkxq|`Bi3XWgET;hiMy{)+t@PB&|DSnz^_Rz-N0Zv!{el( z0?}gxo$Z#!dofY02O&b`#j(V(_Fk~Vw0@N{fsG$KSn~0zMHg)S?F0*98rSZQl$rGo2SZr`1%xX znZjq!`-tY{6RltA)|9FSJ^D3+o_e@(_uKDJfhonOH4mC0L2RnC)bZvL4gLt&2}{o! zwtj;2E99}q!)L4tuXPE;3W^#5Cp$j$!lV5h`O@)h1x)dt+`H3SH*-Wv9BQT`8^uE< zp%N=i;bF5ga{z{Eea6A$@#z##?$fG{hV5p>jBTRZl)X{Ar#<21WDp!xwqs2BziR!b zw1PvAgb6cqAz&%5eN4;tvc7$Ju#-lw7tv@Etn@i`>M~ra2?rt@Ghc00Wz}JkZf&fv zz4#<GC?;sK27AX*lh_)r-9OUnw#7N=n7A zvC>zm&j?F3(zQ*mM5r`nVx&--q$kIAermDF&3>}TjDb`F(*3CdgW?-V5ru&l0_wLf7ifyI z1~vs#2SJ~>`y4QY^B-j7hbB31P%thE~!0D9Xmm+MSF~j zeEPkP2KP%-FV_qI>8`S-UuC(>RGS7CPk9!FdTv`+w|V@mD-@#w-XUTI)zx2i&TwH- z*TGytSAM<$GBL$Pp?Q`;#_T=Y(75AYxdEM-V12XdRK{}Q;Y!dJS$gunJd{_^x)kq8 zqzwI_u6{fX&o-DQPQ66DC#IsSWLA@VEH2NovvbMJGOyGkqwaag3h${@E2Ax(Kcm=m zUnpKt^~a9EfvZ?@l(S)&C^T5Ss6UZxO0KWPA74&c*&>`pr_pAq`M+=vkaW*ZEfG&A zsbZ?rqg`|%E*rzi$w_MRP2!VRUl^pl@VSa=R4Mq@inS~L9_g=XEm3L5&}wKr7MF%- ziI8sp`}$5EGsMY-J!EUTt~Itu^*VUoD-?;i%*6I9S?!&ZhyKy6?E;WI=n*y9H~e6y)~KHObhiF@7zHhfQ&ouf?}k(TH%N29=@iXbiILW;NSE zw-LT|QW9sR_Nz9d+IbS!?s9gBEI*IJSA^xh+t&0L)SAzz6_ncjPL&Mzz;ul?*xh5 zy0ShZ1sR9}glb|~R>LbQuCd^YilTw=E?cvbA-l*h4XKHk6=mXbD(*@f5k@!);Qmj7 zI-I(h?if95iWFzSzyLPee+P&wlWN}7AjpJg39!^RHv4xY@z2(z22k_+S!>0UJWI`8(fC^8@hbYdLym z1w72D?UHeOYq=LkT>PEw^zwRz+X_QnLm6_VUTu2XQB#b6>8uMknb&t%gnW<_Fsaa1 zS5Y^5JZ<_?a?*Q|QeMJ^<|pc&i6Qd~jR{*(oRb)7U6mhS?V4L=)R~_0rb-?6k7@{i z^*jD|Z`{VqRn^g1Ndm%yv3&xqG(KjED4za4uib3)Tlb^fckKL!9ZZ0@XSdi$VH0Wa zJXe*RjB&vQ&Oy#%f8zL-1ojI|sw$lsa(`(uV|QBkUPq7_FuINNT7C~Nrs-0my`X%% zxf52lJ%PD3d}OYCbBb^?G-&+-fJF!{SM;Xm$Kfir#!Bf7adizQ7M5#lul?JbWsnCk zc>;LPTvk;mb!st-dUGLHR)8?SO5)FEFjyY~kzuG)h3C?>M$ad)Mq#>Z&NmLoal7Z_(f4eM04x8Cz?j1Eh= z)9LIx;msQ?pGN=8v_Y|(XTKEXyx`KE@r;w#O6~S$&A}+vX)JD!P;Z&&#cx ziH}5adVGwl-+(KYP>i*CwXrg0)d+Sbr!i@4k>)m!RbKF3Z}8)arB()pU0E)uCFjMW zI4}*9lzGIzI@4?De%aGMoGyegT7*mx_50#-AP&Uuy*z+xEzMU$cTbI=#VFs*&SAlF z3v^1Eu>DaFCe`Eq@ecObn$n@?`r1}Kr#MGr9;9NpZ?4L!jMeCs~X1A^Ry%+><=7S5Mr zaZO%_U;BR;E4h5XE963sosWW;h*<)Uo;}aAEij_I7IIX8UkAg1ng)^yMmv9wngOjF z)M5Ff=gKVkAhr1_n#3?EDeWku$?kXPr`M~Kr1@%EvN43;&TLOb9WMk(BCc&G0!Cq` zJpBTwtNtUsTIh1Ebs)Yw+?8WbZM)&ZhmI$m7amLw@-{RykZjufn`&&H6lMD_zjucv zsQ*>{XV-B{$SdqXnD5+8N0Zl9+YNbRps%kUl2~KDen__GS?|-!8n!Vw^|-SQ0iuC2 zBN0o^2;$KgvHu0tkJigNhxpy5CS+?u?zV%o8fgIC-H1Th*W0Z1)clIZzqvXX???Oa zcz2z%y*&qL28oeNw(UHh0k6|}Ody0tRuy<#y;^C2M(Ht~^4mHE9u{m6_^L9hYVz7o z9fQXdM=OB;z-`CrH=dEtLW@>L@s4>#4RSb1r)abJB3ubUvi-e5qM_Sm6ZbcX|qManr#VLC8GB zcoKq=`oMQb$?_Xw281i1n~#rs?b`xqx3b-gu;?&!IuMa$!?0A*GU4DWk23OE)g^%4 z%ZA--wbL8zjWo<3=7urEv9>l=I^N0rK>ci2XgP$cbEp|pbOc_=mYYta*2~p~I?-L{ z&EEi3!o~6T^VR)qu5sMmE?yAc@Nfp+yKWt#El>6UO~cQUZIL0~cCog& z9=2h&!HrC%o4)c$*RqWYBKSD)OSTzbOn*9w&+FnpEkg?&|B`tZNNz6dX!i0x`9ho8 z^j*GUz40nHxG3~uC{$Xvc6S2vH9f;;-#phBv*TP~hx1nsRN=FYW(as2mQ<$y1J7VB zb9lL}9`=dQ_ErD2{i-PJ?d2xuhLpyo*lOK8hsvb9dFj*A`Ppt89!MT$LqI>?-v;VlEyVv zWPACavqkmi$x;inc;C2Q9rYohe+y0GZse2Y~8* zMB{J@OMmV@@v&d-RY3VWiI``D8H#{OG{o3vaYzB^k}BL$$B`f})*~JN&QpEu@?6{C zAyULUb{Pi7xyHaha-0#2R5`U2g=@LAgoU1WHPl_&Q=b=Q0VKaczK$ZdTeAPz;C!{C z!Sr3PQte8H*!Z`wJ%xaff6D)&C&h}FO0lZ6I8?M0Vdn${tv>9)RPT6C=v8d|$qsB! zsVggKR-hEMDfMwK_TY5UyZgJb#bW_XaadWS<53=_3_OIG|Bl#S11k$|AoY0Nh0&K( zp~(g2yg6p3f|@peERhSI@a!UU_tG%jjc^rNRU%>zibsKvLYtRzjBz>dUV%PaLxLfV ziY#OgO%o6xDpSqnf$MuO#_sVfDP+@NY@|m2)xU4>=WR59jki25V_58C5!hI37^)=vKNEbqd>VvLS-p2v0dB3CL)P>JE1H)DA&xgTNHVDS|!^hlz8YOMLT@mBf zOsEgh(bO!_e#XeO<-GaTmAsKzhkv*V5k@kwwNP_ObvLS-#k$Y0AvCYoBs%$CkG3S_ z>?GZV)%_K|C*ZX7YIgUp<}-lL%lUYIIEaX0AAYK@kRogh-o#7?T`BXEG(1t4=}yph zyxx~!ep3&e-D8-&N}2kdx+*%iwnDSwpOI|&?h{YLE8N?gr;XgHb#+yBRa4=W7;8#s zFuNFOZ??)16IpM<{YcwxlhKDkl&G27B1=DKR{kU5ArJP{o<#6U0kUId-);vva&K&C zzDE3a>Ax>+#B|-M#&Wr6Y3@IhhQT8mv)s0*3-ie_kCZ9qVf)cW<+e@*u4vtzLRFzV zR1!HctE=4)kx$-k9XD&1gw@)xvMkJjQy=?;jN4+PEfOIiC%-Y2>N#d<;kGlCU0?pQ zx}Jd|j6e(rDYR4JxyXi-tIGT=jmu5Zl<3o)x= z8q;#24}Ou)EF`H7N~GqfC(RD=lXCT>d#yz}!fsBEtMeB-{Cv%dDyusEq(jPT*eYTvr%#J*({`ylMB^kH6nZzT$Rj|BIvl| z_xveH|Dj-H6+E1Ide`^Wk?@=T?(RU12!D1EmDw}#4eb0+mEN{g=X~xDs`-y>8c_Wk z>va$E&0@7^M;_5?9SWMToWyRk0CTvHUd>ZE89V8EG9ht&y^;_8-q<)!a5C5ilTxz zOwU5V=G1y~XreL6Z-Q<)=ol}9o&CKJzXIoe^w=1XiQlij zZ!|PH0|+Hm@LxwQdX1Cgy~PYzQ!aTO#UXB9^6czMKcVDyKSpQEg@yt@N|z4Cd}UIs zw526Syr~>0FsG`9+N!%!Mv% ztyyO(J?>_%UDF#r2omQra%2S_(swKcUK~Xe@uX5VuFl;1_0PxR-4B)FnSVr=YG$}3 z^9x45i26wXfRVetfDMMbVCj(h-kAMp z68Cf=+tryUATGuxYb4vf(lO+=Ke5#UX@PWFk6#F@$H$GuWB~&ASHU(Q+%vq6m$-_K z6N{I`5M|p%7dyZxnvW;Mwe(@V(Y=qmA^+Gm zf8a2Oind5ZIXy3cYn-s>dZrJt^$qVoD76_I3|=`2XMgYqmokkc1t z;!+jm2{B4us#YkBLvUzyYFWk=XverXapRb|RBVm@r#C}V4}FiX6JL|eMDQsf{38S; ze@EIT73HDJdnZ_}Uic#$OHF9Pu{NZY#X#vhrlZ~e`>H#HFm50gH%~Vl|8GODaC~&! zpa2lWelh4}J046V36mrSgX@x<`pvv1N&&0=5$7O^NPKVuFGbmCeH*DD5c7Q(;tX(7 zkX@3WJ72rrP-;ZjT;zBq7XVz)$u-8m<9~BsaNPY$aEz$c&=4n`kHBmjD2H;D*`YlkW_|!PZ>O~L#7TtO(s*x(d!G;Xi7kBjdtI_?6 z6AJ6++qI9`djig!-N<`unUgt}b?*gn)Uxz1LH!D!J@tDk_DxJaG>pBcsMNY~h?Hv( zr)Ng_BT^J{-caX4vn&{SQv!%AXB(!_pzq}aI33!2j{-gb1SeHXvFAYVNf5~VzFs!d z&~OoH$Q$Q=S{_n9TF9J8#{B)RoX5X%^4*WI5s4Uwu}*`+ohr(^20w06fM-WEgdpn* zje|($EuDxgBf)-O&8aNDvTZ1q?t8OZb6Ve-JQ+ia>#K?#)PSk>|9%rtSzu{+ZDb1K zSRh0HiCusGF?d1t-1nWQRQwGfmi0p>@E^h|`)*HsZhX`89^yEp3QI{Q2-K{D5Pnv` zEPQ?Z>3?_Nr%h<|muHbL+Dgq3R&7Ns2g#LIA%b|&;Kx(PKN?}J{>rsC${b(`w@Xn4y0UMc-@8xaCxo?DygCbL-|Udgm}+o_;hpM*@i>mAXhfz@nQ5is5&>=*+r9tWLZXCLiZp5Jn5TsL3YAERjL4g~I zp}P@AT0%O08}Ix1zSqm;9}J#z=EU0j?6uY>&{PrS3+XOOg|yhprDt=CEq_rEA744l z3POGsob+7C0An8%5nVOLb6y@G3#kzx|5sE)JEuzsQ9-cHa?97PPsW~owr*Z|&cxD& zz`ofg%wr5J2Jk)Xq#>oxBOI`SXNsBbi<>tBq(@qIu7ee8!jBy20OiKv4`5@`D@VSP zpk0pY;|`YMxujkruP(PR>!X$SwL2pxVV`0s_AxuQT4fsK(&7|SFQ1y~YYlq^wUfs1 zT@i5MU!5HplN(HqJGW$RQ2G7}WSxC@A6py%(Ncv>Hzl==8vVCY8J4?LfI|Fz(G3IS z?vCgc)@1zkIhdf=LN1Je1P@44+d?1K?Z53ZlN@yWRz~o19OHZbR`Bxl0;BRg{Xkip z)m8&$hC=nmvv71K@J@7-hU__@c5cIHB`BvKi5a+dR3qMlqC;UEb!Ca z-(`)@lasUBtj?HA^*D3b_uu#!0x|!qlhB6Ei##&=zYo+0Z5n|^o6O<>YxBPRifXh7e_np#?cwC)=3KQjoJ8Z+PiFEg7mv4ld+IqCgM7pT)M**^% z|4cSnZM{KB)iis9uiIWNqzy%R2c`k(Clwbn5qq9n-5cqZX-Znkl2_oTRrmViONMz@4xqhcNh*8Qnt9!x5Q4JXg0T`8r9{|uu= z0xr{auj-GqxMCNOIEYN&~(b)0qm`j2ZT+Zk2(cB{pO2Ih8p68N& z7+EU64hO6eb@B06&D+wj$LY?paTbbKM*(cYtamGXS%TgVxP60Q6X}-QGm$e4yNUyp zt4lBxI82ukLa+-NuZ=tkn3;g7Zd))kj=3npW?GAzVDN!B@BJQb%IUEOH25)uVmI5K z!iDf-7*Kk{8=j&c+nqOGvVZ>7upmSgV~XTaRJM`$2BAjg#D-z&vsFk531Xyha%H(#gJgEDdSYgTDr*_ih_i^B12akA&D5Dr(bq4imHE;xl8(?ge+T zUcznL5m zbf)Q6*}pgaW9-BZBR)u5?{W?g4U@sep33G7%1j1+i)mOq^x0|LIz1<5LANXnY1vOV z9~>-$m5CB4OesC_x&(mvAH6?-;nVd{9|s;)b#9TR6y~|P;!6Bm0C!t|GSkZTq zWJIJSuMhG7pR!gV+x7T&cOSc-RP)yCOypL5{?+B!0vySd8Bb_FsG;|p678olh0cq` zPoE@aeE1;q9n+V(dm??M-{KlxN`dr3yr(zvv|kSSED z#xevn85&Q3Uhp#FW4XvsZc*iq@|x2Yy@~>=R!6J0tbo42V8KVjv{CHBin7s^9Q}Tn z>M4C#C?yU@+V=C`R3|1p-<=jsv>kUd^KxX%B+m_AHXFo&u zp#W$Iw4NXLf#Odje#2gfz7nZ73T3^I>GeMPL!w=#^N{?nsmZ!zFkyp($KZw1OLaMO z$yoDXXoyoiMpIQ&Ztb6aHiyxgixJsndL(7D+2Z-;Ow-*g&l;aHkxy60D`oTkHeh0& zBr%w3*4{aDY!)GpGC`Va=EiaFHOcSkS7-7aIwF6|=4ZL}2;;R}wh!~po_vi1>+5sD z!uiE_4o&+lR-X@&p0wa#i)-F~0^eL>x+?2>byt~m-$U10R;$vYi%PT#{9)dGc7v?_$ieOR||ZHz)h9=V1!E; z4XV7#$In;;;CiyLv|mzYCdWY)7guG4W8?Ol z@fzU!@Ynd^qX>CJzf!>k18%6qr&y48NM*iQ5<*~OW+2#C8GPG`wyfr$*CWiNCdu-3 zwQaNLuV3&T;WchLIP9Xw6Wvd+%u;#Of%bMcDVuX_KG+Q1X?ewtFC#%?PM_f|)um*Z z#H{zxmb|Q@70itgXY<3D!-CSE3lqcWkvOIXx^w z_q@@8Xi1+noo^DN^78sqp|ABVcHZIf1hwgxHoMM^$V%YKRD8B>pzY3fN_KJ3)dD`; z^S)~-s7`|xv)GOL{7ltlNY7Ct#(Jve(`|Th!Fub5XOF#l7vfKHOxPuuGVdawC{*+n z2EC?EpXEEHi;F>@%ttE!^VW5|oM)Er<}RQ1{TdypE+C(UX<`4WSp`K z)|YPYi-38DP1NhECuaWYXLD`m#l_vuWZY8J6o4}|+jLY|@Yk=Ak)`NPhCbv2-g&{T z$kToZHfVxJz5HFPI?tk8_wmY98vEU=RSv{^VDbT!e?#1CQ&)Zlb5#PDzg{7a(Fk++ zaU7IOObCZx#hKT`lS-pEOcWUZWX7g2$O1b=GTljV zOTfQtxx0z0-!!&0Heno&^qZe3iX+rMYcM{aVD8>?rq7%yKYNv;s~fM@Rr4Ws28Aj% ztVEH+YaHOyTF)PCdrZU%PV9&koYs7zqhZn?jygahM@}rvEL3IX{N59Zfh421*A9k2 z+30y!B6~NH#TMXERMUd^Bj2Dg}9# zJW*3^z3eTiNd_-nwhDI}I#7I2%?e$o%-xrz8%n;tg$E7FnI%5E@;6Fa6= z{bBrHqA&<78N;!9HTkOJm0T{c{XV(yMmqNkk5?0f|9l&YUt=#1DMgWsL0kUfuK%c` zW&czyr>$KQ-C{uuxQajEm6z`^LBf!bXMnU0Y<_R=H&OBg7NzP!U@D{LzBzj#qiY7M zULXkZL@w<%+_$=}_Q!wjUhzdQd)W;*ciE;UPB{b%5&DlsPPw`CbxA~7#1grEJ9Q(x zJc*Rk_-!xx8&q(l47-H=exC5o|M{A8d%rX4l7=dhKYEs#-Vv0F_hVQmv{ERM{J2Lc?HYlK3m+gObQ# z&dQ+dfpB`fEFQo0t#QLl8CrHREwlZv%OP3rWBg62U7=gWTNu?&2oB7kYqF_csz@Ml z1>-nJbat#{tMDsPkpkGLZyGMoXBM$^IXmO z(JttH_D;o;XrS^4iWn4|#z*6N*or^2gXGkJqo&7DUH|Mup~d*&rCl9aS!W?CLGXKn ztDqAQ+5^ChIIH@j`iF)iBW0~M3Qrds9_|~k*3ov;u+~>}z4Ggo2znnc=Iyre{Exn9 z=F8CouS!c|5_{o4y)JLw>_^QZsAI-c=nG5{`-+!JGJ^z!jgk3R2ux zuVkI^0evy@LNJ@SsPlQky2BF#Ny^tq%C5CHCPyHdq3k*&p?pRVE!W>I)u`iv7w4LQ!NT=jGLc^YA|g5!BQ!t? zmyKh8#uK0k(*Yg^0Nv3dbl~);tDs^Q#4S{*g|9BnH`uaR`hRS|C zV3bXm@khLm4|+EJJf=I7qr}Q~F#}I%takn@=)`Ob``is`148AYLql;9VQS$T47S?U z8ye@YAK!#Ys=jcX`MoIUIOB~LN4K6_elHK8kXi_X-Z zGJ#vuSHD3*(~y}q%WS!zD$SP4d(<|`TOTcK+WV`gw0^NLX+D$JM~eN?HZYY=)np>r zO=j-Vj1dx(p{CNWGTElnHV(kNi*eLxyaPWtQx+A7=2~xL!=u!B2ddrGiE@;i>WU?H z!wUC>mVUXgwfN4=2b3DuhPccXDbIrh?y%pMt@HKZ%cm-l9Q7s*f9(R>~7QEo39<=(te?Eoyr|gBcmfqfgVQsosfAFoC$F4G0Z|UedjC~L0w6pwG z)YLw2NZpK-YuyW%{FG>(TLTtA%;Y7V0stpiVLF>Cz0-Oz6In*;Iunj82Zej#qwnGv zV{c82!(G}@GirRUK8clj2^xU6wV_XQ9eC64_U(9g1FgvAJf(|yD7rD@$$SXd;v{yH zzRO!jUZs)P)QGy$vx9)`EMA{g4zLb=v%VHT6vUEtd2T+!Ch8vvRnyq2#G5xyf8uif zepouw7+`TCV=ik!vFhDJk&&7$6dVdv(=KO|vOt~!+AhbcUH1QAOcu`YPc>d(@d$<(?HEMPLGaMuGdn0C^F@hQ)^WBE~8G%k* zuJ`6q>Z*QKHI{6G-+H;#NKLWEC&1S1;Vjy2v^i?oF^`d=Nw6b|l1h(n-@FcWEbcgO zDac|~X8wz@0>pdTdd2C7MbCU!>xoNuY`9?9|3k0NC{wGpxcDC@AiKhpXzU0+|8`N9W_|hX}EFXitR#7yi9m>xR{d(U>-mU`{lU-WLm-UpUNd zDk`_R*i_Fo9#=?iFtthzf!5fA%?)|aBfS43c>ud^EcUpJsFG=X0^6V2!~VcxnRt4FA98i0)fd7S;f* zvgVTBE^+f6{E}~Z9ZcrcW9mfMu9VY@>4ZT=(Vv%?)JFNiJ3bR*Y4>~MHSLi^b?a-S zre4zu+q0sYc#q&f8X(C=+74{;*unht{wdMMD4!+7e%wOwmeSUUBY!nXXYv)390Mku zqs9=Ilu&`sGM$SS`V67gorIKC_sqm3$rZK)GagZB#G)U<;;UY6X_bWfp$_#qbVIPI z<4;*eW|RL+>{R#G5@^P}m&?+a^5A(;r*@WbC^>2bVgXoEKK)1`A^hor{Z2#P$b(V; zm7Y8^Y@1xQpwUazI(Y|;q-|M7| z(Ytsi2x`FI+ITOalQD&Q((Vt7M!69xT7l?ewN5qFVc}F+)@wR*YM~BJ!50?7hdwO( zCB8qlekB)H?X1@wG5Ia+SjoVz(MX&5at((Du8qDvGdp`Pc@MP(6M{dj+A}gtXE;<6 zJJ+jEk6e!Sqir$%`qF2c8sm+}i>1DrUGO|sskuq1>+m+YiXY6uAK{vsADZ~P-T{En zP*2t?V|a1d-Tzr|ZdQ_eH@5N&-~!Zz(@0rmUP8xzV*C@Wqpr8=KhX`;T^|ex`-?E9 zQAn=Indtrd*+g`Bpz&wq|LN;*PLnshodnh2zvW=Ced#S-zJE8x!umfc{r~GCVEs?# z9}DYWbI?HVK<7UJK=qrDar8IMRT1T9@}~f~v@ycg?&erix<3_eZ=245#f?wCfJMX; z@R0xS!9Q+0p-Wc%8L_kDy?S4K@@A)mtI0ZYqN|sJz1eRO>g_j^(B}YyF%%U+koNjp zAG^jUuN4Zu3ysS?T6^oN;66C}tPW!;=4@!j-I=+eA*zmL#R*l-cHOx63keG}ybHHO zR3fYFXjrBp=Id?uY0~WxmG8*-HPkBh1Ru8i#+Sr>1G+lx2K2(UeY;6QrJP?w@&?Dzup9 zG0v9ZKhxpScY@)XMykmYgMkF?Os`+uB$ke9^1D1PTgtsn+LNr(Px=fSjzq{fjP1nR z^0H*{c=TGL@QDqeV)$awL}+`Lh2R+E(hNM4sZPbU;>}?^Tb2-;aDLwc?v5VcTBC$6 zERhx_F%-$ncQiWzMj*t}DELvn7!WlOgAj_bSNB;tOmCBjo^I5#8I=E=&l-KHLu<|f z;J%^_z*mEBKkIIVzAL%!qM^&>$;b=%w8cFvMfsQFlz$x+CO(0>aYC<7_u0`ySX}yZ z7NO1Fv>2iN=voJn_VVS5;_pB1O}mM5Y7s04r3@0NJ2BeoJ!R%g(uB{pGvGbM?Lj?b zNZpu-CL0YR)2bSAVU``Nen|@340W0ahXBW5>N-Le7M1F!)Y$OX2+kIt-BddD0JW$u z&~z>-5DoNNw+y-ky9iEx&FTIa&R$rE;TdiS44_j?Uz^!DmPM*|F+IP zTL1G);&Ye^gOSz(ZO)7fVXRnJw0zuBvZ?}u6oRX4=Y5Z!$5yNVTGj34*6U{BP-^wM z|97&=%TqqBib7qG0UU~&ucIAZMHl0UGtL}z1pL|%jtCP{(*S%JY@~cSf}C${9Rnhw z#pHY(0`K>tR(r%SQ*dWFh(lJ@chI0E3<_@(f=QIY`>jXK0~4O>^X;Co6k$vi^xTE3 z`fh|OU#vV>74T;F8{n@kGi0|v>1{Z14Tf`u+ct=mQ$!c_ksO_mgj`+{zTJES;r=f3xAS^y zHi0fhhBNk&!t?gJr7X^8k8ohvf`{j!4F|&broMYT=ycBx^-N0_bl*SrKIe2tWQ)vQ za%R=PTxV_{-LGF-i}t$%S5RtMO(A3pm~vqjRSQyCZ*b@1x*EE=9BY^c9lXA8-#v0o zh11FU9q{{m@hmYtHc!{KJ0Q6I90^i$`;*~G!qGV0wmu6h%2#tP1N>S!3R+QwtUgbf zT0ao6+4_C`YC1kEvQR~V--fIQ#dX^*k*;YiB((4i@k8+XTjx5?*_KY1qtjKZT4wd~ zJbvJa(+MSp;KC*rBA;xy{x(5&4-{nzT&#NV!AZZ}xVcGPmwg#{_iu$c^}bmARpFlU zYJD40r8{vnz|Tn(K9_nzsN8r`5NZQz-=rg};eh$;9h`zbZ z-+h&m8%e5+DT8q{HM3>jmsxbfm#5qHOa-*+vSKn$+Zmo~%K#KD+9{DZh<2RgKii49 zcxtUsnDBf+V5INkj^V6}C^nJ2``wi>C0mO>@_S>RaHre;vo>GxdFx1aH|MwLT*o;LjYtfq_ zxaz|4J_KjB>UExNnsuL^qpom(esM5VBau?Qm-4LRFs+)=p!U1ccLB;b?KeU*UhFn% zcllo$v%FV&?$%365C&bV_1G~I_(ReGp=mSd(x}41+=nq^(<9t}`OWN+1vu(*vC-5< zWrX#fFTeArH=ai6U)5jv)>yA>*4(AaF7S@*4^=qb?r5Pm8q0z2RFrIJ3Rn5>KGGdL z=Lw!(BUdo!vKw4mXd@Ah&m511F7dyBF~=vM`SasmcQ*51`J!$QJrb@noveBwk8$Vw zl{^{X7lt3AJ^fPszqj7zZ4<<8z(0YQ_6xmb@2qQ3=pMC`Vt)m}X)~7`y=fgT6AQ3= zjK?qdZRn_XD}cNawxvW|?QKKIs{-00sn1TgU~vmb=sN$iBLhjidkC#QO2OY%X?m{P z6c9_6lvDLHqj!3)BD5^|in?v7aX~y9YK%+#Jw;U}3VcUZFQ>v9MJB(PfobDm?XtOq zTA9B;LAHMeNw485KQTHPSupP?O_4u~e zXU$$Wuw-&kI?PuR8kMhj0_GjK`csG@Y{|#pEMubhw(^qhWcX`s4z`7S+pU> zK;!J|*I})G%4OOmgq+M%T5Jr}(c|s65#d!`Pn>Rx1=T}v z6s$VLqbF+f?-Ng#_2FW@E&3&Nh)6L93f_IW5>6&5!wPo0)dphwHWFeZO^g#hgpZQIA6& zH;=?oPgU>B;Xro&<-zI)u`nLoXH)^*gi?A|?c->T&!yiG1j6r$WqMSR>;wk52zW=D z!8o~VzhQviflOs$MvTyg5<=*wv>{;-#}mGDsji45J0rIPucJaKr~Y5c8p1lcA=Frb zfpdf;&k+a{)^>@Zp|E0n$$V6R|MsAz0jx;^hoDzJ-U;2A{B%fVr{v$qSqL6yfsu$$ zsd>i_HPNNs$|dt|Gbb@8CZp9Ps^a4a8l-Mt+N8yZ>~}LD-FQ)Zw8Ou$=_6`ZdUhm@ z=iFA}8Sk}yn8d@JY}wI6>O#cw#dPgJ`HE{Vd4GG;`;|KrpmG6!S&_1!E)~j)E z`(87Prz7l9oO7ExnBoO!Q(B?>0T>||HX(T zz487}BIPS}tvZVzc#en)y<;0HQ-dn!;a*Wup~LgLoO@HcyE$ko!F;P_PDxy?2l;mb zgA43v=o6jWr??T6^WRNtixy_rjw^9MH?PFdIN9d2_1h}XNiAe} z@ok~5pUj%#xC*qBj#})$Zk8yd5Y!UH-^F*dL0;-&v^e@}rvc1|Q%YzW1lk%X91 zcV`I;>NGZfZR~t+h>u7`mYi%#1re0;1P)36u><^#s zPH7iZ+pQ)KM)3G5Xx++$OBVAbn8A{Xm}C>z=G-4Byome)HQ;Cus+9N)F)hB+E)#Yy zDmn$@9j!?v5LAxQxuouhz=c%4HcwzpOIDG@d(%l^9*j^Kg`||LwVv}?W|Fa}jsz|+ zt7^$S*L3|Yd`mI%Lj5JY%}`cZy>beU2*%L9Yfc?`+Qa78D@n?<#uD~=LbB-G!}#pi z_0$yuVtpbT@l0o`)RU*PZs_KHF{aCKj>2P9VjrVT9>iD&F30faTRD5|Pn)F*wbVau z>|$XuoMHuW=^doY@x<(T$)8JYzb7o$dX1?cuq>$LmIU(TAH^n!5Kwe zu;X^UFhu~LF5C4u2psYL_hVUQ?aC>bYRqZ0&-C?))Ljoc3LcBag6%Ax3%|wyhk$l1 z)P&j*heqSB`;!QpPL(y~QI?{Nn+9fq&lo=zQ4K#h%kM67R_dU76UMwNj@vPIcGP%tATixR$nC z?BiBKR92|J{?9~aCg7)D&e55ZJw$+8YF1VCLRxZJ85r}XAl`3{p*2%(cX|p6E^KKv z+Z~~8^uLnQj3nb^lTW-Rg?A>KVk-$^?&&7-lZ1O}jJh&*$46KbcCD<`>Xo~;b^a+@ ziIC8q-nv*v267yd{4qgNPOnc?TRQ9~E?<(5mPlu%Hzj`Pyi@|E0n+*gxb@jBM_%KE zb(`z50@g%EPCdTuuWeB(nztO!Y*d`Iq#05&6I`ahp)>e=Kcj#&OZuC!;QUM%FCpSB zARM~bmHE?)6|MkD>~)L+Xk(yUg!qbpiY=F0UD3pdUj5Kl;A$hY{ihx(_eeZ!3NwVI zPW56BAWMAl1dfD6iCUjzEeMWtbY^03+TxzPLCf1GbD`&pZE*ct(*gcT6S5{XefGef z;|VKv?!jlSen3Mn!3g;O)A99Fs0HRH2bvI)n=JD_;y@w2Tm$!*!Us!^~_|C(%01S#p#Q6KzlN_G1nT zfK*=)rc!;3zY}CiLwYZGm`GCgJN!YOHZ(!3zBhdQ(4rNV2YfH@N)Frg&?4>x!C(?q z#Ts$uVqwM4)19Z~5W|&r(-nP);^*;d9gyU3&)`gp27D7Lu0B4xxbl+Q;cDS7s}oA> z=}HWW-{F~_tQ5dQ(y@;HG zI9iuZyXpJ+mQxn(+=QgrDtdP;0rcueL=f=srGPzFlD9-k_Q-Jyzl1p336eA5Vt)e> za=C+OHJ6nV`z7_1m|@gaT(#Qjb39b6kQNj%;crcJMyswhENf6Ujk83Cy!(GW4k5pq z?}5c^h0*SI;|uzftB1{QXZ>3O?ml~$8>B8nTov^Tz59tQnLYgAu3B0cxL^1gHXgP8 zbFn>ql&?%h!}Oz&hHY!s@goY`fNgg<>4_rQnKb5>H>KA(Lj|+w?*j_DU`e*CBdYOo zj_gKePLL5l7m$+pm@2o#(;E+5#$%v1z1|+zh!itPQ1ru3?ZQ*>kTIa0wFRNf=R6kkhiaEFsYLWHU1hmrf1M548M` zlzMvm2f1&-T~GcTT^xS1RPVg-pW@d(_~jxqIM&WOi}z;pm}IAQGJF3fno^#Qg^KBN{atM$b9(bMkE>xX?)4Bqdw3=b z3H>TT9RXWcc{>@9H7C?soe-Avi0CFkR7~O&3ejll1 zA`$j_r1%55-49aJ&XcT9E#5y5d!96`#8n;i5-JOKaW6v_Z}}V=RKAg|r(~^rk)GJ% z*3%hft9>ZC=eg}wWB*6c*U1@x`lDNI!pm}VN*ei14Q{(Aq-*!z6Dv5fKrT_&3DvKE!?Bmkdt z&@LC`2CEWK8w;G&G}`S zcz@HvdJQF>ibk$^+QY;YC%ftWCM#WQA#&?q(l-O7cnX_CQYy+8wOEYJQo=u=o2-6! z)8N0+uUY%mMbDgC>y$?MUPc+fZIsE+^uY)U=Bm)p+;ILK*bNWJ*U+ncz3a|Wwf&Kz zEw24$SGmu@TGlADM`!$QPg1Wo`Jh`v8gmGAX=eY{cXLTYZp+1A#;r^&tmy)#uCmUP z=y_ia(C%JG4DMRdre}_p4&SIh@oG~!CBqoHjo^Hv(>)OK41CfRq$;Vvk13#*xxhGz z=rzCY-lN;MRHB@3(xi~oI(zJmz&v{>ymX9DVwg0ZV{a6B?w--WA1(fm1Id6O``GfZdZZwp?nQTX2 z9ldU)iP;$5frt%&;oRcg0r))>gOQUjiKp>bG|Om!-#H`b2p*C763 zK1(qZ)f)uuHNDZZ-Zl-+^A9jd_LCD0@<$>U4>2>^>^If*wA6B*mz(hUm8HFzerO0H zYQ|$>u=V2i3Q5@oN#RsNt;onp;5$AHFgm^m%xL7oQ^L?GFUpl$X$W_J<#=()MbxZI zecbu_Dd21|lFi6x$T3?yiHd69m4?r<^Jh5RU;O6mZdOuArvD;t%v=rq*w-z_^zso7 z7o$t`=WwW4kPD1YPA}4#QI=x7gj(Y4EXgskHzk5rcUatdZOvaypi?-0>8%vRxs7QG zKgb2?M2*kHIt7T;WujhB+ChafJ~4aaP690?_wOi^A{vNt{xrKWzes=t-MGRc2d{;< z`NqaAp5@Rcx3g%#O-(-8;WNY|eY;0;LAq@6+;I5MC=)SmzoXBu$))xZmT6ao9+~|3 z9}yK69dT{+F?EaE(zV2o&i@Q+XJTF}q*~+!t>-sc&9(Cnlk}(fFBMw;T&acRo4bpA z=^E=x<7h*n@~2?&iAoGBNZV8nubG`A;gg!;fqbeu*-_w=O46I^-TsAZe^39E<&oXg zrhrnGc#M$uKVSMNUO-?|?wf~acvVgP2g{kPu&*yW(r{ zYQ~zjso4}a!sSH$cjtI&Mb8hWjZ5?^1)%pshB)WFc16QIHUI7 zkqtBPOb1*rZegw>*Dc@vX2b41d5B`qkElc<-2RR6hn*7l%tnRfS#tqOA%$}rt;0=z z4|qxnTKAR_N?(c5;g~kL?T09Cj2}Xai+>Y z%J`A6o>qm$3IQv2=Rf5oqdg>z(UqQa$ZDpfJaaRSPGWQ#zt6fv8-J&jZChT{h8A4m z-bE{PX<}@BMV^^!n~h_p$y8CbEl;P)Zt8mgB)b8hnSn7`X!Qu3_;&32{PkO6bJPUM zZ~4}#VS$;7;hF2vV+^UOjs_t6d!f7?_{vyfD_#fZYS+7=7=p7xNcs8 z3`{7G;)Yz|22ki_eLwIg5K~`~b8I9#&B+25sfc##2bi=jF{dJv@CBnN*-3J%AD7w| z)Z2VDInU#0eKIYvgGQ&?k{n2vC4_$P<6(d6?qsU|NO1#JXP%n50YPYJj=MIiZs5NN z>F@=V0F<>Xy(=}9x~8JmqaIFvcq-LP2*>KARyzb6za0X+XYyC z(#?7$rO29@%GzRmRvxXP(}-=zD>3#}*jq?0;=LI+NJXpv#~#bk%U6ul?zVwvprR;m z&Bhy1@BAF?GTtDDgq(Bs_%9Sf#WdZJs+_#Q?JR?9+pggV>^p4? z73)U zkZ=5flCj28&@S5p-@)(cr^nbIdVD7nH%3g}c}w;)Wt;X|Q+Tr%FiQxaNkD#9c4EQT%}n_6ZC ztdx+#`jhk4v}gDJ85Hk-32_5)aW#A5>2B1L5C+sJOnT*_vst?ZP2jj zdpJFwMn6QbTOel^|nFJAjQQ)B6eu&yD_ z3ZZe+Obp*4h$-6+_=&yX+~My?;fGZ0UIztSY%Q{b2ceEFP#hAN>snOIW5I*oBO~95 z8U@W^O9e76k9BN?+-WNRYr{dqlh)g)JY3*;SGrMUH7ru3yZw&W2+A}a@g+SrV?*F@ zkUmq1ZY?F$fg5g~jofUc^4a=lS?T2T9f`qscvlWl&Xct8I{0+5Nk9L-0oqN(55vzy z)z{m7)hhS|Pyk~tAOE?X9hXO;5tq7B&9~Nz+j>0TquzCagxbvI?LY7k4*^`ur>24jq@S=rML*R{836_bksdtb%lk(TC6z%I)iXu6AV`&se;?FHK z0}_zDDDRqz(OI``7M3oXt-fHJsQ~Md6?*~Klyfv&$+U+QB*TBPy3K?SKjuY`ZT6Z# z0uQ6CWU#&#v+nyjW?nr#fMG*9c@rlTEcnN2WdHM{VYH{#PA}j>Sh>WY!DOW(IC52q zUczQLdn0{~kcBHVW4yv@W7Ui6S?$Ki16aiSj||DmDjlev#|M3v^ zPOyjH+ux;OL_i^*@{5l83owz4W@sD8#5H++6OeG~c|lns5u_F_R{@{aovd$jIt{62 zGSih)P2oG?+rZUDyIi=Eq&gHE*1K*#5j}P$?{xuo=3J$x{M>4dbn%_=!K>!uENjB6 z7dP9~r3`!*M{5b?f}wRkT)4z;;{1$xOTdUduT_r&?5AO*mX1wIVB+>TJN!}i&Kld9VBVjh=^BHa!g}`Z`e9J+$FN$^R&Dwxc z89#j1=ZNA66Vsvp;%Ds^nE1LFmi?uJO7yFXL3wK4_cy1Q|7$)Q#1M3Ezv~2t12`!< z88PfrVhl#Phmlu*mb-v}(%r-6t!$Fvp-L^*jQPr)ug0xspPlwYRJ<)>L~dDJ3Oegn+-`ph0o~!TQX?q_fC4QLmG)CAC|(0zdK=no z9+WgKsmu#QQBd79C$&{ zJ?V~K&PG?tCA;zOa>H5REz!ye9f@9Y8Likdjj*1|-U70#61ul3|uW^TXY+(LS^k7t`sz8xF4l)hS$hdlFJuLFNx{kC7)VE^?aA+Y2620;vQig=yX%jkwb4cZ$C;da-{yB#Ld+r;F>gqjMlV@zwbK)8C zo3NRevhHbr`z=LYH%!Xvbhk^@=0I(o)Y2$v+fTrK>s4Wue_wXtx$K;w#CH>W;nPDi8i9Ou5ckB#hRZa9IZ9iQjdkDKY|ENNqX z>71Q4EV5cc;~+^)KL{giJl%NV4Ksb$=3g%V7 zoS222vP>tgF)fem;=&$JzcG|{f^}EqQ4p=%NvZdP5w+5E3UT3M(kZ0gb0|X=$Hf5> zT{rPV&kc3kJUeZf4mUf%{vZ@Hlhk}f^pM@8jBwyVYOuK76<#?>iaszuZA&5A?Nu}8 z*j&5yH2^-R6C9g1ciqaW1}kKlgh~iZk?Y(hz#o6}GvtfHup6Z$9=4cudihW7%Ydkt zU(WGssSk9u9)Y61WdSwfmbS*6Qo?2`{(vfb^=b`}eImb~ODFF|FPNioFPQ7ReZl{& zvk`uKdC7e~vF7LgZu2h_mv*4Z z!q{!as*`(H7YX&=NsvzI($G9Is9i5(WPlrgiHHxu#*Aimjs~z|lZ^T|mGo(xZ1f!H zd6%t-V@-&U>}Q~`6N_Fw{~CYe3n>;9qR%pI#Q%N-kViA_|9<7p3A{u0;NK5{fu*g;ztoNEBa#)~kYFoCWt;lJ{{8PSW%qs= zN{{@;N4WjBGiaKr>Anm4Z5+MJgJp=v1%_N-Rw~55*#I84=n55tW)oLD} z@IXMoXT}btyxwh-V~ZL4*`sSjbYYlA=~ zD5`CoakmI&o#7<(MAZC)B8KGq^xmewzWgtO`017_HDQlP*jMqd@t`-owM*$66{X++ zV>Q=gVJ+oO1&epN^Ou=B!E*FuQ@~wMtJF3vIBiUY@zpsv|HjNt2i^p#&l(Yr9NS2F z9A`~?LNqg%3FO-T-coJ?(6be8lazAL#J}&LQ$Ij5Vsb64%ZTUtsmBV2pk*?b)JH%| z1gW4bEUZk-PLFZjuW$CifC;b*8-e7RW2%4K*Xh8jmZCsGNe^^|Kk% zev`$C{jDtly4U!$(3=5ZKd__6V@XwwS#V8{91L!)lVJsJ-9BJ7df=q_Ac|aB3KtOV zl_ccHnKM2;*V6-+_g?8*WWx&h0_6r%EXNXb3dzwS*$XVOuxfCAH5lWeNIG&tlqvcc zm=RCo5C|v3Mw5$s!Kw%g9OINIlU7{?0$c|BK~A^BacrrcH$HdQaba zNV)#E?Ng$d{Y# zzk{JS)o~7K|2?~bUnWQnB7>)hqO)Q45e{5wKW=W=_ZNMhGre}R8T>Cgu@4#k+Y(^v z7^K(-ie1+7#2Dps2Gzcg8jg&iiCFmH5^7)?_;<6Y2if<;5L|P0&6~wfOB<2I0C2*} zFhSaD&1Nk?a^IctzoU_wC?vxztJdwhVr{1o+&M=z{)*$8Al@mbT~i=tt1jpc(l^up z-KGaIFN0KM(N_3u;if}%<#=XEo%J+iQ5>sCA|ku~ZBK{>RVFWi-8T{ybV{kXQBC)O4DRewR%L4cDa}mj2oul?x>r?siA@?%eRu5^ zHc>r^sxHr-?#QbkIawmoN_jc1G3t8X5pKjv%C4(S4@@g`{lEJ>O!MfE5n}9b?p>!# zub;^wa*+IFTAO2Or7YXnm&kXXI0SW`jlnb2xJpT2UEZB(!wG~!w+(cLzZJ?x{EATg z*VWuy{C`hBBzp}AY(xmpH+~ov(8w)#!PWCI`@fA}Rz-#11J+b{1L)G=Nl8)Dh|1a)RD7*y z&L<--H{M+3BT;5n4;NLB!*~@&w@O}1JNTNM{J%d|em#XaGfdvgBA^{|OT@!ITB&!^ zXlGIjCSezxmI@QlU;_~>hqHM(oyK*jT&ZaxIkZuWT zfWNMfK_JNZf2M`lp>j!K(-bm)eO2NccUYy&E%35<$+hh$N%F6o_;*(PQP006YclUk zOnIxo@-cD9P&~5#7V@?hkB&a#6fZ@qp}nH9TtQ4A#=C_>o{x3yISs2_-e{tg2SpvTFDoJG#+Q;A|5&KW9>KMdM}lWje%7q{uY2zc`~3Ff z5^|NSs};H_E)J?cE0yfB;pC=;W=UcF^-NBFZ#!&KnAn^`NPQFBdhiu~Nnu#9nZ1iN zm1+iWMu9&(8`fGFxj^bMRPCQ9t13juiLSc1jn zmE$a-ipCPXL=fp8$38D zrrak3Pi6k&ul6@{-xNHI7X2aPQ}tiwD7=ZkH&IDlWep{caxb9_Ed8X|gh8a*k{ZLW zjd7Pd3Ua)SBn7ld626u7wdj{pjIZ&)yVEb7QpTGx6Wp7Y&Aky)&(%|*{XqGMu|PgM zEMzUPSZT@N-s+u2-(p$! zgmK>;ib*dY?Yn=#2{+2?TPb|om&d*~R!oG$uYA>ZqqqZeV^1eN{^1nI0}owd6UoPH zg;AMKMOb-UImV$~ygzEkv7P!!+4`$JX8Ej|BF!V*HcdDKY8NIDvT!&_7`ec)s0R77 z=0Z1OUNb)8zkJrIBYzk8UhD*_Xzv!CFf}GsYCC8Xis#h4_7M%<3~_+RFXK}#OJ1zL z5Z~+<>HguQ(AnTflt873tOyVFj4ewdwNq?D`R=XoS$I+H@Yrm+$p(4FK=wifx8Zy4 zq%ynnvUpA2jmVxM&6i4{;J!TVu0an{DM$!YwbboeRIAk50=g;?|M6wS%H)#LM*xKI zomLm&sa5tkZX!O|9sVo2;#Nq{zN5ytV2M0LZBxV@yEr?L*sHtIm{eO%N9g^HCj&ca z`;8H^@br|M)uF68e6Vl%c)u^ud61W#)E)PjZr?ZGBt$nK?FMP@Pe?@vp^{ zwj%e@NW2IcW*`K#I_5>O7Ca1_BP(uItEVj5DU%NK7x zFWvyerXJfnSzAprIRriVvv+)x<+U=bfU%QL8nh^@?!;A52Reu2D`a2#7;{*QY%7Jw z3E#$(na-}k9Cu(|_%_1Ge!=pqz(9@G$fG38G)XT+O5-Zbl z0dzf(okm`d{<49(iV}H?sjC0BE3rE_FcE9ANe=#1&Qzn{vf#O#i+Hz;NATmP=Mq6Q zw$prVU)-xoOTC4`d<(=yVR9Lp&OP=wBP4m62$*dxTdCg?OG#A0eGeR_B05VE(8JBH z{~NfDeoBdvuUrL>=`fg#=koUO^Wk*m%&$1;4=3i_IBvPbO-lDebpUQ++~D?NXX6LW zz&~Kv*7M-77oIIWFZc{+JulAPqVrwP;d}>%{R5v=x!&K?8qWO0E06d*4-s)lgR>=zN+dZ}nyL)KMFLL!jmrLWM7dHoRy3)Uj## zd_xH#@pzf4D)zWaY~p9u6@rvu`w~!Ci&#qofi^m6-(sjM1_*GKq-kWQ1^#8~(8b2l zLeGGnB}^a8H9e@gP8?A#d{|+j6l82gGUJo6w6Ywkm zQedofqQrSwuj67rI5o~ydznHzDfPEaYP51t&_z6l5GOf~Sy;J@=&Xp<+{e&o_lu3} zN-s+Yor#k*+W8(bQj5NV?PR^vrXa67`4kGP4{*eT#<&M4w*+x44nJ8W?MtlT1&4v1 zKkQ^5noL4cRT(jyhjU^2ogjK&Z_2eh=M_%`5T@OZuSJXwPwO4) z$*!&+kAHZ=T+zPSzu@~J|3k%@!%G_0BIfEdRA(1D*pX%l zT>D)a3hXTrLZj>-HA!qgsL<69VJ6urNz+6$Uo{%&H#(dR^CBD^eE|DlGGp56sr#yUt+HN%A`E&2GJC!2n!&fdp*=`ItF3y9pi-Gw&e#slsH@vu@F8-f$j$kBGatuH46-W+iz2nD znqpD%C$n8*l=urx^X0IwbETP{W7p;5fQLrL50JIoe!NG!& zw`dGEPNZ}PuQ+8A&n(d89#^=huknQ`fo`z2`XIs-V3;}xC_}k-+KP*{W*g3*y#gMP zg2EJ+hhD}*DNLrvGLLDRi)Gd|yx-R8fKi#Mc{(E+l zGGdVSOC+%A$6lPi_=2X+bQFnXcy+g|GH1IJ-CL#jcE>Kh%Xz^AlIt+?VE-IB2Mwo9 zMlgy7)zwl&$pyz1>-0g@Lf=$ZI@#GP>Gxjm^Tpc%+Hxmve**5#R(e{R=*`jvz()>$ zgSZ$KJ%9pup^7w=2R;mZT24YmMNOfni69>kI!jA+cOUB1 z*4~;_75@OeGh1T95&OP~w4A}AC+u|S15}I@V734S6<6fy_fp%^)d4^B?>*H}ZNQt< z!n|c7b^~ni*hyx7u*jcXIuVb8n>Qeu zgc-^uCxtQVdQa)*aO^iq>i#i-dOx%vRZ*+04qOveB48^EW&a+nwXJ%L3&KyiU+ z2A0Pb&UovkarLx#e|}mP=kZukmv3B`+!tY_)<_?6$P*R<6@JZgj7(dJ=@e3wsPh3& z1|MHGcL>9ef+D{~Vs@NFD+5H^3$1MlA&bXL`RJmTq5{AFEWUViUz7r?dm|hOzxUYn z3kaweF}h;cE?xOEYOufW}qs2UgeZ zU1@lJ^Z+~v;O`FDg^Sr(gk_wvopX93()1A$<}P2dc-`gNQOoWBpUcs|OL z4*X{@1IEV>13G}kaGbrp^4Vn<&-Y%|zVl~lB~eM_=X>ykq8jjgr4HgM-%6UTf%AQDmf7Mq!-C!c{U1x+)^8Pi^d z3h|~8bIF>WS`ORW!LiQ!_SF5YEMnYLbn{29t(HIW>rdYo5MEMdiW!y)DRK$qd&9#i z40;)siCfI?Xr6V2etpu$mjLGp0d^S2|bx? zLSS)LGcyn0%mR{QL#_6IrZ#+Uut`Nf7P_d9FGb>x%pzffvSCjLX9L!VECuyugBvH- z_Z(FITVTBuP_V2I^`*bhjDo{>peZh`ZkfY!2XXm!GJ`&L+s?<6omaUQp8MMHAlR`XJsig9Nql+ zswTw0TN)P}RY2Ac{1adRx7GfUQ}H zv_lb?WBv1Tqi7sWlUrW!WsauBBbPZ0ViG(a?9C4Jc*-Elj^%ZE*H&WoyBhnN)`gQB z%}*64q!ztgjD~zp*GnYcDy_N1x8i}EzJL3y?oc1C6r8A!K(gw!^te>q9$WE494*BH zQZ~Qp7m3*KIP-QqrE7MWP#9p$dN`Ly{)14xNtC>U#hVGMA>y0eaU(!R1hD?#Vq*xA zK+5-S_Og;O(Exs!#F43)vDMZV4^!zZD)ZU?@&=WKh2ssO9F!b>Th4SYyu*X7sW$dB zJNpg;HH}bKA;sfvH+e{hZSdgpj*BqR_j|n1P*+g~k!6YVJ91`BYM8WNWa7U^%bR{8F#wCcH+vtMnVCS&r!{+t zNie`+bd93^T7dJz{^jBh5dsV;>)LWFE-4|6QZXhhtH@4I_r0lNQ7M(4<*Nui#2?*= zbPptWH6gpS(v!mgs<$Y+INj)~81KRO$>d4|E?ju~P78bB%lkYTVy9c7^>Ozc5(IY+ z<#t_V*3S%P9)@)aP$3DtvD#^*(msCs)fO?fpxf`=_3&u#!#UTrt~ZHR_)?TfZ-E|9 zGZc(x*E7BhgGu=P7&ot*6^{>5pfAB85QXxz84>Do5Ym-oHJ5ke!m^ zR=EGeWW@(-aN_UdDyQykSL;cT&;IYhNL;aR!K;5|RoUdS`xhK4XWQI{z6w0yO?iikL{xkM{jqE>TVVNd+cUzsEZ1ZXw2j%Uz8+p#{cV2pX+?HPqN|%HI+gs{R z?n{j0efuu9gW7KvHA_|e4+6yVagogRyt<`$j#HvsO*)Pe4S+6Iao=A@n@omxYmc}` z_kToWCiz=Otm|^i&)P0JPj-m0bz8R+cwY?|l)6lX%gd_!-E{bDVId~4Bk|BcJ=|Yx z*zN*mSA8D;IRclHo=5*qS-80Cgy+R^eyjaXUfg-yn1!^m=T%7{hwpikY9^(47_;5k zgv5#_DdP()VWM&U`U(Cr>XHbPo3lx@yP__P;2eHU4vfeiEpqCTMz; z-TAp%a1{QTd}tq@mz&#gn3cZuR#8vg@cz$GXNPsquUDL<#m(ECZQf5ER77HDgcBa4 zjMc_<``ZT2h7AGf{)K(8=VKl$WGIGoH&% zO$hevv-#2-WBs$|J!K|Aotb|xmkORmcf3+Iq)w)<+auIVs~u^qy(* z+&5423A3Rwx9^1!0`j+wwGeZxflj=pBVJlhHp^g#H{2V!zI5y3b$r;bmerYg-@`D+ zZ9vj%Ex-}ToNe$h`s9CeIjEVLM0qvATFJQV6JEuvTs>0oQ7IzIZ0_h9IC|64Gpv7G z@{%{XZo)o){tQ*g#iQ24abTH$y>Mi!H;*19etUsHe~yKP_vKAEI^e`gFKul7yc&1i zzM6Cq$g8KN5qf8GOv_0u{ZzYX>veNM3 z=`Ym;53k0g21%5{N}qi_rc7Z5-SZlh^2V{e-L$eHNclv#bs_@M`k@+11w8Q&#>CI zbQf*1wNUU<@v^pN#6%E$TKQ_A6W#mWEHKuTfY-eiNRPZ94u(RXVKJ+F24)FBi5tq1W+}W>6I^>kVx$7l1rBRq^6S-d$)=vbHW|&yi47Qay0B1jS8A%M%$XHB5Q@6^yj zPNJ73@f5JT=zM*FtU9;&n}^E!6M;69YQFHrPYbLdk(=X(H>mJxg%p{|%Wv!9-X{z9 zkADGW1ig%_`$wZz0zLsOeuMCAlUGDIYnn@~-oalh7RrXA@9gaS4VNA_jERFgJVihN zAC`}|ZZczJabj}P&v+qzvjy0YL^z~faiaZc^h%434&H*~PED2byw&3S!{6SuPikr| zXOXBxKf}i0jc~{!i=M$%dgiMhN&ULkK#)zjnhO0%;S<_U%beZIZwU=pFD14ewC5Ji zrW6D($&1*0pq_T<$RW(nOaGqyzCQ^J;kMShUVlpo_wT<%G&x=Ph`!)_P>?Pt!?9pf zcnM>c7O=_2K|zLBrw-Xwz*yp>)YHtsgtGSm;(0rGy>8??rv!u*I2hoD#t~~bLafBSSBQJX zst;uQ+@<;(GIg|E3aL*YvUop$qX;46EYB_8A%XB$Y;4}J&6#_GU;e!GvD3>aVE%P- za~}XG4SjKxg!9;LXvSTRI<)kZ{;>9d%7#-N2|KfI!OezrC35|_@uQ7Ba&g| zh0FmDH=aTH&Oge`0MA2%(E~sw+Jl20^iFwbK{178w(yGA9%Gt860owm%oET!wx*F$ zyT{=9fm8GLzCF{s&ihfiPI9BGjeU!OU$W|=p8JsAF|gV4m~A$Ui%8aZ(nDLDB#O}q zFz#~~(EqwUmBsng?*0(LebV-L{7MHZ?72VH5h&p%%DI4IG<(95N22x1sYz#s6*bBl z4<1uMhM^x7U>YH4B!C@2S!%#TXcyT-Wu_wxbp!LPnAv{o80yg;2*|R)kBj0D!YAgW z??tHd$Orrp%HMN&o2>*buN0g>j!2f>96lP@|GHcq}-pZg5do4_kQBZ9J zPfK%nlj2dhFLScejtx)`kb`QPf}euIsI|x?5^d4Cx&$FzATWTyO9&|}Cwj3rgci2f`a##*TY3e(Z4x!bQaVqsy4DnLhm{zhK;yvR0c-DS@G!YzqH%+6g9 zRKQ`>>ad_2hHdjHS8_b95al&1>%E~L%XrVu)%C%u4qn9O04u&S0SABK9`NFW)~2WJ zr3Yj&P=8DM`u26bi3F`(+<~JoQIN?8EDRA!Kqr$n-^;z5dj?s|X2a?k@&PXF*pAfT zR8gjEdTpIqauI#F%ij|U9Fcy)^)O!S-bDw%w&3at{ToW7SoB9vPhVeRvj~-Z@!l~A zHdl;;|$9!ZD1AWCfDn_rd(hGiT_lV2tpD}Cv9_;N#bp8)s*#}i0=xzvb-C+<+sD3M0F2x9WK2G z5i;DG8k%{2euLAqhPmmvR^D@RP%>WkndQ}>`=h~Brf#n5<7NMm1|3|mo1ULvztLo= z)rSwspGf)vz13qe_-fFABS)tF&n>zSqj3MtDCL!X(kLqrqkPf3sGcFT*5%`Ss!t#4 z78Us&tu>bpW&%@kG7Us)er~y44N;x0g`r;`uDIWhnI-OU!MJ22O+~JTv-Ue4|7?4V zx(id#Kgn%6+XLxUPAbqCA!rl#27?=$;7?dmp-tXS<*(QLj?7tn{&GRxASga3MmRd| zYc@7D!V=7oeo&OzlF#PVGfuKYuhtX)FLTzw={~O*Ph02`$ZrqI*b=|Dly)+98gCQg z$aI$k^rUuHn?BsE^hO7-`%r>Fcq8Apwgv+tcnkxzW>&Yj{1f6rKYc|MG4EjpM7 zt%EWrZJXvnZ=`2V>!i%%Hgp>c3*9FB+3T!T5uCfLrU^Y^JxCRWrq4C6M!!C--&R(W zyHBU*itNBO4Q*{%8X8t4C25vlCjS~r3clJp_CLuNq3$%1llxQOdh&C4-x7?r7eda2 zExR|t=X}mCaLKuwpOKfHk+rr_D+oXIT7=F|0*SxJ^1uOikLUo^?b+D6^jk{5+o0&)>%JWkpS%xXSYctU zW$%ohJ8X;iviH+V6tl6lf7UBX7I4XOzf&5j`}~I7}jX3!~ zwd3*#TRp7fCe2Pyf4$#fdRpjsrU|A2Sob5=_W=j|8CID!J{g;HDJksE9d|@@rx0a- z(S{s;$Bu()mihU4<9z3{RHdPzp(Bo2gan0;+jvU3<_WpDIkVL5qH{;!V}k%VYTVN( zghr|MJ@bbY!`_dAaqbV`1Aok#rs>)4A;+$7EvhWVYF z==0)0@fw(I8*@j;b;5p5#m;DMAC{=X*!`e{1S$oWT^Rum29i0rfAcKOVS&eSA$ML# z&$z~UFcqPdMz!NRdU8Q9-vxTJhD$Ek>@z;WqUlT}-ew&C&(Rr>*~B- zAmgJ%EVb~G^}h(HJ=V;yP*O?~JDW?Lgsrw%?$Ii1+uMl(H_ty*3%pdTzB`X1$8Db5 zReMhhe^1htGJ))~*=)jD{9$c#Td&eeFN2=tQrc)X&^RBqCyJnA7i+v7`~Z8`9th-< z8i0_xq4E0;|5>MqWHxk5Jw_;T&Pb!<0g!>^2RdO6xf&>nKON)*Z_3hm2xeI5JlT%a z?`dvxHshMn-<6bRvOR6*1mZNc9_r5fp9J^}!?~kaVHFj%^ud1y<$BCceFN$Hc*bez=mMv9*9(~^AV=kAqBnd#zeimBo8=%=Gs*#w10cigW(@&MU6R6a@Q7KZqnGdEA0SB7D2B`jAcR z1Db>T-lLxcAId8W`4wNr4&-I?KPL96id6$%C1Ix~_>Qc1ywb$i@m~o>0)k8P?>2~Q zZjTpFWYr}xP>~e}`@eSjUxupAI#T6Xs1yH-{f|#if_S4>Pipi{!U-0ejVoA^?od_1ol|IDX9@3x5b1h z9Q$h=()UJ{TkFtfpBH@)IV$Jx1%Wpj1QW#Xe>>9~5GIm0OZ&YL@i+8UNjBHfC&2z_ zIcQxMTPUxt1q3i(zcO(1gDk;t*q&3Km zG+GOC9M7m9KUVd2yKo{dB4Sl0>)8g;B<(74=)Ef|FWktL)Cm#pAbE8{hA$k!L3@A$ zG&Z~ra7sG<5l%i332USN^%5;+@yJ@JvAR)3olu={P+_~OD-IYZq{fK&C~4Cziogde zZ?*{HQ%tD8 zm_jk87=L*50;( zuZ@i|yAAlOR)S2U$mi>ir$qvk=dpy1GAyHj`_&+92tPIutR6dkAnJPm4UjHKVw^{- z;^1%mc&hFev1RAY)QecZCcwRPNPmXw-eEP5M-Ur?g!IlVy0_o}K6}6**}d-a@he5a zA6i5)s9@PC(<&=K-UZalqf6Ls%!&CS#XgEK66krDm#JwQ-30O}hB#!TT2RcF!G#6= z3A0B@utG`%UUjf$k{TDMfuke4U9;Y+DJ)QAkdh{Z`qVG5TQ~r;cJ)VI94+D_P|fyi z|C?m1FGyzT7(pogqq>AS&T`+Tc{wKhHwwt68da)H=OnM4bMLYHo(fG#SAaqXFQx+} z%lDw|ipbiQE94uhr9#HTOME#^K87z7km*YpYELaaLEYyBNqe}?nK~pApWh=Ky7l!U z_4QUEH3%6+{v2Hl<41TJwa-C7RKcPQK8UXzU;{#A7ahH5!OD{;NCe#37;JY85!{j7 z3TU)SNVN2OlY1@@-Di^!S$g_)-Pgq)Lfj$>9d9NfL$wJPfUE!)_6Qer_MjKMc*HNO z4hqqgw)=)XRQo#^iT?b<8+bhP^WqFkm#EaC7|WcxzSg_3pp#~GN|Z-uL5ck{mLgEnYMsO>-eh-V{xj>+id z!9&StfSwp;@Iq`e@t}qX$-^FtL_fK80cJMRUl0p=);7gj9^n%&0)6lE-QqKD&T)ccObPFv~NWv5BcP4dmCzoM7!ZfD$O zoc(V~vYo0&WS`${j?wJ<^OEvJKrX(#tC%pwjv7~7#t2dC&VHAq7D}dsS`e^1Qx(b$ zBNa((E64b&m+BBsGx;)XvR3@ySd zrpd;O18vFyBg%q2j5KnrlKmOu+8!swUJ-00I|MJQIIr)_M@*H`b?JQ^DioW;nNxI` zMez@p&c{ZW$r<-UEPhk=pg0DRB^9#di44KG*1x?XKo^LiutE2t@kH_st+|>qhmu6$ zFuc*VD~bGDn}tpwJee?k(Q9$=db%2)#x)ll1-6F0J8)?(WuPD+o?LVHd2XOQnm8@} z0P>LHku)a@>L>cVcmx`=W)2^T82^pxoytsCk+jnANCDwjJ(9mL6CfgsesV8L_i5Ss z2)WaSTfOH2&|f>krXRq3=K)-_x@c{bT}%4`<)tpNvJj!8Hr@p_ZTL6#QFCK8*tm3kL7 zs<@y50WxsK<;N_R3j0YyWh7;?$v6o%S(}>`UjJ}V^nth4D*LbikA%G!8%%M>d-FNv z)ARiWhiYad6N1t(1|JHu1ztt0DhoA{9x`TZqOBS{lu!ID5%Q*fVW+b=a_3I}HrIdw|Y6$(0lezx3 zwewYOc8=bdEWC{9@grZHyn`9K`VWim&V`40)Ubie#uOLiKFj(r;u9IoPLdI&3yu3~ z6*uFMibn!lWP7cvvNThgTTIuUEtl|Tbgdj# z4msRw&-xHZJ#TjAm#M^yauD}bSh>I>Cl~z-R|3!i#D7C!xiP{t`QX{ypRf%Z&I6oq zDuPd)$!#HE)y>bXFKI$Bi3zLFiqy57Nu=gvCR~bpxa+jB)na0OpIKn$&>oPR3$4>> zGd-8`V55HlOp1|{Il3N3A`t{Tp9Q#&#~d=Q#7fL_kPnkSp1SvxB+6k6o0KO+VLhi{ z`AEJTRQO51Rg8?E-#NRFoth%wVQYum=Pj*5zJ1lML$B-G31$wWpiQSQlFv{d*0#ZeYt~FaD5oMf2 zN}@hw=(((h`G8iU*uI@koLXgaparTbO+m3^&T|TUu}w?d?~Oh^5&0H&+Kg?Hm}73& ze+5x^zM>Tw?7p7Ser+B%R1{r4I_>xym5V@h#Qk%!2ZRsGeh7*Wxdji7RU5RF+4@10 zAay&K^l9~H5_9ynt%KnasIOu}g#~Fr6owUoRp+6Cm_?g;2>OZ~4|3!Q>n@wLpGbRx zbbGs0gzqMBXz$*%HD)mX0y+B98;mo;7Jj{Sy_`cF(fc^|(JG|MSQaK`%5XxRvb<^x z$vOI}t-3idz>Y6pH5H{R$9^;5a>P=k-MfaOa=#$lycRWk+5e3@y+HkF{zsj{ttq_M zGN-YOb}+-i6}{t3fnucIpDIF5XpychWTJ{->G-&?&$bb?CQohr77FKUIDK2l`)M`<*B(Dc*=MEk{K?nh$Q8&Sfw=G zC@SVviHp){cVw}-Pl>UodJDG#-#08idq;PDm%k&&gz}%9D@9jqQYbWSb3ZqaD&92e z7J2S3o@j&|eH(^76j9QR!dExuh^qERcy43e}bA12WChOG4my-I!NZ+lwS7- z4wq$8I)W2ka!|j()Dz`oyu~$#;6d8Q@Q49NLe2IfgI9|DWsm`eo<7a0VJ(9}w8S8N z0Hr-_1UIDd`GViKrlQh-sO#31V!u80KC@WjkNkXH&Svy4W~NK7Ubz)Sl@L^XGVxe# z11aK#IrIGQCC{IR#T*Xcgrai@zddKYWNqTieo0eFQ}a62 literal 0 HcmV?d00001 diff --git a/scripts/generate_star_cta.py b/scripts/generate_star_cta.py new file mode 100644 index 000000000..a75ef2281 --- /dev/null +++ b/scripts/generate_star_cta.py @@ -0,0 +1,148 @@ +#!/usr/bin/env python3 +"""Render the README's original, stylized GitHub star demonstration. + +Optional authoring dependency only: python3 -m pip install Pillow==13.0.0 +Run from any directory: python3 scripts/generate_star_cta.py +Requires DejaVu Sans (Debian/Ubuntu: fonts-dejavu-core). For another install, +pass --font-dir containing DejaVuSans.ttf and DejaVuSans-Bold.ttf. +Outputs: docs/guides/assets/star-opendirector.{gif,png}; 960x560, 5.6 s, infinite loop. +No network calls, screenshots, adoption counters, or GitHub mutations. +""" + +import argparse +import math +from pathlib import Path + +from PIL import Image, ImageDraw, ImageFont + +ROOT = Path(__file__).resolve().parents[1] +W, H, SCALE = 960, 560, 2 + + +def render(font_dir: Path, output: Path) -> None: + fonts = {} + + def font(size, bold=False): + key = (size, bold) + if key not in fonts: + name = 'DejaVuSans-Bold.ttf' if bold else 'DejaVuSans.ttf' + fonts[key] = ImageFont.truetype(str(font_dir / name), size * SCALE) + return fonts[key] + + background = Image.new('RGB', (W, H)) + pixels = background.load() + for y in range(H): + for x in range(W): + glow = max(0, 1 - math.hypot(x / W, y / H) / 1.2) + blue = max(0, 1 - math.hypot((x - W) / W, (y - H) / H)) + pixels[x, y] = (int(11 + 10 * glow + 10 * blue), + int(24 + 53 * glow + 10 * blue), + int(54 + 61 * glow + 44 * blue)) + background = background.resize((W * SCALE, H * SCALE)) + + def frame(t): + im = background.copy() + d = ImageDraw.Draw(im) + + def box(bounds, fill, outline=None, radius=8, width=1): + d.rounded_rectangle(tuple(round(v * SCALE) for v in bounds), + radius * SCALE, fill, outline, width * SCALE) + + def text(x, y, value, size=16, color='#dbe7f5', bold=False): + d.text((x * SCALE, y * SCALE), value, font=font(size, bold), fill=color) + + def line(points, fill, width=1): + d.line([(round(x * SCALE), round(y * SCALE)) for x, y in points], + fill, width * SCALE) + + def star(x, y, radius, fill, outline=None): + points = [] + for i in range(10): + angle = -math.pi / 2 + i * math.pi / 5 + r = radius if i % 2 == 0 else radius * .46 + points.append(((x + math.cos(angle) * r) * SCALE, + (y + math.sin(angle) * r) * SCALE)) + d.polygon(points, fill=fill, outline=outline, width=SCALE) + + text(46, 26, 'A little star. A big encouragement.', 27, bold=True) + text(47, 65, 'OpenDirector on GitHub', 15, '#a7c8ef') + box((37, 110, 923, 511), '#08152c', radius=18) + box((32, 100, 928, 500), '#0d1117', '#35577e', 16) + box((33, 101, 927, 145), '#161d29', radius=15) + for x, c in [(55, '#f27b82'), (73, '#e8bf6a'), (91, '#66b99c')]: + d.ellipse(((x-4)*SCALE, 119*SCALE, (x+4)*SCALE, 127*SCALE), fill=c) + text(126, 113, 'github.com/ThinkFlowLab/OpenDirector', 14, '#9eafc4') + text(57, 166, 'ThinkFlowLab /', 19, '#8cbbff') + text(218, 165, 'OpenDirector', 20, '#8cbbff', True) + box((387, 169, 443, 192), '#0d1117', '#39434e', 12) + text(399, 172, 'Public', 11, '#9da9b8') + active = 2.25 <= t < 4.85 + box((742, 159, 899, 202), '#273241' if active else '#202833', + '#a18c4b' if active else '#465364', 8) + star(767, 180, 10, '#eac45c' if active else None, '#eac45c' if active else '#b7c3d2') + text(788, 168, 'Starred' if active else 'Star', 17, '#f0e2b4' if active else '#edf3fa', True) + text(58, 220, '< > Code', 14, bold=True) + text(180, 220, 'Issues', 14, '#9eafc4') + text(265, 220, 'Pull requests', 14, '#9eafc4') + line([(33, 253), (927, 253)], '#303946') + line([(54, 252), (143, 252)], '#72a8ff', 3) + box((56, 274, 615, 470), '#101722', '#303d4e', 9) + text(76, 288, 'README.md', 12, '#92a4bb') + text(76, 319, 'OpenDirector', 32, '#f0f5fc', True) + text(77, 370, 'From an idea to a short film.', 18, '#bacce0') + for x, label, width in [(78, 'Chat', 70), (159, 'Canvas', 91), (261, 'Timeline', 106)]: + box((x, 414, x+width, 444), '#1a304d', radius=15) + text(x+15, 420, label, 12, '#a9ceff') + text(647, 285, 'About', 15, bold=True) + text(647, 321, 'AI video creation', 16, '#bacce0') + text(647, 347, 'in a local workspace.', 16, '#bacce0') + text(647, 402, 'ThinkFlowLab', 14, '#86b9ff') + text(647, 431, 'Open source', 13, '#91a4bd') + text(46, 520, 'Support the project. Help others discover it.', 14, '#b8d0ee') + # One deliberate click, then a quiet hold. Fade the pointer before + # resetting the illustrated state, so the loop never depicts un-starring. + if .8 <= t < 4.4: + p = min(1, (t-.8)/1.3) + p = 1-(1-p)**3 + x, y = 664+163*p, 382-197*p + alpha = min(1, (t-.8)/.25, (4.4-t)/.35) + overlay = Image.new('RGBA', im.size) + od = ImageDraw.Draw(overlay) + if 2.25 <= t < 2.95: + q = (t-2.25)/.7 + r = 15+34*q + od.ellipse(((x-r)*SCALE,(y-r)*SCALE,(x+r)*SCALE,(y+r)*SCALE), + outline=(242,205,105,int(230*(1-q))), width=2*SCALE) + points = [(0,0),(2,29),(9,22),(16,35),(22,32),(15,19),(26,18)] + od.polygon([((x+a)*SCALE,(y+b)*SCALE) for a,b in points], + fill=(248,251,255,int(255*alpha)), + outline=(7,15,28,int(255*alpha)), width=2*SCALE) + im = Image.alpha_composite(im.convert('RGBA'), overlay).convert('RGB') + return im.resize((W,H), Image.Resampling.LANCZOS) + + output.mkdir(parents=True, exist_ok=True) + first = frame(0) + first.save(output / 'star-opendirector.png', optimize=True) + # Shared palette prevents background shimmer. 80 ms frames = 12.5 fps. + palette = Image.new('RGB', (W, H*2)) + palette.paste(first) + palette.paste(frame(2.56), (0,H)) + palette = palette.quantize(colors=125) + colors = palette.getpalette() + colors[375:384] = [234, 196, 92, 242, 205, 105, 240, 226, 180] + palette.putpalette(colors) + frames = [frame(i*.08).quantize(palette=palette, dither=Image.Dither.NONE) + for i in range(70)] + frames[0].save(output / 'star-opendirector.gif', save_all=True, + append_images=frames[1:], duration=80, loop=0, + optimize=True, disposal=1) + print(f'Generated {output / "star-opendirector.gif"}') + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument('--font-dir', type=Path, + default=Path('/usr/share/fonts/truetype/dejavu')) + parser.add_argument('--output-dir', type=Path, default=ROOT / 'docs/guides/assets') + args = parser.parse_args() + render(args.font_dir, args.output_dir) From 2f35c78ee3b4d7ba389bf62686762b5c849c0062 Mon Sep 17 00:00:00 2001 From: Hongsheng Liu Date: Sun, 8 Nov 2026 22:13:19 +0800 Subject: [PATCH 05/61] [ci] Daily comparable benchmark after nightly (#216) ## summary - After perf-outputs, run the #180 storage micro-bench and reuse that run's drag and render sample. - Publish a trend artifact and a one-line comparison against the previous run and a pinned baseline. - Fail the advisory lane only for a regression past the configured ratio and absolute floor, or when the suite itself breaks. - Keep the daily v0.1.x decision on gate parity. ## validation - python -m pytest tests/test_daily_benchmark.py (13 passed) - python scripts/nightly/daily_benchmark.py at 600 commits / 200 nodes and 200 projects finished in 131s, within threshold, with the baseline still unseeded. Fixes: #213 Co-authored-by: Cursor Agent --- .github/workflows/nightly.yml | 136 +++++++- docs/development/ui-performance.md | 2 + docs/development/validation.md | 20 +- scripts/bench_creation_projects.py | 3 + scripts/nightly/benchmark.json | 25 ++ scripts/nightly/daily_benchmark.py | 482 +++++++++++++++++++++++++++++ tests/test_daily_benchmark.py | 213 +++++++++++++ 7 files changed, 875 insertions(+), 6 deletions(-) create mode 100644 scripts/nightly/benchmark.json create mode 100644 scripts/nightly/daily_benchmark.py create mode 100644 tests/test_daily_benchmark.py diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f375625e7..6dcf92832 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -6,6 +6,8 @@ # Release policy: cutting a daily v0.1.x requires the gate-parity lane green # on the candidate SHA. The extended lanes are advisory in v1: their failures # are reported and tracked, but they do not block a release by themselves. +# daily-benchmark runs after perf-outputs and is in that same advisory class. +# It fails only on a threshold regression or a broken suite. # Matrix and policy are documented in docs/development/validation.md. # # Schedule: 0 18 * * * UTC = 02:00 Asia/Shanghai next day. @@ -18,6 +20,7 @@ on: permissions: contents: read + actions: read concurrency: group: nightly-${{ github.ref }} @@ -413,20 +416,138 @@ jobs: /tmp/opendirector-drag-nightly-*.cpuprofile if-no-files-found: ignore + # Lane 6: fixed comparable benchmark, after this run's perf sample exists. + # Advisory, same class as perf-outputs: the result does not block v0.1.x. + # The job fails only for a threshold regression or a broken suite, which is + # the room signal on nightly-summary (notify: true). The one-line comparison + # is published on every run, including improvements. + # + # Scenario and thresholds: scripts/nightly/benchmark.json + # (#180 scale: cold-open/delete 600 commits / 200 nodes, catalog 200 projects). + # UI numbers are this run's nightly-perf sample, not a second browser pass. + # Budgets in docs/development/ui-performance.md are a reading reference only. + daily-benchmark: + needs: [perf-outputs] + if: always() && (github.event_name != 'schedule' || github.repository == 'ThinkFlowLab/OpenDirector') && needs.perf-outputs.result != 'cancelled' && needs.perf-outputs.result != 'skipped' + runs-on: ubuntu-22.04 + timeout-minutes: 30 + outputs: + summary: ${{ steps.report.outputs.summary }} + notify: ${{ steps.report.outputs.notify }} + steps: + - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + with: + python-version: '3.12' + cache: pip + cache-dependency-path: requirements.txt + - name: Install Python dependencies + # The micro-bench imports the source tree itself. Skip the editable + # install so this lane does not rebuild the frontend. + run: | + grep -v '^-e \.' requirements.txt > "$RUNNER_TEMP/benchmark-requirements.txt" + python -m pip install -r "$RUNNER_TEMP/benchmark-requirements.txt" + - name: Download this run's UI sample + continue-on-error: true + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + with: + name: nightly-perf + path: nightly-perf + - name: Download the previous trend artifact + continue-on-error: true + env: + GH_TOKEN: ${{ github.token }} + run: | + set -u + mkdir -p previous-benchmark + ids="$(gh run list --workflow nightly.yml --repo "$GITHUB_REPOSITORY" --limit 20 \ + --json databaseId,status \ + --jq "[.[] | select(.databaseId != ${{ github.run_id }} and .status == \"completed\") | .databaseId] | .[]")" + for id in $ids; do + if gh run download "$id" --repo "$GITHUB_REPOSITORY" --name daily-benchmark --dir previous-benchmark; then + echo "previous run $id" + exit 0 + fi + done + echo "no previous daily-benchmark artifact" + exit 0 + - id: report + name: Run the fixed suite and compare + run: | + set -eu + args=(python scripts/nightly/daily_benchmark.py + --config scripts/nightly/benchmark.json + --out daily-benchmark.json + --sha "$GITHUB_SHA" + --run-id "$GITHUB_RUN_ID") + if [ -f nightly-perf/nightly-perf.json ]; then + args+=(--perf nightly-perf/nightly-perf.json) + fi + if [ "${{ needs.perf-outputs.result }}" = "success" ]; then + args+=(--ui-required) + fi + if [ -f previous-benchmark/daily-benchmark.json ]; then + args+=(--previous previous-benchmark/daily-benchmark.json) + fi + set +e + "${args[@]}" + status=$? + set -e + if [ "$status" -ne 0 ] && [ ! -f daily-benchmark.json ]; then + exit "$status" + fi + summary="$(python -c 'import json; print(json.load(open("daily-benchmark.json"))["summary"])')" + notify="$(python -c 'import json; print("true" if json.load(open("daily-benchmark.json"))["notify"] else "false")')" + { + echo "notify=$notify" + echo "summary<> "$GITHUB_OUTPUT" + { + echo "## Daily comparable benchmark" + echo "" + echo "$summary" + } >> "$GITHUB_STEP_SUMMARY" + - name: Upload trend artifact + if: always() + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + with: + name: daily-benchmark + path: daily-benchmark.json + if-no-files-found: error + - name: Fail on threshold regression or suite failure + if: steps.report.outputs.notify == 'true' + run: exit 1 + # Aggregated run summary; also the machine-readable lane record the # Coordinator consumes for the daily release decision. summary: if: always() && (github.event_name != 'schedule' || github.repository == 'ThinkFlowLab/OpenDirector') - needs: [gate-parity, pytest-flake-triage, browser-extended, browser-production, perf-outputs] + needs: [gate-parity, pytest-flake-triage, browser-extended, browser-production, perf-outputs, daily-benchmark] runs-on: ubuntu-22.04 timeout-minutes: 5 steps: - name: Aggregate lane results + env: + BENCH_RESULT: ${{ needs.daily-benchmark.result }} + BENCH_SUMMARY: ${{ needs.daily-benchmark.outputs.summary }} + BENCH_NOTIFY: ${{ needs.daily-benchmark.outputs.notify }} run: | run_url="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" sha="${{ github.sha }}" flake="${{ needs.pytest-flake-triage.outputs.classification }}" [ -n "$flake" ] || flake=unknown + case "$BENCH_RESULT" in + success) if [ "$BENCH_NOTIFY" = "true" ]; then bench_notify=true; else bench_notify=false; fi ;; + failure) bench_notify=true ;; + *) bench_notify=false ;; + esac + if [ -n "$BENCH_SUMMARY" ]; then + bench_summary="$BENCH_SUMMARY" + else + bench_summary="daily benchmark ${BENCH_RESULT}" + fi cat > summary.md <> "$GITHUB_STEP_SUMMARY" @@ -450,9 +576,13 @@ jobs: --arg extended "${{ needs.browser-extended.result }}" \ --arg production "${{ needs.browser-production.result }}" \ --arg perf "${{ needs.perf-outputs.result }}" \ + --arg bench "$BENCH_RESULT" \ + --arg benchSummary "$bench_summary" \ + --argjson benchNotify "$bench_notify" \ '{sha: $sha, runId: ($run | tonumber), url: $url, lanes: {gateParity: $gate, flakeTriage: {result: $flake, classification: $flakeClass}, - browserExtended: $extended, browserProduction: $production, perfOutputs: $perf}}' \ + browserExtended: $extended, browserProduction: $production, perfOutputs: $perf, + dailyBenchmark: {result: $bench, notify: $benchNotify, summary: $benchSummary}}}' \ > nightly-summary.json - name: Upload nightly summary uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/docs/development/ui-performance.md b/docs/development/ui-performance.md index cc03aa610..b28186432 100644 --- a/docs/development/ui-performance.md +++ b/docs/development/ui-performance.md @@ -25,6 +25,8 @@ Start both timers at the user action. Define the visible feedback and the usable Use browser measurements for user-facing latency. Record first feedback and readiness separately, and split slow paths into client work, request queueing, server time, and rendering. Use comparable builds, fixtures, and interaction sequences. Keep initial load, warm navigation, direct manipulation, and long-running operations separate when setting budgets and reporting results. +The nightly trend reuses the drag sample and render probe already collected on that run. The budgets in this document are a reference for reading those samples. They are not the nightly failure line; a regression past the threshold in the [validation guide](validation.md) is what gets reported. + ## Measurement example: Warm canvas switching diff --git a/docs/development/validation.md b/docs/development/validation.md index c01c28318..44e3285f3 100644 --- a/docs/development/validation.md +++ b/docs/development/validation.md @@ -106,7 +106,7 @@ Release checks 的 `Assistant auxiliary panels` 阶段自动运行此检查, | L1 单元、静态与构建 | 前端单元测试、Python 单元套件、双语词条检查、浏览器清单检查、分层导入检查、契约一致性、生产构建 | 每个 PR;push 到 main | 整个 job ≤30 min | Release checks 中浏览器阶段之前的各检查步骤 | | L2 浏览器 E2E(模型替身) | 隔离服务与模型替身下的核心旅程:画布、参考、导出、助手、时间线 | 每个 PR;push 到 main | 与 L1 同一 job | Release checks 浏览器阶段(含 Assistant auxiliary panels 独立 fixture 阶段) | | L3 main HEAD 复核与扩展覆盖 | 与 L1+L2 相同门槛在 main HEAD 重跑(gate parity);Python 套件失败分类与已知时序敏感用例观测(flake triage);PR 门禁未覆盖的全部浏览器脚本(extended) | 每晚定时;发布前可手动触发 | gate parity 与 L1+L2 相同;extended ≤60 min | nightly 的 gate-parity、pytest-flake-triage、browser-extended | -| L4 生产构建、性能与输出 | 以生产构建(`vite preview` 服务 `dist`)运行核心旅程;MP4 落盘后 ffprobe 校验时长、流与帧数;帧延迟、长任务诊断采样与 CPU profile | 每晚定时;发布前对候选 SHA 手动触发 | production ≤45 min;perf ≤30 min | nightly 的 browser-production、perf-outputs | +| L4 生产构建、性能与输出 | 以生产构建(`vite preview` 服务 `dist`)运行核心旅程;MP4 落盘后 ffprobe 校验时长、流与帧数;帧延迟、长任务诊断采样与 CPU profile。同一次 nightly 之后另跑固定可对比基准(存储微基准 + 复用上述采样) | 每晚定时;发布前对候选 SHA 手动触发 | production ≤45 min;perf ≤30 min;daily benchmark ≤30 min | nightly 的 browser-production、perf-outputs、daily-benchmark | | L5 稳定性与恢复(规划中) | 进程中断重启、工程重开恢复、长时运行稳定性;需要新的场景编写 | 每周;发布前 | 待定 | 未建设,作为后续工作跟踪 | L1–L4 的自动检查不调用付费模型、不依赖真实服务;真实凭证与真实模型的验收属于需要明确授权的范围,不纳入本体系的自动执行。建议性结论与阻断性结论的边界见下节;已知失败模式的解读见 [CI 失败模式](ci-failures.md)。 @@ -114,8 +114,8 @@ L1–L4 的自动检查不调用付费模型、不依赖真实服务;真实凭 ### 发布决策与 lane 政策 - Gate parity 绿色是候选 `v0.1.x` 的发布门槛;nightly 不自动打 tag,也不以任何结果自动触发发布动作。 -- Extended、production、perf lane 当前为建议性(advisory):失败需登记跟进,但不单独阻断发布。某条 lane 连续两周稳定绿色后,由发布协调人决定是否升级为阻断项。 -- 每次运行产出 `nightly-summary`(各 lane 结果 + SHA)与 `nightly-perf`(渲染探针与拖拽采样)artifact;发布看板与失败通知按 summary artifact 对接,通知通道由发布协调人约定。 +- Extended、production、perf 与 daily benchmark lane 当前为建议性(advisory):失败需登记跟进,但不单独阻断发布。某条 lane 连续两周稳定绿色后,由发布协调人决定是否升级为阻断项。 +- 每次运行产出 `nightly-summary`(各 lane 结果 + SHA + 基准一行摘要)与 `nightly-perf`(渲染探针与拖拽采样)artifact;发布看板与失败通知按 summary artifact 对接,通知通道由发布协调人约定。`lanes.dailyBenchmark.notify` 只在超阈回归或基准套件本身失败时为 true,改善和阈值内波动不通知。 - `flaky-watchlist.txt` 一行一个 pytest node id,`#` 为注释;用例稳定后应删除条目,而不是长期静默重试。triage 结论写入 `flake-report` artifact 与 Actions summary。 ### 脚本登记与 lane 归属 @@ -124,6 +124,20 @@ L1–L4 的自动检查不调用付费模型、不依赖真实服务;真实凭 `mp4_render_probe.mjs` 与 `reference_drag_performance.mjs` 需要导入 `/src/*.ts`,只在 dev server 上运行;`vite preview` lane 只运行不导入 `/src` 的脚本。需要 `--assistant-fixture` 的浏览器脚本不属于普通隔离服务阶段。 +### 每日可对比基准 + +`daily-benchmark` 在同一次 nightly 的 `perf-outputs` 之后运行,不重跑浏览器,也不进入发布门槛。固定场景与阈值在 [`scripts/nightly/benchmark.json`](../../scripts/nightly/benchmark.json): + +- `cold-open` 与 `delete`:`--commits 600 --nodes 200`(#180 验收规模)。 +- `catalog`:`--projects 200`,每个额外工程 3 个节点,使 `list_projects` 测的是目录成本而不是再放一份 600 提交历史。 +- UI:复用本 run 的 `nightly-perf`(`reference_drag_performance.mjs` 的 pan/node `frameP95`,以及渲染探针采样)。[`ui-performance.md`](ui-performance.md) 的 100 ms / 500 ms 预算只作阅读对照,不是这条 lane 的失败线。 + +比较规则:每个指标越低越好。已写入 `baseline.metrics` 时,相对基线判断回归,一行摘要仍同时给出相对上一次的百分比;基线为空时,以上一次 nightly 的 `daily-benchmark` artifact 为参照(距本次 12–36 小时记为 yesterday,否则记为 previous)。只有同时超过 `regressionRatio`(1.5)和该指标的 `minDeltaMs` 才算回归。套件跑不起来同样 `notify: true`。渲染探针的通过与否仍由 perf-outputs 负责,不在这里重复失败。 + +不要把开发机计时抄进 `baseline.metrics`。基线应来自 nightly 的 `ubuntu-22.04` artifact。在基线写入之前,摘要写明 `baseline unseeded`。 + +产物为 artifact `daily-benchmark`(`daily-benchmark.json`)。`nightly-summary.json` 的 `lanes.dailyBenchmark` 带上同一行 `summary` 和 `notify`,供现有 summary 通知路径使用。 + ## 证据记录 在 PR 或专题验收记录中写明: diff --git a/scripts/bench_creation_projects.py b/scripts/bench_creation_projects.py index 36289e803..6f424d0bf 100644 --- a/scripts/bench_creation_projects.py +++ b/scripts/bench_creation_projects.py @@ -34,6 +34,7 @@ from opendirector.domain.creation.commands import parse_command # noqa: E402 from opendirector.infrastructure.creation_projects import CreationProjects # noqa: E402 from opendirector.infrastructure.local_projects import LocalProjects # noqa: E402 +from opendirector.wiring import configure_runtime # noqa: E402 def command(kind, project_id, payload, versions=()): @@ -208,6 +209,8 @@ def scenario_delete(root, commits, nodes, projects_count): def main(): + # Command dispatch is not configured on import; this script is an entry point. + configure_runtime() parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( "--scenario", choices=["cold-open", "catalog", "delete"], default="cold-open" diff --git a/scripts/nightly/benchmark.json b/scripts/nightly/benchmark.json new file mode 100644 index 000000000..5f4b11565 --- /dev/null +++ b/scripts/nightly/benchmark.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "reference": "baseline-else-previous", + "regressionRatio": 1.5, + "description": "Fixed daily suite (#213), same scale as the #180 acceptance repro. Lower is better. cold-open and delete use 600 commits and 200 nodes; catalog lists 200 extra projects built with 3 nodes so the number is listing cost, not another history replay. UI metrics are the same nightly run's drag frame p95 (reference_drag_performance.mjs). Render-probe duration is kept on the artifact for the trend and is not a regression metric; docs/development/ui-performance.md budgets are a reading reference, not this failure line. Baseline metrics stay empty until an ubuntu-22.04 nightly sample is copied in. Until then the regression reference is the previous run. A metric regresses only when it is slower than that reference by both regressionRatio and its minDeltaMs.", + "storage": { + "cold-open": {"commits": 600, "nodes": 200, "projects": 0}, + "catalog": {"commits": 0, "nodes": 3, "projects": 200}, + "delete": {"commits": 600, "nodes": 200, "projects": 0} + }, + "metrics": [ + {"id": "storage.coldOpen.snapshot", "label": "snapshot", "source": "storage", "scenario": "cold-open", "field": "snapshot", "minDeltaMs": 100}, + {"id": "storage.coldOpen.open", "label": "open", "source": "storage", "scenario": "cold-open", "field": "open", "minDeltaMs": 100}, + {"id": "storage.catalog.listFirst", "label": "list", "source": "storage", "scenario": "catalog", "field": "list_projects_first", "minDeltaMs": 100}, + {"id": "storage.delete.clientSnapshot", "label": "read", "source": "storage", "scenario": "delete", "field": "client_snapshot", "minDeltaMs": 100}, + {"id": "storage.delete.trash", "label": "trash", "source": "storage", "scenario": "delete", "field": "trash", "minDeltaMs": 50}, + {"id": "ui.drag.node.frameP95", "label": "node", "source": "drag", "kind": "node", "field": "frameP95", "minDeltaMs": 50}, + {"id": "ui.drag.pan.frameP95", "label": "pan", "source": "drag", "kind": "pan", "field": "frameP95", "minDeltaMs": 50} + ], + "baseline": { + "runner": "ubuntu-22.04", + "note": "Seed metrics from a daily-benchmark.json artifact produced on the nightly runner. Do not copy a developer-machine timing.", + "metrics": {} + } +} diff --git a/scripts/nightly/daily_benchmark.py b/scripts/nightly/daily_benchmark.py new file mode 100644 index 000000000..00945acd4 --- /dev/null +++ b/scripts/nightly/daily_benchmark.py @@ -0,0 +1,482 @@ +"""Fixed daily benchmark: storage micro-bench plus the nightly UI sample. + +Reads ``scripts/nightly/benchmark.json`` and writes one trend document. +Exit 0 when nothing should notify the room. Exit 1 when a tracked metric +regresses past the configured threshold, or when the suite itself fails. +The one-line summary is always printed and stored; a within-threshold run +is not a failure. + +UI latency budgets in ``docs/development/ui-performance.md`` are not read +here. Render-probe success stays on the perf-outputs lane. + + python scripts/nightly/daily_benchmark.py --out daily-benchmark.json \\ + --sha "$GITHUB_SHA" --run-id "$GITHUB_RUN_ID" \\ + --perf nightly-perf.json --previous previous/daily-benchmark.json +""" + +import argparse +import json +import subprocess +import sys +from datetime import datetime, timezone +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[2] +BENCH = ROOT / "scripts" / "bench_creation_projects.py" +SCENARIOS = ("cold-open", "catalog", "delete") +DRAG_SAMPLE_FIELDS = ("elapsed", "frameP95", "frames", "longTasks", "maxLong") +RENDER_SAMPLE_FIELDS = ("passed", "renderMs", "duration", "frames", "bytes") + + +def load_config(path): + config = json.loads(Path(path).read_text(encoding="utf-8")) + if config.get("version") != 1: + raise ValueError("benchmark config version must be 1") + if config.get("reference") != "baseline-else-previous": + raise ValueError("unsupported reference policy") + ratio = config.get("regressionRatio") + if isinstance(ratio, bool) or not isinstance(ratio, (int, float)) or ratio <= 1: + raise ValueError("regressionRatio must be a number greater than 1") + storage = config.get("storage") + if not isinstance(storage, dict): + raise ValueError("storage scenarios are required") + for scenario in SCENARIOS: + params = storage.get(scenario) + if not isinstance(params, dict): + raise ValueError(f"missing storage scenario {scenario}") + for key in ("commits", "nodes", "projects"): + if type(params.get(key)) is not int or params[key] < 0: + raise ValueError(f"{scenario}.{key} must be a non-negative integer") + metrics = config.get("metrics") + if not isinstance(metrics, list) or not metrics: + raise ValueError("metrics must be a non-empty list") + seen = set() + for metric in metrics: + metric_id = metric.get("id") + if not isinstance(metric_id, str) or not metric_id or metric_id in seen: + raise ValueError("metric id must be a unique string") + seen.add(metric_id) + if type(metric.get("minDeltaMs")) is not int or metric["minDeltaMs"] < 0: + raise ValueError(f"{metric_id} minDeltaMs must be a non-negative integer") + if metric.get("source") == "storage": + if metric.get("scenario") not in SCENARIOS or not metric.get("field"): + raise ValueError(f"{metric_id} storage metric is incomplete") + elif metric.get("source") == "drag": + if metric.get("kind") not in {"node", "pan"} or not metric.get("field"): + raise ValueError(f"{metric_id} drag metric is incomplete") + else: + raise ValueError(f"{metric_id} source is not storage or drag") + baseline = config.get("baseline", {}).get("metrics", {}) + if not isinstance(baseline, dict): + raise ValueError("baseline.metrics must be an object") + return config + + +def run_scenario(scenario, params): + command = [ + sys.executable, + str(BENCH), + "--scenario", + scenario, + "--commits", + str(params["commits"]), + "--nodes", + str(params["nodes"]), + "--projects", + str(params["projects"]), + "--json", + ] + completed = subprocess.run(command, check=False, capture_output=True, text=True) + if completed.returncode != 0: + detail = (completed.stderr or completed.stdout or "benchmark failed").strip() + return {"ok": False, "error": one_line(detail)[-400:]} + try: + data = json.loads(completed.stdout) + except json.JSONDecodeError as exc: + return {"ok": False, "error": f"invalid json: {exc}"} + if not isinstance(data, dict): + return {"ok": False, "error": "benchmark json must be an object"} + return {"ok": True, "data": data} + + +def run_storage(config): + return { + scenario: run_scenario(scenario, config["storage"][scenario]) + for scenario in SCENARIOS + } + + +def load_perf(path): + payload = json.loads(Path(path).read_text(encoding="utf-8")) + drag = {} + for scenario in payload.get("drag", {}).get("scenarios", []): + kind = scenario.get("kind") + if kind in {"node", "pan"}: + drag[kind] = { + field: scenario.get(field) + for field in DRAG_SAMPLE_FIELDS + if field in scenario + } + render = payload.get("render") or {} + return { + "drag": drag, + "render": { + field: render.get(field) + for field in RENDER_SAMPLE_FIELDS + if field in render + }, + } + + +def load_previous(path): + file = Path(path) + if not file.is_file(): + return None + try: + payload = json.loads(file.read_text(encoding="utf-8")) + except (OSError, json.JSONDecodeError) as exc: + return {"ignored": f"unreadable previous artifact: {exc}"} + if payload.get("version") != 1 or not isinstance(payload.get("metrics"), dict): + return {"ignored": "previous artifact version is not comparable"} + return payload + + +def parse_time(value): + if not isinstance(value, str) or not value: + return None + try: + return datetime.fromisoformat(value.replace("Z", "+00:00")) + except ValueError: + return None + + +def previous_label(previous, now): + recorded = parse_time(previous.get("recordedAt")) if previous else None + if recorded is None: + return "previous" + hours = (now - recorded).total_seconds() / 3600 + if 12 <= hours <= 36: + return "yesterday" + return "previous" + + +def number(value): + if isinstance(value, bool) or not isinstance(value, (int, float)): + return None + return float(value) + + +def change_ratio(current, reference): + if reference is None or reference == 0: + return None + return (current - reference) / reference + + +def regressed(current, reference, ratio_limit, min_delta): + if reference is None or current - reference < min_delta: + return False + if reference == 0: + return current > 0 + return current > reference * ratio_limit + + +def metric_value(metric, storage, ui): + if metric["source"] == "storage": + scenario = storage.get(metric["scenario"]) or {} + if not scenario.get("ok"): + return None + return number((scenario.get("data") or {}).get(metric["field"])) + if not ui: + return None + return number((ui.get("drag") or {}).get(metric["kind"], {}).get(metric["field"])) + + +def pct(delta): + if delta is None: + return "n/a" + value = round(delta * 100) + if value > 0: + return f"+{value}%" + return f"{value}%" + + +def one_line(text): + return " ".join(str(text).split()) + + +def clause(title, views, previous_label_text, show_baseline, has_previous): + labels = "/".join(view["label"] for view in views) + if all(view["value"] is not None for view in views): + numbers = "/".join(f"{view['value']:.1f}" for view in views) + "ms" + else: + numbers = "/".join( + "FAILED" if view["value"] is None else f"{view['value']:.1f}ms" + for view in views + ) + bits = [] + if has_previous: + bits.append( + "/".join(pct(view["previousRatio"]) for view in views) + + f" vs {previous_label_text}" + ) + if show_baseline and any(view["baseline"] is not None for view in views): + bits.append( + "/".join( + pct(view["baselineRatio"]) if view["baseline"] is not None else "n/a" + for view in views + ) + + " vs baseline" + ) + body = f"{title} {labels} {numbers}" + if not bits: + return body + return f"{body} ({', '.join(bits)})" + + +def format_summary(config, views, *, has_previous, previous_label_text, + show_baseline, suite, regressions, ui_unavailable, ui_required): + cold = config["storage"]["cold-open"] + catalog = config["storage"]["catalog"] + prefix = ( + f"{cold['commits']} commits/{cold['nodes']} nodes, " + f"{catalog['projects']} projects" + ) + grouped = [] + drag = [] + for view in views: + if view["source"] == "drag": + drag.append(view) + continue + if not grouped or grouped[-1][0] != view["scenario"]: + grouped.append((view["scenario"], [])) + grouped[-1][1].append(view) + parts = [ + clause(name, group, previous_label_text, show_baseline, has_previous) + for name, group in grouped + ] + if drag and any(view["value"] is not None for view in drag): + parts.append(clause("drag p95", drag, previous_label_text, show_baseline, has_previous)) + else: + parts.append("drag p95 unavailable") + if not has_previous: + parts.append("no yesterday") + if not show_baseline: + parts.append("baseline unseeded") + if suite: + parts.append("SUITE " + ",".join(suite)) + if ui_required and ui_unavailable: + parts.append("SUITE ui sample missing") + if regressions: + parts.append("REGRESSION " + ",".join(regressions)) + elif not suite and not (ui_required and ui_unavailable): + parts.append("within threshold") + return one_line(prefix + ": " + "; ".join(parts)) + + +def comparable_previous(previous): + if not isinstance(previous, dict): + return None, None + if previous.get("ignored"): + return None, str(previous["ignored"]) + if previous.get("version") != 1 or not isinstance(previous.get("metrics"), dict): + return None, "previous artifact version is not comparable" + return previous, None + + +def build_report(config, storage, ui, previous, *, sha, run_id, now, ui_required, ui_error): + baseline_metrics = config.get("baseline", {}).get("metrics", {}) + comparable, ignored = comparable_previous(previous) + previous_metrics = comparable.get("metrics", {}) if comparable else {} + has_previous = bool(previous_metrics) + label = previous_label(comparable, now) if has_previous else None + views = [] + metrics = {} + comparison = {} + regressions = [] + missing = [] + for metric in config["metrics"]: + metric_id = metric["id"] + current = metric_value(metric, storage, ui) + if current is None: + missing.append(metric_id) + views.append({ + "id": metric_id, + "label": metric["label"], + "source": metric["source"], + "scenario": metric.get("scenario"), + "value": None, + "previous": None, + "previousRatio": None, + "baseline": None, + "baselineRatio": None, + }) + continue + current = round(current, 1) + metrics[metric_id] = current + baseline = number(baseline_metrics.get(metric_id)) + prior = number(previous_metrics.get(metric_id)) if has_previous else None + reference_name = "baseline" if baseline is not None else ("previous" if prior is not None else None) + reference = baseline if baseline is not None else prior + regression = regressed(current, reference, config["regressionRatio"], metric["minDeltaMs"]) + if regression: + regressions.append(metric_id) + view = { + "id": metric_id, + "label": metric["label"], + "source": metric["source"], + "scenario": metric.get("scenario"), + "value": current, + "previous": prior, + "previousRatio": change_ratio(current, prior), + "baseline": baseline, + "baselineRatio": change_ratio(current, baseline), + } + views.append(view) + comparison[metric_id] = { + "value": current, + "previous": prior, + "previousRatio": view["previousRatio"], + "baseline": baseline, + "baselineRatio": view["baselineRatio"], + "reference": reference_name, + "regression": regression, + "minDeltaMs": metric["minDeltaMs"], + } + show_baseline = any(view["baseline"] is not None for view in views) + suite = [scenario for scenario in SCENARIOS if not (storage.get(scenario) or {}).get("ok")] + ui_unavailable = ui is None + summary = format_summary( + config, + views, + has_previous=has_previous, + previous_label_text=label or "previous", + show_baseline=show_baseline, + suite=suite, + regressions=regressions, + ui_unavailable=ui_unavailable, + ui_required=ui_required, + ) + notify = bool(regressions or suite or (ui_required and ui_unavailable)) + samples = {} + for scenario in SCENARIOS: + result = storage.get(scenario) or {"ok": False, "error": "not run"} + if result.get("ok"): + samples[scenario] = result.get("data") + else: + samples[scenario] = {"error": result.get("error") or "failed"} + previous_record = {"present": bool(comparable), "label": label} + if comparable: + previous_record.update({ + "sha": comparable.get("sha"), + "runId": comparable.get("runId"), + "recordedAt": comparable.get("recordedAt"), + }) + if ignored: + previous_record["ignored"] = ignored + return { + "version": 1, + "sha": sha, + "runId": run_id, + "recordedAt": now.astimezone(timezone.utc).isoformat(timespec="seconds").replace("+00:00", "Z"), + "scenario": config["storage"], + "regressionRatio": config["regressionRatio"], + "metrics": metrics, + "missing": missing, + "regressions": regressions, + "notify": notify, + "summary": summary, + "comparison": { + "previous": previous_record, + "baselineSeeded": show_baseline, + "metrics": comparison, + }, + "samples": {"storage": samples, "ui": ui, "uiError": ui_error}, + "errors": [ + {"scenario": scenario, "message": samples[scenario]["error"]} + for scenario in SCENARIOS + if "error" in samples[scenario] + ], + } + + +def failure_report(message, sha, run_id, now): + summary = one_line(f"SUITE benchmark config: {message}") + return { + "version": 1, + "sha": sha, + "runId": run_id, + "recordedAt": now.astimezone(timezone.utc).isoformat(timespec="seconds").replace("+00:00", "Z"), + "metrics": {}, + "missing": [], + "regressions": [], + "notify": True, + "summary": summary, + "errors": [{"scenario": "config", "message": one_line(message)}], + } + + +def write_report(path, report): + Path(path).write_text(json.dumps(report, indent=2, ensure_ascii=False) + "\n", encoding="utf-8") + + +def main(argv=None): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--config", type=Path, default=ROOT / "scripts/nightly/benchmark.json") + parser.add_argument("--storage", type=Path, help="Combined scenario results; omit to run the bench") + parser.add_argument("--perf", type=Path, help="nightly-perf.json from the same run") + parser.add_argument("--previous", type=Path, help="Previous daily-benchmark.json") + parser.add_argument("--out", type=Path, required=True) + parser.add_argument("--sha", default="unknown") + parser.add_argument("--run-id", type=int) + parser.add_argument("--now", help="ISO time used to label yesterday; default UTC now") + parser.add_argument("--ui-required", action="store_true") + args = parser.parse_args(argv) + now = parse_time(args.now) if args.now else datetime.now(timezone.utc) + if now is None: + now = datetime.now(timezone.utc) + try: + config = load_config(args.config) + except (OSError, ValueError, json.JSONDecodeError) as exc: + report = failure_report(str(exc), args.sha, args.run_id, now) + write_report(args.out, report) + print(report["summary"]) + return 1 + if args.storage: + try: + storage = json.loads(args.storage.read_text(encoding="utf-8")) + except (OSError, json.JSONDecodeError) as exc: + report = failure_report(f"storage results: {exc}", args.sha, args.run_id, now) + write_report(args.out, report) + print(report["summary"]) + return 1 + else: + storage = run_storage(config) + ui = None + ui_error = None + if args.perf: + if not args.perf.is_file(): + ui_error = "perf file missing" + else: + try: + ui = load_perf(args.perf) + except (OSError, json.JSONDecodeError) as exc: + ui_error = one_line(exc) + previous = load_previous(args.previous) if args.previous else None + report = build_report( + config, + storage, + ui, + previous, + sha=args.sha, + run_id=args.run_id, + now=now, + ui_required=args.ui_required, + ui_error=ui_error, + ) + write_report(args.out, report) + print(report["summary"]) + return 1 if report["notify"] else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tests/test_daily_benchmark.py b/tests/test_daily_benchmark.py new file mode 100644 index 000000000..80a58fd01 --- /dev/null +++ b/tests/test_daily_benchmark.py @@ -0,0 +1,213 @@ +"""Daily benchmark comparison: fixed #180 scale, notify only past the threshold.""" +import importlib.util +import json +import subprocess +import sys +from datetime import datetime, timezone +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +CONFIG = ROOT / 'scripts/nightly/benchmark.json' +SCRIPT = ROOT / 'scripts/nightly/daily_benchmark.py' + +spec = importlib.util.spec_from_file_location('daily_benchmark', SCRIPT) +bench = importlib.util.module_from_spec(spec) +spec.loader.exec_module(bench) + +NOW = datetime(2026, 11, 8, 18, 0, tzinfo=timezone.utc) + + +def config(): + return bench.load_config(CONFIG) + + +def storage(snapshot=40, open_ms=38, listing=120, read=35, trash=12): + return { + 'cold-open': {'ok': True, 'data': {'snapshot': snapshot, 'open': open_ms}}, + 'catalog': {'ok': True, 'data': {'list_projects_first': listing}}, + 'delete': {'ok': True, 'data': {'client_snapshot': read, 'trash': trash}}, + } + + +def ui(node=14, pan=11, render_ms=900, passed=True): + return { + 'drag': {'node': {'frameP95': node}, 'pan': {'frameP95': pan}}, + 'render': {'passed': passed, 'renderMs': render_ms}, + } + + +def previous(metrics, recorded_at='2026-11-07T18:00:00Z'): + return {'version': 1, 'sha': 'prev', 'runId': 9, 'recordedAt': recorded_at, 'metrics': metrics} + + +def report(storage_results, *, previous_payload=None, sample=None, ui_required=False, ui_error=None): + return bench.build_report( + config(), storage_results, sample, previous_payload, + sha='abc', run_id=7, now=NOW, ui_required=ui_required, ui_error=ui_error) + + +def test_fixed_scenario_matches_canvas_acceptance_scale(): + loaded = config() + assert loaded['storage']['cold-open'] == {'commits': 600, 'nodes': 200, 'projects': 0} + assert loaded['storage']['catalog'] == {'commits': 0, 'nodes': 3, 'projects': 200} + assert loaded['storage']['delete'] == {'commits': 600, 'nodes': 200, 'projects': 0} + assert loaded['regressionRatio'] == 1.5 + assert loaded['reference'] == 'baseline-else-previous' + assert loaded['baseline']['metrics'] == {} + + +def test_within_threshold_records_yesterday_without_notifying(): + prior = previous({ + 'storage.coldOpen.snapshot': 42, 'storage.coldOpen.open': 40, + 'storage.catalog.listFirst': 110, 'storage.delete.clientSnapshot': 36, + 'storage.delete.trash': 13, 'ui.drag.node.frameP95': 15, 'ui.drag.pan.frameP95': 12, + }) + result = report(storage(), previous_payload=prior, sample=ui()) + assert result['notify'] is False + assert result['regressions'] == [] + assert result['comparison']['previous']['label'] == 'yesterday' + assert 'within threshold' in result['summary'] + assert 'baseline unseeded' in result['summary'] + assert '-5%/-5% vs yesterday' in result['summary'] + assert '\n' not in result['summary'] + assert result['samples']['ui']['render']['renderMs'] == 900 + + +def test_recent_rerun_is_labeled_previous_not_yesterday(): + prior = previous({'storage.coldOpen.snapshot': 40}, recorded_at='2026-11-08T12:00:00Z') + result = report(storage(), previous_payload=prior, sample=ui()) + assert result['comparison']['previous']['label'] == 'previous' + assert 'vs previous' in result['summary'] + + +def test_regression_uses_baseline_when_seeded_and_still_reports_yesterday(): + loaded = config() + loaded['baseline']['metrics'] = {'storage.coldOpen.snapshot': 100} + prior = previous({'storage.coldOpen.snapshot': 390}) + quiet = report(storage(snapshot=120), previous_payload=prior, sample=ui()) + built = bench.build_report( + loaded, storage(snapshot=400), ui(), prior, + sha='abc', run_id=7, now=NOW, ui_required=False, ui_error=None) + assert quiet['notify'] is False + assert built['notify'] is True + assert built['regressions'] == ['storage.coldOpen.snapshot'] + assert 'vs yesterday' in built['summary'] + assert 'vs baseline' in built['summary'] + assert built['comparison']['metrics']['storage.coldOpen.snapshot']['reference'] == 'baseline' + + +def test_ratio_alone_under_min_delta_does_not_notify(): + loaded = config() + loaded['baseline']['metrics'] = { + 'storage.coldOpen.snapshot': 100, 'storage.coldOpen.open': 100, + 'storage.catalog.listFirst': 100, 'storage.delete.clientSnapshot': 100, + 'storage.delete.trash': 20, 'ui.drag.node.frameP95': 10, 'ui.drag.pan.frameP95': 10, + } + # 1.6× snapshot but only +60 ms, under the 100 ms storage floor. + result = bench.build_report( + loaded, storage(snapshot=160, open_ms=100, listing=100, read=100, trash=20), + ui(node=10, pan=10), None, + sha='abc', run_id=7, now=NOW, ui_required=False, ui_error=None) + assert result['notify'] is False + assert result['regressions'] == [] + + +def test_no_previous_and_unseeded_baseline_does_not_notify(): + result = report(storage(), sample=ui()) + assert result['notify'] is False + assert result['summary'].count('no yesterday') == 1 + assert 'baseline unseeded' in result['summary'] + assert result['comparison']['baselineSeeded'] is False + + +def test_storage_scenario_failure_notifies_even_without_a_slower_metric(): + broken = storage() + broken['catalog'] = {'ok': False, 'error': 'disk full'} + result = report(broken, sample=ui()) + assert result['notify'] is True + assert 'SUITE catalog' in result['summary'] + assert result['errors'] == [{'scenario': 'catalog', 'message': 'disk full'}] + + +def test_missing_ui_sample_is_advisory_until_the_lane_requires_it(): + optional = report(storage(), ui_error='perf file missing') + required = report(storage(), ui_required=True, ui_error='perf file missing') + assert optional['notify'] is False + assert 'drag p95 unavailable' in optional['summary'] + assert required['notify'] is True + assert 'SUITE ui sample missing' in required['summary'] + + +def test_render_probe_failure_is_not_a_benchmark_regression(): + result = report(storage(), sample=ui(passed=False)) + assert result['notify'] is False + assert result['samples']['ui']['render']['passed'] is False + assert result['regressions'] == [] + + +def test_incomparable_previous_artifact_is_ignored(): + result = report(storage(), previous_payload={'version': 2, 'metrics': {}}, sample=ui()) + assert result['notify'] is False + assert result['comparison']['previous']['ignored'] == 'previous artifact version is not comparable' + assert 'no yesterday' in result['summary'] + + +def test_zero_reference_regresses_only_past_the_absolute_floor(): + prior = previous({'ui.drag.node.frameP95': 0, 'ui.drag.pan.frameP95': 11}) + under = report(storage(), previous_payload=prior, sample=ui(node=40, pan=11)) + over = report(storage(), previous_payload=prior, sample=ui(node=80, pan=11)) + assert under['notify'] is False + assert over['regressions'] == ['ui.drag.node.frameP95'] + assert over['notify'] is True + + +def test_storage_bench_emits_the_fields_the_suite_tracks(): + loaded = config() + tiny = { + 'cold-open': {'commits': 2, 'nodes': 2, 'projects': 0}, + 'catalog': {'commits': 0, 'nodes': 2, 'projects': 2}, + 'delete': {'commits': 2, 'nodes': 2, 'projects': 0}, + } + ran = {} + for metric in loaded['metrics']: + if metric['source'] != 'storage' or metric['scenario'] in ran: + continue + ran[metric['scenario']] = bench.run_scenario(metric['scenario'], tiny[metric['scenario']]) + for metric in loaded['metrics']: + if metric['source'] != 'storage': + continue + result = ran[metric['scenario']] + assert result['ok'], result + assert metric['field'] in result['data'] + assert isinstance(result['data'][metric['field']], float) + + +def test_cli_exits_with_the_notify_bit_and_writes_one_line(tmp_path): + prior_path = tmp_path / 'previous.json' + prior_path.write_text(json.dumps(previous({ + 'storage.coldOpen.snapshot': 40, 'storage.coldOpen.open': 38, + 'storage.catalog.listFirst': 120, 'storage.delete.clientSnapshot': 35, + 'storage.delete.trash': 12, + })), encoding='utf-8') + out = tmp_path / 'daily-benchmark.json' + quiet = subprocess.run( + [sys.executable, str(SCRIPT), '--storage', str(_write(tmp_path / 'quiet.json', storage())), + '--previous', str(prior_path), '--out', str(out), '--sha', 'abc', '--run-id', '7', + '--now', '2026-11-08T18:00:00Z'], + check=False, capture_output=True, text=True) + written = json.loads(out.read_text(encoding='utf-8')) + assert quiet.returncode == 0 + assert quiet.stdout.strip() == written['summary'] + assert written['notify'] is False + loud = subprocess.run( + [sys.executable, str(SCRIPT), '--storage', str(_write(tmp_path / 'loud.json', storage(snapshot=4000))), + '--previous', str(prior_path), '--out', str(out), '--sha', 'abc', '--run-id', '7', + '--now', '2026-11-08T18:00:00Z'], + check=False, capture_output=True, text=True) + assert loud.returncode == 1 + assert json.loads(out.read_text(encoding='utf-8'))['notify'] is True + + +def _write(path, payload): + path.write_text(json.dumps(payload), encoding='utf-8') + return path From 095ecbbccf04715f38ce88b5abfe16f12187b61e Mon Sep 17 00:00:00 2001 From: kunkun Date: Mon, 9 Nov 2026 10:46:57 +0800 Subject: [PATCH 06/61] [bugfix] ci: fail the daily benchmark on a missing required measurement (#232) ## summary - A sample that parsed but lost a required measurement was recorded in `missing` and then ignored by the failure decision: an empty `drag` block under `--ui-required`, or a storage sample missing a tracked field, ended the summary in `within threshold` and left the lane green while the same summary printed `FAILED` for that clause. - Required measurements now decide `notify`: storage metrics always, drag metrics only while the lane requires the UI sample, so an advisory run without `--ui-required` keeps its current behaviour. - Name the gap explicitly as `INCOMPLETE ` in the one-line summary and stop claiming `within threshold` when one exists. The artifact carries the same list as `incomplete`. ## validation - python -m pytest tests/test_daily_benchmark.py -q --noconftest (16 passed, 3 new: empty-but-parsed UI sample, storage sample with a removed field, partial UI sample that stays advisory) - build_report with `{'drag': {}, 'render': {}}` and ui_required=True: notify True, `INCOMPLETE ui.drag.node.frameP95,ui.drag.pan.frameP95`, exit 1 - build_report with `cold-open.data.open` removed: notify True, `INCOMPLETE storage.coldOpen.open`, exit 1 - Same inputs without ui_required still notify False Refs: #216 --- .github/workflows/nightly.yml | 14 ++++++------ docs/development/validation.md | 2 +- scripts/nightly/daily_benchmark.py | 34 ++++++++++++++++++++++++------ tests/test_daily_benchmark.py | 33 +++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 13 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6dcf92832..b6fd72230 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -7,7 +7,8 @@ # on the candidate SHA. The extended lanes are advisory in v1: their failures # are reported and tracked, but they do not block a release by themselves. # daily-benchmark runs after perf-outputs and is in that same advisory class. -# It fails only on a threshold regression or a broken suite. +# It fails only on a threshold regression, a broken suite, or a required +# measurement missing from a sample that otherwise parsed. # Matrix and policy are documented in docs/development/validation.md. # # Schedule: 0 18 * * * UTC = 02:00 Asia/Shanghai next day. @@ -418,9 +419,10 @@ jobs: # Lane 6: fixed comparable benchmark, after this run's perf sample exists. # Advisory, same class as perf-outputs: the result does not block v0.1.x. - # The job fails only for a threshold regression or a broken suite, which is - # the room signal on nightly-summary (notify: true). The one-line comparison - # is published on every run, including improvements. + # The job fails for a threshold regression, a broken suite, or a required + # measurement missing from a parsed sample; that is the room signal on + # nightly-summary (notify: true). The one-line comparison is published on + # every run, including improvements. # # Scenario and thresholds: scripts/nightly/benchmark.json # (#180 scale: cold-open/delete 600 commits / 200 nodes, catalog 200 projects). @@ -516,7 +518,7 @@ jobs: name: daily-benchmark path: daily-benchmark.json if-no-files-found: error - - name: Fail on threshold regression or suite failure + - name: Fail on threshold regression, suite failure or an incomplete sample if: steps.report.outputs.notify == 'true' run: exit 1 @@ -565,7 +567,7 @@ jobs: Release rule: cut the daily \`v0.1.x\` only when **gate parity** is \`success\` on this SHA. Extended lanes, including the daily benchmark, are advisory in v1. Benchmark \`notify\` is set only for a threshold - regression or a broken suite. + regression, a broken suite, or a missing required measurement. Run: $run_url EOF cat summary.md >> "$GITHUB_STEP_SUMMARY" diff --git a/docs/development/validation.md b/docs/development/validation.md index 44e3285f3..636a08ecb 100644 --- a/docs/development/validation.md +++ b/docs/development/validation.md @@ -115,7 +115,7 @@ L1–L4 的自动检查不调用付费模型、不依赖真实服务;真实凭 - Gate parity 绿色是候选 `v0.1.x` 的发布门槛;nightly 不自动打 tag,也不以任何结果自动触发发布动作。 - Extended、production、perf 与 daily benchmark lane 当前为建议性(advisory):失败需登记跟进,但不单独阻断发布。某条 lane 连续两周稳定绿色后,由发布协调人决定是否升级为阻断项。 -- 每次运行产出 `nightly-summary`(各 lane 结果 + SHA + 基准一行摘要)与 `nightly-perf`(渲染探针与拖拽采样)artifact;发布看板与失败通知按 summary artifact 对接,通知通道由发布协调人约定。`lanes.dailyBenchmark.notify` 只在超阈回归或基准套件本身失败时为 true,改善和阈值内波动不通知。 +- 每次运行产出 `nightly-summary`(各 lane 结果 + SHA + 基准一行摘要)与 `nightly-perf`(渲染探针与拖拽采样)artifact;发布看板与失败通知按 summary artifact 对接,通知通道由发布协调人约定。`lanes.dailyBenchmark.notify` 只在超阈回归、基准套件本身失败或必填测量缺失(样本解析成功但缺少 `--ui-required` 时应有的帧采样,或 storage 样本缺少必填字段)时为 true,改善和阈值内波动不通知。 - `flaky-watchlist.txt` 一行一个 pytest node id,`#` 为注释;用例稳定后应删除条目,而不是长期静默重试。triage 结论写入 `flake-report` artifact 与 Actions summary。 ### 脚本登记与 lane 归属 diff --git a/scripts/nightly/daily_benchmark.py b/scripts/nightly/daily_benchmark.py index 00945acd4..226b39770 100644 --- a/scripts/nightly/daily_benchmark.py +++ b/scripts/nightly/daily_benchmark.py @@ -2,9 +2,10 @@ Reads ``scripts/nightly/benchmark.json`` and writes one trend document. Exit 0 when nothing should notify the room. Exit 1 when a tracked metric -regresses past the configured threshold, or when the suite itself fails. -The one-line summary is always printed and stored; a within-threshold run -is not a failure. +regresses past the configured threshold, when the suite itself fails, or when a +required measurement is missing from a sample that otherwise parsed. The +one-line summary is always printed and stored; a within-threshold run with every +required measurement present is not a failure. UI latency budgets in ``docs/development/ui-performance.md`` are not read here. Render-probe success stays on the perf-outputs lane. @@ -180,6 +181,17 @@ def regressed(current, reference, ratio_limit, min_delta): return current > reference * ratio_limit +def required_metric_ids(config, ui_required): + """Measurements this lane must produce: storage always, drag when it gates. + + A drag metric stays optional while the UI lane is advisory, so an absent UI + sample is only a note; once ``--ui-required`` is passed, a sample without + that frame measurement is incomplete rather than quiet. + """ + return [metric["id"] for metric in config["metrics"] + if metric["source"] != "drag" or ui_required] + + def metric_value(metric, storage, ui): if metric["source"] == "storage": scenario = storage.get(metric["scenario"]) or {} @@ -234,7 +246,8 @@ def clause(title, views, previous_label_text, show_baseline, has_previous): def format_summary(config, views, *, has_previous, previous_label_text, - show_baseline, suite, regressions, ui_unavailable, ui_required): + show_baseline, suite, regressions, ui_unavailable, ui_required, + incomplete): cold = config["storage"]["cold-open"] catalog = config["storage"]["catalog"] prefix = ( @@ -266,9 +279,11 @@ def format_summary(config, views, *, has_previous, previous_label_text, parts.append("SUITE " + ",".join(suite)) if ui_required and ui_unavailable: parts.append("SUITE ui sample missing") + if incomplete: + parts.append("INCOMPLETE " + ",".join(incomplete)) if regressions: parts.append("REGRESSION " + ",".join(regressions)) - elif not suite and not (ui_required and ui_unavailable): + elif not suite and not incomplete and not (ui_required and ui_unavailable): parts.append("within threshold") return one_line(prefix + ": " + "; ".join(parts)) @@ -345,6 +360,10 @@ def build_report(config, storage, ui, previous, *, sha, run_id, now, ui_required show_baseline = any(view["baseline"] is not None for view in views) suite = [scenario for scenario in SCENARIOS if not (storage.get(scenario) or {}).get("ok")] ui_unavailable = ui is None + required = set(required_metric_ids(config, ui_required)) + # A sample that parsed but lost a measurement it was supposed to carry never + # reached the threshold check, so the run cannot be reported as quiet. + incomplete = [metric_id for metric_id in missing if metric_id in required] summary = format_summary( config, views, @@ -355,8 +374,9 @@ def build_report(config, storage, ui, previous, *, sha, run_id, now, ui_required regressions=regressions, ui_unavailable=ui_unavailable, ui_required=ui_required, + incomplete=incomplete, ) - notify = bool(regressions or suite or (ui_required and ui_unavailable)) + notify = bool(regressions or suite or incomplete) samples = {} for scenario in SCENARIOS: result = storage.get(scenario) or {"ok": False, "error": "not run"} @@ -382,6 +402,7 @@ def build_report(config, storage, ui, previous, *, sha, run_id, now, ui_required "regressionRatio": config["regressionRatio"], "metrics": metrics, "missing": missing, + "incomplete": incomplete, "regressions": regressions, "notify": notify, "summary": summary, @@ -408,6 +429,7 @@ def failure_report(message, sha, run_id, now): "recordedAt": now.astimezone(timezone.utc).isoformat(timespec="seconds").replace("+00:00", "Z"), "metrics": {}, "missing": [], + "incomplete": [], "regressions": [], "notify": True, "summary": summary, diff --git a/tests/test_daily_benchmark.py b/tests/test_daily_benchmark.py index 80a58fd01..ba2658dd9 100644 --- a/tests/test_daily_benchmark.py +++ b/tests/test_daily_benchmark.py @@ -138,6 +138,39 @@ def test_missing_ui_sample_is_advisory_until_the_lane_requires_it(): assert 'SUITE ui sample missing' in required['summary'] +def test_empty_ui_sample_is_incomplete_when_the_lane_requires_it(): + # The artifact parsed, so ui is not None, but it carries no frame sample. + empty = {'drag': {}, 'render': {}} + optional = report(storage(), sample=empty) + required = report(storage(), sample=empty, ui_required=True) + assert optional['notify'] is False + assert required['notify'] is True + assert required['incomplete'] == ['ui.drag.node.frameP95', 'ui.drag.pan.frameP95'] + assert 'INCOMPLETE ui.drag.node.frameP95,ui.drag.pan.frameP95' in required['summary'] + assert 'within threshold' not in required['summary'] + + +def test_storage_sample_missing_a_required_field_is_incomplete(): + partial = storage() + del partial['cold-open']['data']['open'] + result = report(partial, sample=ui()) + assert result['notify'] is True + assert result['incomplete'] == ['storage.coldOpen.open'] + assert 'INCOMPLETE storage.coldOpen.open' in result['summary'] + # The clause still shows the gap, but the run is no longer reported quiet. + assert 'FAILED' in result['summary'] + assert 'within threshold' not in result['summary'] + + +def test_partial_ui_sample_stays_advisory_while_the_lane_is_optional(): + partial = {'drag': {'node': {'frameP95': 14}}, 'render': {}} + result = report(storage(), sample=partial) + assert result['notify'] is False + assert result['incomplete'] == [] + assert result['missing'] == ['ui.drag.pan.frameP95'] + assert 'within threshold' in result['summary'] + + def test_render_probe_failure_is_not_a_benchmark_regression(): result = report(storage(), sample=ui(passed=False)) assert result['notify'] is False From c54d78eb5314d7068b6bf465dbbb2cf199ab1df9 Mon Sep 17 00:00:00 2001 From: Peng Cheng <96950223+PCcoding666@users.noreply.github.com> Date: Mon, 9 Nov 2026 11:24:26 +0800 Subject: [PATCH 07/61] [feat] audio: add a connection-scoped voice library with on-demand MOSS pagination (#218) * [feat] audio: add a connection-scoped voice library with on-demand MOSS pagination * [fix] audio: correct voice uploads and distinguish missing previews * [fix] audio: enforce the upload connection and align voice validation errors * [fix] audio: select compatible voices without previews from the whole card --- .github/workflows/release-checks.yml | 24 +- apps/api/src/opendirector_api/localization.py | 24 + apps/api/src/opendirector_api/main.py | 2 + apps/api/src/opendirector_api/voices.py | 97 ++ docs/development/i18n.md | 1 + docs/development/validation.md | 19 +- docs/guides/cli.md | 24 + docs/guides/user-guide.md | 10 +- docs/guides/user-guide.zh-CN.md | 10 +- packages/core/src/opendirector/agent/tools.py | 39 + .../application/creation_generation.py | 26 + .../opendirector/application/voice_library.py | 309 +++++++ packages/core/src/opendirector/cli.py | 56 ++ .../opendirector/domain/creation/commands.py | 7 +- .../domain/creation/generation.py | 24 +- .../opendirector/domain/creation/models.py | 17 + .../src/opendirector/domain/input_rules.py | 5 + .../src/opendirector/domain/moss_speech.py | 8 +- .../core/src/opendirector/domain/voices.py | 106 +++ pyproject.toml | 1 + requirements.txt | 6 +- src/backend/creationProjection.ts | 8 +- src/backend/rules.ts | 51 +- src/backend/voices.ts | 110 +++ src/canvas/CreateVoiceForm.tsx | 245 ++++++ src/canvas/NodeComposer.tsx | 96 +- src/canvas/VoiceLibrary.tsx | 570 ++++++++++++ src/canvas/assistantActivity.ts | 17 +- src/canvas/dataBoundary.ts | 14 + src/canvas/model.ts | 10 +- src/canvas/providerPresets.ts | 7 +- src/canvas/voice-library.css | 284 ++++++ src/canvas/voiceFavorites.ts | 27 + src/contracts/creation.schema.json | 474 +++++++++- src/contracts/generated.ts | 56 +- src/i18n/messages/en-US/index.ts | 2 + src/i18n/messages/en-US/voiceLibrary.ts | 73 ++ src/i18n/messages/zh-CN/generation.ts | 2 +- src/i18n/messages/zh-CN/index.ts | 2 + src/i18n/messages/zh-CN/voiceLibrary.ts | 69 ++ tests/browser/manifest.json | 14 +- tests/browser/moss_provider.mjs | 15 +- tests/browser/moss_speech.mjs | 183 +--- tests/browser/voice_library.mjs | 831 ++++++++++++++++++ tests/browser/voice_library_server.py | 81 ++ tests/creationParameters.test.ts | 23 +- tests/providerPresets.test.ts | 2 +- tests/test_agent_tools_voices.py | 36 + tests/test_cli.py | 79 ++ tests/test_moss.py | 43 +- tests/test_voice_library.py | 666 ++++++++++++++ tests/voiceLibrary.test.ts | 300 +++++++ 52 files changed, 4929 insertions(+), 276 deletions(-) create mode 100644 apps/api/src/opendirector_api/voices.py create mode 100644 packages/core/src/opendirector/application/voice_library.py create mode 100644 packages/core/src/opendirector/domain/voices.py create mode 100644 src/backend/voices.ts create mode 100644 src/canvas/CreateVoiceForm.tsx create mode 100644 src/canvas/VoiceLibrary.tsx create mode 100644 src/canvas/voice-library.css create mode 100644 src/canvas/voiceFavorites.ts create mode 100644 src/i18n/messages/en-US/voiceLibrary.ts create mode 100644 src/i18n/messages/zh-CN/voiceLibrary.ts create mode 100644 tests/browser/voice_library.mjs create mode 100644 tests/browser/voice_library_server.py create mode 100644 tests/test_agent_tools_voices.py create mode 100644 tests/test_voice_library.py create mode 100644 tests/voiceLibrary.test.ts diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml index 2e30e831e..700e83bf8 100644 --- a/.github/workflows/release-checks.yml +++ b/.github/workflows/release-checks.yml @@ -104,6 +104,28 @@ jobs: curl --fail -H 'X-OpenDirector-Request: 1' "$CREATION_API_URL/api/creation-test-health" curl --silent --fail "$CREATION_WEB_URL/" >/dev/null node scripts/run-browser-suite.mjs + - name: Voice library workflows + if: always() && steps.install.outcome == 'success' + timeout-minutes: 5 + env: + CREATION_WEB_URL: http://127.0.0.1:5190 + CREATION_API_URL: http://127.0.0.1:8030 + run: | + export PLAYWRIGHT_MODULE="$RUNNER_TEMP/opendirector-browser/node_modules/playwright-core/index.mjs" + python tests/browser/voice_library_server.py --port 8030 >"$RUNNER_TEMP/voice-server.log" 2>&1 & + api_pid=$! + OPENDIRECTOR_API_URL="$CREATION_API_URL" node node_modules/vite/bin/vite.js --host 127.0.0.1 --port 5190 --strictPort >"$RUNNER_TEMP/voice-vite.log" 2>&1 & + web_pid=$! + trap 'kill "$api_pid" "$web_pid" 2>/dev/null || true; wait "$api_pid" "$web_pid" 2>/dev/null || true' EXIT + for attempt in {1..60}; do + if curl --silent --fail -H 'X-OpenDirector-Request: 1' "$CREATION_API_URL/api/voice-test-health" >/dev/null && curl --silent --fail "$CREATION_WEB_URL/" >/dev/null; then + break + fi + sleep 1 + done + curl --fail --silent -H 'X-OpenDirector-Request: 1' "$CREATION_API_URL/api/voice-test-health" + curl --silent --fail "$CREATION_WEB_URL/" >/dev/null + node tests/browser/voice_library.mjs - name: Assistant auxiliary panels if: always() && steps.install.outcome == 'success' timeout-minutes: 5 @@ -129,6 +151,6 @@ jobs: - name: Print isolated service logs on failure if: failure() run: | - for log in "$RUNNER_TEMP/creation-server.log" "$RUNNER_TEMP/vite.log" "$RUNNER_TEMP/assistant-creation-server.log" "$RUNNER_TEMP/assistant-vite.log"; do + for log in "$RUNNER_TEMP/voice-server.log" "$RUNNER_TEMP/voice-vite.log" "$RUNNER_TEMP/creation-server.log" "$RUNNER_TEMP/vite.log" "$RUNNER_TEMP/assistant-creation-server.log" "$RUNNER_TEMP/assistant-vite.log"; do if [ -f "$log" ]; then tail -n 150 "$log"; fi done diff --git a/apps/api/src/opendirector_api/localization.py b/apps/api/src/opendirector_api/localization.py index 067db96dc..e4d1466ee 100644 --- a/apps/api/src/opendirector_api/localization.py +++ b/apps/api/src/opendirector_api/localization.py @@ -9,6 +9,26 @@ from opendirector.domain.creation.commands import CommandReceipt ENGLISH_BY_CODE = { + 'voice_upload_type': 'Upload the voice recording using multipart/form-data.', + 'voice_upload_form': 'Check the recording, form fields and text lengths, then try the upload again.', + 'voice_model_unsupported': 'This checkpoint does not accept uploaded voices. Choose a Base model for voice cloning or a compatible built-in voice.', + 'voice_library_unsupported': 'This model does not have a confirmed voice library. Select a supported speech model.', + 'voice_connection_changed': 'The voice service or account changed. Reopen the library and select a voice again.', + 'voice_reference_required': 'This model needs a registered reference recording. Upload and select a voice; default cannot replace a recording.', + 'voice_transcript_required': 'This model needs an accurate recording transcript. Enter the transcript and create the voice again.', + 'voice_transcript_too_long': 'The recording transcript must be at most 100,000 characters.', + 'voice_description_too_long': 'The speaker description must be at most 4,000 characters.', + 'voice_not_found': 'The selected voice no longer exists. Refresh the library and select another voice.', + 'voice_delete_unsupported': 'This voice cannot be deleted. Only supported uploaded voices can be deleted.', + 'voice_consent_required': 'Enter the consent recording ID for this voice.', + 'voice_name_invalid': 'Enter a valid voice name without path separators or control characters.', + 'voice_audio_invalid': 'The recording could not be decoded. Check the actual audio format and file integrity.', + 'voice_format': 'This recording format is unsupported. Choose a listed format.', + 'voice_size': 'The recording exceeds the service file size limit.', + 'voice_duration': 'The recording duration is outside the service limits. Trim it and try again.', + 'voice_provider_protocol': 'The voice service returned an invalid response or pagination did not finish. Check its API version.', + 'voice_provider_error': 'The voice service request failed. Check the connection and account permissions.', + 'voice_provider_timeout': 'The voice service timed out. Check its status and try again.', "moss_speech_text": "Enter the text to read aloud.", "moss_speech_voice": "Enter a Voice ID available to your MOSS account.", "moss_speech_reference": "MOSS speech generation does not accept references. Enter speech text and a Voice ID.", @@ -77,6 +97,10 @@ def localized_error_for_language( if generic and status in {413, 502, 504}: return ENGLISH_BY_STATUS[status] specific = None if code == "operation_rejected" else ENGLISH_BY_CODE.get(code) + if code == 'voice_provider_error': + from opendirector.domain.voices import VOICE_MESSAGES + detail = chinese.removeprefix(VOICE_MESSAGES[code]).strip() + return specific + (' ' + detail if detail else '') return ( specific or ENGLISH_BY_STATUS.get(status) diff --git a/apps/api/src/opendirector_api/main.py b/apps/api/src/opendirector_api/main.py index d6dcac7f3..0e6a7f5c9 100644 --- a/apps/api/src/opendirector_api/main.py +++ b/apps/api/src/opendirector_api/main.py @@ -26,6 +26,7 @@ from opendirector_api.creation import creation_routes from opendirector_api.agent import agent_routes from opendirector_api.library import library_routes +from opendirector_api.voices import voice_routes from opendirector_api.localization import localized_error from opendirector_api.models import (ModelConfigInput, ModelConfigPublic, AgentModelTest, ModelCapabilityRequest, ModelDiscoveryRequest, ModelBatchInput, @@ -68,6 +69,7 @@ async def lifespan(app): app.include_router(creation_routes(creation_projects, creation_generation)) app.include_router(agent_routes(creation_projects, creation_generation, model_configs, chat_provider)) app.include_router(library_routes(creation_projects)) + app.include_router(voice_routes(creation_generation.voices)) @app.exception_handler(RequestValidationError) async def invalid_request(request, error): diff --git a/apps/api/src/opendirector_api/voices.py b/apps/api/src/opendirector_api/voices.py new file mode 100644 index 000000000..57051b9ad --- /dev/null +++ b/apps/api/src/opendirector_api/voices.py @@ -0,0 +1,97 @@ +"""HTTP adapter for the shared provider voice registry.""" +from uuid import UUID + +from fastapi import APIRouter, Query, Request, Response +from starlette.concurrency import run_in_threadpool +from starlette.datastructures import UploadFile +from starlette.formparsers import MultiPartException, MultiPartParser + +from opendirector.domain.projects import ProjectError +from opendirector.domain.voices import VOICE_CREATE_TEXT_LIMITS, voice_error + + +_FORM_LIMITS = {'name': 200, 'connectionId': 200, 'consent': 4000} +_TEXT_LIMITS = {**_FORM_LIMITS, **{field: limit for field, (limit, _) in VOICE_CREATE_TEXT_LIMITS.items()}} + + +class _VoiceUploadParser(MultiPartParser): + def on_part_data(self, data, start, end): + # Four bytes per character allows every valid UTF-8 value. Report the + # field even when an oversized part is rejected before it is decoded. + part = self._current_part + if part.file is None and part.field_name in VOICE_CREATE_TEXT_LIMITS: + limit, code = VOICE_CREATE_TEXT_LIMITS[part.field_name] + if len(part.data) + end - start > 4 * limit: + raise voice_error(code) + super().on_part_data(data, start, end) + + +async def _voice_upload(request, max_bytes): + if request.headers.get('content-type', '').partition(';')[0].strip().lower() != 'multipart/form-data': + raise ProjectError('请通过 multipart/form-data 表单上传音色录音。', 415, code='voice_upload_type') + # Allow four UTF-8 bytes per text character, plus bounded multipart headers. + body_limit = max_bytes + 4 * sum(_TEXT_LIMITS.values()) + 16384 + + async def bounded_stream(): + total = 0 + async for chunk in request.stream(): + total += len(chunk) + if total > body_limit: + raise voice_error('voice_size', 413) + yield chunk + + parser = _VoiceUploadParser(request.headers, bounded_stream(), max_files=1, max_fields=len(_TEXT_LIMITS), + max_part_size=4 * max(_TEXT_LIMITS.values())) + try: + form = await parser.parse() + except MultiPartException: + raise ProjectError('无法解析音色上传表单,请检查录音和文本字段。', 422, code='voice_upload_form') from None + try: + audio = form.get('audio_sample') + if not isinstance(audio, UploadFile) or not audio.filename or len(audio.filename) > 255: + raise voice_error('voice_audio_invalid') + if audio.size is None or audio.size > max_bytes: + raise voice_error('voice_size', 413) + fields = {} + for field, value in form.multi_items(): + if field == 'audio_sample' and value is audio: + continue + if (field not in _TEXT_LIMITS or field in fields or not isinstance(value, str) + or (field in _FORM_LIMITS and len(value) > _FORM_LIMITS[field])): + raise ProjectError('音色上传表单的字段或长度无效,请检查后重试。', 422, code='voice_upload_form') + fields[field] = value + return audio.filename, await audio.read(), fields + finally: + await form.close() + + +def voice_routes(voices): + router = APIRouter(prefix='/api/voices') + + @router.get('') + async def list_voices(modelConfigId: UUID, pageSize: int | None = Query(default=None, ge=1, le=150), + after: str | None = Query(default=None, min_length=1, max_length=2048), + connectionId: str | None = Query(default=None, min_length=1, max_length=200)): + return await run_in_threadpool(voices.list, str(modelConfigId), page_size=pageSize, after=after, + connection_id=connectionId) + + @router.post('') + async def create_voice(request: Request, modelConfigId: UUID): + _, capabilities = await run_in_threadpool(voices._config, str(modelConfigId)) + filename, data, fields = await _voice_upload(request, capabilities['maxBytes']) + return await run_in_threadpool(voices.create, str(modelConfigId), data, filename=filename, + name=fields.get('name', ''), consent=fields.get('consent'), + connection_id=fields.get('connectionId'), ref_text=fields.get('refText'), + speaker_description=fields.get('speakerDescription')) + + @router.delete('/{voice_id}', status_code=204) + async def delete_voice(voice_id: str, modelConfigId: UUID, connectionId: str = Query(max_length=200)): + await run_in_threadpool(voices.delete, str(modelConfigId), voice_id, connectionId) + return Response(status_code=204) + + @router.get('/{voice_id}/preview') + async def preview_voice(voice_id: str, modelConfigId: UUID, connectionId: str = Query(max_length=200)): + data, mime = await run_in_threadpool(voices.preview, str(modelConfigId), voice_id, connectionId) + return Response(content=data, media_type=mime, headers={'Cache-Control': 'no-store'}) + + return router diff --git a/docs/development/i18n.md b/docs/development/i18n.md index a480cbfdf..e70dc2355 100644 --- a/docs/development/i18n.md +++ b/docs/development/i18n.md @@ -97,6 +97,7 @@ npm run check:i18n | 画布外壳 | [canvasShell.ts](../../src/i18n/messages/zh-CN/canvasShell.ts) | [canvasShell.ts](../../src/i18n/messages/en-US/canvasShell.ts) | | 画布工作区 | [canvasWorkspace.ts](../../src/i18n/messages/zh-CN/canvasWorkspace.ts) | [canvasWorkspace.ts](../../src/i18n/messages/en-US/canvasWorkspace.ts) | | 生成器 | [generation.ts](../../src/i18n/messages/zh-CN/generation.ts) | [generation.ts](../../src/i18n/messages/en-US/generation.ts) | +| 音色库 | [voiceLibrary.ts](../../src/i18n/messages/zh-CN/voiceLibrary.ts) | [voiceLibrary.ts](../../src/i18n/messages/en-US/voiceLibrary.ts) | | 时间线 | [timeline.ts](../../src/i18n/messages/zh-CN/timeline.ts) | [timeline.ts](../../src/i18n/messages/en-US/timeline.ts) | | 素材库 | [library.ts](../../src/i18n/messages/zh-CN/library.ts) | [library.ts](../../src/i18n/messages/en-US/library.ts) | | 助手 | [assistant.ts](../../src/i18n/messages/zh-CN/assistant.ts) | [assistant.ts](../../src/i18n/messages/en-US/assistant.ts) | diff --git a/docs/development/validation.md b/docs/development/validation.md index 636a08ecb..20999fafa 100644 --- a/docs/development/validation.md +++ b/docs/development/validation.md @@ -202,7 +202,24 @@ MOSS 图像与语音接入使用以下检查。浏览器命令连接本文前述 ```sh .venv/bin/python -m pytest tests/test_moss.py tests/test_generation_errors.py -q CREATION_API_URL=http://127.0.0.1:8019 CREATION_WEB_URL=http://127.0.0.1:5179 node tests/browser/moss_provider.mjs -CREATION_API_URL=http://127.0.0.1:8019 CREATION_WEB_URL=http://127.0.0.1:5179 node tests/browser/moss_speech.mjs ``` Python 用例使用模拟 HTTP 服务及真实 PNG、MP3,检查请求字段、音色、执行快照、文件探测、工程重开和下载恢复不重复生成。通用错误分类和安全提示由现有错误测试负责。浏览器用例检查两种语言下的提供商及型号列表、获取模型失败的具体原因、音色必填、保存重开和实际音频播放;播放器使用隔离服务的 WAV 替身,不代表 MOSS 已生成语音。真实验收另需有效 MOSS 凭证和音色 ID,并保留实际音频、模型标识及播放器截图。 + + +### Voice library / 音色库 + +The voice browser workflow uses a separate isolated fixture. It runs the real shared voice service, media probing, project storage and generation acceptance with mocked provider HTTP; it does not contact MOSS or a GPU service. + +```sh +.venv/bin/python -m pytest tests/test_voice_library.py -q +node --test tests/voiceLibrary.test.ts tests/creationParameters.test.ts +# Terminal 1 +.venv/bin/python tests/browser/voice_library_server.py --port 8030 +# Terminal 2 +OPENDIRECTOR_API_URL=http://127.0.0.1:8030 npm run dev -- --port 5190 +# Terminal 3 (Playwright installed as for the other browser checks) +CREATION_API_URL=http://127.0.0.1:8030 CREATION_WEB_URL=http://127.0.0.1:5190 node tests/browser/voice_library.mjs +``` + +The bilingual browser workflow covers opening/outside click/Escape, keyboard tabs, four-column and narrow layouts, real previews and unavailable previews, metadata filters, scoped favorites, loading/error/retry, invalid and valid local audio, creation, selection, Drama3 transcript and Nano reference requirements, supported deletion and failure feedback, model/service switching, project reopening and persisted job input. `moss_speech.mjs` is retained as an alias for this integrated workflow. The pagination regression includes a 15,001-voice catalog. With a configured MOSS account, open the library, go to the next page, and return to the first. Verify the page counts and that returning to the first page restores its entries using read-only requests. Python tests verify provider fields, pagination, credentials, account boundaries, actual audio/container/duration validation, and equivalent Agent operations. Actual provider synthesis still requires a configured service, account permission and a recording authorized for use. diff --git a/docs/guides/cli.md b/docs/guides/cli.md index 5ddb23869..d8cdad2b9 100644 --- a/docs/guides/cli.md +++ b/docs/guides/cli.md @@ -60,3 +60,27 @@ Agent 的 Shell 通过 PATH 使用同一个 `opendirector`。宿主提供受令 `generation-spec update` replaces the complete configuration. Read it with `opendirector query object.get --object-id `, edit the intended fields, and submit the complete object as `payload.spec` with its current `expectedVersions`. Keep `purpose`, `modelConfigId`, `prompt`, `promptContent`, `parameters`, and `currentResultId`; use explicit `null` to clear nullable fields. `--spec` accepts a JSON object, not a UUID, and overrides the entire `payload.spec` from `--file`. If the file already contains the configuration, use `opendirector generation-spec update --file update.json` without `--spec`. Query assets with `query object.get` and obtain preview access with `query asset.preview`; `query asset` is not supported. + + +## Voice library + +`opendirector voice list --model MODEL_CONFIG_UUID` reads the full library and returns the selected model's connection identity, voices and adapter requirements. For a large MOSS library, request up to 150 voices per page. + +```sh +opendirector voice list --model MODEL_CONFIG_UUID --page-size 150 +opendirector voice list --model MODEL_CONFIG_UUID --page-size 150 --after "NEXT_CURSOR" --connection "CONNECTION_ID" +``` + +Use the previous response's `nextCursor` and `connectionId` for each following page. Stop when `nextCursor` is `null`. The Agent tool `voice_list` accepts `pageSize`, `after`, and `connectionId` for the same workflow. + +MOSS 音色较多时,首次查询加上 `--page-size 150`。下一页沿用该参数,把上一页返回的 `nextCursor` 和 `connectionId` 分别传给 `--after` 和 `--connection`。当 `nextCursor` 为 `null` 时,已经读到最后一页。 + +To register an authorized recording, run the following command. + +```sh +opendirector voice create recording.wav --model MODEL_CONFIG_UUID --connection CONNECTION_ID --name Narrator --consent CONSENT_RECORDING_ID --ref-text "Words spoken in the recording" +``` + +Use the returned `voiceId` as the speech parameter `voice`, and preserve the returned selection fields as `voiceSelection` when updating the audio generation specification. Use `opendirector generation-spec update --help-field payload.spec@audio.parameters.voiceSelection` to inspect the current typed fields. Do not copy voice identities across connections. `opendirector voice delete VOICE_ID --model MODEL_CONFIG_UUID --connection CONNECTION_ID` immediately deletes the uploaded voice if the provider supports deletion. Obtain authorization for that specific voice before invoking the CLI or Agent tool. The composer asks for confirmation in the UI. These commands use the same services as the UI and Agent tools. + +音色库命令同样适用于中文工作流:先用 `voice list` 读取当前模型的连接身份及要求,再用 `voice create` 上传已获授权的录音;Drama3 等适配器必须填写 `--ref-text`。保存生成配置时同时保留服务端 `voiceId` 和返回的音色选择信息。不同服务之间不能直接复用音色 ID。`voice delete` 仅删除服务支持的上传音色,CLI 和 Agent 会立即执行,请先取得针对该音色的明确授权。在界面中删除时会弹出确认框。 diff --git a/docs/guides/user-guide.md b/docs/guides/user-guide.md index 5e7751dc3..645b49b10 100644 --- a/docs/guides/user-guide.md +++ b/docs/guides/user-guide.md @@ -85,7 +85,15 @@ For video generation, choose a mode supported by the model: - **First and last frames**: Connect up to two image sources and assign them to the first- and last-frame slots. Last-frame support depends on the model's capabilities and the guidance in the interface. - **Continuation**: Select a model that supports continuation and a source video. If the service restarts or the source is no longer available, you may need to regenerate the source video. -For audio generation, enter the text to be read aloud in the prompt and choose a voice supported by the service in the parameters. +For audio generation, enter the text to be read aloud in the prompt. Supported vLLM-Omni speech models and MOSS Open Platform offer **Voice library** beside the model controls. The library opens above the composer with **All voices**, **My voices**, and **Favorites**. Click a compatible voice’s name to select it. When a preview is available, click the circular play button to listen. When a compatible voice has no preview, its icon and card background also select it. Metadata filters appear only when supplied by the service. + +On MOSS Open Platform, select the stable `moss-tts-1.5-flash` or `moss-tts-1.0-pro` model, or choose its dated snapshot to pin a version. All four use the same voice library on a given account connection. The library shows up to 150 MOSS voices per page. Use **Next page** and **Previous page** to browse. Filters and the Favorites tab show matches on the current page. + +Choose **Create voice** to upload a local recording, name it, and review its playback, format, size and duration before submitting. vLLM-Omni requires the consent recording ID; adapters such as Drama3 also require the recording transcript. MOSS-TTS-Nano needs a registered voice with reference audio: a listed `default` voice is insufficient. This upload registers the voice with the selected service without adding a canvas reference node. + +Selected voices are saved in the project; favorites are saved as browser preferences. Both are scoped to the configured service and account. Compatible models sharing a service can retain the selection; another service or account requires its own registered voice. Use a voice’s secondary menu to copy its provider ID or delete an uploaded voice where supported. Deletion requires confirmation; MOSS deletion is unavailable until its API supports it. Service errors are shown without credentials; an unsupported model keeps its existing voice controls. + +Agents use the same validation through `voice_list`, `voice_create`, and `voice_delete`. The [business CLI](cli.md) also exposes `voice list`, `voice create`, and `voice delete`. ## Monitor and manage generation tasks diff --git a/docs/guides/user-guide.zh-CN.md b/docs/guides/user-guide.zh-CN.md index c29d709b6..5a7835535 100644 --- a/docs/guides/user-guide.zh-CN.md +++ b/docs/guides/user-guide.zh-CN.md @@ -85,7 +85,15 @@ HTTP 400。 - **首尾帧**:最多连接两个图片来源,按槽位选择首帧和尾帧;能否使用尾帧以模型能力和界面提示为准。 - **接续**:选择支持该功能的模型和来源视频。服务重启或来源不再可用时,可能需要重新生成来源视频。 -音频生成时,在提示词中填写需要朗读的正文,在参数中选择服务支持的音色。 +音频生成时,在提示词中填写需要朗读的正文。受支持的 vLLM-Omni 语音模型和 MOSS 开放平台会在模型控件旁显示**音色库**。点击后在创作区上方打开**全部音色 / 我的音色 / 收藏**。点击兼容音色的名称即可选用。有试听音频时,点击圆形播放按钮即可试听。兼容音色没有试听音频时,点击图标或卡片空白处也可以选用。筛选项仅根据服务实际提供的元数据显示。 + +在 MOSS 开放平台上,可选择稳定版 `moss-tts-1.5-flash` 或 `moss-tts-1.0-pro`,也可以选择带日期的快照来固定版本。同一账户连接下,这四个型号共用音色库。每页最多显示 150 个 MOSS 音色,点击**下一页**或**上一页**可以翻页。筛选和收藏标签显示当前页中符合条件的音色。 + +选择**创建音色**,上传本地录音、填写名称,并在提交前检查试听、格式、大小和时长。vLLM-Omni 需要填写授权录音 ID;Drama3 等适配器还必须填写录音逐字稿。MOSS-TTS-Nano 需要带有参考音频的已注册音色,列表中的 `default` 不能代替录音。上传会直接在当前服务注册音色,不创建画布参考音频节点。 + +所选音色随工程保存,收藏作为浏览器偏好保存,均按服务连接和账户隔离。同一连接下的兼容模型可以保留选择;其他服务或账户必须单独注册音色。音色的更多操作菜单可复制服务端 ID,或在服务支持时删除上传音色。删除前需要确认;MOSS 尚未开放删除操作。服务错误不会显示凭据;不支持音色库的模型保留原有音色控件。 + +Agent 通过 `voice_list`、`voice_create`、`voice_delete` 使用同一套校验;[业务 CLI](cli.md) 也提供 `voice list`、`voice create`、`voice delete`。 ## 查看和处理生成任务 diff --git a/packages/core/src/opendirector/agent/tools.py b/packages/core/src/opendirector/agent/tools.py index 369f13dca..bc38ac225 100644 --- a/packages/core/src/opendirector/agent/tools.py +++ b/packages/core/src/opendirector/agent/tools.py @@ -10,11 +10,13 @@ from opendirector.application.creation_artifacts import publish_artifact from opendirector.application.creation_assets import CreationAssets from opendirector.application.creation_canvas import CreationCanvas +from opendirector.application.voice_library import VoiceLibrary from opendirector.domain.creation.assets import AssetProvenance from opendirector.domain.creation.base import ObjectVersion from opendirector.domain.creation.commands import Query, COMMAND_MODELS, parse_command from opendirector.domain.creation.models import ModelSnapshot from opendirector.domain.projects import ProjectError +from opendirector.domain.voices import VOICE_CREATE_TEXT_LIMITS from opendirector.infrastructure.creation_projects import directory from opendirector.infrastructure.local_projects import child @@ -248,6 +250,23 @@ def tools() -> list[dict]: {'type': 'object', 'properties': {'type': command_type, 'payload': {'type': 'object'}, 'expectedVersions': versions, 'expectedPreview': {'type': ['string', 'null']}}, '$defs': definitions, 'required': ['type', 'payload'], 'additionalProperties': False})) + for name, description, properties, required in [ + ('voice_list', 'Read the selected model voice library and compatibility requirements. For large MOSS libraries use pageSize 150. ' + 'Continue with nextCursor as after and the returned connectionId until nextCursor is null.', + {'modelConfigId': {'type': 'string', 'format': 'uuid'}, + 'pageSize': {'type': 'integer', 'minimum': 1, 'maximum': 150, 'description': 'MOSS voices per page. Omit to read the full library.'}, + 'after': {'type': 'string', 'minLength': 1, 'maxLength': 2048, 'description': 'Opaque nextCursor from the previous page. Supply pageSize and connectionId.'}, + 'connectionId': {'type': 'string', 'minLength': 1, 'maxLength': 200, 'description': 'Connection identity from the previous page.'}}, ['modelConfigId']), + ('voice_create', 'Register an authorized local recording as a reusable provider voice. For vLLM-Omni, supply the consent recording ID. Check voice_list for adapter requirements.', + {'modelConfigId': {'type': 'string', 'format': 'uuid'}, 'connectionId': {'type': 'string'}, + 'path': {'type': 'string'}, 'name': {'type': 'string'}, 'consent': {'type': 'string', 'minLength': 1, 'description': 'Consent recording ID for vLLM-Omni.'}, + **{field: {'type': 'string', 'maxLength': limit} for field, (limit, _) in VOICE_CREATE_TEXT_LIMITS.items()}}, + ['modelConfigId', 'connectionId', 'path', 'name']), + ('voice_delete', 'Call only after the user explicitly authorizes deletion of this uploaded voice. The tool sends the deletion request to the provider immediately.', + {'modelConfigId': {'type': 'string', 'format': 'uuid'}, 'connectionId': {'type': 'string'}, 'voiceId': {'type': 'string'}}, + ['modelConfigId', 'connectionId', 'voiceId']), + ]: + result.append(tool_schema(name, description, {'type': 'object', 'properties': properties, 'required': required, 'additionalProperties': False})) return result @@ -257,10 +276,30 @@ def __init__(self, projects, generation, configs): self.generation = generation self.configs = configs self.assets = CreationAssets(projects) + self.voices = getattr(generation, 'voices', None) or VoiceLibrary(configs) async def execute(self, project_id: UUID, turn_id: UUID, session: str, call_id: str, name: str, arguments: dict, roots: list[Path], config: dict | None, native_runtime: str | None = None, execution_directory: Path | None = None) -> JsonValue: + if name in {'voice_list', 'voice_create', 'voice_delete'}: + model_id = str(UUID(arguments['modelConfigId'])) + if name == 'voice_list': + return await asyncio.to_thread(self.voices.list, model_id, page_size=arguments.get('pageSize'), + after=arguments.get('after'), connection_id=arguments.get('connectionId')) + if name == 'voice_delete': + await asyncio.to_thread(self.voices.delete, model_id, arguments['voiceId'], arguments['connectionId']) + return {'deleted': True, 'voiceId': arguments['voiceId'], 'connectionId': arguments['connectionId']} + target = Path(arguments['path']).resolve() + if execution_directory is None or not target.is_relative_to(execution_directory.resolve()): + raise ProjectError('只能上传本轮执行目录内的录音。', 403) + _, capabilities = self.voices._config(model_id) + def recording(): + with target.open('rb') as stream: + return stream.read(capabilities['maxBytes'] + 1) + data = await asyncio.to_thread(recording) + return await asyncio.to_thread(self.voices.create, model_id, data, filename=target.name, + name=arguments['name'], consent=arguments.get('consent'), connection_id=arguments['connectionId'], + ref_text=arguments.get('refText'), speaker_description=arguments.get('speakerDescription')) if name == 'read_project': snapshot = await asyncio.to_thread(self.projects.snapshot, project_id) return {'project': snapshot.model_dump(mode='json'), 'models': self.configs.list(), 'commands': list(COMMANDS), diff --git a/packages/core/src/opendirector/application/creation_generation.py b/packages/core/src/opendirector/application/creation_generation.py index fc3228145..f8131ab50 100644 --- a/packages/core/src/opendirector/application/creation_generation.py +++ b/packages/core/src/opendirector/application/creation_generation.py @@ -14,6 +14,7 @@ from opendirector.application.creation_assets import CreationAssets from opendirector.application.creation_canvas import CreationCanvas, asset_ref, current_generation_inputs, visible_item_ids +from opendirector.application.voice_library import VoiceLibrary from opendirector.application.generation_runtime import GenerationRuntime, _self_hosted_video from opendirector.domain.creation.assets import AssetProvenance from opendirector.domain.creation.canvas import TextCanvasItem, ImageCanvasItem, VideoCanvasItem, AudioCanvasItem @@ -86,6 +87,7 @@ def __init__(self, projects, configs, provider=None): self.store = ProviderMedia(self) self.settings = gateway().settings(projects.local.repository) self.provider = provider or GenerationProviders(self.store) + self.voices = VoiceLibrary(configs) def directory(self, project_id): with self.projects.local.transaction() as db: @@ -273,6 +275,21 @@ def prepare(self, command, *, session=None, source='ui'): replay = self.projects.replay(command) if replay is not None: return replay + # Voice registries are remote services. Probe outside the catalog/file + # transaction, then compare the exact spec and private configuration + # again under commit so a slow/offline provider cannot freeze editing. + initial = self.projects.snapshot(command.projectId) + voice_spec = next((spec for spec in initial.generationSpecs if spec.id == command.payload.specId), None) + voice_config, voice_failure = None, None + if voice_spec is not None and voice_spec.kind == 'audio' and voice_spec.parameters.creationType == 'audio': + try: + voice_config = self.configs.resolve(str(voice_spec.modelConfigId), 'audio') + public = ModelConfigPublic.model_validate({key: value for key, value in voice_config.items() if key != 'apiKey'} | {'inputRules': input_rules(voice_config)}) + prepared_spec, references = current_generation_inputs(initial, voice_spec, public.inputRules) + validate_generation(prepared_spec, public, references) + self.voices.validate_selection(voice_config, prepared_spec.parameters.voice, prepared_spec.parameters.voiceSelection) + except (ValueError, ProjectError) as error: + voice_failure = error def accept(before): data = before.model_dump(mode='json') spec_data = CreationCanvas._get(data, 'generation_spec', command.payload.specId) @@ -310,6 +327,11 @@ def accept(before): spec = execution_spec(spec, resolved, public.inputRules) try: validate_generation(spec, public, resolved) + if spec.kind == 'audio' and spec.parameters.creationType == 'audio': + if old != voice_spec or config != voice_config: + raise ContractError('revision_conflict', '音色验证期间生成配置或模型服务已变化,请重新提交。', spec.id) + if voice_failure is not None: + raise voice_failure except (ValueError, ProjectError) as error: raise ContractError.from_error(error, spec.id) from error for reference in resolved: @@ -552,6 +574,10 @@ async def recover(self, project_id, job_id, session=None, *, explicit=False): try: config = self.configs.resolve(task['modelConfigId'], 'agent' if task['kind'] == 'text' else task['kind']) valid = (config['url'], config['modelId'], config['protocol'], config.get('videoAdapter', 'auto')) == (task['baseURL'], task['model'], task['protocol'], job.inputSnapshot.model.videoAdapter) + if valid and job.inputSnapshot.spec.kind == 'audio' and job.inputSnapshot.spec.parameters.voiceSelection is not None: + from opendirector.domain.voices import voice_library_capabilities + capabilities = voice_library_capabilities(config) + valid = capabilities is not None and capabilities['connectionId'] == job.inputSnapshot.spec.parameters.voiceSelection.connectionId except ProjectError: valid = False if not valid: diff --git a/packages/core/src/opendirector/application/voice_library.py b/packages/core/src/opendirector/application/voice_library.py new file mode 100644 index 000000000..ed5671864 --- /dev/null +++ b/packages/core/src/opendirector/application/voice_library.py @@ -0,0 +1,309 @@ +"""Shared voice registry operations for HTTP, Agent and generation acceptance.""" +import json +from pathlib import Path +import tempfile +from time import monotonic +from urllib.parse import quote, urlencode, urljoin, urlsplit + +import httpx + +from opendirector.domain.projects import ProjectError +from opendirector.domain.voices import VOICE_CREATE_TEXT_LIMITS, voice_error, voice_library_capabilities, valid_voice_name, voice_incompatibility +from opendirector.integrations.http_settings import auth_headers, trust_environment +from opendirector.integrations.volcengine import endpoint +from opendirector.media.probe import probe_file + + +# Trusted internal callers may omit the scope. Public adapters always pass the +# supplied connection, including None when a client omits a required field. +_CURRENT_CONNECTION = object() + + +class VoiceLibrary: + def __init__(self, configs, transport=None): + self.configs, self.transport = configs, transport + + def _config(self, model_config_id): + config = dict(self.configs.resolve(str(model_config_id), 'audio')) + capabilities = voice_library_capabilities(config) + if capabilities is None: raise voice_error('voice_library_unsupported', 409) + return config, capabilities + + def _request(self, config, method, suffix='', **kwargs): + try: + # Sync service runs in worker threads, including job preparation. + with httpx.Client(transport=self.transport, trust_env=trust_environment(config['url'], config=config), + timeout=httpx.Timeout(120, connect=15), follow_redirects=False) as client: + with client.stream(method, endpoint(config['url'], '/audio/voices') + suffix, + headers=auth_headers(config), **kwargs) as response: + data = bytearray() + for chunk in response.iter_bytes(): + data.extend(chunk) + if len(data) > 2 * 1024 * 1024: raise voice_error('voice_provider_protocol', 502) + if not response.is_success: + # Retain useful upstream detail; redact the configured credential + # before it reaches either the HTTP or Agent presentation boundary. + detail = self._provider_detail(data, config) + error = voice_error('voice_provider_error', response.status_code if 400 <= response.status_code < 500 else 502) + if detail: error.args = (str(error) + ' ' + detail,) + raise error + value = json.loads(data) if data else {} + if not isinstance(value, dict): raise voice_error('voice_provider_protocol', 502) + return value + except httpx.TimeoutException: + raise voice_error('voice_provider_timeout', 504) from None + except httpx.HTTPError: + raise voice_error('voice_provider_error', 502) from None + except (ValueError, TypeError): + raise voice_error('voice_provider_protocol', 502) from None + + @staticmethod + def _provider_detail(data, config): + try: + value = json.loads(data) + error = value.get('error', value.get('detail', '')) + detail = error.get('message', '') if isinstance(error, dict) else error + if not isinstance(detail, str): return '' + secret = config.get('apiKey', '') + if secret: detail = detail.replace(secret, '[redacted]') + return detail[:1000] + except (ValueError, AttributeError): return '' + + def _record(self, item, capabilities, *, source, has_audio=None, config=None): + if not isinstance(item, dict): raise voice_error('voice_provider_protocol', 502) + identity = item.get('id') + # vLLM-Omni also documents name-only uploads. Its registry keys are lowercase. + if 'id' not in item and capabilities['provider'] == 'vllm_omni' and source == 'uploaded': + name = item.get('name') + if valid_voice_name(name): + identity = name.strip().lower() + if not valid_voice_name(identity): raise voice_error('voice_provider_protocol', 502) + name = item.get('name') or identity + if not isinstance(name, str) or len(name) > 255: raise voice_error('voice_provider_protocol', 502) + text = item.get('ref_text') or None + if text is not None and (not isinstance(text, str) or len(text) > 100000): raise voice_error('voice_provider_protocol', 502) + if has_audio is None: + has_audio = source == 'uploaded' and (capabilities['provider'] == 'moss' or item.get('embedding_source', 'audio') == 'audio') + dimension = item.get('embedding_dim') + if not isinstance(dimension, int) or isinstance(dimension, bool) or not 0 < dimension <= 65536: + dimension = None + incompatible = voice_incompatibility(capabilities, has_audio, text, uploaded=source == 'uploaded', embedding_dim=dimension) + if config is not None: + model = config['modelId'].rsplit('/', 1)[-1].lower().replace('_', '-') + if model.startswith('qwen3-tts') and model.endswith(('voicedesign', 'voice-design', 'voice.design')): + incompatible = 'voice_model_unsupported' + metadata = {} + for field in ('gender', 'age', 'language', 'style', 'speaker_description', 'created_at', 'file_size', 'mime_type', 'embedding_source'): + value = item.get(field) + if isinstance(value, (str, int, float)) and not isinstance(value, bool): metadata[field] = str(value)[:2000] + if isinstance(item.get('voice_style'), str): metadata['style'] = item['voice_style'][:2000] + preview = None + preview_locator = None + locator = item.get('preview_url') or item.get('sample_url') + if config is not None and isinstance(locator, str) and 0 < len(locator) <= 8192: + try: + locator = urljoin(config['url'].rstrip('/') + '/', locator) + parsed = urlsplit(locator) + valid = parsed.scheme in {'http', 'https'} and parsed.hostname and not parsed.username and not parsed.password and not parsed.fragment + parsed.port + except ValueError: + valid = False + if valid: + preview_locator = locator + preview = '/api/voices/' + quote(identity, safe='') + '/preview?' + urlencode({'modelConfigId': config['id'], 'connectionId': capabilities['connectionId']}) + return dict(connectionId=capabilities['connectionId'], voiceId=identity, name=name, + hasReferenceAudio=has_audio, embeddingDim=dimension, refText=text, source=source, previewUrl=preview, + metadata=metadata, compatible=incompatible is None, incompatibility=incompatible, + canDelete=capabilities['canDelete'] and source == 'uploaded'), preview_locator + + def _vllm_page(self, config, capabilities): + value = self._request(config, 'GET') + names, uploaded = value.get('voices'), value.get('uploaded_voices', []) + if not isinstance(names, list) or not isinstance(uploaded, list) or len(names) + len(uploaded) > 10000: + raise voice_error('voice_provider_protocol', 502) + records = {} + for name in names: + record, locator = self._record({'id': name}, capabilities, source='builtin', has_audio=False, config=config) + records[record['voiceId']] = (record, locator) + seen_uploaded = set() + for item in uploaded: + record, locator = self._record(item, capabilities, source='uploaded', config=config) + identity = record['voiceId'] + if identity in seen_uploaded: raise voice_error('voice_provider_protocol', 502) + seen_uploaded.add(identity) + records[identity] = (record, locator) + return list(records.values()), None + + @staticmethod + def _valid_cursor(cursor): + return isinstance(cursor, str) and 0 < len(cursor) <= 2048 and cursor == cursor.strip() and cursor.isprintable() + + def _moss_page(self, config, capabilities, limit, after): + params = {'limit': limit} + if after is not None: + params['after'] = after + value = self._request(config, 'GET', params=params) + items, more = value.get('data'), value.get('has_more') + if not isinstance(items, list) or len(items) > limit or not isinstance(more, bool): + raise voice_error('voice_provider_protocol', 502) + cursor = value.get('next_cursor') + if more and (not items or not self._valid_cursor(cursor) or cursor == after): + raise voice_error('voice_provider_protocol', 502) + if not more and cursor not in (None, ''): + raise voice_error('voice_provider_protocol', 502) + return [self._record(item, capabilities, source='uploaded', config=config) for item in items], cursor if more else None + + def _assert_current(self, config, capabilities): + current, rules = self._config(config['id']) + if rules != capabilities or current['modelId'] != config['modelId']: + raise voice_error('voice_connection_changed', 409) + + def _pages(self, config, capabilities, limit, after=None): + # A complete traversal may span many pages. Fail explicitly on a cycle + # or elapsed deadline instead of imposing a voice-count ceiling. + config = dict(config) + deadline = monotonic() + 300 + seen_cursors = {after} + seen_ids = set() + while True: + self._assert_current(config, capabilities) + if capabilities['provider'] == 'moss': + records, cursor = self._moss_page(config, capabilities, limit, after) + else: + records, cursor = self._vllm_page(config, capabilities) + for record, _ in records: + identity = record['voiceId'] + if identity in seen_ids: raise voice_error('voice_provider_protocol', 502) + seen_ids.add(identity) + if cursor is not None and cursor in seen_cursors: + raise voice_error('voice_provider_protocol', 502) + if monotonic() >= deadline: + raise voice_error('voice_provider_timeout', 504) + self._assert_current(config, capabilities) + yield records, cursor + if cursor is None: + return + seen_cursors.add(cursor) + after = cursor + + def list(self, model_config_id, *, page_size=None, after=None, connection_id=None): + config, capabilities = self._config(model_config_id) + if connection_id is not None and connection_id != capabilities['connectionId']: + raise voice_error('voice_connection_changed', 409) + if page_size is not None and (type(page_size) is not int or not 1 <= page_size <= 150): + raise ProjectError('每页音色数量必须为 1 至 150。', 422) + if after is not None: + if connection_id is None: + raise voice_error('voice_connection_changed', 409) + if page_size is None or capabilities['provider'] != 'moss' or not self._valid_cursor(after): + raise ProjectError('音色分页游标无效,请重新打开音色库。', 422) + voices = [] + for records, cursor in self._pages(config, capabilities, page_size or 150, after): + voices.extend(record for record, _ in records) + if page_size is not None: + break + return dict(connectionId=capabilities['connectionId'], capabilities=capabilities, voices=voices, nextCursor=cursor) + + def _find(self, config, capabilities, voice_id): + for records, _ in self._pages(config, capabilities, 150): + for record, locator in records: + if record['voiceId'] == voice_id: + return record, locator + return None, None + + def create(self, model_config_id, data, *, filename, name, consent=None, ref_text=None, speaker_description=None, connection_id=_CURRENT_CONNECTION): + config, capabilities = self._config(model_config_id) + if connection_id is not _CURRENT_CONNECTION and connection_id != capabilities['connectionId']: + raise voice_error('voice_connection_changed', 409) + if not capabilities['supportsUploadedVoices']: raise voice_error('voice_model_unsupported') + if not valid_voice_name(name): raise voice_error('voice_name_invalid') + name = name.strip() + if capabilities['provider'] == 'vllm_omni' and (not isinstance(consent, str) or not consent.strip()): + raise voice_error('voice_consent_required') + for field, value in [('refText', ref_text), ('speakerDescription', speaker_description)]: + if value is None: continue + if not isinstance(value, str): raise ProjectError('音色上传的文本字段必须是字符串。', 422) + limit, code = VOICE_CREATE_TEXT_LIMITS[field] + if len(value) > limit: raise voice_error(code) + text = (ref_text or '').strip() or None + if capabilities['requiresTranscript'] and not text: raise voice_error('voice_transcript_required') + if not data or len(data) > capabilities['maxBytes']: raise voice_error('voice_size', 413) + extension = Path(filename).suffix.lower().lstrip('.') + if extension not in capabilities['formats']: raise voice_error('voice_format') + with tempfile.TemporaryDirectory(prefix='opendirector-voice-') as folder: + file = Path(folder) / ('sample.' + extension) + file.write_bytes(data) + try: media = probe_file(file, 'audio', include_container=True) + except ProjectError as error: + if error.status == 409: raise + raise voice_error('voice_audio_invalid') from None + # Validate actual demuxed container rather than trusting the filename. + expected = {'wav': {'wav'}, 'mp3': {'mp3'}, 'flac': {'flac'}, 'ogg': {'ogg'}, 'aac': {'aac'}, + 'webm': {'matroska', 'webm'}, 'm4a': {'mov', 'mp4', 'm4a'}, 'mp4': {'mov', 'mp4', 'm4a'}} + if not set(media['container'].split(',')) & expected[extension]: raise voice_error('voice_format') + seconds = media['durationSeconds'] + if (capabilities['minSeconds'] is not None and seconds < capabilities['minSeconds']) or (capabilities['maxSeconds'] is not None and seconds > capabilities['maxSeconds']): raise voice_error('voice_duration') + fields = {'name': name} + if capabilities['provider'] == 'vllm_omni': + fields['consent'] = consent.strip() + if text: fields['ref_text'] = text + if speaker_description: fields['speaker_description'] = speaker_description.strip() + mime = {'wav': 'audio/wav', 'mp3': 'audio/mpeg', 'm4a': 'audio/mp4', 'mp4': 'audio/mp4', 'flac': 'audio/flac', 'ogg': 'audio/ogg', 'aac': 'audio/aac', 'webm': 'audio/webm'}[extension] + value = self._request(config, 'POST', data=fields, files={'audio_sample': ('sample.' + extension, data, mime)}) + item = value.get('voice') if capabilities['provider'] == 'vllm_omni' else value + if not isinstance(item, dict): raise voice_error('voice_provider_protocol', 502) + if capabilities['provider'] == 'vllm_omni' and value.get('success') is not True: raise voice_error('voice_provider_protocol', 502) + record, _ = self._record(item, capabilities, source='uploaded', has_audio=True, config=config) + return record + + def preview(self, model_config_id, voice_id, connection_id): + config, capabilities = self._config(model_config_id) + if connection_id != capabilities['connectionId']: raise voice_error('voice_connection_changed', 409) + _, url = self._find(config, capabilities, voice_id) + if url is None: raise voice_error('voice_not_found', 404) + parsed, configured = urlsplit(url), urlsplit(config['url']) + def origin(value): return value.scheme, value.hostname, value.port or (443 if value.scheme == 'https' else 80) + headers = auth_headers(config) if origin(parsed) == origin(configured) else {} + try: + with httpx.Client(transport=self.transport, trust_env=trust_environment(url, config=config), timeout=30, follow_redirects=False) as client: + with client.stream('GET', url, headers=headers) as response: + mime = response.headers.get('content-type', '').split(';')[0].lower() + if not response.is_success or not mime.startswith('audio/'): raise voice_error('voice_provider_error', 502) + data = bytearray() + for chunk in response.iter_bytes(): + data.extend(chunk) + if len(data) > 10 * 1024 * 1024: raise voice_error('voice_size', 413) + self._assert_current(config, capabilities) + return bytes(data), mime + except httpx.TimeoutException: raise voice_error('voice_provider_timeout', 504) from None + except httpx.HTTPError: raise voice_error('voice_provider_error', 502) from None + + def delete(self, model_config_id, voice_id, connection_id): + _, capabilities = self._config(model_config_id) + if connection_id != capabilities['connectionId']: raise voice_error('voice_connection_changed', 409) + if not capabilities['canDelete']: raise voice_error('voice_delete_unsupported', 409) + listed = self.list(model_config_id) + record = next((voice for voice in listed['voices'] if voice['voiceId'] == voice_id), None) + if record is None: raise voice_error('voice_not_found', 404) + if not record['canDelete']: raise voice_error('voice_delete_unsupported', 409) + config, current = self._config(model_config_id) + if current['connectionId'] != connection_id: raise voice_error('voice_connection_changed', 409) + value = self._request(config, 'DELETE', '/' + quote(voice_id, safe='')) + if value.get('success') is not True: raise voice_error('voice_provider_protocol', 502) + + def validate_selection(self, config, voice_id, selection): + capabilities = voice_library_capabilities(config) + if selection is not None: + selection = selection.model_dump() if hasattr(selection, 'model_dump') else selection + if capabilities is None or selection['connectionId'] != capabilities['connectionId'] or selection['voiceId'] != voice_id: + raise voice_error('voice_connection_changed', 409) + if capabilities is None: + return + if not selection and not capabilities['requiresReferenceAudio'] and capabilities['supportsUploadedVoices']: + if not voice_id or not capabilities['requiresTranscript']: + return + if not voice_id: raise voice_error('voice_reference_required') + if voice_id == 'default' and capabilities['requiresReferenceAudio']: raise voice_error('voice_reference_required') + record, _ = self._find(config, capabilities, voice_id) + if record is None: raise voice_error('voice_not_found', 409) + if not record['compatible']: raise voice_error(record['incompatibility']) diff --git a/packages/core/src/opendirector/cli.py b/packages/core/src/opendirector/cli.py index 34ab4646a..946f5fdcd 100644 --- a/packages/core/src/opendirector/cli.py +++ b/packages/core/src/opendirector/cli.py @@ -29,6 +29,7 @@ GROUP_HELP = { "project": "List, inspect, create, rename, trash or restore projects.", "model": "Inspect available model configurations and input capabilities.", + "voice": "List, create or delete voices on a configured speech service.", "asset": "Import files, write text and manage registered project assets.", "canvas": "Display, arrange, hide and configure canvas items.", "video": "Create video generation nodes with model settings and references.", @@ -544,5 +545,60 @@ def main(): raise SystemExit(1) +@group('voice').command('list', help='Read the voice library and model requirements. For large MOSS libraries use --page-size 150.') +def voice_list(ctx: typer.Context, + model: Annotated[UUID, typer.Option(help='Speech model configuration UUID.')], + page_size: Annotated[int | None, typer.Option(min=1, max=150, help='MOSS voices per page. Omit to read the full library.')] = None, + after: Annotated[str | None, typer.Option(help='Continue from the previous nextCursor using --page-size and --connection.')] = None, + connection: Annotated[str | None, typer.Option(help='Connection ID from the previous page.')] = None): + client = ctx.obj + client.command = ctx.command_path + arguments = {'modelConfigId': str(model)} + if page_size is not None: arguments['pageSize'] = page_size + if after is not None: arguments['after'] = after + if connection is not None: arguments['connectionId'] = connection + emit(client.call('voice_list', arguments) if client.live else client.request('GET', '/api/voices', params=arguments)) + + +@group('voice').command('create', help='Upload an authorized recording to the speech model voice library.') +def voice_create(ctx: typer.Context, + file: Annotated[Path, typer.Argument(exists=True, dir_okay=False, readable=True)], + model: Annotated[UUID, typer.Option(help='Speech model configuration UUID.')], + connection: Annotated[str, typer.Option(help='Connection identity from voice list.')], + name: Annotated[str, typer.Option(help='Readable voice name.')], + consent: Annotated[str | None, typer.Option(help='Consent recording ID (required by vLLM-Omni).')] = None, + ref_text: Annotated[str | None, typer.Option(help='Accurate transcript, required by some models.')] = None, + speaker_description: Annotated[str | None, typer.Option(help='Optional provider voice description.')] = None): + client = ctx.obj + client.command = ctx.command_path + fields = dict(connectionId=connection, name=name) + if consent is not None: fields['consent'] = consent + if ref_text is not None: fields['refText'] = ref_text + if speaker_description is not None: fields['speakerDescription'] = speaker_description + if client.live: + emit(client.call('voice_create', {**fields, 'modelConfigId': str(model), 'path': str(file.resolve())})) + else: + from opendirector.domain.voices import voice_error + with file.open('rb') as stream: data = stream.read(10 * 1024 * 1024 + 1) + if len(data) > 10 * 1024 * 1024: raise voice_error('voice_size', 413) + emit(client.request('POST', '/api/voices', params={'modelConfigId': str(model)}, + data=fields, files={'audio_sample': (file.name, data)})) + + +@group('voice').command('delete', help='Delete a provider-supported uploaded voice with explicit authorization.') +def voice_delete(ctx: typer.Context, + voice_id: Annotated[str, typer.Argument(help='Provider voice identity.')], + model: Annotated[UUID, typer.Option(help='Speech model configuration UUID.')], + connection: Annotated[str, typer.Option(help='Connection identity from voice list.')]): + client = ctx.obj + client.command = ctx.command_path + arguments = dict(modelConfigId=str(model), connectionId=connection, voiceId=voice_id) + if client.live: emit(client.call('voice_delete', arguments)) + else: + response = client.http.delete('/api/voices/' + quote(voice_id, safe=''), params={'modelConfigId': str(model), 'connectionId': connection}) + if not response.is_success: raise ProjectError(response.text, response.status_code) + emit({'deleted': True, 'voiceId': voice_id, 'connectionId': connection}) + + if __name__ == "__main__": main() diff --git a/packages/core/src/opendirector/domain/creation/commands.py b/packages/core/src/opendirector/domain/creation/commands.py index bf78f154d..6bdf19b2b 100644 --- a/packages/core/src/opendirector/domain/creation/commands.py +++ b/packages/core/src/opendirector/domain/creation/commands.py @@ -397,7 +397,12 @@ def command_fingerprint(command: Command) -> str: IssueCode = Literal['invalid_input', 'revision_conflict', 'role_restricted', 'missing_object', 'reference_invalid', 'capability_unsupported', 'preview_expired', 'storage_unavailable', 'submission_unknown', 'provider_error', 'moss_speech_text', 'moss_speech_voice', 'moss_speech_reference', 'moss_prompt_limit', - 'moss_image_size', 'moss_image_reference', 'moss_layout_reference'] + 'moss_image_size', 'moss_image_reference', 'moss_layout_reference', + 'voice_library_unsupported', 'voice_connection_changed', 'voice_reference_required', + 'voice_transcript_required', 'voice_transcript_too_long', 'voice_description_too_long', + 'voice_not_found', 'voice_delete_unsupported', + 'voice_consent_required', 'voice_name_invalid', 'voice_audio_invalid', 'voice_format', + 'voice_size', 'voice_duration', 'voice_provider_protocol', 'voice_provider_error', 'voice_provider_timeout', 'voice_model_unsupported'] class ContractIssue(Contract): diff --git a/packages/core/src/opendirector/domain/creation/generation.py b/packages/core/src/opendirector/domain/creation/generation.py index 76d74959b..974f43e0a 100644 --- a/packages/core/src/opendirector/domain/creation/generation.py +++ b/packages/core/src/opendirector/domain/creation/generation.py @@ -1,5 +1,6 @@ """Generation intent, references and fixed execution facts, independent of nodes.""" import math +import re from typing import Annotated, Literal from datetime import datetime from uuid import UUID @@ -53,10 +54,22 @@ def reference_music_seconds(reference_seconds): return min(MUSIC_SECONDS[1], max(MUSIC_SECONDS[0], math.ceil(reference_seconds * REFERENCE_LENGTH_HEADROOM))) +class VoiceSelection(Contract): + connectionId: str = Field(min_length=1, max_length=200, description='Opaque voice service identity.') + voiceId: str = Field(min_length=1, max_length=200, pattern=r'^[^/\\\x00-\x1f\x7f]+$', description='Provider voice identity.') + name: str = Field(min_length=1, max_length=255, description='Readable provider voice name.') + source: Literal['builtin', 'uploaded'] = Field(description='Provider voice source; used to check checkpoint compatibility.') + hasReferenceAudio: bool = Field(description='Provider reports a registered reference recording.') + embeddingDim: int | None = Field(default=None, ge=1, le=65536, description='Registered reference embedding dimension, when the provider reports one.') + refText: str | None = Field(default=None, max_length=100000, description='Provider reference transcript, when available.') + + class AudioParameters(Contract): creationType: Literal['audio', 'music'] = Field(default='audio', description='Speech or music creation mode.') mode: Literal['tts', 'unified'] = Field(default='tts', description='Operation mode within this contract variant.') - voice: str | None = Field(default=None, pattern=STORED_VOICE_PATTERN, description='Provider voice identifier or name.') + voice: str | None = Field(default=None, max_length=200, description='Provider voice identifier or name; library voices retain provider naming.') + voiceSelection: VoiceSelection | None = Field(default=None, exclude_if=lambda value: value is None, + description='Connection-scoped voice selection; validated against the live registry before generation.') # Legacy: a release stored an explicit instrumental choice. It stays readable # so those specs and job fingerprints still load; generation ignores it. instrumental: bool = Field(default=False, exclude_if=lambda value: value is False, description='Legacy explicit instrumental choice retained for stored records.') @@ -75,6 +88,15 @@ class AudioParameters(Contract): description='Music with one audio reference: cap the length at the reference length (unset follows it) ' 'instead of durationSeconds') + @model_validator(mode='after') + def voice_identity(self): + if self.voiceSelection is not None: + if self.voice != self.voiceSelection.voiceId: + raise ValueError('Selected voice must match the provider voice identity') + elif self.voice is not None and not re.fullmatch(STORED_VOICE_PATTERN, self.voice): + raise ValueError('Invalid service voice identity; select a voice from the library') + return self + class PromptText(Contract): type: Literal['text'] = Field(description='Operation or variant discriminator.') diff --git a/packages/core/src/opendirector/domain/creation/models.py b/packages/core/src/opendirector/domain/creation/models.py index 120f7d085..163ce5ca0 100644 --- a/packages/core/src/opendirector/domain/creation/models.py +++ b/packages/core/src/opendirector/domain/creation/models.py @@ -28,8 +28,25 @@ class ImageOutput(Contract): size: str = Field(pattern=r'^(?:2K|[1-9]\d{2,3}x[1-9]\d{2,3})$', description='Supported image dimensions or size preset.') +class VoiceLibraryCapabilities(Contract): + provider: Literal['vllm_omni', 'moss'] = Field(description='Voice registry protocol.') + connectionId: str = Field(min_length=1, max_length=200, description='Opaque service, endpoint and account identity.') + requiresTranscript: bool = Field(description='Registered voice must have a reference transcript.') + requiresReferenceAudio: bool = Field(description='Registered voice must have actual reference audio.') + supportsUploadedVoices: bool = Field(default=True, description='Selected model checkpoint accepts uploaded registry voices.') + referenceEmbeddingDimension: int | None = Field(default=None, ge=1, le=65536, + description='Accepted registered reference embedding dimension; null requires actual reference audio when required.') + canDelete: bool = Field(description='Provider supports uploaded voice deletion.') + maxBytes: int = Field(ge=1, description='Maximum audio sample bytes.') + formats: tuple[str, ...] = Field(description='Supported recording file extensions.') + minSeconds: float | None = Field(description='Minimum recording duration, if documented.') + maxSeconds: float | None = Field(description='Maximum recording duration, if documented.') + + class InputRules(Contract): profile: str = Field(min_length=1, max_length=100, description='Model capability profile.') + voiceLibrary: VoiceLibraryCapabilities | None = Field(default=None, exclude_if=lambda value: value is None, + description='Supported voice registry and adapter requirements; omitted for unsupported models.') maxPromptCharacters: Annotated[int, Field(strict=True, ge=1)] | None = Field( default=None, exclude_if=lambda value: value is None, description='Maximum characters in the final prompt including text references.') voiceRequired: bool | None = Field(default=None, exclude_if=lambda value: value is None, diff --git a/packages/core/src/opendirector/domain/input_rules.py b/packages/core/src/opendirector/domain/input_rules.py index 5989181c7..f014af489 100644 --- a/packages/core/src/opendirector/domain/input_rules.py +++ b/packages/core/src/opendirector/domain/input_rules.py @@ -114,6 +114,11 @@ def _adapter_rules(config): def input_rules(config): rules = _adapter_rules(config) + if config['kind'] == 'audio': + from .voices import voice_library_capabilities + library = voice_library_capabilities(config) + if library is not None: + rules['voiceLibrary'] = library if config['kind'] == 'video': rules['generateAudioOptions'] = [True, False] if config.get('protocol') == 'volcengine' else [True] if config['kind'] == 'image' and rules['profile'] != 'vllm-omni-segmentation': diff --git a/packages/core/src/opendirector/domain/moss_speech.py b/packages/core/src/opendirector/domain/moss_speech.py index 32e4756b1..72131ecbd 100644 --- a/packages/core/src/opendirector/domain/moss_speech.py +++ b/packages/core/src/opendirector/domain/moss_speech.py @@ -5,14 +5,18 @@ from .projects import ProjectError -MOSS_SPEECH_MODEL = 'moss-tts-1.5-flash' +MOSS_SPEECH_MODELS = frozenset({ + 'moss-tts-1.5-flash', 'moss-tts-1.0-pro', + 'moss-tts-1.5-flash-2026-06-26', 'moss-tts-1.0-pro-2026-02-07', +}) def is_moss_speech(config): url = urlsplit(config.get('url', '')) return (config.get('kind') == 'audio' and config.get('protocol') == 'openai' + and config.get('connectionType', 'api') == 'api' and url.scheme == 'https' and url.hostname == 'api.mosi.cn' and url.port in {None, 443} - and url.path.rstrip('/') == '/v1' and config.get('modelId') == MOSS_SPEECH_MODEL) + and url.path.rstrip('/') == '/v1' and config.get('modelId') in MOSS_SPEECH_MODELS) def validate_moss_speech_input(text, voice): diff --git a/packages/core/src/opendirector/domain/voices.py b/packages/core/src/opendirector/domain/voices.py new file mode 100644 index 000000000..791bcd538 --- /dev/null +++ b/packages/core/src/opendirector/domain/voices.py @@ -0,0 +1,106 @@ +"""Provider voice identity and model-specific registered-reference requirements.""" +import hashlib +import json +import re +from urllib.parse import urlsplit, urlunsplit + +from .moss_speech import is_moss_speech +from .projects import ProjectError + +# Character limits and the corresponding error for each upload metadata field. +VOICE_CREATE_TEXT_LIMITS = { + 'refText': (100_000, 'voice_transcript_too_long'), + 'speakerDescription': (4_000, 'voice_description_too_long'), +} + +VOICE_MESSAGES = { + 'voice_library_unsupported': '当前模型没有已确认支持的音色库,请选择受支持的语音模型。', + 'voice_model_unsupported': '当前模型版本不支持使用已上传音色,请选择支持音色克隆的 Base 模型或兼容的内置音色。', + 'voice_connection_changed': '音色所属服务或账户已变化,请重新打开音色库并选择音色。', + 'voice_reference_required': '当前模型需要已注册的参考音频,请上传录音并选择该音色;default 不能替代录音。', + 'voice_transcript_required': '当前模型需要录音的准确文本,请填写转写文本后重新创建音色。', + 'voice_transcript_too_long': '录音的转写文本不能超过 100,000 个字符。', + 'voice_description_too_long': '说话人描述不能超过 4,000 个字符。', + 'voice_not_found': '所选音色已不存在,请刷新音色库并重新选择。', + 'voice_delete_unsupported': '该音色不支持删除;只能删除服务支持的已上传音色。', + 'voice_consent_required': '请填写此音色的授权录音 ID。', + 'voice_name_invalid': '请填写有效音色名称(不能包含路径分隔符或控制字符)。', + 'voice_audio_invalid': '无法读取录音的实际音频,请检查文件格式和完整性。', + 'voice_format': '录音格式不受当前服务支持,请选择列表中的格式。', + 'voice_size': '录音文件超过当前服务的大小限制。', + 'voice_duration': '录音时长不符合当前服务要求,请裁剪后重试。', + 'voice_provider_protocol': '音色服务返回格式无效或分页未结束,请检查服务版本和接口。', + 'voice_provider_error': '音色服务请求失败,请检查服务配置和账户权限。', + 'voice_provider_timeout': '音色服务请求超时,请检查服务状态后重试。', +} + + +def voice_error(code, status=422): + return ProjectError(VOICE_MESSAGES[code], status, code=code) + + +def voice_library_capabilities(config): + if config.get('kind') != 'audio' or config.get('protocol') != 'openai': + return None + name = config.get('modelId', '').rsplit('/', 1)[-1].lower().replace('_', '-') + moss = is_moss_speech(config) + cosyvoice = name.startswith(('cosyvoice3', 'fun-cosyvoice3')) + fish_speech = name.startswith('fish-speech') or name in {'s2-pro', 'drama-3', 'drama-3-int4'} + # Explicit served-model families; an arbitrary compatible endpoint is not + # evidence that the server implements the vLLM voice registry. + known = cosyvoice or fish_speech or name.startswith(('moss-tts', 'qwen3-tts', 'fishaudio', + 'index-tts', 'indextts', 'omnivoice', 'higgs-audio', 'glm-tts', 'ming-', 'drama3')) + if not moss and not (config.get('connectionType') == 'self_hosted' and known): + return None + provider = 'moss' if moss else 'vllm_omni' + parsed = urlsplit(config['url']) + host = parsed.hostname.lower() + if ':' in host: host = '[' + host + ']' + port = parsed.port + if port and (parsed.scheme, port) not in {('https', 443), ('http', 80)}: host += ':' + str(port) + endpoint = urlunsplit((parsed.scheme.lower(), host, parsed.path.rstrip('/'), '', '')) + account = hashlib.sha256((config.get('apiKey', '') if config.get('authMode') != 'none' else '').encode()).hexdigest() + identity = [provider, config.get('providerId') or config.get('id'), endpoint, config.get('authMode', 'none'), account] + connection = hashlib.sha256(json.dumps(identity, separators=(',', ':')).encode()).hexdigest() + # Upstream vllm_omni/entrypoints/openai/tts_adapters/moss_tts.py: + # validate() requires reference audio for standard/realtime/local/Nano. + # Local-Transformer ref_text is optional continuation conditioning; Drama3 + # requires the registered transcript under issue #205's adapter contract. + registered_transcript = 'drama3' in name or name.startswith('glm-tts') + # Fish Speech (including Drama 3) and Higgs v2 accept plain speech, but + # require a transcript alongside a registered recording. Higgs v3 accepts + # both plain speech and a recording without its transcript. + transcript = not moss and (registered_transcript or cosyvoice or fish_speech or name.startswith('higgs-audio-v2')) + reference = not moss and (registered_transcript or cosyvoice or name.startswith(( + 'moss-tts', 'indextts2', 'indextts-2', 'index-tts2', 'index-tts-2', 'omnivoice', 'fishaudio', + ))) + # qwen3_tts.py validates stored voices as Base tasks before checking the + # checkpoint variant; CustomVoice/VoiceDesign weights reject those tasks. + uploaded = not (name.startswith('qwen3-tts') and re.search(r'(?:^|[-.])(?:custom[-.]?voice|voice[-.]?design)$', name)) + qwen_base = name.startswith('qwen3-tts') and name.endswith('-base') + dimension = (1024 if '0.6b' in name else 2048 if '1.7b' in name else None) if qwen_base else None + reference = reference or qwen_base + return dict(provider=provider, connectionId=connection, requiresTranscript=transcript, + requiresReferenceAudio=reference, supportsUploadedVoices=uploaded, + referenceEmbeddingDimension=dimension, canDelete=not moss, maxBytes=10 * 1024 * 1024, + formats=['wav', 'mp3', 'm4a', 'flac'] if moss else ['wav', 'mp3', 'flac', 'ogg', 'aac', 'webm', 'm4a', 'mp4'], + minSeconds=None if moss else 1, maxSeconds=30) + + +def valid_voice_name(value): + return isinstance(value, str) and 0 < len(value.strip()) <= 200 and not re.search(r'[/\\\x00-\x1f\x7f]', value) + + +def voice_incompatibility(capabilities, has_audio, ref_text, *, uploaded=False, embedding_dim=None): + if uploaded and not capabilities['supportsUploadedVoices']: + return 'voice_model_unsupported' + embedding = uploaded and not has_audio and embedding_dim is not None and embedding_dim == capabilities['referenceEmbeddingDimension'] + if uploaded and not has_audio and embedding_dim is not None and not embedding: + return 'voice_model_unsupported' + if uploaded and not has_audio and not embedding and not capabilities['requiresReferenceAudio']: + return 'voice_model_unsupported' + if capabilities['requiresReferenceAudio'] and not has_audio and not embedding: + return 'voice_reference_required' + if uploaded and capabilities['requiresTranscript'] and not (ref_text or '').strip(): + return 'voice_transcript_required' + return None diff --git a/pyproject.toml b/pyproject.toml index f60e6a840..7b35e7fdb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ dependencies = [ "PyYAML>=6,<7", "filelock>=3.16,<4", "httpx>=0.27,<1", "anyio>=4,<5", "pydantic>=2,<3", "typer>=0.27.3,<0.28", "Pillow>=12,<14", "fastapi>=0.115,<1", "uvicorn>=0.30,<1", + "starlette>=1.8,<2", "python-multipart>=0.0.33,<1", ] [project.optional-dependencies] diff --git a/requirements.txt b/requirements.txt index 21ad92a9d..57d44c53d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,12 +67,16 @@ pygments==2.21.0 # rich pytest==9.1.1 # via opendirector +python-multipart==0.0.33 + # via opendirector pyyaml==6.0.3 # via opendirector rich==15.0.0 # via import-linter starlette==1.8.0 - # via fastapi + # via + # fastapi + # opendirector typing-extensions==4.16.0 # via # anyio diff --git a/src/backend/creationProjection.ts b/src/backend/creationProjection.ts index 9963f799a..1140a93e8 100644 --- a/src/backend/creationProjection.ts +++ b/src/backend/creationProjection.ts @@ -164,9 +164,7 @@ export class CreationProjection { /** The archive source a generation node's media carries, if any. * Without it the media is imported as a plain upload and the generation * binding would claim an output the project has no evidence for. */ - private archiveSource( - node: CanvasNode, - ): "generated" | "edited" | undefined { + private archiveSource(node: CanvasNode): "generated" | "edited" | undefined { const evidence = node.data.generationProvenance; if (!evidence) return undefined; if (evidence.source === "generated") return "generated"; @@ -662,6 +660,7 @@ export class CreationProjection { ...(spec.kind === "audio" ? { voiceName: spec.parameters.voice ?? undefined, + voiceSelection: spec.parameters.voiceSelection ?? undefined, audioCreationType: spec.parameters.creationType, audioMode: spec.parameters.mode, ...(spec.parameters.creationType === "music" @@ -854,6 +853,9 @@ export class CreationProjection { kind: "audio", parameters: { voice: node.data.settings?.voiceName ?? null, + ...(node.data.settings?.voiceSelection + ? { voiceSelection: node.data.settings.voiceSelection } + : {}), creationType: node.data.settings?.audioCreationType ?? "audio", mode: node.data.settings?.audioMode ?? "tts", ...(node.data.settings?.audioCreationType === "music" diff --git a/src/backend/rules.ts b/src/backend/rules.ts index 830278fb5..a3e61c6d2 100644 --- a/src/backend/rules.ts +++ b/src/backend/rules.ts @@ -1,3 +1,4 @@ +import { voiceIssue, type VoiceCapabilities } from "./voices.ts"; import { nodeByteSize } from "../canvas/uploadPolicy.ts"; import type { CanvasNode, GenerationSettings } from "../canvas/model.ts"; import { @@ -40,6 +41,7 @@ export interface InputRules { requestBytes?: number; maxPromptCharacters?: number | null; voiceRequired?: boolean | null; + voiceLibrary?: VoiceCapabilities | null; referencesAllowed?: boolean | null; maxVideos: number; maxAudios: number; @@ -169,8 +171,14 @@ const LABELS: Record = { }; /** Speaker names a speech service accepts; others fall back to its default voice. */ -export function serviceVoice(settings: Pick) { - return isServiceVoice(settings.voiceName) ? settings.voiceName : undefined; +export function serviceVoice( + settings: Pick, +) { + return settings.voiceSelection?.voiceId === settings.voiceName + ? settings.voiceName + : isServiceVoice(settings.voiceName) + ? settings.voiceName + : undefined; } export function modelLabel(config: Pick) { @@ -288,10 +296,12 @@ export function backendReferences( /** Canvas slot assignment for a saved reference. The backend stores this role. */ export function canvasReferenceRole( - settings: Pick< - GenerationSettings, - "videoMode" | "firstFrameNodeId" | "lastFrameNodeId" - > | undefined, + settings: + | Pick< + GenerationSettings, + "videoMode" | "firstFrameNodeId" | "lastFrameNodeId" + > + | undefined, sourceKind: string | undefined, ref: { binding: string; @@ -420,9 +430,20 @@ export function serviceGenerationSettings( next = serviceAudioSettings(next, config); if (modelChanged) { next.imagePreset = "none"; - if (!isServiceVoice(next.voiceName)) next.voiceName = undefined; + if (next.voiceSelection) { + if (voiceIssue(next.voiceSelection, config.inputRules.voiceLibrary)) { + next.voiceName = undefined; + next.voiceSelection = undefined; + } + } else if ( + config.inputRules.voiceLibrary || + !isServiceVoice(next.voiceName) + ) { + next.voiceName = undefined; + } if ( next.mode === "audio" && + !config.inputRules.voiceLibrary && config.inputRules.profile === "moss-speech" && !next.voiceName ) @@ -495,8 +516,17 @@ export function backendBlocker( const rules = config.inputRules; if (rules.referencesAllowed === false && incoming.length) return tNow("errors.rules.referencesUnsupported"); + if (settings.mode === "audio" && !isMusicModel(config)) { + const issue = voiceIssue(settings.voiceSelection, rules.voiceLibrary); + if (issue) return tNow(issue); + if ( + settings.voiceSelection && + settings.voiceName !== settings.voiceSelection.voiceId + ) + return tNow("voiceLibrary.selectRequired"); + } if (rules.voiceRequired && !serviceVoice(settings)) - return tNow("errors.rules.voiceRequired"); + return tNow(rules.voiceLibrary ? "voiceLibrary.selectRequired" : "errors.rules.voiceRequired"); if (rules.profile === "moss-image" && incoming.some((node) => node.data.kind === "text")) { let layout: unknown; try { @@ -509,7 +539,9 @@ export function backendBlocker( rules.maxPromptCharacters != null && Array.from(settings.prompt).length > rules.maxPromptCharacters ) - return tNow("errors.rules.promptTooLong", { limit: rules.maxPromptCharacters }); + return tNow("errors.rules.promptTooLong", { + limit: rules.maxPromptCharacters, + }); if (settings.mode === "image") { if (settings.imagePreset && settings.imagePreset !== "none") return tNow("errors.rules.productViews"); @@ -553,6 +585,7 @@ export function backendBlocker( if ( settings.mode === "audio" && settings.voiceName && + !settings.voiceSelection && !isServiceVoice(settings.voiceName) ) return tNow("errors.rules.voiceId"); diff --git a/src/backend/voices.ts b/src/backend/voices.ts new file mode 100644 index 000000000..a3f0a09b4 --- /dev/null +++ b/src/backend/voices.ts @@ -0,0 +1,110 @@ +import { request } from "./api.ts"; + +import type { + VoiceLibraryCapabilities, + VoiceSelection, +} from "../contracts/generated.ts"; +export type { VoiceSelection } from "../contracts/generated.ts"; +export type VoiceCapabilities = VoiceLibraryCapabilities; + +export interface VoiceRecord extends VoiceSelection { + source: "builtin" | "uploaded"; + previewUrl: string | null; + metadata: Record; + compatible: boolean; + incompatibility: string | null; + canDelete: boolean; +} +export interface VoiceLibraryData { + connectionId: string; + capabilities: VoiceCapabilities; + voices: VoiceRecord[]; + nextCursor?: string | null; +} +export const voiceSelection = (voice: VoiceRecord): VoiceSelection => ({ + connectionId: voice.connectionId, + voiceId: voice.voiceId, + name: voice.name, + source: voice.source, + hasReferenceAudio: voice.hasReferenceAudio, + embeddingDim: voice.embeddingDim, + refText: voice.refText, +}); +export function voiceIssue( + selection: VoiceSelection | undefined, + capabilities: VoiceCapabilities | null | undefined, +) { + if (selection && selection.connectionId !== capabilities?.connectionId) + return "voiceLibrary.connectionChanged"; + if ( + capabilities?.supportsUploadedVoices === false && + selection?.source === "uploaded" + ) + return "voiceLibrary.modelUnsupported"; + const uploadedWithoutAudio = + selection?.source === "uploaded" && !selection.hasReferenceAudio; + const matchingEmbedding = + uploadedWithoutAudio && + selection.embeddingDim != null && + selection.embeddingDim === capabilities?.referenceEmbeddingDimension; + if ( + uploadedWithoutAudio && + !matchingEmbedding && + (selection.embeddingDim != null || !capabilities?.requiresReferenceAudio) + ) + return "voiceLibrary.modelUnsupported"; + if ( + capabilities?.requiresReferenceAudio && + !selection?.hasReferenceAudio && + !matchingEmbedding + ) + return "voiceLibrary.referenceRequired"; + if ( + capabilities?.requiresTranscript && + selection?.source === "uploaded" && + !selection.refText?.trim() + ) + return "voiceLibrary.transcriptRequired"; + return null; +} +export function listVoices( + modelConfigId: string, + signal?: AbortSignal, + page?: { connectionId: string; after?: string }, +) { + const query = new URLSearchParams({ modelConfigId }); + if (page) { + query.set("pageSize", "150"); + query.set("connectionId", page.connectionId); + if (page.after) query.set("after", page.after); + } + return request(`/voices?${query}`, { signal }); +} +export function createVoice( + modelConfigId: string, + file: File, + fields: { + connectionId: string; + name: string; + consent: string; + refText: string; + speakerDescription: string; + }, +) { + const body = new FormData(); + body.set("audio_sample", file); + body.set("name", fields.name); + body.set("connectionId", fields.connectionId); + if (fields.consent) body.set("consent", fields.consent); + if (fields.refText) body.set("refText", fields.refText); + if (fields.speakerDescription) body.set("speakerDescription", fields.speakerDescription); + return request(`/voices?${new URLSearchParams({ modelConfigId })}`, { + method: "POST", + body, + }); +} +export const deleteVoice = (modelConfigId: string, voice: VoiceRecord) => + request( + `/voices/${encodeURIComponent(voice.voiceId)}?${new URLSearchParams({ modelConfigId, connectionId: voice.connectionId })}`, + { method: "DELETE" }, + ); diff --git a/src/canvas/CreateVoiceForm.tsx b/src/canvas/CreateVoiceForm.tsx new file mode 100644 index 000000000..6d90effaf --- /dev/null +++ b/src/canvas/CreateVoiceForm.tsx @@ -0,0 +1,245 @@ +import { useEffect, useId, useRef, useState } from "react"; +import { + createVoice, + type VoiceCapabilities, + type VoiceRecord, +} from "../backend/voices"; +import { errorMessage } from "../backend/api"; +import { useI18n } from "../i18n/I18nProvider"; +import { CanvasIcon } from "./CanvasIcon"; +import { withMediaDuration } from "./editorMedia"; + +export function CreateVoiceForm({ + modelConfigId, + capabilities, + onBack, + onCreated, +}: { + modelConfigId: string; + capabilities: VoiceCapabilities; + onBack: () => void; + onCreated: (voice: VoiceRecord) => Promise; +}) { + const { t } = useI18n(); + const prefix = useId(); + const [name, setName] = useState(""); + const [file, setFile] = useState(); + const [url, setUrl] = useState(""); + const [duration, setDuration] = useState(); + const [refText, setRefText] = useState(""); + const [speakerDescription, setSpeakerDescription] = useState(""); + const [consent, setConsent] = useState(""); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(""); + const mounted = useRef(true); + useEffect(() => { + mounted.current = true; + return () => { + mounted.current = false; + }; + }, []); + const maxMB = capabilities.maxBytes / 1024 / 1024; + const isVllm = capabilities.provider === "vllm_omni"; + const inputIssue = !file + ? null + : file.size === 0 + ? t("voiceLibrary.invalidAudio") + : file.size > capabilities.maxBytes + ? t("voiceLibrary.fileTooLarge", { size: maxMB }) + : !capabilities.formats.includes( + file.name.split(".").at(-1)!.toLowerCase(), + ) + ? t("voiceLibrary.fileFormat", { + formats: capabilities.formats.join(", "), + }) + : null; + useEffect(() => { + setDuration(undefined); + setError(""); + if (!file || inputIssue) { + setUrl(""); + return; + } + const objectUrl = URL.createObjectURL(file); + const controller = new AbortController(); + setUrl(objectUrl); + withMediaDuration( + { id: objectUrl, kind: "audio", title: file.name, src: objectUrl }, + controller.signal, + t, + ).then( + (audio) => { + if (!controller.signal.aborted) setDuration(audio.durationSeconds); + }, + () => { + if (!controller.signal.aborted) + setError(t("voiceLibrary.invalidAudio")); + }, + ); + return () => { + controller.abort(); + URL.revokeObjectURL(objectUrl); + }; + }, [file, inputIssue, t]); + const fileIssue = + inputIssue ?? + (duration !== undefined && + ((capabilities.minSeconds !== null && duration < capabilities.minSeconds) || + (capabilities.maxSeconds !== null && duration > capabilities.maxSeconds)) + ? t("voiceLibrary.fileDuration") + : null); + return ( +
{ + event.preventDefault(); + if (!file || fileIssue || duration === undefined || busy) return; + setBusy(true); + setError(""); + try { + const voice = await createVoice(modelConfigId, file, { + connectionId: capabilities.connectionId, + name: name.trim(), + consent, + refText: refText.trim(), + speakerDescription: speakerDescription.trim(), + }); + if (mounted.current) await onCreated(voice); + } catch (failure) { + if (mounted.current) setError(errorMessage(failure)); + } finally { + if (mounted.current) setBusy(false); + } + }} + > + + +

{t("voiceLibrary.uploadGuidance")}

+

+ {t("voiceLibrary.formats", { + formats: capabilities.formats.join(", "), + size: maxMB, + })} + {capabilities.minSeconds !== null && ( + <> + {" "} + ·{" "} + {t("voiceLibrary.durationMin", { + seconds: capabilities.minSeconds, + })} + + )} + {capabilities.maxSeconds !== null && ( + <> + {" "} + ·{" "} + {t("voiceLibrary.durationMax", { + seconds: capabilities.maxSeconds, + })} + + )} +

+ `.${format}`).join(",")} + required + disabled={busy} + aria-describedby={`${prefix}-requirements`} + onChange={(event) => setFile(event.target.files?.[0])} + /> + {file && !inputIssue && (duration !== undefined || !error) && ( +

+ {duration === undefined + ? t("voiceLibrary.checking") + : t("voiceLibrary.fileInfo", { + name: file.name, + size: (file.size / 1024 / 1024).toFixed(2), + seconds: duration.toFixed(1), + })} +

+ )} + {url &&