fix: Correct inner padding and sider visibility logic in HeaderBar, PageLayout, and SiderBar components

- Updated the click handler in HeaderBar to toggle inner padding and sider visibility correctly based on the selected item.
- Adjusted the conditional rendering of SiderBar in PageLayout to ensure it displays when the sider is shown.
- Refined the inner padding logic in SiderBar to maintain consistent behavior when selecting items.
- Introduced a new function in Style context to manage sider visibility based on the current pathname, enhancing responsiveness to navigation changes.

relay/channel/gemini/constant.go

@@ -8,6 +8,7 @@ var ModelList = []string{
 	"gemini-1.5-pro-latest", "gemini-1.5-flash-latest", "gemini-ultra",
 	"gemini-1.5-pro-exp-0827", "gemini-1.5-flash-exp-0827",
 	"gemini-exp-1114", "gemini-exp-1206",
+	"gemini-2.0-flash-exp",
 }
 
 var ChannelName = "google gemini"

relay/channel/gemini/dto.go

@@ -34,6 +34,7 @@ type GeminiChatSafetySettings struct {
 }
 
 type GeminiChatTools struct {
+	GoogleSearch         any `json:"googleSearch,omitempty"`
 	FunctionDeclarations any `json:"functionDeclarations,omitempty"`
 }
 

relay/channel/gemini/relay-gemini.go

@@ -45,13 +45,25 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest) *GeminiChatReques
 	}
 	if textRequest.Tools != nil {
 		functions := make([]dto.FunctionCall, 0, len(textRequest.Tools))
+		googleSearch := false
 		for _, tool := range textRequest.Tools {
+			if tool.Function.Name == "googleSearch" {
+				googleSearch = true
+				continue
+			}
 			functions = append(functions, tool.Function)
 		}
-		geminiRequest.Tools = []GeminiChatTools{
-			{
-				FunctionDeclarations: functions,
-			},
+		if len(functions) > 0 {
+			geminiRequest.Tools = []GeminiChatTools{
+				{
+					FunctionDeclarations: functions,
+				},
+			}
+		}
+		if googleSearch {
+			geminiRequest.Tools = append(geminiRequest.Tools, GeminiChatTools{
+				GoogleSearch: make(map[string]string),
+			})
 		}
 	} else if textRequest.Functions != nil {
 		geminiRequest.Tools = []GeminiChatTools{
@@ -134,7 +146,6 @@ func CovertGemini2OpenAI(textRequest dto.GeneralOpenAIRequest) *GeminiChatReques
 			shouldAddDummyModelMessage = false
 		}
 	}
-
 	return &geminiRequest
 }
 

web/src/components/HeaderBar.js

@@ -124,11 +124,11 @@ const HeaderBar = () => {
               return (
                 <div onClick={(e) => {
                   if (props.itemKey === 'home') {
-                    styleDispatch({ type: 'SET_INNER_PADDING', payload: true });
-                    styleDispatch({ type: 'SET_SIDER', payload: true });
-                  } else {
                     styleDispatch({ type: 'SET_INNER_PADDING', payload: false });
                     styleDispatch({ type: 'SET_SIDER', payload: false });
+                  } else {
+                    styleDispatch({ type: 'SET_INNER_PADDING', payload: true });
+                    styleDispatch({ type: 'SET_SIDER', payload: true });
                   }
                 }}>
                   <Link
@@ -150,10 +150,10 @@ const HeaderBar = () => {
                   {
                     styleState.showSider ?
                       <Button icon={<IconMenu />} theme="light" aria-label="展开侧边栏" onClick={
-                        () => styleDispatch({ type: 'SET_SIDER', payload: false })
+                        () => styleDispatch({ type: 'SET_SIDER', payload: true })
                       } />:
                       <Button icon={<IconIndentLeft />} theme="light" aria-label="关闭侧边栏" onClick={
-                        () => styleDispatch({ type: 'SET_SIDER', payload: true })
+                        () => styleDispatch({ type: 'SET_SIDER', payload: false })
                       } />
                   }
                 </>

web/src/components/PageLayout.js

@@ -19,11 +19,11 @@ const PageLayout = () => {
       </Header>
       <Layout style={{ flex: 1, overflow: 'hidden' }}>
         <Sider>
-          {styleState.showSider ? null : <SiderBar />}
+          {styleState.showSider ? <SiderBar /> : null}
         </Sider>
         <Layout>
           <Content
-            style={{ overflowY: styleState.shouldInnerPadding?'hidden':'auto', padding: styleState.shouldInnerPadding? '0': '24px' }}
+            style={{ overflowY: styleState.shouldInnerPadding?'auto':'hidden', padding: styleState.shouldInnerPadding? '24px': '0' }}
           >
             <App />
           </Content>

web/src/components/SiderBar.js

@@ -274,9 +274,9 @@ const SiderBar = () => {
         items={headerButtons}
         onSelect={(key) => {
           if (key.itemKey.toString().startsWith('chat')) {
-            styleDispatch({ type: 'SET_INNER_PADDING', payload: true });
-          } else {
             styleDispatch({ type: 'SET_INNER_PADDING', payload: false });
+          } else {
+            styleDispatch({ type: 'SET_INNER_PADDING', payload: true });
           }
           setSelectedKeys([key.itemKey]);
         }}

web/src/context/Style/index.js

@@ -44,6 +44,26 @@ export const StyleProvider = ({ children }) => {
 
     updateIsMobile();
 
+    const updateShowSider = () => {
+      if (isMobile()) {
+        dispatch({ type: 'SET_SIDER', payload: false });
+      } else {
+        // check pathname
+        const pathname = window.location.pathname;
+        console.log(pathname)
+        if (pathname === '' || pathname === '/' || pathname.includes('/home') || pathname.includes('/chat')) {
+          dispatch({ type: 'SET_SIDER', payload: false });
+          dispatch({ type: 'SET_INNER_PADDING', payload: false });
+        } else {
+          dispatch({ type: 'SET_SIDER', payload: true });
+          dispatch({ type: 'SET_INNER_PADDING', payload: true });
+        }
+      }
+    };
+
+    updateShowSider()
+
+
     // Optionally, add event listeners to handle window resize
     window.addEventListener('resize', updateIsMobile);
 

web/src/pages/Detail/index.js

@@ -490,20 +490,16 @@ const Detail = (props) => {
                 <Card>
                   <Descriptions row size='small'>
                     <Descriptions.Item itemKey='平均RPM'>
-                      {renderNumber(
-                        times /
-                          ((Date.parse(end_timestamp) -
-                            Date.parse(start_timestamp)) /
-                            60000),
-                      ).toFixed(3)}
+                      {(times /
+                        ((Date.parse(end_timestamp) -
+                          Date.parse(start_timestamp)) /
+                          60000)).toFixed(3)}
                     </Descriptions.Item>
                     <Descriptions.Item itemKey='平均TPM'>
-                      {renderNumber(
-                        consumeTokens /
-                          ((Date.parse(end_timestamp) -
-                            Date.parse(start_timestamp)) /
-                            60000),
-                      ).toFixed(3)}
+                      {(consumeTokens /
+                        ((Date.parse(end_timestamp) -
+                          Date.parse(start_timestamp)) /
+                          60000)).toFixed(3)}
                     </Descriptions.Item>
                   </Descriptions>
                 </Card>

web/src/pages/Playground/Playground.js

@@ -326,7 +326,12 @@ const Playground = () => {
               }}
               value={inputs.group}
               autoComplete='new-password'
-              optionList={groups}
+              optionList={groups.map((group) => ({
+                ...group,
+                label: styleState.isMobile && group.label.length > 18
+                  ? group.label.substring(0, 18) + '...'
+                  : group.label,
+              }))}
             />
             <div style={{ marginTop: 10 }}>
               <Typography.Text strong>模型：</Typography.Text>