Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-08 06:19:05 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(DMXAPI): new add painting seededit (#9226)

Browse Source 
adjust api
This commit is contained in:
Caelan 2025-08-16 23:32:26 +08:00 committed by GitHub
parent e2e8ded2c0
commit b3643944f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/renderer/src/pages/paintings/DmxapiPage.tsx
View File

@ -13,7 +13,7 @@ import FileManager from '@renderer/services/FileManager'
import { useAppDispatch } from '@renderer/store' import { useAppDispatch } from '@renderer/store'
import { setGenerating } from '@renderer/store/runtime' import { setGenerating } from '@renderer/store/runtime'
import type { FileMetadata, PaintingsState } from '@renderer/types' import type { FileMetadata, PaintingsState } from '@renderer/types'
import { uuid } from '@renderer/utils' import { convertToBase64, uuid } from '@renderer/utils'
import { DmxapiPainting } from '@types' import { DmxapiPainting } from '@types'
import { Avatar, Button, Input, InputNumber, Segmented, Select, Switch, Tooltip } from 'antd' import { Avatar, Button, Input, InputNumber, Segmented, Select, Switch, Tooltip } from 'antd'
import TextArea from 'antd/es/input/TextArea' import TextArea from 'antd/es/input/TextArea'
@ -364,7 +364,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
} }
// 准备V1生成请求函数 // 准备V1生成请求函数
const prepareV1GenerateRequest = (prompt: string, painting: DmxapiPainting) => { const prepareV1GenerateRequest = async (prompt: string, painting: DmxapiPainting) => {
const params = { const params = {
prompt, prompt,
model: painting.model, model: painting.model,
@ -391,6 +391,13 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
params.prompt = prompt + ',风格：' + painting.style_type params.prompt = prompt + ',风格：' + painting.style_type
} }
if (Array.isArray(fileMap.imageFiles) && fileMap.imageFiles.length > 0) {
const imageFile = fileMap.imageFiles[0]
if (imageFile instanceof File) {
params['image'] = await convertToBase64(imageFile)
}
}
return { return {
body: JSON.stringify(params), body: JSON.stringify(params),
headerExpand: headerExpand, headerExpand: headerExpand,
@ -508,13 +515,17 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
} }
// 准备请求配置函数 // 准备请求配置函数
const prepareRequestConfig = (prompt: string, painting: DmxapiPainting) => { const prepareRequestConfig = async (prompt: string, painting: DmxapiPainting) => {
// 根据模式和模型版本返回不同的请求配置 // 根据模式和模型版本返回不同的请求配置
if ( if (
painting.generationMode !== undefined && painting.generationMode !== undefined &&
[generationModeType.MERGE, generationModeType.EDIT].includes(painting.generationMode) [generationModeType.MERGE, generationModeType.EDIT].includes(painting.generationMode)
) { ) {
return prepareV2GenerateRequest(prompt, painting) if (painting.model === 'seededit-3.0') {
return await prepareV1GenerateRequest(prompt, painting)
} else {
return prepareV2GenerateRequest(prompt, painting)
}
} else { } else {
return prepareV1GenerateRequest(prompt, painting) return prepareV1GenerateRequest(prompt, painting)
} }
@ -550,7 +561,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
dispatch(setGenerating(true)) dispatch(setGenerating(true))
// 准备请求配置 // 准备请求配置
const requestConfig = prepareRequestConfig(prompt, painting) const requestConfig = await prepareRequestConfig(prompt, painting)
// 发送API请求 // 发送API请求
const urls = await callApi(requestConfig, controller) const urls = await callApi(requestConfig, controller)

2
src/renderer/src/pages/paintings/config/DmxapiConfig.ts
View File

@ -83,7 +83,7 @@ export const MODEOPTIONS = [
// 获取模型分组数据 // 获取模型分组数据
export const GetModelGroup = async (): Promise<DMXApiModelGroups> => { export const GetModelGroup = async (): Promise<DMXApiModelGroups> => {
try { try {
const response = await fetch('https://dmxapi.cn/cherry_painting_models.json') const response = await fetch('https://dmxapi.cn/cherry_painting_models_v2.json')
if (response.ok) { if (response.ok) {
const data = await response.json() const data = await response.json()