diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java index a1a2327..bcb0d7d 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java @@ -541,7 +541,7 @@ public class CatalogService { // "异步执行器待接入" when the execution path is already implemented, // while unsupported task types remain visibly pending. boolean asyncExecutor = asyncExecutorReady( - resultSet.getString("provider_id"), providerProtocol, resultSet.getString("model_type")); + resultSet.getString("provider_id"), providerProtocol, resultSet.getString("model_type"), resultSet.getString("upstream_model")); String upstream=resultSet.getString("upstream_model").toLowerCase(java.util.Locale.ROOT); if(upstream.startsWith("mj_") || upstream.startsWith("suno") || upstream.startsWith("lyria") || upstream.equals("swap_face")) asyncExecutor=false; boolean syncExecutor=List.of("chat","text","code","multimodal","llm","reasoning","vision","embedding").contains(resultSet.getString("model_type")) && ("openai-compatible".equalsIgnoreCase(providerProtocol)||"provider-mock".equals(resultSet.getString("provider_id"))); @@ -581,9 +581,16 @@ public class CatalogService { } static boolean asyncExecutorReady(String providerId, String providerProtocol, String modelType) { - if (List.of("provider-mock", "provider-vast", "provider-bytedance").contains(providerId)) return true; + return asyncExecutorReady(providerId, providerProtocol, modelType, null); + } + + static boolean asyncExecutorReady(String providerId, String providerProtocol, String modelType, String upstreamModel) { + if ("provider-mock".equals(providerId)) return true; + if ("provider-vast".equals(providerId)) return "3d".equalsIgnoreCase(modelType); + if ("provider-bytedance".equals(providerId)) return "video".equalsIgnoreCase(modelType); if (!"openai-compatible".equalsIgnoreCase(providerProtocol)) return false; - return List.of("image", "video", "audio").contains(String.valueOf(modelType).toLowerCase(java.util.Locale.ROOT)); + if ("audio".equalsIgnoreCase(modelType)) return com.moyi.controlplane.provider.media.AsyncMediaSupport.supportsSpeech(upstreamModel); + return List.of("image", "video").contains(String.valueOf(modelType).toLowerCase(java.util.Locale.ROOT)); } private boolean billingReady(Map pricing, String mode, String providerId) { diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/provider/media/AsyncMediaSupport.java b/control-plane-java/src/main/java/com/moyi/controlplane/provider/media/AsyncMediaSupport.java new file mode 100644 index 0000000..37115f9 --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/provider/media/AsyncMediaSupport.java @@ -0,0 +1,17 @@ +package com.moyi.controlplane.provider.media; + +import java.util.Locale; +import java.util.Set; + +/** Shared catalog/execution contract. Audio model type alone does not imply a speech endpoint. */ +public final class AsyncMediaSupport { + private AsyncMediaSupport() {} + private static final Set SPEECH_MODELS = Set.of( + "tts-1", "tts-1-1106", "tts-1-hd", "tts-1-hd-1106", "gpt-4o-mini-tts"); + + public static boolean supportsSpeech(String upstreamModel) { + if (upstreamModel == null) return false; + String model = upstreamModel.toLowerCase(Locale.ROOT); + return SPEECH_MODELS.contains(model) || model.matches("gpt-4o-mini-tts-[0-9]{4}-[0-9]{2}-[0-9]{2}"); + } +} diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java index 8b53c31..a5e4366 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncProviderClient.java @@ -9,6 +9,7 @@ import com.moyi.controlplane.provider.credentials.UpstreamCredentialResolver; import com.moyi.controlplane.provider.transport.ProviderRequestException; import com.moyi.controlplane.provider.transport.BoundedHttpTransport; import com.moyi.controlplane.provider.media.MediaDownloader; +import com.moyi.controlplane.provider.media.AsyncMediaSupport; import com.moyi.controlplane.provider.media.MediaDownloader.MediaBytes; import java.net.URI; import java.net.http.HttpRequest; @@ -83,6 +84,7 @@ public class AsyncProviderClient { Provider provider = provider(providerId, routeId, upstreamModel); String code = provider.code().toLowerCase(java.util.Locale.ROOT); if (isTripo(provider.code(), provider.baseUrl())) { + requireTaskType(taskType, "3d"); Map body = new LinkedHashMap<>(); body.put("model", upstreamModel); String media = mediaUrl(input); @@ -94,6 +96,7 @@ public class AsyncProviderClient { return withKeyFingerprint(request("POST", tripoBase(provider.baseUrl()) + (media == null ? "/generation/text-to-model" : "/generation/image-to-model"), apiKey, body, "上游 3D 任务创建失败"), apiKey); } if (code.contains("byte") || code.contains("seedance") || provider.baseUrl().contains("volces.com")) { + requireTaskType(taskType, "video"); List> content = new ArrayList<>(); if (!prompt.isBlank()) content.add(Map.of("type", "text", "text", prompt)); String media = mediaUrl(input); @@ -197,15 +200,29 @@ public class AsyncProviderClient { } } if ("audio".equalsIgnoreCase(taskType)) { + if (!AsyncMediaSupport.supportsSpeech(model)) throw new ApiException("ASYNC_PROVIDER_NOT_IMPLEMENTED", "该音频模型不是已接入的文本转语音模型;转写、音乐和实时音频需专用接口", 501); if (media != null) throw new ApiException("MEDIA_INPUT_UNSUPPORTED", "该语音生成接口接收文本;音频转写需使用专用转写接口", 400); + if (prompt.isBlank() || prompt.length() > 4096) throw new ApiException("INVALID_TASK_INPUT", "语音文本必须为 1 至 4096 个字符", 400); // OpenAI-compatible TTS returns an audio/* binary body. Keep the // payload bounded before embedding it into the task result so a // provider cannot make the database grow without limit. Map body = new LinkedHashMap<>(); body.put("model", model); body.put("input", prompt); - body.put("voice", input.getOrDefault("voice", "alloy")); - body.put("response_format", input.getOrDefault("response_format", "mp3")); - copyParameter(input, body, "speed"); + Object voice = input.getOrDefault("voice", "alloy"); + if (!(voice instanceof String name) || name.isBlank() || name.length() > 100) throw new ApiException("INVALID_TASK_INPUT", "请提供有效的语音音色", 400); + Object format = input.getOrDefault("response_format", "mp3"); + if (!(format instanceof String formatName) || !List.of("mp3","wav","opus","aac","flac").contains(formatName)) { + throw new ApiException("INVALID_TASK_INPUT", "语音结果支持 mp3、wav、opus、aac、flac;原始 PCM 尚未接入播放", 400); + } + if (input.containsKey("stream_format") && !"audio".equals(input.get("stream_format"))) throw new ApiException("INVALID_TASK_INPUT", "语音任务暂不支持 SSE 事件格式", 400); + body.put("voice", voice); body.put("response_format", format); + if (input.containsKey("speed")) { + try { + var speed = new java.math.BigDecimal(String.valueOf(input.get("speed"))); + if (speed.compareTo(new java.math.BigDecimal("0.25")) < 0 || speed.compareTo(new java.math.BigDecimal("4")) > 0) throw new NumberFormatException(); + body.put("speed", speed); + } catch (NumberFormatException error) { throw new ApiException("INVALID_TASK_INPUT", "语速必须为 0.25 至 4", 400); } + } String apiKey = provider.nextApiKey(routeId, model, environment, keyCursors); return Map.of("_moyiInlineResult", requestAudio("POST", base + "/audio/speech", apiKey, body, "上游语音任务创建失败"), "_moyiUpstreamKeyFingerprint", keyFingerprint(apiKey)); } @@ -326,7 +343,14 @@ public class AsyncProviderClient { if (response.statusCode() < 200 || response.statusCode() >= 300) throw upstreamStatus(response.statusCode(), message); byte[] bytes = response.body(); if (bytes.length == 0 || bytes.length > 8 * 1024 * 1024) throw new ApiException("UPSTREAM_MEDIA_TOO_LARGE", message + "(返回音频超过 8 MiB 或为空)", 502); - String contentType = response.headers().firstValue("Content-Type").orElse("audio/mpeg").split(";", 2)[0].trim().toLowerCase(java.util.Locale.ROOT); + String contentType = response.headers().firstValue("Content-Type").orElse("application/octet-stream").split(";", 2)[0].trim().toLowerCase(java.util.Locale.ROOT); + if (contentType.equals("application/octet-stream")) contentType = switch (String.valueOf(body.get("response_format"))) { + case "wav" -> "audio/wav"; + case "opus" -> "audio/ogg"; + case "aac" -> "audio/aac"; + case "flac" -> "audio/flac"; + default -> "audio/mpeg"; + }; if (!contentType.startsWith("audio/")) throw new ApiException("UPSTREAM_INVALID_MEDIA", message + "(返回内容不是音频)", 502); Map result = new LinkedHashMap<>(); result.put("base64", Base64.getEncoder().encodeToString(bytes)); @@ -377,6 +401,10 @@ public class AsyncProviderClient { return ProviderRequestException.http(status, message); } + private void requireTaskType(String actual, String expected) { + if (!expected.equalsIgnoreCase(actual)) throw new ApiException("ASYNC_PROVIDER_NOT_IMPLEMENTED", "渠道专用执行接口与任务类型不匹配", 501); + } + private ProviderRequestException requestFailure(Exception exception, boolean sending, String message) { if (exception instanceof InterruptedException) Thread.currentThread().interrupt(); if (exception instanceof ProviderRequestException failure) return failure; diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java new file mode 100644 index 0000000..2dec99b --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizer.java @@ -0,0 +1,87 @@ +package com.moyi.controlplane.task; + +import java.math.BigDecimal; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** Bounded envelope normalization only. No upstream calls, credentials, routing or settlement. */ +final class AsyncTaskResponseNormalizer { + private AsyncTaskResponseNormalizer() {} + + static String status(Map response) { + Object raw = response.get("status"); + if (raw == null) raw = nested(response).get("status"); + return switch (String.valueOf(raw == null ? "running" : raw).trim().toLowerCase(Locale.ROOT)) { + case "success", "succeeded", "completed" -> "succeeded"; + case "failed", "failure", "error", "banned" -> "failed"; + case "cancelled", "canceled" -> "cancelled"; + default -> "running"; + }; + } + + static int progress(Map response, String status) { + if ("succeeded".equals(status)) return 100; + Object raw = response.get("progress"); + if (raw == null) raw = nested(response).get("progress"); + try { + String value = String.valueOf(raw).trim(); + if (value.length() > 32) return 0; + if (value.endsWith("%")) value = value.substring(0, value.length() - 1); + return new BigDecimal(value).max(BigDecimal.ZERO).min(BigDecimal.valueOf(100)).intValue(); + } catch (NumberFormatException error) { return 0; } + } + + static Map result(Map response) { + Map data = nested(response); + for (String field : List.of("output", "content", "result")) { + Map result = asset(response.get(field)); + if (result == null) result = asset(data.get(field)); + if (result != null) { + if (data.get("credits_consumed") != null) result.put("creditsConsumed", data.get("credits_consumed")); + return result; + } + } + Map direct = asset(response); + return direct != null ? direct : asset(data); + } + + private static Map nested(Map response) { + return response.get("data") instanceof Map data ? data : Map.of(); + } + + private static Map asset(Object raw) { + // A bare string is only a media reference when it is a URL; provider messages are not assets. + if (raw instanceof String value) return value.matches("(?i)(https?://|data:).+") ? new LinkedHashMap<>(Map.of("url", value)) : null; + if (!(raw instanceof Map source)) return null; + // Select assets explicitly: task metadata, provider errors or arbitrary content are not media. + var result = new LinkedHashMap(); + for (String field : List.of("url", "modelUrl", "previewUrl", "imageUrl", "videoUrl", "audioUrl", "base64", "b64_json")) { + Object value = source.get(field); + if (value instanceof String text && !text.isBlank()) result.put(field, text); + } + String[][] aliases = {{"model_url","modelUrl"},{"rendered_image_url","previewUrl"}, + {"generated_image_url","imageUrl"},{"image_url","imageUrl"},{"video_url","videoUrl"}, + {"audio_url","audioUrl"},{"last_frame_url","previewUrl"},{"preview_url","previewUrl"}}; + for (String[] alias : aliases) { + Object value = source.get(alias[0]); + if (value instanceof Map map) value = map.get("url"); + if (value instanceof String text && !text.isBlank()) result.putIfAbsent(alias[1], text); + } + for (String kind : List.of("video","audio","image")) { + if (source.get(kind) instanceof Map map && map.get("url") instanceof String text && !text.isBlank()) { + result.putIfAbsent(kind + "Url", text); + } + } + if (result.isEmpty() || result.keySet().stream().allMatch("previewUrl"::equals)) return null; + for (String field : List.of("format","mimeType","mime_type","creditsConsumed","credits_consumed")) { + if (source.get(field) instanceof String || source.get(field) instanceof Number) result.put(field, source.get(field)); + } + for (String field : List.of("usage","usageMetadata")) if (source.get(field) instanceof Map value) result.put(field, value); + for (String field : List.of("modelUrl","videoUrl","audioUrl","imageUrl")) { + if (!result.containsKey("url") && result.containsKey(field)) result.put("url", result.get(field)); + } + return result; + } +} diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java index 5e9a92b..79ba5e7 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java @@ -392,10 +392,12 @@ public class AsyncTaskService { task.put("id", resultSet.getString("id")); task.put("provider", "upstream"); task.put("model", resultSet.getString("model_id")); + task.put("taskType", resultSet.getString("task_type")); task.put("status", resultSet.getString("status")); task.put("progress", resultSet.getInt("progress")); task.put("createdAt", resultSet.getObject("created_at", OffsetDateTime.class)); task.put("updatedAt", resultSet.getObject("updated_at", OffsetDateTime.class)); + putIfPresent(task, "completedAt", resultSet, "completed_at"); task.put("requiresReconciliation", "reconciling".equals(resultSet.getString("status"))); putIfPresent(task, "costAmount", resultSet, "cost_amount"); String result = resultSet.getString("result"); @@ -483,9 +485,15 @@ public class AsyncTaskService { updatePollingState(taskId, null, "UPSTREAM_TASK_POLL_RETRY", message); return; } - String status = normalizedStatus(response); - int progress = progress(response, status); - Map result = result(response); + String status = AsyncTaskResponseNormalizer.status(response); + int progress = AsyncTaskResponseNormalizer.progress(response, status); + Map result = AsyncTaskResponseNormalizer.result(response); + String taskType = jdbc.queryForObject("SELECT task_type FROM model_tasks WHERE id=?", String.class, taskId); + if ("succeeded".equals(status) && result == null && List.of("video", "audio").contains(taskType)) { + // Generation success is not proof that the media bytes were delivered. Preserve billing + // semantics, never resubmit/refund automatically, and expose the missing delivery explicitly. + result = new LinkedHashMap<>(Map.of("deliveryStatus", "pending", "deliveryCode", "TASK_RESULT_UNAVAILABLE")); + } if(result!=null) { result=new LinkedHashMap<>(result); result.putAll(usageOnly(response)); @@ -518,63 +526,6 @@ public class AsyncTaskService { throw new IllegalStateException("Persisted task timestamp is missing"); } - private String normalizedStatus(Map response) { - Object raw = response.get("status"); - if (raw == null && response.get("data") instanceof Map data) raw = data.get("status"); - String value = String.valueOf(raw == null ? "running" : raw).toLowerCase(java.util.Locale.ROOT); - return switch (value) { - case "success", "succeeded", "completed" -> "succeeded"; - case "failed", "failure", "error", "banned" -> "failed"; - case "cancelled", "canceled" -> "cancelled"; - default -> "running"; - }; - } - - private int progress(Map response, String status) { - Object raw = response.get("progress"); - if (raw == null && response.get("data") instanceof Map data) raw = data.get("progress"); - if (raw instanceof Number number) return Math.max(0, Math.min(100, number.intValue())); - return "succeeded".equals(status) ? 100 : 0; - } - - private Map result(Map response) { - Object raw = response.get("output"); - Map data = response.get("data") instanceof Map value ? value : null; - if (raw == null && data != null) raw = data.get("output"); - if (raw instanceof Map map) { - Map value = new LinkedHashMap<>(); - map.forEach((k,v)->value.put(String.valueOf(k),v)); - copyAlias(value, "model_url", "modelUrl"); - copyAlias(value, "rendered_image_url", "previewUrl"); - copyAlias(value, "generated_image_url", "imageUrl"); - copyAlias(value, "video_url", "videoUrl"); - copyAlias(value, "audio_url", "audioUrl"); - copyAlias(value, "image_url", "imageUrl"); - if (value.get("url") == null && value.get("modelUrl") != null) value.put("url", value.get("modelUrl")); - if (value.get("url") == null && value.get("imageUrl") != null) value.put("url", value.get("imageUrl")); - if (value.get("url") == null && value.get("videoUrl") != null) value.put("url", value.get("videoUrl")); - if (value.get("url") == null && value.get("audioUrl") != null) value.put("url", value.get("audioUrl")); - if (data != null && data.get("credits_consumed") != null) value.put("creditsConsumed", data.get("credits_consumed")); - return value; - } - if (raw instanceof String value && !value.isBlank()) return Map.of("url", value); - // OpenAI-compatible video jobs return the media URL at the top level - // (or in a nested video object) rather than under `output`. - Object directUrl = response.get("url"); - if (directUrl == null) directUrl = response.get("video_url"); - if (directUrl == null) directUrl = response.get("image_url"); - if (directUrl == null) directUrl = response.get("audio_url"); - if (directUrl == null && response.get("video") instanceof Map video) directUrl = video.get("url"); - if (directUrl == null && response.get("image") instanceof Map image) directUrl = image.get("url"); - if (directUrl == null && response.get("audio") instanceof Map audio) directUrl = audio.get("url"); - if (directUrl != null && !String.valueOf(directUrl).isBlank()) return Map.of("url", directUrl); - return null; - } - - private void copyAlias(Map value, String source, String target) { - if (value.get(target) == null && value.get(source) != null) value.put(target, value.get(source)); - } - private String writeJson(Object value) { try { return objectMapper.writeValueAsString(value); } catch (JsonProcessingException exception) { return "{}"; } } private long estimateInputUnits(Map input) { diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/catalog/CatalogServiceTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/catalog/CatalogServiceTest.java index a192847..c5762b1 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/catalog/CatalogServiceTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/catalog/CatalogServiceTest.java @@ -25,7 +25,15 @@ class CatalogServiceTest { assertTrue(CatalogService.asyncExecutorReady("provider-bytedance", "http", "video")); assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "image")); assertTrue(CatalogService.asyncExecutorReady("relay-provider", "OPENAI-COMPATIBLE", "video")); - assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio")); + // Audio readiness depends on the upstream endpoint, not on the model type alone. + assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "tts-1")); + assertTrue(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "gpt-4o-mini-tts-2025-03-20")); + assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio")); + assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "whisper-1")); + assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "audio", "gpt-4o-realtime-preview")); + // Dedicated adapters only execute the task type they implement. + assertFalse(CatalogService.asyncExecutorReady("provider-vast", "http", "video")); + assertFalse(CatalogService.asyncExecutorReady("provider-bytedance", "http", "3d")); assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "3d")); assertFalse(CatalogService.asyncExecutorReady("relay-provider", "http", "video")); } diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java index 37c3b2c..55d8ea1 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncProviderClientTest.java @@ -340,6 +340,53 @@ class AsyncProviderClientTest { } finally { server.stop(0); } } + @Test void nonSpeechAudioAndInvalidSpeechInputNeverReachTheProvider() throws Exception { + var calls = new java.util.concurrent.atomic.AtomicInteger(); + HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + server.createContext("/", exchange -> { calls.incrementAndGet(); exchange.sendResponseHeaders(500, -1); exchange.close(); }); server.start(); + try { + var client = relayClient(server); + for (String model : java.util.List.of("whisper-1", "gpt-4o-realtime-preview", "suno-v4")) { + assertEquals("ASYNC_PROVIDER_NOT_IMPLEMENTED", assertThrows(ApiException.class, () -> client.submit("relay", model, "audio", Map.of("prompt", "hi"))).getCode()); + } + for (Map input : java.util.List.>of(Map.of("prompt", ""), Map.of("prompt", "x".repeat(4097)), + Map.of("prompt", "hi", "response_format", "pcm"), Map.of("prompt", "hi", "voice", 7), + Map.of("prompt", "hi", "speed", "9"), Map.of("prompt", "hi", "stream_format", "sse"))) { + assertEquals("INVALID_TASK_INPUT", assertThrows(ApiException.class, () -> client.submit("relay", "tts-1", "audio", input)).getCode()); + } + assertEquals(0, calls.get()); + } finally { server.stop(0); } + } + + @Test void speechWithoutAudioContentTypeUsesTheRequestedFormat() throws Exception { + HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + server.createContext("/audio/speech", exchange -> { + String body = new String(exchange.getRequestBody().readAllBytes(), StandardCharsets.UTF_8); + assertTrue(body.contains("\"speed\":1.5")); + exchange.getResponseHeaders().set("Content-Type", "application/octet-stream"); + byte[] audio = "fake-wav".getBytes(StandardCharsets.UTF_8); + exchange.sendResponseHeaders(200, audio.length); + try (var output = exchange.getResponseBody()) { output.write(audio); } + }); + server.start(); + try { + var result = relayClient(server).submit("relay", "gpt-4o-mini-tts", "audio", Map.of("prompt", "hi", "response_format", "wav", "speed", 1.5)); + assertEquals("audio/wav", ((Map) result.get("_moyiInlineResult")).get("mimeType")); + } finally { server.stop(0); } + } + + @Test void dedicatedAdaptersRejectMismatchedTaskTypesBeforeSending() { + var client = clientFor("http://127.0.0.1:1"); + assertEquals("ASYNC_PROVIDER_NOT_IMPLEMENTED", assertThrows(ApiException.class, () -> client.submit("provider-vast", "tripo", "video", Map.of("prompt", "x"))).getCode()); + } + + private AsyncProviderClient relayClient(HttpServer server) { + var jdbc = mock(JdbcTemplate.class); var cipher = new SecretCipher("test-encryption"); + when(jdbc.queryForMap(any(String.class), eq("relay"))).thenReturn(Map.of("code", "relay", "protocol", "openai-compatible", + "base_url", "http://127.0.0.1:" + server.getAddress().getPort(), "credential_ciphertext", cipher.encrypt("test-key"))); + return new AsyncProviderClient(jdbc, cipher, new ObjectMapper(), mock(Environment.class)); + } + private AsyncProviderClient clientFor(String baseUrl) { JdbcTemplate jdbc = mock(JdbcTemplate.class); SecretCipher cipher = new SecretCipher("test-encryption"); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java index 0523bad..eaeeefb 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskPostgresTest.java @@ -422,6 +422,30 @@ class AsyncTaskPostgresTest { assertEquals(new BigDecimal("8.56000000"), wallet("balance")); } + @Test void finishedVideoWithoutDeliveredFileIsChargedOnceAndMarkedUndelivered() { + jdbc.update("UPDATE model_tasks SET task_type='video' WHERE id=?", taskId); + when(provider.poll("provider-vast", "model-mock-3d", "v3.1-20260211", "upstream-task", null)) + .thenReturn(Map.of("id", "upstream-task", "status", "completed", "model", "sora-2")); + poll(); poll(); + assertEquals("succeeded", status()); + assertEquals(new BigDecimal("8.56000000"), wallet("balance")); + assertEquals(0, wallet("reserved_balance").signum()); + var view = tasks.getForKey(Map.of("id", keyId.toString()), taskId); + assertEquals("video", view.get("taskType")); + assertEquals("pending", ((Map) view.get("result")).get("deliveryStatus")); + verify(provider, never()).submit(anyString(), anyString(), anyString(), anyString(), anyMap()); + } + + @Test void seedanceContentVideoUrlIsPersistedAsTheTaskResult() { + jdbc.update("UPDATE model_tasks SET task_type='video' WHERE id=?", taskId); + when(provider.poll("provider-vast", "model-mock-3d", "v3.1-20260211", "upstream-task", null)) + .thenReturn(Map.of("status", "succeeded", "content", Map.of("video_url", "https://example.test/v.mp4?sig=1"))); + poll(); + var result = (Map) tasks.getForKey(Map.of("id", keyId.toString()), taskId).get("result"); + assertEquals("https://example.test/v.mp4?sig=1", result.get("videoUrl")); + assertFalse(result.containsKey("deliveryStatus")); + } + @Test void confirmedUpstreamFailureReleasesHoldImmediately() { when(provider.poll("provider-vast","model-mock-3d","v3.1-20260211","upstream-task",null)).thenReturn(Map.of("data",Map.of("status","failed"))); poll(); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java new file mode 100644 index 0000000..a44a372 --- /dev/null +++ b/control-plane-java/src/test/java/com/moyi/controlplane/task/AsyncTaskResponseNormalizerTest.java @@ -0,0 +1,53 @@ +package com.moyi.controlplane.task; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Test; + +class AsyncTaskResponseNormalizerTest { + @Test void seedanceContentVideoUrlIsAResult() { + var response = Map.of("id", "cgt-1", "status", "succeeded", + "content", Map.of("video_url", "https://cdn.example.test/v.mp4?sig=1", "last_frame_url", "https://cdn.example.test/f.png"), + "usage", Map.of("completion_tokens", 100)); + var result = AsyncTaskResponseNormalizer.result(response); + assertEquals("https://cdn.example.test/v.mp4?sig=1", result.get("videoUrl")); + assertEquals("https://cdn.example.test/v.mp4?sig=1", result.get("url")); + assertEquals("https://cdn.example.test/f.png", result.get("previewUrl")); + assertEquals("succeeded", AsyncTaskResponseNormalizer.status(response)); + } + + @Test void nestedEnvelopesAndOpenAiVideoObjects() { + var tripo = Map.of("code", 0, "data", Map.of("status", "success", "progress", 100, "credits_consumed", 30, + "output", Map.of("model_url", "https://cdn.example.test/m.glb", "rendered_image_url", "https://cdn.example.test/p.png"))); + var result = AsyncTaskResponseNormalizer.result(tripo); + assertEquals("https://cdn.example.test/m.glb", result.get("url")); + assertEquals(30, result.get("creditsConsumed")); + var openAi = Map.of("status", "completed", "video", Map.of("url", "https://cdn.example.test/o.mp4")); + assertEquals("https://cdn.example.test/o.mp4", AsyncTaskResponseNormalizer.result(openAi).get("url")); + var nestedUrl = Map.of("data", Map.of("status", "completed", "result", Map.of("video_url", Map.of("url", "https://cdn.example.test/n.mp4")))); + assertEquals("https://cdn.example.test/n.mp4", AsyncTaskResponseNormalizer.result(nestedUrl).get("videoUrl")); + } + + @Test void metadataOnlyResponsesAreNotMedia() { + // Task metadata, error text and a preview frame alone must not be presented as the result file. + assertNull(AsyncTaskResponseNormalizer.result(Map.of("id", "video-1", "status", "completed", "model", "sora-2"))); + assertNull(AsyncTaskResponseNormalizer.result(Map.of("status", "completed", "content", List.of(Map.of("type", "text"))))); + assertNull(AsyncTaskResponseNormalizer.result(Map.of("status", "completed", "result", "generation finished"))); + assertNull(AsyncTaskResponseNormalizer.result(Map.of("status", "completed", "content", Map.of("last_frame_url", "https://cdn.example.test/f.png")))); + var result = AsyncTaskResponseNormalizer.result(Map.of("output", Map.of("url", "https://cdn.example.test/a.mp3", "error", "secret detail"))); + assertFalse(result.containsKey("error")); + } + + @Test void progressIsBoundedAndSuccessIsComplete() { + assertEquals(42, AsyncTaskResponseNormalizer.progress(Map.of("progress", "42%"), "running")); + assertEquals(100, AsyncTaskResponseNormalizer.progress(Map.of("progress", 250), "running")); + assertEquals(0, AsyncTaskResponseNormalizer.progress(Map.of("progress", "n/a"), "running")); + assertEquals(0, AsyncTaskResponseNormalizer.progress(Map.of(), "running")); + assertEquals(100, AsyncTaskResponseNormalizer.progress(Map.of("progress", 10), "succeeded")); + assertEquals("failed", AsyncTaskResponseNormalizer.status(Map.of("data", Map.of("status", " FAILED ")))); + } +} diff --git a/docs/24-security-and-cpr-task-tracker.md b/docs/24-security-and-cpr-task-tracker.md index 43810f2..31e9c9d 100644 --- a/docs/24-security-and-cpr-task-tracker.md +++ b/docs/24-security-and-cpr-task-tracker.md @@ -1,6 +1,6 @@ # 安全与 CPR 差距任务追踪 -最新增量审查日期:2026-10-22。对照用户粘贴的 CPR 比对报告与本地代码,不将建议清单视为已完成验收。 +最新增量审查日期:2026-10-22。对照用户粘贴的 CPR 比对报告与本地代码,不将建议清单视为已完成验收。比对结论与优化方案全文见 `29-cpr-gap-analysis-and-optimization-plan.md`。 ## 已交付基线 @@ -29,9 +29,16 @@ | SCH-02 | 公平排队 / 取消 / 共享等待预算 | 未完成,现有同步 Redis 竞争不保证 FIFO | 多客户端饥饿/FIFO/取消回收与横向并发验证 | | OPS-01 | request/attempt 诊断、配置版本、质量门禁 | 部分:已有最终审计/健康/部分快照;本轮加依赖方向测试、CI/Dependabot 配置,远端未运行;逐 attempt/完整配置版本仍缺 | 本地门禁不等于 GitHub CI、CVE 扫描或真实协议验收 | | OPS-02 | CPR 可选部署 / OAuth 账号池 | 未部署;属于可选方案,不默认新建生产基础设施 | 用户确认部署方式及授权来源后才接入;本地不发付费生成 | +| MED-01 | 音视频任务回执与结果规范化 | 本地已实现:独立 `AsyncTaskResponseNormalizer` 解析 `content`/`result`/嵌套 `data` 与 `{url}` 对象,仅白名单媒体字段;视频/音频完成但无文件时标记 `deliveryStatus=pending`,结算一次、不重发不退款。逐供应商实测未做 | 本地协议桩、结果回读与钱包只结算一次;逐供应商实测待授权 | +| MED-02 | 音频协议与执行能力准确标识 | 本地已实现:目录与执行共用 `AsyncMediaSupport.supportsSpeech` 白名单;非 TTS 音频、专用渠道错配任务类型、非法文本/音色/格式/语速在发送前拒绝。转写/音乐/Realtime 仍未接入 | 目录与实际执行共享判定,错误协议在发送前拒绝;TTS/非 TTS 回归 | +| MED-03 | 音视频结果展示与历史任务类型 | 本地已实现:任务响应返回持久 `taskType`/`completedAt`,前端以其优先于目录;补 opus/aac/flac MIME、签名 URL 后缀、尾帧预览与“结果未交付”提示 | 无目录历史任务、音频 base64、带签名视频 URL、错误响应前端回归 | +| MED-04 | 音视频用量计费及逐路由验收 | 未完成:音视频 Token/时长计费不可用固定单任务费代替,配置就绪不等于真实生成通过 | 每条路由分别核对协议、模型、用量、费用、播放;不猜报价,不自动发付费任务 | +| MED-05 | 视频鉴权内容下载与不同渠道协议 | 未完成:返回任务元数据但无公开 URL 的供应商需要鉴权内容获取;不同渠道不能共用猜测接口 | 绑定原账号、受控内容下载、用户隔离、体积期限与安全存储联合验收 | ## 实施边界 +附件追踪确认(2026-10-22):用户再次提供的 CPR 比对文本已通过 SEC-01–07、COD-01–03、SCH-01–02、OPS-01–02 映射到本表,包含保留人民币钱包/凭据加密、不直接整体替换 CPR 的边界;附件中的版本是当次锁定基线,不是当前最新版声明。此前没有单列完整音视频验收任务,本轮新增 MED-01–05 并优先排查用户反馈,不能用安全回归通过替代音视频生成实测。 + 已补 SEC-01/02/03、SEC-06 的本地下载代码边界、验证码/账号事务,以及请求侧一致的验证码受理和加密异步投递。下一优先级是管理授权审查、同步 Transport 与完整 provider 配置版本,再处理 COD-01/02/03 的协议/续接/长请求合同。投递真实环境、残余时序与生产网络隔离仍属待验收。Codex WebSocket 与 OAuth 不是添加 URL 即可安全完成的能力,须连同状态归属、计量、预留续期和客户端验收逐步实施。未部署、未真实供应商验证或待设计的项必须保持未完成标记。 本轮设计与验证细节见 `25-auth-and-bounded-transport.md`。这份表按用户粘贴报告的锁定基线追踪本地实施,不把旧的 CPR 版本号冒充实时最新版,也没有重新部署 CPR。只做本地 Git commit,不 push,不修改业务数据库。 @@ -45,3 +52,5 @@ 2026-10-22 投递隔离增量:新建 V50 加密 outbox、`VerificationDispatchService` 与封闭目的枚举;发送请求与投递分离,未知/停用账号不触发真实发送,但参与完全相同的请求端限额与写入路径。错误重置码统一公开错误,后台最多双线程、无内存等待队列,旧代次失败不影响新码,投递结果不明不自动重发。后端 `mvn -B -o clean verify` **390 项,0 失败/错误/跳过**,2026-10-22 08:41:38(Asia/Shanghai)结束;前端构建与 25 项测试通过,并通过独立容器的完整 Spring Boot 启动/健康检查。见 `28-verification-delivery-isolation.md`。 用户于 2026-10-22 明确取消每半小时提交检查,聊天自动化 `moyi` 已删除,不再自动轮询或提交;不停止产品内部 worker。当前开发仍只做经审查验证的本地提交,不 push、不部署、不迁移业务数据库;规格驱动验收环境未修复,未自行批准或执行业务验收。 + +2026-10-22 音视频规范化增量(MED-01/02/03):审查时修复音频参数校验中重复的模式变量名(编译错误)与旧目录测试假设,并收紧裸字符串结果只接受 URL。新增结果规范化、音频发送前拒绝、无文件完成结算一次等回归。后端 `mvn -B -o clean verify` **399 项,0 失败/错误/跳过**(独立 PostgreSQL 15.18/Redis 7,2026-10-22 11:47);前端构建与 27 项测试通过。没有真实供应商音视频生成,MED-04/05 仍未完成。 diff --git a/docs/29-cpr-gap-analysis-and-optimization-plan.md b/docs/29-cpr-gap-analysis-and-optimization-plan.md new file mode 100644 index 0000000..a11b551 --- /dev/null +++ b/docs/29-cpr-gap-analysis-and-optimization-plan.md @@ -0,0 +1,154 @@ +# CPR 及开源网关差距分析与深度优化方案 + +整理日期:2026-10-22(Asia/Shanghai)。本文合并两轮只读比对结论,作为后续优化的方案基线;实施进度以 `24-security-and-cpr-task-tracker.md` 为准。 + +## 任务来源 + +用户需求:对比当前版本与 CPR([Codex Proxy RS](https://github.com/zyycn/codex-proxy-rs))最新版的差距,确认 MOYI 是否基于 New API、Sub2API 或其他项目改造,与最新仓库比对,先分析差距,再对产品做深度优化。 + +第一轮比对时尚未确认 “cpr” 的具体指代,曾临时核查 CPA(CLIProxyAPI)和 CRS(Claude Relay Service);第二轮由用户确认为 Codex Proxy RS 后重新做了源码、架构与发布记录比对。两轮均为只读分析,没有修改代码、部署 CPR 或发起付费调用,也没有做同环境性能测试。 + +## 一、核心结论 + +- MOYI 不是 New API、Sub2API 或 CPR 的直接 fork,是自研 Java/Vue 控制面;早期计划接入 Otari,后来逐步自研网关数据面。 +- MOYI 在多模型产品管理、人民币钱包账本、价格快照、异步媒体任务方面已有自己的基础。 +- 与 CPR 相比,明显不足的是 Codex 专用协议、上游账号调度、长请求处理、重试与故障恢复边界。 +- 与 New API/Sub2API/Otari 相比,差距集中在协议转换完整性、企业组织权限、路由策略、复杂计费和生产治理。 +- 建议:**保留 MOYI 产品控制面和账本,重整网关执行层;CPR 作为 Codex 专用能力的参考或可选内网上游,不整体替换。** + +## 二、比对基线(当次锁定,非实时最新版) + +| 对象 | 锁定版本 | 日期 | 说明 | +|---|---|---|---| +| MOYI | `7785cda` | 2026-10-13 | 本地与自有远端一致;之后的安全增量见 24 号文档 | +| CPR 正式发布 | [`v3.29.6`](https://github.com/zyycn/codex-proxy-rs/releases/tag/v3.29.6)(`af35cde3`) | 2026-10-20 | 比对主要依据 | +| CPR 主分支 | `78bc57c5`(标记 `v3.29.7`) | 2026-10-21 | 多 9 个提交,未发布正式 Release;插件 RPC v4→v5,已有插件需重编译 | +| [New API](https://github.com/QuantumNous/new-api/releases/tag/v1.0.0-rc.45) | `v1.0.0-rc.45` | 10-17 | 主分支 `206e0fa5`,多 16 个提交 | +| [Sub2API](https://github.com/Wei-Shaw/sub2api/releases/tag/v0.2.17) | `v0.2.17` | 10-16 | 主分支 `8f2cbb53`,多 7 个提交 | +| [Otari](https://github.com/mozilla-ai/otari/releases/tag/v0.30.1) | `v0.30.1` | 10-20 | 主分支 `ac172ab7`,多 19 个提交 | +| [CPA](https://github.com/router-for-me/CLIProxyAPI/releases/tag/v8.0.36) | `v8.0.36` | 10-21 | 主分支与发布一致 | +| [CRS](https://github.com/Wei-Shaw/claude-relay-service/releases/tag/v1.1.315) | `v1.1.315` | 09-10 | 主分支与发布一致 | + +这些项目与 MOYI 没有共同版本线,不能用“落后多少提交”衡量,只比较能力、边界和验证程度。 + +## 三、项目来源判断 + +- 工程决策([04 号文档](04-open-source-baseline-and-development-nodes.md)):New API 仅参考产品功能和兼容性,不复制代码;Sub2API 参考共享额度、账号池和运营流程;Otari 原计划作为独立网关;用户、权限、钱包、模型目录、异步任务和双端控制台自研。 +- Git 历史:产品定义与 Vue 原型 → Otari 开发基座 → TypeScript 认证服务 → 迁移至 Java。未见继承 New API/Sub2API 提交历史的证据,也未发现基于 CPR 改造的证据。此判断不等同于逐文件代码相似度或许可证法律审计。 +- 运行架构已偏离早期设计:开发基座仍固定 Otari `v0.4.0`(`infra/otari/docker-compose.yml`),云端 Compose 不部署 Otari;Java 转发器直连供应商,自行处理协议、密钥选择、重试和流式响应(`provider/OpenAiCompatibleProvider.java`)。 + +因此不存在“升级 Otari 镜像”或“合并 New API/Sub2API 更新”的简单升级路径。 + +## 四、已具备的能力(10-13 版本) + +Messages、Responses、Gemini 原生入口与 Embeddings;用户级共享 RPM/并发/预算;Key 到期、IP 白名单、周期预算;渠道账号健康、冷却、安全重试、会话亲和与有限故障切换;版本化售价、采购成本、缓存写入、上下文阶梯与人工成本对账;TOTP 与恢复码;运营告警;真实异步媒体执行、钱包冻结结算与部分图片 Token 计费。范围见 [19 号文档](19-enterprise-gateway-increment.md)。优化应完善已有体系,而非重建。 + +## 五、与 CPR 的差距 + +先明确边界:CPR 是“面向 Codex 的自托管多账号网关”,明确不支持 `/v1/chat/completions`,内置 Provider 仅 OpenAI 与 xAI,不是通用多协议平台。 + +| 能力 | CPR 当前实现 | MOYI 现状与差距 | 优先级 | +|---|---|---|---| +| Codex 协议兼容 | 专用模型目录、业务扩展头、推理历史、工具及原生请求兼容 | 通用模型列表与有限 Responses 入口 | P0 | +| WebSocket 与续接 | Responses WebSocket、连接复用、`previous_response_id` 归属、续接失效恢复、中断控制 | 无 WebSocket 入口,直接拒绝 `previous_response_id` | P0 | +| 长推理与大上下文 | 不设统一总时限,分别管理连接、空闲、取消和租约 | 同步上游最多 90 秒;原生请求最多 256 KiB;输出 Token 上限 32,768 | P0 | +| 重试安全边界 | 区分未发送/已发送/结果不明,以及是否已交付业务输出 | 有安全重试和有限切换,缺同等完整的发送/交付状态模型 | P0 | +| 账号池生命周期 | OAuth/API Key 账号、凭据刷新、额度窗口、模型权限、账号级并发 | 渠道 + Key 池轮换,缺独立上游账号实体 | P1 | +| 调度策略 | 智能、额度重置优先、轮询、粘性;综合负载、额度、健康、首输出延迟 | 轮换、固定冷却、会话哈希亲和;延迟未进入选路 | P1 | +| 公平排队 | 有界等待、同级 FIFO、优先级、取消回收、共享等待预算 | 同步请求约每 100 ms 重新争抢 Redis 槽位,无公平性保证 | P1 | +| 诊断与统计 | 逐 attempt、上下游关联、传输类型、调度原因、恢复耗时、费用来源 | 仅最终调用记录与账号健康 | P1 | +| 配置与工程边界 | 冻结请求配置快照;协议、执行、Provider、存储分层;架构依赖测试与安全流水线 | 价格有快照,网关职责集中,缺统一执行合同和同等门禁 | P1 | + +参考:CPR [架构文档](https://github.com/zyycn/codex-proxy-rs/blob/af35cde3744b7afc81c4ad6e1e9c9c76bbbd68b8/docs/architecture.md)、[数据面接口文档](https://github.com/zyycn/codex-proxy-rs/blob/af35cde3744b7afc81c4ad6e1e9c9c76bbbd68b8/docs/api.md)。 + +直接影响客户体验的三点: + +1. **Responses 只是有限支持。** `gateway/NativeProtocolMeter.java` 明确拒绝云端续接、图片、文件、多种托管工具和服务档位,并固定限制请求体与输出 Token。简单文本可成功,长对话、图像、复杂工具和客户端恢复未必通过,不能宣传“完整支持 Codex”。 +2. **会话亲和不等于有状态续接。** `provider/UpstreamHealth.java` 用 `X-Moyi-Session` 选择账号,冷却后会重新选择。支持增量续接时必须记录响应所属账号、凭据版本和连接,不能把 A 账号的响应 ID 交给 B 账号。 +3. **排队与诊断不足以支撑企业 SLA。** `resources/redis/acquire-pair.lua` 获取槽位时不检查排队先后,持续竞争下新请求可能先于旧请求;只有最终错误和总耗时,无法区分慢在排队、建连、冷却还是生成。 + +## 六、与 New API/Sub2API/Otari 等的差距 + +“部分具备”指已有实现但覆盖或管理闭环不足。 + +| 维度 | MOYI 现状 | 主要差距 | 优先级 | +|---|---|---|---| +| 协议转换 | 原生透传 + 统一用量扣费 | New API RelayKit、Sub2API 有更完整的跨协议转换 | P0 | +| 编程客户端兼容 | 基础文本与函数工具,子路径少 | 缺 Responses WebSocket、compact 等入口;CPA 持续修复工具调用、推理和协议差异 | P0 | +| 多模态与托管工具 | 聊天入口拒绝图片、文件、音频、托管搜索 | 缺视觉聊天、文档理解、托管工具的协议与计费闭环 | P0/P1 | +| 身份与会话安全 | 密码、验证码、TOTP | 10-13 版本缺登录限速、统一密码策略、改密撤销会话(后续已补,见第九节) | P0 | +| 组织与权限 | 用户、三个全局角色、个人项目 | 缺组织、成员、项目角色、共享资源、企业 SSO 与离职回收;Otari 有组织/工作区治理 | P1 | +| 路由策略 | 有限备用路由、优先级、冷却 | 缺按成本、延迟、权重、容量、预算组合的策略及解释 | P1 | +| 上游账号池 | 环境变量 Key 池、轮换、健康指纹 | 缺账号生命周期、额度窗口、账号级容量、可视化轮换 | P1 | +| 定价与计量 | Token、缓存、部分阶梯、固定任务费、图片 Token | 缺视频时长/分辨率、音频、托管工具、服务档位;New API 有表达式计费 | P1 | +| 成本核对 | 快照、采购成本、人工核对 | 缺账单导入、自动匹配、差异归因、毛利预警 | P1 | +| 异步结果交付 | 数据库任务、轮询、部分媒体执行 | OSS 主要是配置预留;缺产物托管、授权下载、生命周期、批量与回调 | P1 | +| 可观测性 | 用量、容量快照、账号健康、错误率告警 | 缺链路追踪、逐 attempt、SLO、企业/项目聚合、日志留存治理 | P1 | +| 商业运营 | 管理员入账、对公合同付款 | 自助支付、订阅、退款不如 New API/Sub2API;与 B/G 定位不同,非首要 | P2 | +| 工程交付 | 单元测试、隔离数据库脚本、发布工具 | 缺自动化兼容矩阵与持续安全门禁;README 与实现不同步 | P1 | + +上游近期更新中值得转成 MOYI 回归用例的风险场景(不表示 MOYI 一定存在相同缺陷): + +- New API:Claude 显式零用量、全缓存请求计费、Vidu 按实际模型/时长/分辨率计费;任务重试前重新定价和预留、查询重定向凭据的主机限制、Redis 脚本被清空后的恢复。重点验证“字段缺失”与“明确为零”不混同。 +- Sub2API:Gemini 流中途断开计费、缓存计数导致负输入 Token、异步图片转存策略。 +- CPA:并行工具调用、推理 Token、结束原因、Gemini thought signature、首 Token 延迟统计,这类问题容易被“HTTP 200 测试”漏掉。 +- Otari:权重/条件/预算路由、组织工作区、策略解释与追踪。 + +## 七、不能照搬 CPR 的地方 + +- **额度不是严格预付费钱包。** CPR 准入只检查已结算金额、不预占;并发请求可使最终金额超限;无法取得费用的尝试按零累计且不建待核账记录;结算暂存重试依赖进程内状态([budget.rs](https://github.com/zyycn/codex-proxy-rs/blob/af35cde3744b7afc81c4ad6e1e9c9c76bbbd68b8/backend/crates/gateway-core/src/engine/budget.rs#L34))。MOYI 的钱包锁、预占、价格快照和待对账状态(`wallet/ChatBillingService.java`)应保留并强化。 +- **凭据保护不能降级。** CPR Provider 凭据以明文 JSON 保存;MOYI 使用 AES-GCM。 +- **不能直接横向扩容。** CPR 官方限定单进程单副本,含进程内队列、连接池和状态。 +- **不能替代产品控制面。** CPR 只有管理员与 Key 持有者身份,没有用户、角色、人民币钱包、项目和媒体任务体系。 +- **业务备份不等于审计备份。** CPR `v3.29.6` 业务归档排除请求明细、诊断与审计日志,B/G 端须独立制定审计留存与备份策略。 +- **不能因 Rust 断言更快。** 未做同环境性能测试。 +- **许可证。** 参考或复用代码时须分别处理 New API(AGPL)、Sub2API(LGPL)及 Otari/CPA/CRS/CPR 的实际许可证。 + +## 八、深度优化方案 + +原则:保留 Java/Vue、现有账户和钱包账本,先明确数据面边界,不整体重写为某个开源项目。直接换底座会同时带来账户迁移、历史金额、Key、审计和许可证风险。MOYI 钱包始终是唯一用户财务事实来源,不让两套系统各自扣费。 + +### 第一阶段:安全与统一执行底座 + +- 安全:登录分布式限速、统一密码策略、改密撤销会话、用户停用、任务 scope/项目隔离、Provider 出站限制、管理接口授权审查。 +- 统一请求生命周期,重试、断线、取消、服务重启都进入同一流程,不由各 Controller 分别处理: + + `准入 → 冻结权限与价格 → 排队 → 上游尝试 → 交付 → 结算/待核账` + +- 不能只把 90 秒超时改长。同步请求租约 3 分钟、钱包预留默认 5 分钟到期;放开长任务必须同时设计租约续期、预留恢复和结算逻辑,否则引入资金与并发问题。 +- 协议解析、流事件、工具调用、用量归一化从业务 Controller 中分离;错误格式分别符合 Anthropic、OpenAI、Gemini 约定。 + +### 第二阶段:Codex 兼容通道与兼容矩阵 + +- 优先完成 Responses WebSocket、模型能力目录、会话与续接归属、工具/图片输入、长流和取消。 +- 建立“客户端 × 协议 × 上游 × 能力”验收矩阵,指定客户端版本、模型、工具和计费联合验收。 +- 可选小范围验证:仅 Codex 路由接内网 CPR,Chat、Messages、Gemini、3D/媒体仍走原适配器。不能只改 Base URL:MOYI 当前会在转发前拒绝大量原生请求,还需对接请求关联、用量、重试和费用合同。 +- 用同一测试集比较“继续自研”与“接入独立网关”的成本后再定底座。 + +### 第三阶段:账号调度与组织权限 + +- 将“渠道下多个字符串 Key”升级为受控、加密、可审计的独立账号资源:凭据版本、模型范围、容量、额度、健康。 +- 先做可解释的加权策略,再引入延迟、失败率、额度重置信号;补公平排队(FIFO、取消回收、共享等待预算)。 +- OAuth 订阅账号池为可选能力,不作为 B/G 客户 SLA 默认基础,须先核实上游授权和服务条款。 +- 组织、成员、项目角色、项目钱包/预算、资源归属、企业 SSO;保留个人账号作为兼容入口,授权在后端统一执行。 + +### 第四阶段:财务、媒体与生产治理 + +- 定价使用版本化规则、试算和审核发布;补视频时长/分辨率、音频、托管工具计费;账单自动匹配与差异告警独立于用户扣费。 +- 媒体:OSS 产物、短期下载授权、留存删除、任务回调与恢复。 +- 治理:逐 attempt 诊断、链路追踪、SLO、企业/项目用量、数据留存、备份恢复演练、依赖扫描、协议回归、发布门禁。 +- 模型状态拆分为:目录已登记 → 凭据已配置 → 协议已验证 → 计费已验证 → 生产可用,并记录验证日期与证据。10-13 部署记录为 315 个公开分组、226 个配置就绪、39 个暂缓、50 个待核实,“配置就绪”不等于真实调用验收。 + +## 九、实施映射与当前进度 + +各项已拆为 24 号文档中的任务 ID,进度只在该表更新: + +| 方案内容 | 任务 ID | +|---|---| +| 第一阶段安全 | SEC-01~SEC-07 | +| 长请求与续租、Codex 协议、WebSocket 续接 | COD-01~COD-03 | +| 账号生命周期、公平排队 | SCH-01~SCH-02 | +| 诊断、配置版本、门禁;CPR 可选部署 | OPS-01~OPS-02 | +| 音视频回执、协议、展示、计费、鉴权下载 | MED-01~MED-05 | + +截至 2026-10-22,SEC-01/02/03 已实现并验证(25、27、28 号文档),SEC-06 完成本地代码边界(26 号文档),其余 COD/SCH/OPS/MED 项未完成。未部署、未真实供应商验证的项保持未完成标记,不宣称“完整支持 Codex”或“全仓库安全”。 diff --git a/prototype/src/services/catalog.ts b/prototype/src/services/catalog.ts index 9a1fb8c..f55c1f5 100644 --- a/prototype/src/services/catalog.ts +++ b/prototype/src/services/catalog.ts @@ -231,6 +231,7 @@ export interface ChatCompletionResult { export interface AsyncTaskResult { id: string model: string + taskType?: AsyncMediaType provider?: string status: 'queued' | 'running' | 'reconciling' | 'succeeded' | 'failed' | 'cancelled' requiresReconciliation?: boolean diff --git a/prototype/src/services/media.ts b/prototype/src/services/media.ts index 1bf901d..8f4e34f 100644 --- a/prototype/src/services/media.ts +++ b/prototype/src/services/media.ts @@ -29,7 +29,7 @@ function base64DataUrl(value: unknown, mimeType: unknown, format: string): strin if (!/^[a-z0-9+/]+={0,2}$/i.test(payload) || payload.length % 4 === 1) return undefined const mime = typeof mimeType === 'string' && /^(image|video|audio|model)\/[a-z0-9.+-]+$/i.test(mimeType) ? mimeType.toLowerCase() - : ({ png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', webp: 'image/webp', gif: 'image/gif', mp4: 'video/mp4', webm: 'video/webm', mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', glb: 'model/gltf-binary', gltf: 'model/gltf+json' } as Record)[format] + : ({ png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', webp: 'image/webp', gif: 'image/gif', mp4: 'video/mp4', webm: 'video/webm', mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', opus: 'audio/ogg', aac: 'audio/aac', flac: 'audio/flac', m4a: 'audio/mp4', glb: 'model/gltf-binary', gltf: 'model/gltf+json' } as Record)[format] return mime ? `data:${mime};base64,${payload}` : undefined } @@ -47,22 +47,27 @@ export function mediaResult(result: Record = {}, type = ''): Me const format = typeof result.format === 'string' ? result.format.toLowerCase() : '' const mime = typeof result.mimeType === 'string' ? result.mimeType.toLowerCase() : typeof result.mime_type === 'string' ? result.mime_type.toLowerCase() : '' const url = mediaValue(result.url, mime, format) || base64DataUrl(result.b64_json || result.base64 || result.data, mime, format) - const suffix = url ? new URL(url).pathname.toLowerCase().split('.').pop() : '' + const suffix = url && !url.startsWith('data:') ? new URL(url).pathname.toLowerCase().match(/\.([a-z0-9]+)$/)?.[1] || '' : '' const isImage = type === '图像' || type === 'image' || mime.startsWith('image/') || /^(png|jpe?g|webp|gif|avif)$/.test(format || suffix || '') const isVideo = type === '视频' || type === 'video' || mime.startsWith('video/') || /^(mp4|webm|mov)$/.test(format || suffix || '') - const isAudio = type === '音频' || type === 'audio' || mime.startsWith('audio/') || /^(mp3|wav|ogg|m4a|flac|aac)$/.test(format || suffix || '') + const isAudio = type === '音频' || type === 'audio' || mime.startsWith('audio/') || /^(mp3|wav|ogg|opus|m4a|flac|aac)$/.test(format || suffix || '') const isModel = type === '3D' || type === '3d' || /^(glb|gltf|obj|fbx|stl)$/.test(format || suffix || '') return { imageUrl: mediaValue(result.imageUrl, mime, format) || mediaValue(result.image_url, mime, format) || (isImage ? url : undefined), videoUrl: mediaValue(result.videoUrl, mime, format) || mediaValue(result.video_url, mime, format) || (isVideo ? url : undefined), audioUrl: mediaValue(result.audioUrl, mime, format) || mediaValue(result.audio_url, mime, format) || (isAudio ? url : undefined), modelUrl: mediaValue(result.modelUrl, mime, format) || (isModel ? url : undefined), - previewUrl: mediaValue(result.previewUrl, mime, format), + previewUrl: mediaValue(result.previewUrl, mime, format) || mediaValue(result.preview_url, mime, format) || mediaValue(result.last_frame_url, 'image/png', ''), resultUrl: url, resultFormat: format || suffix, } } +/** Persisted task kind wins over a missing/edited model catalog entry. */ +export function taskMediaType(taskType: unknown, fallback: string): string { + return ({ video: '视频', audio: '音频', image: '图像', '3d': '3D' } as Record)[typeof taskType === 'string' ? taskType.toLowerCase() : ''] || fallback +} + export function mediaTypeLabel(type: string): string { return ({ text: '文本', image: '图片', image_url: '图片', video: '视频', audio: '音频', '3d': '3D', glb: 'GLB 模型', multimodal: '多模态' })[type.toLowerCase()] || type } diff --git a/prototype/src/views/UserConsole.vue b/prototype/src/views/UserConsole.vue index 4d54c5d..cfbfa81 100644 --- a/prototype/src/views/UserConsole.vue +++ b/prototype/src/views/UserConsole.vue @@ -51,7 +51,7 @@ import UiModal from '../components/UiModal.vue' import ModelGroupPermissions from '../components/ModelGroupPermissions.vue' import UsageHistory from '../components/UsageHistory.vue' import MediaResult from '../components/MediaResult.vue' -import { generationLabel, mediaResult, mediaTypeLabel, safeMediaUrl } from '../services/media' +import { generationLabel, mediaResult, mediaTypeLabel, safeMediaUrl, taskMediaType } from '../services/media' defineProps<{ view: string; displayName?: string }>() const emit = defineEmits<{ navigate: [view: string]; notify: [message: string]; balance: [value: number | undefined] }>() @@ -494,10 +494,12 @@ function normalizeAssistantMedia(value: unknown) { } function mapAsyncTask(task: AsyncTaskResult, model: ModelItem, taskPrompt?: string): TaskItem { - const modelUrl = task.output?.modelUrl || task.result?.modelUrl - const videoUrl = task.output?.videoUrl || task.result?.videoUrl - const previewUrl = task.output?.previewUrl || task.result?.previewUrl - const assets = mediaResult({ ...task.result, ...task.output }, model.type) + const type = taskMediaType(task.taskType, model.type) + const assets = mediaResult({ ...task.result, ...task.output }, type) + const modelUrl = assets.modelUrl + const videoUrl = assets.videoUrl + const previewUrl = assets.previewUrl + const deliveryPending = task.result?.deliveryStatus === 'pending' const imageUrl = assets.imageUrl const audioUrl = assets.audioUrl const resultUrl = assets.resultUrl @@ -513,13 +515,13 @@ function mapAsyncTask(task: AsyncTaskResult, model: ModelItem, taskPrompt?: stri const createdAt = task.createdAt || task.created_at return { id: task.id, - name: model.type === '视频' || task.provider === 'seedance' ? '文字生成视频' : model.type === '图像' ? '生成图片' : model.type === '音频' ? '生成音频' : '生成 3D', + name: type === '视频' || task.provider === 'seedance' ? '文字生成视频' : type === '图像' ? '生成图片' : type === '音频' ? '生成音频' : '生成 3D', model: model.name, status: statusMap[task.status], progress: task.status === 'succeeded' ? 100 : Math.round(task.progress || 0), createdAt: createdAt ? formatTaskTime(createdAt) : '刚刚', duration: task.completedAt ? '已完成' : task.status === 'reconciling' ? '等待核账' : '计算中', - result: task.error?.message || (videoUrl ? '视频已生成' : imageUrl ? '图片已生成' : audioUrl ? '音频已生成' : modelUrl ? 'GLB 模型已生成' : resultUrl ? '文件已生成' : task.status === 'succeeded' ? '异步任务已完成' : task.status === 'running' ? `正在生成 · ${Math.round(task.progress || 0)}%` : '等待平台调度'), + result: task.error?.message || (deliveryPending ? '上游生成完成,但结果文件尚未接入;请联系管理员获取,勿重复生成' : videoUrl ? '视频已生成' : imageUrl ? '图片已生成' : audioUrl ? '音频已生成' : modelUrl ? 'GLB 模型已生成' : resultUrl ? '文件已生成' : task.status === 'succeeded' ? '异步任务已完成' : task.status === 'running' ? `正在生成 · ${Math.round(task.progress || 0)}%` : '等待平台调度'), provider: task.provider, prompt: taskPrompt, modelUrl: modelUrl || assets.modelUrl, @@ -528,7 +530,7 @@ function mapAsyncTask(task: AsyncTaskResult, model: ModelItem, taskPrompt?: stri imageUrl, audioUrl, resultUrl, - resultFormat: task.output?.format || task.result?.format, + resultFormat: assets.resultFormat, creditsConsumed, remote: true, } @@ -563,7 +565,7 @@ async function pollTask(taskId: string, apiKey: string) { // Refresh financial state without encouraging another generation request. await refreshOverview() historyRevision.value++ - emit('notify', latest.status === 'reconciling' ? `${previous.name}结果尚未确认,额度仍冻结,请联系管理员核账,勿重复提交` : latest.status === 'succeeded' ? `${previous.name}完成,可以查看和保存结果` : `${previous.name}未能完成,请查看错误说明`) + emit('notify', latest.status === 'reconciling' ? `${previous.name}结果尚未确认,额度仍冻结,请联系管理员核账,勿重复提交` : latest.result?.deliveryStatus === 'pending' ? '上游已完成,结果文件尚未接入,请联系管理员,勿重复生成' : latest.status === 'succeeded' ? `${previous.name}完成,可以查看和保存结果` : `${previous.name}未能完成,请查看错误说明`) } } catch (error) { taskPollers.delete(taskId) diff --git a/prototype/tests/media.test.mjs b/prototype/tests/media.test.mjs index b9605d4..7624e1d 100644 --- a/prototype/tests/media.test.mjs +++ b/prototype/tests/media.test.mjs @@ -1,6 +1,6 @@ import { test } from 'node:test' import assert from 'node:assert/strict' -import { mediaResult, safeMediaUrl } from '../src/services/media.ts' +import { mediaResult, safeMediaUrl, taskMediaType } from '../src/services/media.ts' test('mediaResult keeps provider URLs in their declared media lane', () => { const result = mediaResult({ url: 'https://cdn.example.test/result.mp4', format: 'mp4' }, '视频') @@ -24,3 +24,20 @@ test('mediaResult supports provider base64 output and nested media objects', () assert.match(nested.imageUrl, /^data:image\/png;base64,iVBORw0KGgo=$/) assert.equal(safeMediaUrl('data:text/html;base64,PGh0bWw+'), undefined) }) + +test('persisted task type wins over a missing or edited catalog entry', () => { + assert.equal(taskMediaType('video', '3D'), '视频') + assert.equal(taskMediaType('AUDIO', '3D'), '音频') + assert.equal(taskMediaType(undefined, '图像'), '图像') + const video = mediaResult({ url: 'https://cdn.example.test/v?sig=abc' }, taskMediaType('video', '3D')) + assert.equal(video.videoUrl, 'https://cdn.example.test/v?sig=abc') + assert.equal(video.modelUrl, undefined) +}) + +test('audio base64 without a file suffix plays as audio', () => { + const audio = mediaResult({ base64: 'ZmFrZQ==', format: 'opus' }, '音频') + assert.equal(audio.audioUrl, 'data:audio/ogg;base64,ZmFrZQ==') + assert.equal(audio.resultFormat, 'opus') + const frame = mediaResult({ video_url: 'https://cdn.example.test/a.mp4', last_frame_url: 'https://cdn.example.test/a.png' }, '视频') + assert.equal(frame.previewUrl, 'https://cdn.example.test/a.png') +})