From a49722d5c770a24a9aaf39d4acbfc3fb58202049 Mon Sep 17 00:00:00 2001 From: Yiling-J Date: Sun, 6 Sep 2026 15:13:01 +0800 Subject: [PATCH] feat(settings): redesign image/video settings to provider dialog with model toggles (#385) --- bun.lock | 30 +- package.json | 2 +- packages/api/src/media-generation.test.ts | 18 +- packages/api/src/media-generation.ts | 2 +- .../media-generation/media-generation.test.ts | 46 + .../src/media-generation/media-generation.ts | 59 +- packages/dtos/src/media-generation.ts | 16 +- .../ImageVideoGenerationSettings.test.tsx | 389 +++-- .../settings/ImageVideoGenerationSettings.tsx | 1445 ++++++++--------- packages/webui/messages/en.json | 11 +- packages/webui/messages/zh.json | 11 +- packages/webui/paraglide/messages/_index.d.ts | 9 +- packages/webui/paraglide/messages/_index.js | 11 +- .../paraglide/messages/add_custom_model.d.ts | 16 + .../paraglide/messages/add_custom_model.js | 29 + ...search_models.d.ts => all_modalities.d.ts} | 10 +- .../paraglide/messages/all_modalities.js | 29 + .../paraglide/messages/clear_custom_key.d.ts | 16 + .../paraglide/messages/clear_custom_key.js | 29 + .../messages/failed_to_update_provider.d.ts | 16 + .../messages/failed_to_update_provider.js | 29 + .../messages/image_models_count.d.ts | 18 + .../paraglide/messages/image_models_count.js | 29 + .../paraglide/messages/manage_provider.d.ts | 16 + .../paraglide/messages/manage_provider.js | 29 + .../provider_not_configured_warning.d.ts | 16 + .../provider_not_configured_warning.js | 29 + .../webui/paraglide/messages/search_models.js | 29 - .../messages/video_models_count.d.ts | 18 + .../paraglide/messages/video_models_count.js | 29 + 30 files changed, 1450 insertions(+), 986 deletions(-) create mode 100644 packages/webui/paraglide/messages/add_custom_model.d.ts create mode 100644 packages/webui/paraglide/messages/add_custom_model.js rename packages/webui/paraglide/messages/{search_models.d.ts => all_modalities.d.ts} (60%) create mode 100644 packages/webui/paraglide/messages/all_modalities.js create mode 100644 packages/webui/paraglide/messages/clear_custom_key.d.ts create mode 100644 packages/webui/paraglide/messages/clear_custom_key.js create mode 100644 packages/webui/paraglide/messages/failed_to_update_provider.d.ts create mode 100644 packages/webui/paraglide/messages/failed_to_update_provider.js create mode 100644 packages/webui/paraglide/messages/image_models_count.d.ts create mode 100644 packages/webui/paraglide/messages/image_models_count.js create mode 100644 packages/webui/paraglide/messages/manage_provider.d.ts create mode 100644 packages/webui/paraglide/messages/manage_provider.js create mode 100644 packages/webui/paraglide/messages/provider_not_configured_warning.d.ts create mode 100644 packages/webui/paraglide/messages/provider_not_configured_warning.js delete mode 100644 packages/webui/paraglide/messages/search_models.js create mode 100644 packages/webui/paraglide/messages/video_models_count.d.ts create mode 100644 packages/webui/paraglide/messages/video_models_count.js diff --git a/bun.lock b/bun.lock index 2b9e1ea5..1cf4280f 100644 --- a/bun.lock +++ b/bun.lock @@ -6,7 +6,7 @@ "name": "shumai", "devDependencies": { "@eslint/js": "10.0.1", - "@inlang/paraglide-js": "2.25.0", + "@inlang/paraglide-js": "2.20.0", "@playwright/test": "1.61.1", "@testcontainers/postgresql": "12.1.0", "@testing-library/dom": "10.4.1", @@ -648,11 +648,11 @@ "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.35.4", "", { "os": "win32", "cpu": "x64" }, "sha512-XtmnYhBcrORsJ4XJngyzr/EWP0hRZLAZRFaApdKuviyqF78+ylxh2y06ZmtULAMOnObJ3ucpN0AcwSWnMowTRg=="], - "@inlang/paraglide-js": ["@inlang/paraglide-js@2.25.0", "", { "dependencies": { "@inlang/recommend-sherlock": "^0.2.1", "@inlang/sdk": "^3.0.1", "commander": "11.1.0", "consola": "3.4.0", "jiti": "^2.7.0", "json5": "2.2.3", "unplugin": "^2.1.2", "urlpattern-polyfill": "^10.0.0", "valibot": "^1.4.2" }, "peerDependencies": { "typescript": ">=5.6", "vite": ">=5.0.0" }, "optionalPeers": ["typescript", "vite"], "bin": { "paraglide-js": "bin/run.js" } }, "sha512-a3Gw3md1S3WyJK1rFAP/FwDCsFKnu1b98rJ3k5bUl6nc3cmbglaSYpuK9qq9aLLlUlZhuCtB/Pb1LeKDUaLycg=="], + "@inlang/paraglide-js": ["@inlang/paraglide-js@2.20.0", "", { "dependencies": { "@inlang/recommend-sherlock": "^0.2.1", "@inlang/sdk": "^2.10.0", "commander": "11.1.0", "consola": "3.4.0", "json5": "2.2.3", "unplugin": "^2.1.2", "urlpattern-polyfill": "^10.0.0" }, "peerDependencies": { "typescript": ">=5.6" }, "optionalPeers": ["typescript"], "bin": { "paraglide-js": "bin/run.js" } }, "sha512-vI8PdPVZSnpYnpagjvm+nWSa3nMDRJKVM/2eLAtUHFrNcZZadxVdmP79r4W95+dkMLDFGEyzSSY9sFxvjdkkyQ=="], "@inlang/recommend-sherlock": ["@inlang/recommend-sherlock@0.2.1", "", { "dependencies": { "comment-json": "^4.2.3" } }, "sha512-ckv8HvHy/iTqaVAEKrr+gnl+p3XFNwe5D2+6w6wJk2ORV2XkcRkKOJ/XsTUJbPSiyi4PI+p+T3bqbmNx/rDUlg=="], - "@inlang/sdk": ["@inlang/sdk@3.0.2", "", { "dependencies": { "@lix-js/sdk": "0.12.3", "@sinclair/typebox": "^0.31.17", "kysely": "^0.28.12", "sqlite-wasm-kysely": "0.3.0", "uuid": "^14.0.0" } }, "sha512-qBAzkOLRQ42hZBl2/AZFZD+/JkdjBAvwxWphdTs9UbikMsuLathOBOIl+rC/mzaq48ylD3zE8Je2nrx7tbm0pw=="], + "@inlang/sdk": ["@inlang/sdk@2.10.2", "", { "dependencies": { "@lix-js/sdk": "0.4.10", "@sinclair/typebox": "^0.31.17", "kysely": "^0.28.12", "sqlite-wasm-kysely": "0.3.0", "uuid": "^14.0.0" } }, "sha512-O1ki72SNK6LPagaGrvlioBb1mWKvump7cO7P85hfGZjdFTmDdn3icI0A6MvaBsB3P9KQHAjzyubnN1OslGufTw=="], "@isaacs/cliui": ["@isaacs/cliui@8.0.2", "", { "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", "strip-ansi": "^7.0.1", "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", "wrap-ansi": "^8.1.0", "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" } }, "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="], @@ -750,15 +750,9 @@ "@lexical/yjs": ["@lexical/yjs@0.49.0", "", { "dependencies": { "@lexical/internal": "0.49.0", "@lexical/selection": "0.49.0", "lexical": "0.49.0" }, "peerDependencies": { "typescript": ">=5.2", "yjs": ">=13.5.22" }, "optionalPeers": ["typescript"] }, "sha512-uqV3D0AOLqQ1f/Bo6ZtuDLoJYGlBm0RlucNYhNvfMAncEw0f/xHc1pTyXeWjdCI/iWgWR/MV6hgVi26TSPs+Vg=="], - "@lix-js/sdk": ["@lix-js/sdk@0.12.3", "", { "dependencies": { "fflate": "^0.8.3" }, "optionalDependencies": { "@lix-js/sdk-darwin-arm64": "0.12.3", "@lix-js/sdk-linux-arm64": "0.12.3", "@lix-js/sdk-linux-x64": "0.12.3", "@lix-js/sdk-win32-x64": "0.12.3" } }, "sha512-T2194yoZsM2S9kyRmI8UtEJL0fgXYAkeY9jZ/PVyC0K78/wmBvrqOSt9SdvgYxM5qnZ57re3NLOjVlV+X5hWxQ=="], + "@lix-js/sdk": ["@lix-js/sdk@0.4.10", "", { "dependencies": { "@lix-js/server-protocol-schema": "0.1.1", "dedent": "1.5.1", "human-id": "^4.1.1", "js-sha256": "^0.11.0", "kysely": "^0.28.12", "sqlite-wasm-kysely": "0.3.0", "uuid": "^14.0.0" } }, "sha512-0dMInAJK/67guTG5rRZaCEhvzC5cCXENOjaePA5AqMXrCE97kaY7SRor9e2vnoGsFIiGqXKlT0MCIoZj36G0gg=="], - "@lix-js/sdk-darwin-arm64": ["@lix-js/sdk-darwin-arm64@0.12.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-YeMJyYGk+QwvQe8O4AAcBMgfNm68IjAGDvuvZHr1U1rIb3GC2kYFStajqf4mT4BGc+cN65/P/2kkqEo+Igu/sA=="], - - "@lix-js/sdk-linux-arm64": ["@lix-js/sdk-linux-arm64@0.12.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-jtmfNg6jLW61l1QvsU3W184l3hGtYUyPGzZrQyekk0vsMF1hxsP++7ONEGNI19PE7ldwSnGCB8Q6OzRKX87abQ=="], - - "@lix-js/sdk-linux-x64": ["@lix-js/sdk-linux-x64@0.12.3", "", { "os": "linux", "cpu": "x64" }, "sha512-PiQL4h1FJXbxnZx/PgenI5grgpFtYlS/ZtPtTYh638YHVu+6J0cqGY/pLVqP8CKv1dWAKsZ2YgftLd+1j2+WKA=="], - - "@lix-js/sdk-win32-x64": ["@lix-js/sdk-win32-x64@0.12.3", "", { "os": "win32", "cpu": "x64" }, "sha512-hnxMI7kPS4ngXs0ZVnOve5CmtC4+vaNIyNDi/yWU0rSvxj7mqw/1RCegTrCB7LjxlX4DG+eg9HruXurk9NDjGg=="], + "@lix-js/server-protocol-schema": ["@lix-js/server-protocol-schema@0.1.1", "", {}, "sha512-jBeALB6prAbtr5q4vTuxnRZZv1M2rKe8iNqRQhFJ4Tv7150unEa0vKyz0hs8Gl3fUGsWaNJBh3J8++fpbrpRBQ=="], "@mistralai/mistralai": ["@mistralai/mistralai@2.2.6", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.40.0", "ws": "^8.18.0", "zod": "^3.25.0 || ^4.0.0", "zod-to-json-schema": "^3.25.0" }, "peerDependencies": { "@opentelemetry/api": "^1.9.0" }, "optionalPeers": ["@opentelemetry/api"] }, "sha512-W8pX7zHxjJvMIpw8JMxeJEleapXX0Q9NPszdNzqkM3MIEoIGPObdodujj+WHteXEvGfaP/AMwlNyRfEzSY6dQQ=="], @@ -1672,6 +1666,8 @@ "decode-named-character-reference": ["decode-named-character-reference@1.3.0", "", { "dependencies": { "character-entities": "^2.0.0" } }, "sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q=="], + "dedent": ["dedent@1.5.1", "", { "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, "optionalPeers": ["babel-plugin-macros"] }, "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg=="], + "deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="], "deepmerge-ts": ["deepmerge-ts@7.1.5", "", {}, "sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw=="], @@ -1876,7 +1872,7 @@ "fs-monkey": ["fs-monkey@1.1.0", "", {}, "sha512-QMUezzXWII9EV5aTFXW1UBVUO77wYPpjqIF8/AviUCThNeSYZykpoTixUeaNNBwmCev0AMDWMAni+f8Hxb1IFw=="], - "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], + "fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="], "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], @@ -1970,6 +1966,8 @@ "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="], + "human-id": ["human-id@4.2.1", "", { "bin": { "human-id": "dist/cli.js" } }, "sha512-zPGsiS+dWoTZtZ4AtpA9Y+BdSFSNWvnouNlWNoUFyAM6xHOHmdCvqO3k8AIbdamCOv4gUFUVNPf6rJFfc4UiJw=="], + "hyperdyperid": ["hyperdyperid@1.2.0", "", {}, "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A=="], "iconv-lite": ["iconv-lite@0.7.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ=="], @@ -2084,6 +2082,8 @@ "joycon": ["joycon@3.1.1", "", {}, "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw=="], + "js-sha256": ["js-sha256@0.11.1", "", {}, "sha512-o6WSo/LUvY2uC4j7mO50a2ms7E/EAdbP0swigLV+nzHKTTaYnaLIWJ02VdXrsJX0vGedDESQnLsOekr94ryfjg=="], + "js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], "jsesc": ["jsesc@3.1.0", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA=="], @@ -2904,6 +2904,8 @@ "@jsonjoy.com/util/@jsonjoy.com/buffers": ["@jsonjoy.com/buffers@1.2.1", "", { "peerDependencies": { "tslib": "2" } }, "sha512-12cdlDwX4RUM3QxmUbVJWqZ/mrK6dFQH4Zxq6+r1YXKXYBNgZXndx2qbCJwh3+WWkCSn67IjnlG3XYTvmvYtgA=="], + "@lix-js/sdk/uuid": ["uuid@14.0.2", "", { "bin": { "uuid": "dist-node/bin/uuid" } }, "sha512-xZe/16rV4aa+HGSOCiY2YeLT1OybRLrrkL/Rqaq7p7GMVXjFh+6wN4oMYgjFmnSnhY8t6Xpdl2l9qmnHYuMHwQ=="], + "@prisma/dev/std-env": ["std-env@3.10.0", "", {}, "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg=="], "@prisma/engines/@prisma/get-platform": ["@prisma/get-platform@7.10.0", "", { "dependencies": { "@prisma/debug": "7.10.0" } }, "sha512-0bra1LFYi8xNw0yqV62bHJNQk4BKleOngZiqPWIQc7a3+9q6rqsnqJ15BuepP8943PFMvtmgnP52juZsyYkA6w=="], @@ -3010,8 +3012,6 @@ "pg-types/postgres-array": ["postgres-array@2.0.0", "", {}, "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="], - "playwright/fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="], - "prisma-json-types-generator/semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="], "prop-types/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="], @@ -3032,6 +3032,8 @@ "thread-stream/real-require": ["real-require@1.0.0", "", {}, "sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g=="], + "vite/fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], + "wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], "wrap-ansi-cjs/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="], diff --git a/package.json b/package.json index 4a0328cc..73b5158a 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@eslint/js": "10.0.1", - "@inlang/paraglide-js": "2.25.0", + "@inlang/paraglide-js": "2.20.0", "@playwright/test": "1.61.1", "@testcontainers/postgresql": "12.1.0", "@testing-library/dom": "10.4.1", diff --git a/packages/api/src/media-generation.test.ts b/packages/api/src/media-generation.test.ts index bd5d8d97..18b2f8bb 100644 --- a/packages/api/src/media-generation.test.ts +++ b/packages/api/src/media-generation.test.ts @@ -49,13 +49,16 @@ describe('media-generation api', () => { expect(mediaGenerationService.getSettings).toHaveBeenCalledWith('t1') }) - it('PUT /teams/:teamId/media-generation/providers/:provider updates api key', async () => { - vi.mocked(mediaGenerationService.updateProviderApiKey).mockResolvedValue(undefined) + it('PUT /teams/:teamId/media-generation/providers/:provider updates api key and models', async () => { + vi.mocked(mediaGenerationService.updateProvider).mockResolvedValue(undefined) const res = await app.request('/teams/t1/media-generation/providers/openai', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ apiKey: 'sk-new-key' }), + body: JSON.stringify({ + apiKey: 'sk-new-key', + models: [{ type: 'image', modelId: 'dall-e-3', name: 'DALL-E 3' }], + }), }) expect(res.status).toBe(200) @@ -67,11 +70,10 @@ describe('media-generation api', () => { type: ResourceType.Team, id: 't1', }) - expect(mediaGenerationService.updateProviderApiKey).toHaveBeenCalledWith( - 't1', - 'openai', - 'sk-new-key', - ) + expect(mediaGenerationService.updateProvider).toHaveBeenCalledWith('t1', 'openai', { + apiKey: 'sk-new-key', + models: [{ type: 'image', modelId: 'dall-e-3', name: 'DALL-E 3' }], + }) }) it('POST /teams/:teamId/media-generation/models adds an enabled model', async () => { diff --git a/packages/api/src/media-generation.ts b/packages/api/src/media-generation.ts index 79135f90..239638bd 100644 --- a/packages/api/src/media-generation.ts +++ b/packages/api/src/media-generation.ts @@ -43,7 +43,7 @@ const route = new Hono<{ Variables: { user: User } }>() id: teamId, }) - await mediaGenerationService.updateProviderApiKey(teamId, provider, body.apiKey) + await mediaGenerationService.updateProvider(teamId, provider, body) return c.json({ success: true }) }, ) diff --git a/packages/core/src/media-generation/media-generation.test.ts b/packages/core/src/media-generation/media-generation.test.ts index c8b9ded4..91971260 100644 --- a/packages/core/src/media-generation/media-generation.test.ts +++ b/packages/core/src/media-generation/media-generation.test.ts @@ -93,6 +93,52 @@ describe('MediaGenerationService', () => { expect(openai?.customApiKeyOrEnv).toBeUndefined() }) + it('should update provider apiKey and models atomically with updateProvider', async () => { + // Enable a model for fal first + await mediaGenerationService.addEnabledModel(teamId, { + type: 'image', + provider: 'fal', + modelId: 'fal-ai/flux/dev', + }) + + // Update openai apiKey and models + await mediaGenerationService.updateProvider(teamId, 'openai', { + apiKey: 'sk-test-atomic', + models: [ + { type: 'image', modelId: 'dall-e-3', name: 'DALL-E 3' }, + { type: 'image', modelId: 'gpt-image-2', name: 'GPT Image 2' }, + ], + }) + + let settings = await mediaGenerationService.getSettings(teamId) + let openai = settings.providers.find((p) => p.provider === 'openai') + expect(openai?.apiKeyConfigured).toBe(true) + expect(openai?.status).toBe('configured_custom') + expect(openai?.customApiKeyOrEnv).toBe('sk-test-atomic') + + // Enabled models should have the 2 openai models plus the 1 fal model + expect(settings.enabledModels).toHaveLength(3) + const openaiModels = settings.enabledModels.filter((m) => m.provider === 'openai') + expect(openaiModels).toHaveLength(2) + expect(openaiModels.map((m) => m.modelId)).toContain('dall-e-3') + expect(openaiModels.map((m) => m.modelId)).toContain('gpt-image-2') + + // Now update openai with only 1 model enabled (disable gpt-image-2) + await mediaGenerationService.updateProvider(teamId, 'openai', { + models: [{ type: 'image', modelId: 'dall-e-3', name: 'DALL-E 3' }], + }) + + settings = await mediaGenerationService.getSettings(teamId) + openai = settings.providers.find((p) => p.provider === 'openai') + // apiKey should remain unchanged + expect(openai?.customApiKeyOrEnv).toBe('sk-test-atomic') + const nextOpenaiModels = settings.enabledModels.filter((m) => m.provider === 'openai') + expect(nextOpenaiModels).toHaveLength(1) + expect(nextOpenaiModels[0].modelId).toBe('dall-e-3') + // Fal model is still there + expect(settings.enabledModels.find((m) => m.provider === 'fal')).toBeDefined() + }) + it('should add enabled models and reject invalid configurations', async () => { // Valid model addition const added = await mediaGenerationService.addEnabledModel(teamId, { diff --git a/packages/core/src/media-generation/media-generation.ts b/packages/core/src/media-generation/media-generation.ts index 7f3f62b2..971cee35 100644 --- a/packages/core/src/media-generation/media-generation.ts +++ b/packages/core/src/media-generation/media-generation.ts @@ -453,7 +453,18 @@ export class MediaGenerationService { } } - async updateProviderApiKey(teamId: string, provider: string, apiKey?: string): Promise { + async updateProvider( + teamId: string, + provider: string, + data: { + apiKey?: string + models?: Array<{ + type: MediaModelType + modelId: string + name?: string + }> + }, + ): Promise { if (!BUILTIN_MEDIA_PROVIDERS[provider]) { throw new HTTPException(400, { message: `Unknown media provider: "${provider}"` }) } @@ -470,10 +481,44 @@ export class MediaGenerationService { const mediaGen = currentSettings.mediaGeneration || {} const providers = mediaGen.providers || {} - if (apiKey && apiKey.trim()) { - providers[provider] = { apiKey: apiKey.trim() } - } else { - delete providers[provider] + if (data.apiKey !== undefined) { + if (data.apiKey && data.apiKey.trim()) { + providers[provider] = { apiKey: data.apiKey.trim() } + } else { + delete providers[provider] + } + } + + if (data.models !== undefined) { + const providerDef = BUILTIN_MEDIA_PROVIDERS[provider] + for (const m of data.models) { + if (!providerDef.supportedTypes.includes(m.type)) { + throw new HTTPException(400, { + message: `Provider "${provider}" does not support ${m.type} generation`, + }) + } + } + + const otherModels = (mediaGen.enabledModels || []).filter((m) => m.provider !== provider) + const existingForProvider = (mediaGen.enabledModels || []).filter( + (m) => m.provider === provider, + ) + + const updatedForProvider = data.models.map((m) => { + const existing = existingForProvider.find( + (e) => e.modelId === m.modelId && e.type === m.type, + ) + return { + id: existing?.id || ulid(), + type: m.type, + provider, + modelId: m.modelId, + name: m.name || existing?.name || m.modelId, + createdAt: existing?.createdAt || new Date().toISOString(), + } + }) + + mediaGen.enabledModels = [...otherModels, ...updatedForProvider] } mediaGen.providers = providers @@ -485,6 +530,10 @@ export class MediaGenerationService { }) } + async updateProviderApiKey(teamId: string, provider: string, apiKey?: string): Promise { + return this.updateProvider(teamId, provider, { apiKey }) + } + async addEnabledModel( teamId: string, data: CreateEnabledMediaModelRequest, diff --git a/packages/dtos/src/media-generation.ts b/packages/dtos/src/media-generation.ts index 056af216..3a14962c 100644 --- a/packages/dtos/src/media-generation.ts +++ b/packages/dtos/src/media-generation.ts @@ -10,10 +10,22 @@ export const mediaProviderStatusTypeSchema = z.enum([ ]) export type MediaProviderStatusType = z.infer -export const updateMediaProviderApiKeySchema = z.object({ +export const updateMediaProviderConfigSchema = z.object({ apiKey: z.string().optional().or(z.literal('')), + models: z + .array( + z.object({ + type: mediaModelTypeSchema, + modelId: z.string().min(1, 'Model ID is required'), + name: z.string().optional(), + }), + ) + .optional(), }) -export type UpdateMediaProviderApiKeyRequest = z.infer +export type UpdateMediaProviderConfig = z.infer + +export const updateMediaProviderApiKeySchema = updateMediaProviderConfigSchema +export type UpdateMediaProviderApiKeyRequest = UpdateMediaProviderConfig export const createEnabledMediaModelSchema = z.object({ type: mediaModelTypeSchema, diff --git a/packages/webui/components/settings/ImageVideoGenerationSettings.test.tsx b/packages/webui/components/settings/ImageVideoGenerationSettings.test.tsx index 3511786a..204de14b 100644 --- a/packages/webui/components/settings/ImageVideoGenerationSettings.test.tsx +++ b/packages/webui/components/settings/ImageVideoGenerationSettings.test.tsx @@ -1,5 +1,5 @@ // @vitest-environment happy-dom -import { cleanup, render, screen, fireEvent, waitFor } from '@testing-library/react' +import { cleanup, render, screen, fireEvent, waitFor, within } from '@testing-library/react' import React from 'react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' @@ -8,8 +8,6 @@ import type { MediaGenerationSettingsResponse } from '@shumai/dtos' const mockGetSettings = vi.fn() const mockPutProvider = vi.fn() -const mockPostModel = vi.fn() -const mockDeleteModel = vi.fn() const mockGetCurated = vi.fn() vi.mock('@/ui/api/client', () => ({ @@ -25,10 +23,6 @@ vi.mock('@/ui/api/client', () => ({ }, }, models: { - $post: (args: unknown) => mockPostModel(args), - ':modelId': { - $delete: (args: unknown) => mockDeleteModel(args), - }, curated: { $get: (args: unknown) => mockGetCurated(args), }, @@ -111,21 +105,6 @@ describe('ImageVideoGenerationSettings', () => { ok: true, json: async () => ({ success: true }), }) - mockPostModel.mockResolvedValue({ - ok: true, - json: async () => ({ - id: 'new-model-id', - type: 'image', - provider: 'openai', - modelId: 'dall-e-2', - name: 'DALL-E 2', - createdAt: '2026-01-01T00:00:00.000Z', - }), - }) - mockDeleteModel.mockResolvedValue({ - ok: true, - json: async () => ({ success: true }), - }) mockGetCurated.mockResolvedValue({ ok: true, json: async () => [ @@ -146,211 +125,293 @@ describe('ImageVideoGenerationSettings', () => { , ) - it('renders 2 tabs and switches between Providers and Enabled Models', async () => { + it('renders providers list with enabled model count badges and no outer tabs', async () => { renderComponent() await waitFor(() => { - expect(screen.getAllByText('OpenAI').length).toBeGreaterThan(0) - expect(screen.getAllByText('Kling AI').length).toBeGreaterThan(0) - expect(screen.getAllByText('Fal').length).toBeGreaterThan(0) + expect(screen.getByText('OpenAI')).toBeDefined() + expect(screen.getByText('Kling AI')).toBeDefined() + expect(screen.getByText('Fal')).toBeDefined() }) - const openaiProvider = screen.getByText('OpenAI') - expect(openaiProvider.className).toContain('whitespace-nowrap') - const keySpan = screen.getByText('OPENAI_API_KEY') - expect(keySpan.className).toContain('truncate') + // No outer tabs should exist + expect(screen.queryByRole('tablist')).toBeNull() - // Switch to Enabled Models tab - const modelsTab = screen.getByRole('tab', { name: /Enabled Models/i }) - fireEvent.click(modelsTab) + // OpenAI row shows 1 enabled (image) + const openaiRow = screen.getByText('OpenAI').closest('.group') as HTMLElement + expect(within(openaiRow).getByText('1 enabled')).toBeDefined() - // Verify enabled models table content is displayed - await waitFor(() => { - expect(screen.getByText('dall-e-3')).toBeDefined() - expect(screen.getByText('kling-v1-standard')).toBeDefined() - }) + // Kling AI row shows 1 enabled (video) + const klingRow = screen.getByText('Kling AI').closest('.group') as HTMLElement + expect(within(klingRow).getByText('1 enabled')).toBeDefined() + + // Fal row shows 0 enabled for both image and video + const falRow = screen.getByText('Fal').closest('.group') as HTMLElement + expect(within(falRow).getAllByText('0 enabled')).toHaveLength(2) }) - it('opens configure API key dialog and saves new key or env var override', async () => { + it('opens dialog with smart default tab based on API key configuration', async () => { renderComponent() await waitFor(() => { - expect(screen.getAllByText('OpenAI').length).toBeGreaterThan(0) + expect(screen.getByText('OpenAI')).toBeDefined() }) - const editButtons = screen.getAllByRole('button', { name: /Edit API Key/i }) - fireEvent.click(editButtons[0]) + // 1. OpenAI is configured -> opens to Models tab by default + const openaiRow = screen.getByText('OpenAI').closest('.cursor-pointer')! + fireEvent.click(openaiRow) await waitFor(() => { expect(screen.getByRole('dialog')).toBeDefined() + // Models tab should be active + const modelsTab = screen.getByRole('tab', { name: /Models/i }) + expect(modelsTab.getAttribute('data-state')).toBe('active') }) - // Input is type="text" and displays description - const input = document.querySelector('input[type="text"]') as HTMLInputElement - expect(input).toBeDefined() - expect( - screen.getByText( - 'You can provide a literal value (e.g. sk-...) or an Environment variable name (e.g. MY_API_KEY).', - ), - ).toBeDefined() + // Close dialog with Cancel + const cancelBtn = screen.getByRole('button', { name: 'Cancel' }) + fireEvent.click(cancelBtn) - fireEvent.change(input, { target: { value: 'OPENAI_API_NEW_KEY' } }) + await waitFor(() => { + expect(screen.queryByRole('dialog')).toBeNull() + }) - const saveButton = screen.getByRole('button', { name: 'Save' }) - fireEvent.click(saveButton) + // 2. Fal is not configured -> opens to API Key tab by default + const falRow = screen.getByText('Fal').closest('.cursor-pointer')! + fireEvent.click(falRow) + + await waitFor(() => { + expect(screen.getByRole('dialog')).toBeDefined() + const apiKeyTab = screen.getByRole('tab', { name: /API Key/i }) + expect(apiKeyTab.getAttribute('data-state')).toBe('active') + }) + }) + + it('stages API key changes and saves on global footer Save click', async () => { + renderComponent() + + await waitFor(() => screen.getByText('OpenAI')) + fireEvent.click(screen.getByText('OpenAI').closest('.cursor-pointer')!) + + await waitFor(() => screen.getByRole('dialog')) + + // Switch to API Key tab + fireEvent.click(screen.getByRole('tab', { name: /API Key/i })) + + await waitFor(() => { + expect(document.getElementById('provider-api-key')).not.toBeNull() + }) + + const input = document.getElementById('provider-api-key') as HTMLInputElement + fireEvent.change(input, { target: { value: 'sk-new-key' } }) + + // Save button in footer + const saveBtn = screen.getByRole('button', { name: 'Save' }) + fireEvent.click(saveBtn) await waitFor(() => { expect(mockPutProvider).toHaveBeenCalledWith({ param: { teamId: 'team-123', provider: 'openai' }, - json: { apiKey: 'OPENAI_API_NEW_KEY' }, + json: { + apiKey: 'sk-new-key', + models: [ + { + type: 'image', + modelId: 'dall-e-3', + name: 'DALL-E 3', + }, + ], + }, }) }) }) - it('shows unmasked custom key/env in dialog and allows removing custom override', async () => { + it('allows clearing custom API key in API Key tab', async () => { renderComponent() - await waitFor(() => { - expect(screen.getAllByText('Kling AI').length).toBeGreaterThan(0) - }) + await waitFor(() => screen.getByText('Kling AI')) + fireEvent.click(screen.getByText('Kling AI').closest('.cursor-pointer')!) - // In the providers list row, Kling AI shows custom override - expect(screen.getByText('my-custom-key')).toBeDefined() + await waitFor(() => screen.getByRole('dialog')) - const editButtons = screen.getAllByRole('button', { name: /Edit API Key/i }) - // Kling AI is index 1 - fireEvent.click(editButtons[1]) + // Switch to API Key tab + fireEvent.click(screen.getByRole('tab', { name: /API Key/i })) await waitFor(() => { - expect(screen.getByRole('dialog')).toBeDefined() + expect(document.getElementById('provider-api-key')).not.toBeNull() }) - // Input displays raw text 'my-custom-key' - const input = document.querySelector('input[type="text"]') as HTMLInputElement - expect(input).toBeDefined() + // Kling AI has custom key 'my-custom-key' + const input = document.getElementById('provider-api-key') as HTMLInputElement expect(input.value).toBe('my-custom-key') - // Click Remove Key - const removeButton = screen.getByRole('button', { name: 'Remove Key' }) - fireEvent.click(removeButton) + // Click Clear Custom Key + const clearBtn = screen.getByRole('button', { name: /Clear Custom Key/i }) + fireEvent.click(clearBtn) + + expect(input.value).toBe('') + + // Click Save + const saveBtn = screen.getByRole('button', { name: 'Save' }) + fireEvent.click(saveBtn) await waitFor(() => { expect(mockPutProvider).toHaveBeenCalledWith({ param: { teamId: 'team-123', provider: 'klingai' }, - json: { apiKey: '' }, - }) - }) - }) - - it('opens add model dialog with 2-card switch and 2-box provider/model selector', async () => { - renderComponent() - - await waitFor(() => { - expect(screen.getAllByText('OpenAI').length).toBeGreaterThan(0) - }) - - // Switch to Enabled Models tab - const modelsTab = screen.getByRole('tab', { name: /Enabled Models/i }) - fireEvent.click(modelsTab) - - await waitFor(() => { - expect(screen.getByRole('button', { name: /Add Model/i })).toBeDefined() - }) - - const addModelButton = screen.getByRole('button', { name: /Add Model/i }) - fireEvent.click(addModelButton) - - await waitFor(() => { - expect(screen.getByRole('dialog')).toBeDefined() - }) - - // 2-card model type selector - expect(screen.getByRole('button', { name: /Image/i })).toBeDefined() - expect(screen.getByRole('button', { name: /Video/i })).toBeDefined() - - // Left box should show compatible providers for Image (OpenAI and Fal) - expect(screen.getByText('Select a provider on the left to view available models')).toBeDefined() - - // Click OpenAI in providers list - const openaiProviderBtn = screen.getByRole('button', { name: /OpenAI/i }) - fireEvent.click(openaiProviderBtn) - - // Right box loads curated models - await waitFor(() => { - expect(mockGetCurated).toHaveBeenCalled() - expect(screen.getByRole('button', { name: /DALL-E 2/i })).toBeDefined() - }) - - // Select DALL-E 2 - const modelBtn = screen.getByRole('button', { name: /DALL-E 2/i }) - fireEvent.click(modelBtn) - - // Click Add - const submitBtn = screen.getByRole('button', { name: /^Add$/ }) - fireEvent.click(submitBtn) - - await waitFor(() => { - expect(mockPostModel).toHaveBeenCalledWith({ - param: { teamId: 'team-123' }, json: { - type: 'image', - provider: 'openai', - modelId: 'dall-e-2', - name: 'DALL-E 2', + apiKey: '', + models: [ + { + type: 'video', + modelId: 'kling-v1-standard', + name: 'Kling v1', + }, + ], }, }) }) }) - it('supports selecting video type and custom model option', async () => { - mockGetCurated.mockResolvedValue({ - ok: true, - json: async () => [], - }) - + it('stages model toggles and adds custom models before saving', async () => { renderComponent() - await waitFor(() => { - expect(screen.getAllByText('OpenAI').length).toBeGreaterThan(0) - }) - - // Switch to Enabled Models tab and open Add Model dialog - fireEvent.click(screen.getByRole('tab', { name: /Enabled Models/i })) - await waitFor(() => screen.getByRole('button', { name: /Add Model/i })) - fireEvent.click(screen.getByRole('button', { name: /Add Model/i })) + await waitFor(() => screen.getByText('OpenAI')) + fireEvent.click(screen.getByText('OpenAI').closest('.cursor-pointer')!) await waitFor(() => screen.getByRole('dialog')) - // Switch to Video card - const videoCard = screen.getByRole('button', { name: /Video/i }) - fireEvent.click(videoCard) + // Wait for curated models to load + await waitFor(() => { + expect(screen.getByText('DALL-E 3')).toBeDefined() + expect(screen.getByText('DALL-E 2')).toBeDefined() + }) - // Select Kling AI - await waitFor(() => screen.getByRole('button', { name: /Kling AI/i })) - fireEvent.click(screen.getByRole('button', { name: /Kling AI/i })) + // DALL-E 3 is initially enabled (checked) + const dalle3Switch = screen.getByLabelText('Toggle DALL-E 3') + expect(dalle3Switch.getAttribute('data-state')).toBe('checked') - // Select Custom Model option - await waitFor(() => screen.getByRole('button', { name: /Custom Model\.\.\./i })) - fireEvent.click(screen.getByRole('button', { name: /Custom Model\.\.\./i })) + // DALL-E 2 is initially disabled (unchecked) + const dalle2Switch = screen.getByLabelText('Toggle DALL-E 2') + expect(dalle2Switch.getAttribute('data-state')).toBe('unchecked') - // Fill in custom model ID - const customIdInput = screen.getByPlaceholderText('Enter custom model ID') as HTMLInputElement - fireEvent.change(customIdInput, { target: { value: 'kling-v2-custom' } }) + // Toggle DALL-E 2 ON + fireEvent.click(dalle2Switch) + expect(dalle2Switch.getAttribute('data-state')).toBe('checked') - // Click Add - const submitBtn = screen.getByRole('button', { name: /^Add$/ }) - fireEvent.click(submitBtn) + // Add a custom model + const customInput = screen.getByPlaceholderText('Enter custom model ID') + fireEvent.change(customInput, { target: { value: 'custom-gpt-image' } }) + + const addBtn = screen.getByRole('button', { name: 'Add' }) + fireEvent.click(addBtn) + + // Verify custom model is displayed in the list + await waitFor(() => { + expect(screen.getAllByText('custom-gpt-image').length).toBeGreaterThan(0) + }) + + // Click Save in the global footer + const saveBtn = screen.getByRole('button', { name: 'Save' }) + fireEvent.click(saveBtn) await waitFor(() => { - expect(mockPostModel).toHaveBeenCalledWith({ - param: { teamId: 'team-123' }, + expect(mockPutProvider).toHaveBeenCalledWith({ + param: { teamId: 'team-123', provider: 'openai' }, json: { - type: 'video', - provider: 'klingai', - modelId: 'kling-v2-custom', - name: 'kling-v2-custom', + apiKey: '', + models: [ + { type: 'image', modelId: 'dall-e-3', name: 'DALL-E 3' }, + { type: 'image', modelId: 'dall-e-2', name: 'DALL-E 2' }, + { type: 'image', modelId: 'custom-gpt-image', name: 'custom-gpt-image' }, + ], }, }) }) }) + + it('discards staged changes when clicking Cancel', async () => { + renderComponent() + + await waitFor(() => screen.getByText('OpenAI')) + fireEvent.click(screen.getByText('OpenAI').closest('.cursor-pointer')!) + + await waitFor(() => screen.getByRole('dialog')) + + // Wait for curated models + await waitFor(() => screen.getByText('DALL-E 2')) + + // Toggle DALL-E 2 ON + const dalle2Switch = screen.getByLabelText('Toggle DALL-E 2') + fireEvent.click(dalle2Switch) + + // Click Cancel + const cancelBtn = screen.getByRole('button', { name: 'Cancel' }) + fireEvent.click(cancelBtn) + + // Dialog should be closed + await waitFor(() => { + expect(screen.queryByRole('dialog')).toBeNull() + }) + + // mockPutProvider should NOT have been called + expect(mockPutProvider).not.toHaveBeenCalled() + }) + + it('filters models with search input and supports custom model deletion', async () => { + renderComponent() + + await waitFor(() => screen.getByText('OpenAI')) + fireEvent.click(screen.getByText('OpenAI').closest('.cursor-pointer')!) + + await waitFor(() => screen.getByRole('dialog')) + await waitFor(() => screen.getByText('DALL-E 3')) + + // Add a custom model + const customInput = screen.getByPlaceholderText('Enter custom model ID') + fireEvent.change(customInput, { target: { value: 'custom-to-delete' } }) + fireEvent.click(screen.getByRole('button', { name: 'Add' })) + + await waitFor(() => { + expect(screen.getAllByText('custom-to-delete').length).toBeGreaterThan(0) + }) + + // Search for DALL-E 2 + const searchInput = screen.getByPlaceholderText('Search models by ID or name...') + fireEvent.change(searchInput, { target: { value: 'DALL-E 2' } }) + + expect(screen.getByText('DALL-E 2')).toBeDefined() + expect(screen.queryByText('DALL-E 3')).toBeNull() + expect(screen.queryByText('custom-to-delete')).toBeNull() + + // Clear search + fireEvent.change(searchInput, { target: { value: '' } }) + expect(screen.getByText('DALL-E 3')).toBeDefined() + expect(screen.getAllByText('custom-to-delete').length).toBeGreaterThan(0) + + // Delete custom model with trash button + const deleteBtn = screen.getByTitle('Delete') + fireEvent.click(deleteBtn) + + expect(screen.queryByText('custom-to-delete')).toBeNull() + }) + + it('shows warning notice when provider is not configured', async () => { + renderComponent() + + await waitFor(() => screen.getByText('Fal')) + fireEvent.click(screen.getByText('Fal').closest('.cursor-pointer')!) + + await waitFor(() => screen.getByRole('dialog')) + + // Fal opens to API Key by default, switch to Models tab + fireEvent.click(screen.getByRole('tab', { name: /Models/i })) + + await waitFor(() => { + expect( + screen.getByText( + 'This provider is not configured. Configure an API key in the API Key tab before using these models.', + ), + ).toBeDefined() + }) + }) }) diff --git a/packages/webui/components/settings/ImageVideoGenerationSettings.tsx b/packages/webui/components/settings/ImageVideoGenerationSettings.tsx index fa65d0f1..8a30d59b 100644 --- a/packages/webui/components/settings/ImageVideoGenerationSettings.tsx +++ b/packages/webui/components/settings/ImageVideoGenerationSettings.tsx @@ -1,4 +1,4 @@ -import { useState, useMemo } from 'react' +import { useState, useMemo, useEffect } from 'react' import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query' import { client } from '@/ui/api/client' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/ui/components/ui/card' @@ -6,6 +6,7 @@ import { Button } from '@/ui/components/ui/button' import { Input } from '@/ui/components/ui/input' import { Badge } from '@/ui/components/ui/badge' import { ScrollArea } from '@/ui/components/ui/scroll-area' +import { Switch } from '@/ui/components/ui/switch' import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/ui/components/ui/tabs' import { Dialog, @@ -16,25 +17,6 @@ import { DialogTitle, } from '@/ui/components/ui/dialog' import { - AlertDialog, - AlertDialogAction, - AlertDialogCancel, - AlertDialogContent, - AlertDialogDescription, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogTitle, -} from '@/ui/components/ui/alert-dialog' -import { - Table, - TableBody, - TableCell, - TableHead, - TableHeader, - TableRow, -} from '@/ui/components/ui/table' -import { - Key, Plus, Trash2, AlertCircle, @@ -42,15 +24,18 @@ import { VideoIcon, CheckCircle2, Loader2, - Check, + Search, + ChevronRight, } from 'lucide-react' import { toast } from 'sonner' import { m } from '@/ui/paraglide/messages.js' +import { cn } from '@/ui/lib/utils' import type { MediaGenerationSettingsResponse, MediaProviderStatus, EnabledMediaModel, CuratedMediaModel, + MediaModelType, } from '@shumai/dtos' const PROVIDER_NAMES: Record = { @@ -74,26 +59,16 @@ const PROVIDER_NAMES: Record = { azure: 'Azure OpenAI', } +interface StagedModelItem { + type: MediaModelType + modelId: string + name?: string + isCustom?: boolean +} + export function ImageVideoGenerationSettings({ teamId }: { teamId: string }) { const queryClient = useQueryClient() - - // Tab State - const [activeTab, setActiveTab] = useState<'providers' | 'models'>('providers') - - // API Key Dialog State - const [keyDialogOpen, setKeyDialogOpen] = useState(false) - const [editingProvider, setEditingProvider] = useState(null) - const [apiKeyInput, setApiKeyInput] = useState('') - - // Add Model Dialog State - const [addDialogOpen, setAddDialogOpen] = useState(false) - const [addType, setAddType] = useState<'image' | 'video'>('image') - const [addProvider, setAddProvider] = useState('') - const [selectedModelId, setSelectedModelId] = useState('') - const [customModelId, setCustomModelId] = useState('') - - // Delete Model Confirmation State - const [modelToDelete, setModelToDelete] = useState(null) + const [selectedProvider, setSelectedProvider] = useState(null) // Fetch Media Generation Settings const { data: settings, isLoading } = useQuery({ @@ -107,170 +82,14 @@ export function ImageVideoGenerationSettings({ teamId }: { teamId: string }) { }, }) - // Fetch Curated Models for Add Dialog - const { data: curatedModels, isLoading: isLoadingCurated } = useQuery({ - queryKey: ['teams', teamId, 'media-generation', 'curated', addType, addProvider], - queryFn: async () => { - if (!addProvider) return [] - const res = await client.api.teams[':teamId']['media-generation']['models']['curated'].$get({ - param: { teamId }, - query: { provider: addProvider, type: addType }, - }) - if (!res.ok) return [] - return (await res.json()) as CuratedMediaModel[] - }, - enabled: addDialogOpen && !!addProvider, - }) - - // Mutation: Update Provider API Key - const { mutate: updateApiKey, isPending: isSavingKey } = useMutation({ - mutationFn: async ({ provider, apiKey }: { provider: string; apiKey?: string }) => { - const res = await client.api.teams[':teamId']['media-generation']['providers'][ - ':provider' - ].$put({ - param: { teamId, provider }, - json: { apiKey }, - }) - if (!res.ok) { - const err = await res.json().catch(() => ({})) - // eslint-disable-next-line @typescript-eslint/no-explicit-any - throw new Error((err as any)?.message || 'Failed to update API key') - } - return await res.json() - }, - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'media-generation'] }) - toast.success(m.api_key_saved_successfully()) - setKeyDialogOpen(false) - setEditingProvider(null) - setApiKeyInput('') - }, - onError: (err) => { - toast.error(err instanceof Error ? err.message : m.failed_to_save_api_key()) - }, - }) - - // Mutation: Add Enabled Model - const { mutate: addModel, isPending: isAddingModel } = useMutation({ - mutationFn: async (payload: { - type: 'image' | 'video' - provider: string - modelId: string - name?: string - }) => { - const res = await client.api.teams[':teamId']['media-generation']['models'].$post({ - param: { teamId }, - json: payload, - }) - if (!res.ok) { - const err = await res.json().catch(() => ({})) - // eslint-disable-next-line @typescript-eslint/no-explicit-any - throw new Error((err as any)?.message || 'Failed to add model') - } - return await res.json() - }, - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'media-generation'] }) - toast.success(m.model_added_successfully()) - setAddDialogOpen(false) - resetAddForm() - }, - onError: (err) => { - toast.error(err instanceof Error ? err.message : m.failed_to_add_model()) - }, - }) - - // Mutation: Remove Enabled Model - const { mutate: removeModel, isPending: isRemovingModel } = useMutation({ - mutationFn: async (modelId: string) => { - const res = await client.api.teams[':teamId']['media-generation']['models'][ - ':modelId' - ].$delete({ - param: { teamId, modelId }, - }) - if (!res.ok) throw new Error('Failed to remove model') - return await res.json() - }, - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'media-generation'] }) - toast.success(m.model_removed_successfully()) - setModelToDelete(null) - }, - onError: (err) => { - toast.error(err instanceof Error ? err.message : m.failed_to_remove_model()) - }, - }) - - const resetAddForm = () => { - setAddType('image') - setAddProvider('') - setSelectedModelId('') - setCustomModelId('') - } - - const handleOpenKeyDialog = (provider: MediaProviderStatus) => { - setEditingProvider(provider) - setApiKeyInput(provider.customApiKeyOrEnv || '') - setKeyDialogOpen(true) - } - - const handleSaveKey = () => { - if (!editingProvider) return - const trimmed = apiKeyInput.trim() - updateApiKey({ - provider: editingProvider.provider, - apiKey: trimmed, - }) - } - - const handleRemoveKey = () => { - if (!editingProvider) return - updateApiKey({ - provider: editingProvider.provider, - apiKey: '', - }) - } - - const handleTypeChange = (type: 'image' | 'video') => { - if (type === addType) return - setAddType(type) - // Check if current provider supports the new type - const providerObj = settings?.providers?.find((p) => p.provider === addProvider) - if (!providerObj || !providerObj.supportedTypes.includes(type)) { - setAddProvider('') - setSelectedModelId('') - setCustomModelId('') - } else { - setSelectedModelId('') - setCustomModelId('') - } - } - - const handleAddModelSubmit = () => { - const finalModelId = - selectedModelId === '__custom__' ? customModelId.trim() : selectedModelId.trim() - if (!addProvider || !finalModelId) return - - const curated = curatedModels?.find((m) => m.modelId === finalModelId) - const finalName = curated?.name || finalModelId - - addModel({ - type: addType, - provider: addProvider, - modelId: finalModelId, - name: finalName, - }) - } - const providers = settings?.providers || [] const enabledModels = settings?.enabledModels || [] - const activeProvidersMap = new Map(providers.map((p) => [p.provider, p.apiKeyConfigured])) - // Filter providers that support the currently selected addType - const compatibleProviders = useMemo( - () => providers.filter((p) => p.supportedTypes.includes(addType)), - [providers, addType], - ) + // Keep selectedProvider up to date when settings refetch + const currentSelectedProvider = useMemo(() => { + if (!selectedProvider) return null + return providers.find((p) => p.provider === selectedProvider.provider) || selectedProvider + }, [selectedProvider, providers]) if (isLoading) { return ( @@ -282,567 +101,693 @@ export function ImageVideoGenerationSettings({ teamId }: { teamId: string }) { return (
- setActiveTab(val as 'providers' | 'models')} - className="w-full flex-1 flex flex-col min-h-0 min-w-0" - > - - setActiveTab('providers')}> - {m.providers()} - - setActiveTab('models')}> - {m.enabled_media_models()} - - + +
+ + + {m.media_providers()} + {m.media_providers_description()} + + +
+ {providers.map((provider) => { + const displayName = PROVIDER_NAMES[provider.provider] || provider.provider + const isCustom = provider.status === 'configured_custom' + const isEnv = provider.status === 'configured_env' - {/* Tab 1: Providers */} - - -
- - - {m.providers()} - {m.media_providers_description()} - - -
- {providers.map((provider) => { - const displayName = PROVIDER_NAMES[provider.provider] || provider.provider - const isCustom = provider.status === 'configured_custom' - const isEnv = provider.status === 'configured_env' + const imageCount = enabledModels.filter( + (m) => m.provider === provider.provider && m.type === 'image', + ).length + const videoCount = enabledModels.filter( + (m) => m.provider === provider.provider && m.type === 'video', + ).length - return ( -
-
-
- - {displayName} - - {isCustom && ( - - - {m.provider_status_configured_custom()} - - )} - {isEnv && ( - - - {m.provider_status_configured_env()} - - )} - {!isCustom && !isEnv && ( - - {m.provider_status_not_configured()} - - )} -
- -
-
- {provider.supportedTypes.includes('image') && ( - - - {m.media_type_image()} - - )} - {provider.supportedTypes.includes('video') && ( - - - {m.media_type_video()} - - )} -
- - {provider.customApiKeyOrEnv || provider.defaultEnvKey} - -
-
- -
- -
-
- ) - })} -
-
-
-
-
-
- - {/* Tab 2: Enabled Models */} - - -
- - -
- - {m.enabled_media_models()} - - - {m.enabled_media_models_description()} - -
- -
- - {enabledModels.length === 0 ? ( -
-

{m.no_enabled_models()}

-
- ) : ( -
- - - - {m.model_type()} - {m.providers()} - {m.model()} - - - - - {enabledModels.map((model) => { - const isConfigured = activeProvidersMap.get(model.provider) ?? false - const providerDisplayName = - PROVIDER_NAMES[model.provider] || model.provider - - return ( - - - {model.type === 'image' ? ( - - - {m.media_type_image()} - - ) : ( - - - {m.media_type_video()} - - )} - - - {providerDisplayName} - - -
- {model.modelId} - {model.name && ( - - ({model.name}) - - )} - {!isConfigured && ( -
- - {m.provider_status_not_configured()} -
- )} -
-
- - - -
- ) - })} -
-
-
- )} -
-
-
-
-
- - - {/* Dialog: Configure Provider API Key */} - - - - - {editingProvider - ? `${PROVIDER_NAMES[editingProvider.provider] || editingProvider.provider} API Key` - : m.configure_api_key()} - - - {editingProvider && m.default_env_var_desc({ envKey: editingProvider.defaultEnvKey })} - - -
-
- - setApiKeyInput(e.target.value)} - placeholder={m.api_key_placeholder()} - className="font-mono text-sm" - /> -

{m.api_key_description()}

-
-
- - {editingProvider?.status === 'configured_custom' ? ( - - ) : ( -
- )} -
- - -
- - -
- - {/* Dialog: Add Model */} - - - - {m.add_media_model()} - {m.add_media_model_desc()} - - - -
- {/* 1. Model Type Selector: 2-Card Switch */} -
- -
- {/* Image Card */} - - - {/* Video Card */} - -
-
- - {/* 2. Provider / Model Selector: 2 Boxes Side-by-Side */} -
- {/* Left Box: Providers */} -
-
- - {m.providers()} - - {compatibleProviders.length} - - -
- -
- {compatibleProviders.map((p) => { - const isSelected = addProvider === p.provider - const displayName = PROVIDER_NAMES[p.provider] || p.provider - return ( - - ) - })} -
-
-
+ {provider.customApiKeyOrEnv || provider.defaultEnvKey} + +
- {/* Right Box: Models */} -
-
- {m.models()} - {addProvider && ( - - {PROVIDER_NAMES[addProvider] || addProvider} - - )} -
- {!addProvider ? ( -
-

{m.select_provider_first()}

-
- ) : isLoadingCurated ? ( -
- - {m.loading_models()} -
- ) : ( - -
- {(curatedModels || []).map((curated) => { - const isSelected = selectedModelId === curated.modelId - return ( - - ) - })} - {/* Custom Model Option */} - + {isEnv && ( + + + {m.provider_status_configured_env()} + + )} + {!isCustom && !isEnv && ( + + {m.provider_status_not_configured()} + + )} + + {provider.supportedTypes.includes('image') && ( + 0 + ? 'bg-primary/10 text-primary border-primary/20' + : 'bg-muted/50 text-muted-foreground border-border/60', + )} + > + + {m.image_models_count({ count: imageCount })} + + )} + {provider.supportedTypes.includes('video') && ( + 0 + ? 'bg-purple-500/10 text-purple-600 dark:text-purple-400 border-purple-500/20' + : 'bg-muted/50 text-muted-foreground border-border/60', + )} + > + + {m.video_models_count({ count: videoCount })} + + )} +
- - )} -
-
- {/* 3. Inputs below 2 boxes */} - {selectedModelId === '__custom__' && ( -
- - setCustomModelId(e.target.value)} - placeholder={m.enter_custom_model_id()} - className="font-mono text-sm" - /> -
- )} -
-
- - - - - - - - - {/* Alert Dialog: Confirm Model Deletion */} - { - if (!open) setModelToDelete(null) - }} - > - - - {m.remove_model_confirm()} - - {modelToDelete && - m.remove_model_prompt({ - modelId: modelToDelete.modelId, - provider: PROVIDER_NAMES[modelToDelete.provider] || modelToDelete.provider, + +
+ ) })} - - - - {m.cancel()} - { - if (modelToDelete) removeModel(modelToDelete.id) - }} - disabled={isRemovingModel} - className="bg-destructive text-destructive-foreground hover:bg-destructive/90" - > - {isRemovingModel && } - {m.delete()} - - - - + + + + + + + {/* Provider Details Dialog */} + {currentSelectedProvider && ( + setSelectedProvider(null)} + provider={currentSelectedProvider} + teamId={teamId} + enabledModels={enabledModels} + onSuccess={() => { + queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'media-generation'] }) + }} + /> + )} ) } + +interface ProviderDetailsDialogProps { + isOpen: boolean + onClose: () => void + provider: MediaProviderStatus + teamId: string + enabledModels: EnabledMediaModel[] + onSuccess: () => void +} + +function ProviderDetailsDialog({ + isOpen, + onClose, + provider, + teamId, + enabledModels, + onSuccess, +}: ProviderDetailsDialogProps) { + // Smart default: open to 'models' if key is configured, else 'api-key' + const [activeTab, setActiveTab] = useState<'api-key' | 'models'>(() => + provider.apiKeyConfigured ? 'models' : 'api-key', + ) + + // Staged API Key state + const [stagedApiKey, setStagedApiKey] = useState(provider.customApiKeyOrEnv || '') + + // Staged Models state + const [stagedModels, setStagedModels] = useState(() => + enabledModels + .filter((m) => m.provider === provider.provider) + .map((m) => ({ + type: m.type, + modelId: m.modelId, + name: m.name, + })), + ) + + // Filter & Search states + const [searchQuery, setSearchQuery] = useState('') + const [modalityFilter, setModalityFilter] = useState<'all' | 'image' | 'video'>('all') + + // Custom Model Form state + const [customModelId, setCustomModelId] = useState('') + const [customType, setCustomType] = useState( + provider.supportedTypes[0] || 'image', + ) + + // Reset states if provider or dialog open status changes + useEffect(() => { + setActiveTab(provider.apiKeyConfigured ? 'models' : 'api-key') + setStagedApiKey(provider.customApiKeyOrEnv || '') + setStagedModels( + enabledModels + .filter((m) => m.provider === provider.provider) + .map((m) => ({ + type: m.type, + modelId: m.modelId, + name: m.name, + })), + ) + setSearchQuery('') + setModalityFilter('all') + setCustomModelId('') + setCustomType(provider.supportedTypes[0] || 'image') + }, [provider.provider, provider.customApiKeyOrEnv, provider.apiKeyConfigured, enabledModels]) + + // Fetch Curated Models for this Provider + const { data: curatedModels = [], isLoading: isLoadingCurated } = useQuery({ + queryKey: ['teams', teamId, 'media-generation', 'curated', provider.provider], + queryFn: async () => { + const res = await client.api.teams[':teamId']['media-generation']['models']['curated'].$get({ + param: { teamId }, + query: { provider: provider.provider }, + }) + if (!res.ok) return [] + return (await res.json()) as CuratedMediaModel[] + }, + enabled: isOpen, + }) + + // Mutation: Save provider configuration (API Key + Models) + const { mutate: saveProviderConfig, isPending: isSaving } = useMutation({ + mutationFn: async () => { + const res = await client.api.teams[':teamId']['media-generation']['providers'][ + ':provider' + ].$put({ + param: { teamId, provider: provider.provider }, + json: { + apiKey: stagedApiKey.trim(), + models: stagedModels.map((m) => ({ + type: m.type, + modelId: m.modelId, + name: m.name || m.modelId, + })), + }, + }) + if (!res.ok) { + const err = await res.json().catch(() => ({})) + // eslint-disable-next-line @typescript-eslint/no-explicit-any + throw new Error((err as any)?.message || 'Failed to update provider') + } + return await res.json() + }, + onSuccess: () => { + toast.success(m.provider_updated_successfully()) + onSuccess() + onClose() + }, + onError: (err) => { + toast.error(err instanceof Error ? err.message : m.failed_to_update_provider()) + }, + }) + + // Determine curated vs custom models + const curatedModelIds = useMemo( + () => new Set(curatedModels.map((m) => m.modelId)), + [curatedModels], + ) + + const customModels = useMemo( + () => stagedModels.filter((m) => !curatedModelIds.has(m.modelId)), + [stagedModels, curatedModelIds], + ) + + // Combine curated models and custom models for rendering + const allDisplayModels = useMemo(() => { + const list: Array<{ + type: MediaModelType + modelId: string + name: string + isCustom: boolean + isToggledOn: boolean + }> = [] + + // 1. Add curated models (default disabled unless in stagedModels) + for (const curated of curatedModels) { + const isToggledOn = stagedModels.some( + (m) => m.modelId === curated.modelId && m.type === curated.type, + ) + list.push({ + type: curated.type, + modelId: curated.modelId, + name: curated.name, + isCustom: false, + isToggledOn, + }) + } + + // 2. Add custom models (always toggled on while in stagedModels) + for (const custom of customModels) { + list.push({ + type: custom.type, + modelId: custom.modelId, + name: custom.name || custom.modelId, + isCustom: true, + isToggledOn: true, + }) + } + + return list + }, [curatedModels, stagedModels, customModels]) + + // Filter models by search query and modality filter + const filteredModels = useMemo(() => { + return allDisplayModels.filter((model) => { + if (modalityFilter !== 'all' && model.type !== modalityFilter) { + return false + } + if (searchQuery.trim()) { + const q = searchQuery.toLowerCase() + const matchName = model.name.toLowerCase().includes(q) + const matchId = model.modelId.toLowerCase().includes(q) + if (!matchName && !matchId) return false + } + return true + }) + }, [allDisplayModels, modalityFilter, searchQuery]) + + // Toggle model handler + const handleToggleModel = ( + model: { type: MediaModelType; modelId: string; name: string; isCustom: boolean }, + checked: boolean, + ) => { + if (checked) { + // Enable model + setStagedModels((prev) => [ + ...prev, + { + type: model.type, + modelId: model.modelId, + name: model.name, + isCustom: model.isCustom, + }, + ]) + } else { + // Disable model (for curated, turns off; for custom, removes from stagedModels) + setStagedModels((prev) => + prev.filter((m) => !(m.modelId === model.modelId && m.type === model.type)), + ) + } + } + + // Remove custom model + const handleRemoveCustomModel = (modelId: string, type: MediaModelType) => { + setStagedModels((prev) => prev.filter((m) => !(m.modelId === modelId && m.type === type))) + } + + // Add custom model handler + const handleAddCustomModel = () => { + const trimmed = customModelId.trim() + if (!trimmed) return + + // Check duplicate + const alreadyStaged = stagedModels.some((m) => m.modelId === trimmed && m.type === customType) + if (alreadyStaged) { + toast.error(m.failed_to_add_model()) + return + } + + setStagedModels((prev) => [ + ...prev, + { + type: customType, + modelId: trimmed, + name: trimmed, + isCustom: true, + }, + ]) + setCustomModelId('') + } + + const displayName = PROVIDER_NAMES[provider.provider] || provider.provider + + return ( + !open && onClose()}> + + + + {displayName} + {provider.status === 'configured_custom' && ( + + {m.provider_status_configured_custom()} + + )} + {provider.status === 'configured_env' && ( + + {m.provider_status_configured_env()} + + )} + + + {m.default_env_var_desc({ envKey: provider.defaultEnvKey })} + + + + setActiveTab(val as 'api-key' | 'models')} + className="flex-1 flex flex-col min-h-0" + > +
+ + setActiveTab('api-key')}> + {m.api_key()} + + setActiveTab('models')}> + {m.models()} ({stagedModels.length}) + + +
+ + {/* Tab 1: API Key Config */} + +
+ +
+
+
+ + {stagedApiKey && ( + + )} +
+ setStagedApiKey(e.target.value)} + placeholder={m.api_key_or_env_var_placeholder({ + envKey: provider.defaultEnvKey, + })} + className="font-mono text-sm" + /> +

+ {m.api_key_or_env_var_hint({ envKey: provider.defaultEnvKey })} +

+
+
+
+
+
+ + {/* Tab 2: Models List */} + + {/* Unconfigured Warning Notice */} + {!provider.apiKeyConfigured && !stagedApiKey && ( +
+
+ +
+

{m.provider_status_not_configured()}

+

+ {m.provider_not_configured_warning()} +

+
+
+
+ )} + + {/* Filter Bar: Search + Modality Filter */} +
+
+ + setSearchQuery(e.target.value)} + className="pl-9 h-9 text-xs" + /> +
+ + {provider.supportedTypes.length > 1 && ( +
+ + + +
+ )} +
+ + {/* Models List */} +
+ + {isLoadingCurated ? ( +
+ + {m.loading_models()} +
+ ) : filteredModels.length === 0 ? ( +
+ {m.no_models_found()} +
+ ) : ( +
+ {filteredModels.map((model) => ( +
+
+ + {model.type === 'image' ? ( + + ) : ( + + )} + {model.type === 'image' ? m.media_type_image() : m.media_type_video()} + +
+
+ {model.name} + {model.isCustom && ( + + {m.custom_model_option().replace('...', '')} + + )} +
+

+ {model.modelId} +

+
+
+ +
+ {model.isCustom && ( + + )} + handleToggleModel(model, checked)} + aria-label={`Toggle ${model.name}`} + /> +
+
+ ))} +
+ )} +
+
+ + {/* Minimal Add Custom Model Form */} +
+
+ {provider.supportedTypes.length > 1 && ( +
+ + +
+ )} + setCustomModelId(e.target.value)} + placeholder={m.enter_custom_model_id()} + className="font-mono text-xs h-8 flex-1" + onKeyDown={(e) => { + if (e.key === 'Enter') { + e.preventDefault() + handleAddCustomModel() + } + }} + /> + +
+
+
+
+ + {/* Global Footer with Cancel and Save */} + +
+ {stagedModels.length} {m.models().toLowerCase()} +
+
+ + +
+
+
+
+ ) +} diff --git a/packages/webui/messages/en.json b/packages/webui/messages/en.json index e960c8fc..f7fde921 100644 --- a/packages/webui/messages/en.json +++ b/packages/webui/messages/en.json @@ -1407,6 +1407,13 @@ "remove_key": "Remove Key", "select_provider_first": "Select a provider on the left to view available models", "search_providers": "Search providers...", - "search_models": "Search models...", - "default_env_var_desc": "Default: {envKey}" + "default_env_var_desc": "Default: {envKey}", + "image_models_count": "{count} enabled", + "video_models_count": "{count} enabled", + "clear_custom_key": "Clear Custom Key", + "add_custom_model": "Add Custom Model", + "provider_not_configured_warning": "This provider is not configured. Configure an API key in the API Key tab before using these models.", + "failed_to_update_provider": "Failed to update provider", + "manage_provider": "Manage", + "all_modalities": "All" } diff --git a/packages/webui/messages/zh.json b/packages/webui/messages/zh.json index 053212b9..d9e7a548 100644 --- a/packages/webui/messages/zh.json +++ b/packages/webui/messages/zh.json @@ -1407,6 +1407,13 @@ "remove_key": "移除密钥", "select_provider_first": "请先在左侧选择一个提供商以查看可用模型", "search_providers": "搜索提供商...", - "search_models": "搜索模型...", - "default_env_var_desc": "默认:{envKey}" + "default_env_var_desc": "默认:{envKey}", + "image_models_count": "{count} 个已启用", + "video_models_count": "{count} 个已启用", + "clear_custom_key": "清除自定义密钥", + "add_custom_model": "添加自定义模型", + "provider_not_configured_warning": "此提供商尚未配置。在使用这些模型前,请在 API 密钥标签页中配置密钥。", + "failed_to_update_provider": "更新提供商失败", + "manage_provider": "管理", + "all_modalities": "全部" } diff --git a/packages/webui/paraglide/messages/_index.d.ts b/packages/webui/paraglide/messages/_index.d.ts index 7deb3028..0d9130de 100644 --- a/packages/webui/paraglide/messages/_index.d.ts +++ b/packages/webui/paraglide/messages/_index.d.ts @@ -1341,6 +1341,13 @@ export * from "./remove_model_prompt.js"; export * from "./remove_key.js"; export * from "./select_provider_first.js"; export * from "./search_providers.js"; -export * from "./search_models.js"; export * from "./default_env_var_desc.js"; +export * from "./image_models_count.js"; +export * from "./video_models_count.js"; +export * from "./clear_custom_key.js"; +export * from "./add_custom_model.js"; +export * from "./provider_not_configured_warning.js"; +export * from "./failed_to_update_provider.js"; +export * from "./manage_provider.js"; +export * from "./all_modalities.js"; export type LocalizedString = import("../runtime.js").LocalizedString; diff --git a/packages/webui/paraglide/messages/_index.js b/packages/webui/paraglide/messages/_index.js index c3aef17a..5793d121 100644 --- a/packages/webui/paraglide/messages/_index.js +++ b/packages/webui/paraglide/messages/_index.js @@ -1343,5 +1343,12 @@ export * from './remove_model_prompt.js' export * from './remove_key.js' export * from './select_provider_first.js' export * from './search_providers.js' -export * from './search_models.js' -export * from './default_env_var_desc.js' \ No newline at end of file +export * from './default_env_var_desc.js' +export * from './image_models_count.js' +export * from './video_models_count.js' +export * from './clear_custom_key.js' +export * from './add_custom_model.js' +export * from './provider_not_configured_warning.js' +export * from './failed_to_update_provider.js' +export * from './manage_provider.js' +export * from './all_modalities.js' \ No newline at end of file diff --git a/packages/webui/paraglide/messages/add_custom_model.d.ts b/packages/webui/paraglide/messages/add_custom_model.d.ts new file mode 100644 index 00000000..03e72592 --- /dev/null +++ b/packages/webui/paraglide/messages/add_custom_model.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Add Custom Model" | +* +* @param {Add_Custom_ModelInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_custom_model: ((inputs?: Add_Custom_ModelInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Add_Custom_ModelInputs = {}; diff --git a/packages/webui/paraglide/messages/add_custom_model.js b/packages/webui/paraglide/messages/add_custom_model.js new file mode 100644 index 00000000..35e1dcaf --- /dev/null +++ b/packages/webui/paraglide/messages/add_custom_model.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Add_Custom_ModelInputs */ + +const en_add_custom_model = /** @type {(inputs: Add_Custom_ModelInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Add Custom Model`) +}; + +const zh_add_custom_model = /** @type {(inputs: Add_Custom_ModelInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`添加自定义模型`) +}; + +/** +* | output | +* | --- | +* | "Add Custom Model" | +* +* @param {Add_Custom_ModelInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_custom_model = /** @type {((inputs?: Add_Custom_ModelInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_add_custom_model(inputs) + return zh_add_custom_model(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/search_models.d.ts b/packages/webui/paraglide/messages/all_modalities.d.ts similarity index 60% rename from packages/webui/paraglide/messages/search_models.d.ts rename to packages/webui/paraglide/messages/all_modalities.d.ts index 7870fb77..bd78d710 100644 --- a/packages/webui/paraglide/messages/search_models.d.ts +++ b/packages/webui/paraglide/messages/all_modalities.d.ts @@ -1,16 +1,16 @@ /** * | output | * | --- | -* | "Search models..." | +* | "All" | * -* @param {Search_ModelsInputs} inputs +* @param {All_ModalitiesInputs} inputs * @param {{ locale?: "en" | "zh" }} options * @returns {LocalizedString} */ -export const search_models: ((inputs?: Search_ModelsInputs, options?: { +export const all_modalities: ((inputs?: All_ModalitiesInputs, options?: { locale?: "en" | "zh"; -}) => LocalizedString) & import("../runtime.js").MessageMetadata LocalizedString) & import("../runtime.js").MessageMetadata; export type LocalizedString = import("../runtime.js").LocalizedString; -export type Search_ModelsInputs = {}; +export type All_ModalitiesInputs = {}; diff --git a/packages/webui/paraglide/messages/all_modalities.js b/packages/webui/paraglide/messages/all_modalities.js new file mode 100644 index 00000000..1804faab --- /dev/null +++ b/packages/webui/paraglide/messages/all_modalities.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} All_ModalitiesInputs */ + +const en_all_modalities = /** @type {(inputs: All_ModalitiesInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`All`) +}; + +const zh_all_modalities = /** @type {(inputs: All_ModalitiesInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`全部`) +}; + +/** +* | output | +* | --- | +* | "All" | +* +* @param {All_ModalitiesInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const all_modalities = /** @type {((inputs?: All_ModalitiesInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_all_modalities(inputs) + return zh_all_modalities(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/clear_custom_key.d.ts b/packages/webui/paraglide/messages/clear_custom_key.d.ts new file mode 100644 index 00000000..a007587d --- /dev/null +++ b/packages/webui/paraglide/messages/clear_custom_key.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Clear Custom Key" | +* +* @param {Clear_Custom_KeyInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const clear_custom_key: ((inputs?: Clear_Custom_KeyInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Clear_Custom_KeyInputs = {}; diff --git a/packages/webui/paraglide/messages/clear_custom_key.js b/packages/webui/paraglide/messages/clear_custom_key.js new file mode 100644 index 00000000..bd2c5028 --- /dev/null +++ b/packages/webui/paraglide/messages/clear_custom_key.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Clear_Custom_KeyInputs */ + +const en_clear_custom_key = /** @type {(inputs: Clear_Custom_KeyInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Clear Custom Key`) +}; + +const zh_clear_custom_key = /** @type {(inputs: Clear_Custom_KeyInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`清除自定义密钥`) +}; + +/** +* | output | +* | --- | +* | "Clear Custom Key" | +* +* @param {Clear_Custom_KeyInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const clear_custom_key = /** @type {((inputs?: Clear_Custom_KeyInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_clear_custom_key(inputs) + return zh_clear_custom_key(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/failed_to_update_provider.d.ts b/packages/webui/paraglide/messages/failed_to_update_provider.d.ts new file mode 100644 index 00000000..f1c4861e --- /dev/null +++ b/packages/webui/paraglide/messages/failed_to_update_provider.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Failed to update provider" | +* +* @param {Failed_To_Update_ProviderInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const failed_to_update_provider: ((inputs?: Failed_To_Update_ProviderInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Failed_To_Update_ProviderInputs = {}; diff --git a/packages/webui/paraglide/messages/failed_to_update_provider.js b/packages/webui/paraglide/messages/failed_to_update_provider.js new file mode 100644 index 00000000..c8ef6bdd --- /dev/null +++ b/packages/webui/paraglide/messages/failed_to_update_provider.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Failed_To_Update_ProviderInputs */ + +const en_failed_to_update_provider = /** @type {(inputs: Failed_To_Update_ProviderInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Failed to update provider`) +}; + +const zh_failed_to_update_provider = /** @type {(inputs: Failed_To_Update_ProviderInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`更新提供商失败`) +}; + +/** +* | output | +* | --- | +* | "Failed to update provider" | +* +* @param {Failed_To_Update_ProviderInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const failed_to_update_provider = /** @type {((inputs?: Failed_To_Update_ProviderInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_failed_to_update_provider(inputs) + return zh_failed_to_update_provider(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/image_models_count.d.ts b/packages/webui/paraglide/messages/image_models_count.d.ts new file mode 100644 index 00000000..df41640b --- /dev/null +++ b/packages/webui/paraglide/messages/image_models_count.d.ts @@ -0,0 +1,18 @@ +/** +* | output | +* | --- | +* | "{count} enabled" | +* +* @param {Image_Models_CountInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const image_models_count: ((inputs: Image_Models_CountInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Image_Models_CountInputs = { + count: NonNullable; +}; diff --git a/packages/webui/paraglide/messages/image_models_count.js b/packages/webui/paraglide/messages/image_models_count.js new file mode 100644 index 00000000..9d125a8c --- /dev/null +++ b/packages/webui/paraglide/messages/image_models_count.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{ count: NonNullable }} Image_Models_CountInputs */ + +const en_image_models_count = /** @type {(inputs: Image_Models_CountInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`${i?.count} enabled`) +}; + +const zh_image_models_count = /** @type {(inputs: Image_Models_CountInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`${i?.count} 个已启用`) +}; + +/** +* | output | +* | --- | +* | "{count} enabled" | +* +* @param {Image_Models_CountInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const image_models_count = /** @type {((inputs: Image_Models_CountInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_image_models_count(inputs) + return zh_image_models_count(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/manage_provider.d.ts b/packages/webui/paraglide/messages/manage_provider.d.ts new file mode 100644 index 00000000..e9841a2d --- /dev/null +++ b/packages/webui/paraglide/messages/manage_provider.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Manage" | +* +* @param {Manage_ProviderInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const manage_provider: ((inputs?: Manage_ProviderInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Manage_ProviderInputs = {}; diff --git a/packages/webui/paraglide/messages/manage_provider.js b/packages/webui/paraglide/messages/manage_provider.js new file mode 100644 index 00000000..6211d0e3 --- /dev/null +++ b/packages/webui/paraglide/messages/manage_provider.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Manage_ProviderInputs */ + +const en_manage_provider = /** @type {(inputs: Manage_ProviderInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Manage`) +}; + +const zh_manage_provider = /** @type {(inputs: Manage_ProviderInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`管理`) +}; + +/** +* | output | +* | --- | +* | "Manage" | +* +* @param {Manage_ProviderInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const manage_provider = /** @type {((inputs?: Manage_ProviderInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_manage_provider(inputs) + return zh_manage_provider(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/provider_not_configured_warning.d.ts b/packages/webui/paraglide/messages/provider_not_configured_warning.d.ts new file mode 100644 index 00000000..465f3700 --- /dev/null +++ b/packages/webui/paraglide/messages/provider_not_configured_warning.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "This provider is not configured. Configure an API key in the API Key tab before using these models." | +* +* @param {Provider_Not_Configured_WarningInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const provider_not_configured_warning: ((inputs?: Provider_Not_Configured_WarningInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Provider_Not_Configured_WarningInputs = {}; diff --git a/packages/webui/paraglide/messages/provider_not_configured_warning.js b/packages/webui/paraglide/messages/provider_not_configured_warning.js new file mode 100644 index 00000000..80c033f8 --- /dev/null +++ b/packages/webui/paraglide/messages/provider_not_configured_warning.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Provider_Not_Configured_WarningInputs */ + +const en_provider_not_configured_warning = /** @type {(inputs: Provider_Not_Configured_WarningInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`This provider is not configured. Configure an API key in the API Key tab before using these models.`) +}; + +const zh_provider_not_configured_warning = /** @type {(inputs: Provider_Not_Configured_WarningInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`此提供商尚未配置。在使用这些模型前,请在 API 密钥标签页中配置密钥。`) +}; + +/** +* | output | +* | --- | +* | "This provider is not configured. Configure an API key in the API Key tab before using these models." | +* +* @param {Provider_Not_Configured_WarningInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const provider_not_configured_warning = /** @type {((inputs?: Provider_Not_Configured_WarningInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_provider_not_configured_warning(inputs) + return zh_provider_not_configured_warning(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/search_models.js b/packages/webui/paraglide/messages/search_models.js deleted file mode 100644 index 506be5dc..00000000 --- a/packages/webui/paraglide/messages/search_models.js +++ /dev/null @@ -1,29 +0,0 @@ -/* eslint-disable */ -import { getLocale, experimentalStaticLocale } from '../runtime.js'; - -/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ - -/** @typedef {{}} Search_ModelsInputs */ - -const en_search_models = /** @type {(inputs: Search_ModelsInputs) => LocalizedString} */ () => { - return /** @type {LocalizedString} */ (`Search models...`) -}; - -const zh_search_models = /** @type {(inputs: Search_ModelsInputs) => LocalizedString} */ () => { - return /** @type {LocalizedString} */ (`搜索模型...`) -}; - -/** -* | output | -* | --- | -* | "Search models..." | -* -* @param {Search_ModelsInputs} inputs -* @param {{ locale?: "en" | "zh" }} options -* @returns {LocalizedString} -*/ -export const search_models = /** @type {((inputs?: Search_ModelsInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { - const locale = experimentalStaticLocale ?? options.locale ?? getLocale() - if (locale === "en") return en_search_models(inputs) - return zh_search_models(inputs) -}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/video_models_count.d.ts b/packages/webui/paraglide/messages/video_models_count.d.ts new file mode 100644 index 00000000..16e57471 --- /dev/null +++ b/packages/webui/paraglide/messages/video_models_count.d.ts @@ -0,0 +1,18 @@ +/** +* | output | +* | --- | +* | "{count} enabled" | +* +* @param {Video_Models_CountInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const video_models_count: ((inputs: Video_Models_CountInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Video_Models_CountInputs = { + count: NonNullable; +}; diff --git a/packages/webui/paraglide/messages/video_models_count.js b/packages/webui/paraglide/messages/video_models_count.js new file mode 100644 index 00000000..088ddfbe --- /dev/null +++ b/packages/webui/paraglide/messages/video_models_count.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{ count: NonNullable }} Video_Models_CountInputs */ + +const en_video_models_count = /** @type {(inputs: Video_Models_CountInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`${i?.count} enabled`) +}; + +const zh_video_models_count = /** @type {(inputs: Video_Models_CountInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`${i?.count} 个已启用`) +}; + +/** +* | output | +* | --- | +* | "{count} enabled" | +* +* @param {Video_Models_CountInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const video_models_count = /** @type {((inputs: Video_Models_CountInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_video_models_count(inputs) + return zh_video_models_count(inputs) +}); \ No newline at end of file