refactor: Simplify Gemini function parameter handling

- Removed redundant checks for non-empty properties in function parameters. - Set function parameters to nil when no properties are needed, streamlining the logic for handling Gemini requests. - Improved code clarity and maintainability by eliminating unnecessary complexity.
feat: Enhance Gemini function parameter handling
2024-12-22 14:35:21 +08:00 · 2024-12-22 14:29:14 +08:00 · 2024-12-21 20:28:26 +08:00 · 2024-12-21 20:24:22 +08:00
3 changed files with 35 additions and 2 deletions
@@ -56,6 +56,16 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest) (*GeminiChatReque
 				googleSearch = true
 				continue
 			}
+			if tool.Function.Parameters != nil {
+				params, ok := tool.Function.Parameters.(map[string]interface{})
+				if ok {
+					if props, hasProps := params["properties"].(map[string]interface{}); hasProps {
+						if len(props) == 0 {
+							tool.Function.Parameters = nil
+						}
+					}
+				}
+			}
 			functions = append(functions, tool.Function)
 		}
 		if len(functions) > 0 {
@@ -77,7 +87,6 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest) (*GeminiChatReque
 			},
 		}
 	}
-
 	if textRequest.ResponseFormat != nil && (textRequest.ResponseFormat.Type == "json_schema" || textRequest.ResponseFormat.Type == "json_object") {
 		geminiRequest.GenerationConfig.ResponseMimeType = "application/json"

@@ -12,6 +12,7 @@ func GenerateTextOtherInfo(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, m
 	other["group_ratio"] = groupRatio
 	other["completion_ratio"] = completionRatio
 	other["model_price"] = modelPrice
+	other["group"] = relayInfo.Group
 	other["frt"] = float64(relayInfo.FirstResponseTime.UnixMilli() - relayInfo.StartTime.UnixMilli())
 	adminInfo := make(map[string]interface{})
 	adminInfo["use_channel"] = ctx.GetStringSlice("use_channel")
@@ -25,7 +25,7 @@ import {
 } from '@douyinfe/semi-ui';
 import { ITEMS_PER_PAGE } from '../constants';
 import {
-  renderAudioModelPrice,
+  renderAudioModelPrice, renderGroup,
  renderModelPrice, renderModelPriceSimple,
  renderNumber,
  renderQuota,
@@ -217,6 +217,29 @@ const LogsTable = () => {
        );
      },
    },
+    {
+      title: t('分组'),
+      dataIndex: 'group',
+      render: (text, record, index) => {
+        if (record.type === 0 || record.type === 2) {
+          let other = JSON.parse(record.other);
+          if (other === null) {
+            return <></>;
+          }
+          if (other.group !== undefined) {
+            return (
+              <>
+                {renderGroup(other.group)}
+              </>
+            );
+          } else {
+            return <></>;
+          }
+        } else {
+          return <></>;
+        }
+      },
+    },
    {
      title: t('类型'),
      dataIndex: 'type',
Author	SHA1	Message	Date
CalciumIon	7d0f26c9cd	refactor: Simplify Gemini function parameter handling - Removed redundant checks for non-empty properties in function parameters. - Set function parameters to nil when no properties are needed, streamlining the logic for handling Gemini requests. - Improved code clarity and maintainability by eliminating unnecessary complexity.	2024-12-22 14:35:21 +08:00
CalciumIon	d13103b667	feat: Enhance Gemini function parameter handling - Added logic to ensure that function parameters have non-empty properties. - Implemented checks to add a default empty property if no parameters are needed. - Updated the required field to match existing properties, improving the robustness of the Gemini function integration.	2024-12-22 14:29:14 +08:00
CalciumIon	191131b2a6	feat: Enhance LogsTable to render group information - Added `renderGroup` function to improve the display of log data by rendering the 'group' information in the LogsTable component. - Updated the rendering logic to utilize the new function, enhancing the UI's clarity and usability for grouped logs.	2024-12-21 20:28:26 +08:00
CalciumIon	095277e64f	feat: Add log information generation and enhance LogsTable component - Introduced `log_info_generate.go` to implement functions for generating various log information, including text, WebSocket, and audio details. - Enhanced `LogsTable` component to display the 'group' information from the log data, improving the visibility of grouped logs in the UI.	2024-12-21 20:24:22 +08:00