refactor: update ClaudeMessageSource struct to include optional Url field and adjust media source handling in relay-claude #993

dto/claude.go

@@ -70,8 +70,9 @@ func (c *ClaudeMediaMessage) ParseMediaContent() []ClaudeMediaMessage {
 
 type ClaudeMessageSource struct {
 	Type      string `json:"type"`
-	MediaType string `json:"media_type"`
-	Data      any    `json:"data"`
+	MediaType string `json:"media_type,omitempty"`
+	Data      any    `json:"data,omitempty"`
+	Url       string `json:"url,omitempty"`
 }
 
 type ClaudeMessage struct {

relay/channel/claude/relay-claude.go

@@ -246,23 +246,17 @@ func RequestOpenAI2ClaudeMessage(textRequest dto.GeneralOpenAIRequest) (*dto.Cla
 					} else {
 						imageUrl := mediaMessage.GetImageMedia()
 						claudeMediaMessage.Type = "image"
-						claudeMediaMessage.Source = &dto.ClaudeMessageSource{
-							Type: "base64",
-						}
+						claudeMediaMessage.Source = &dto.ClaudeMessageSource{}
 						// 判断是否是url
 						if strings.HasPrefix(imageUrl.Url, "http") {
-							// 是url，获取图片的类型和base64编码的数据
-							fileData, err := service.GetFileBase64FromUrl(imageUrl.Url)
-							if err != nil {
-								return nil, fmt.Errorf("get file base64 from url failed: %s", err.Error())
-							}
-							claudeMediaMessage.Source.MediaType = fileData.MimeType
-							claudeMediaMessage.Source.Data = fileData.Base64Data
+							claudeMediaMessage.Source.Type = "url"
+							claudeMediaMessage.Source.Url = imageUrl.Url
 						} else {
 							_, format, base64String, err := service.DecodeBase64ImageData(imageUrl.Url)
 							if err != nil {
 								return nil, err
 							}
+							claudeMediaMessage.Source.Type = "base64"
 							claudeMediaMessage.Source.MediaType = "image/" + format
 							claudeMediaMessage.Source.Data = base64String
 						}

web/src/components/SystemSetting.js

@@ -203,10 +203,13 @@ const SystemSetting = () => {
 
   const submitWorker = async () => {
     let WorkerUrl = removeTrailingSlash(inputs.WorkerUrl);
-    await updateOptions([
+    const options = [
       { key: 'WorkerUrl', value: WorkerUrl },
-      { key: 'WorkerValidKey', value: inputs.WorkerValidKey },
-    ]);
+    ]
+    if (inputs.WorkerValidKey !== '' || WorkerUrl === '') {
+      options.push({ key: 'WorkerValidKey', value: inputs.WorkerValidKey });
+    }
+    await updateOptions(options);
   };
 
   const submitPayAddress = async () => {

web/src/helpers/utils.js

@@ -143,6 +143,7 @@ export function openPage(url) {
 }
 
 export function removeTrailingSlash(url) {
+  if (!url) return '';
   if (url.endsWith('/')) {
     return url.slice(0, -1);
   } else {

web/src/pages/Setting/Model/SettingGeminiModel.js

@@ -157,7 +157,6 @@ export default function SettingGeminiModel(props) {
                 <Text>
                   {t(
                     "和Claude不同，默认情况下Gemini的思考模型会自动决定要不要思考，就算不开启适配模型也可以正常使用，" +
-                    "-nothinking后缀（BudgetTokens=0，思考关闭）也会返回少量的思考token，这是gemini的特性，" +
                     "如果您需要计费，推荐设置无后缀模型价格按思考价格设置"
                   )}
                 </Text>