From ea9069e332c9b5058c0f8add3e9779af8ec40daa Mon Sep 17 00:00:00 2001 From: WangLX <519407855@qq.com> Date: Wed, 30 Sep 2026 12:50:27 +0800 Subject: [PATCH] fix: expose implemented async relay executors --- .../controlplane/catalog/CatalogService.java | 20 ++++++++++++++----- .../catalog/CatalogServiceTest.java | 19 ++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 control-plane-java/src/test/java/com/moyi/controlplane/catalog/CatalogServiceTest.java 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 6c12880..cc3100e 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 @@ -517,11 +517,15 @@ public class CatalogService { model.put("status", resultSet.getString("status")); String providerCode = resultSet.getString("provider_code"); String providerProtocol = resultSet.getString("provider_protocol"); - // Only adapters that are implemented and verified are published as - // executable. Relay catalog rows stay visibly pending until their - // provider endpoint has been configured and tested; protocol alone is - // not proof that an image/video/audio task API exists. - boolean asyncExecutor = List.of("provider-mock", "provider-vast", "provider-bytedance").contains(resultSet.getString("provider_id")); + // Keep the catalog state aligned with the real async adapters. The + // OpenAI-compatible adapter handles image, video and speech tasks for + // relay providers; it does not claim support for arbitrary async + // model types. Provider-specific adapters cover Tripo 3D and + // Seedance. This prevents a relay route from being shown as + // "异步执行器待接入" 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")); model.put("executionReady", !"async".equals(resultSet.getString("call_mode")) || asyncExecutor); model.put("billingReady", billingReady(pricing, resultSet.getString("call_mode"), resultSet.getString("provider_id"))); // Keep the internal route UUID for permission storage and expose a @@ -542,6 +546,12 @@ public class CatalogService { return amount != null; } + static boolean asyncExecutorReady(String providerId, String providerProtocol, String modelType) { + if (List.of("provider-mock", "provider-vast", "provider-bytedance").contains(providerId)) return true; + if (!"openai-compatible".equalsIgnoreCase(providerProtocol)) return false; + return List.of("image", "video", "audio").contains(String.valueOf(modelType).toLowerCase(java.util.Locale.ROOT)); + } + private boolean billingReady(Map pricing, String mode, String providerId) { if ("provider-mock".equals(providerId)) return true; if (pricing == null) return false; 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 new file mode 100644 index 0000000..23c57d7 --- /dev/null +++ b/control-plane-java/src/test/java/com/moyi/controlplane/catalog/CatalogServiceTest.java @@ -0,0 +1,19 @@ +package com.moyi.controlplane.catalog; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class CatalogServiceTest { + @Test + void asyncReadinessMatchesImplementedAdapters() { + assertTrue(CatalogService.asyncExecutorReady("provider-vast", "http", "3d")); + 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")); + assertFalse(CatalogService.asyncExecutorReady("relay-provider", "openai-compatible", "3d")); + assertFalse(CatalogService.asyncExecutorReady("relay-provider", "http", "video")); + } +}