Merge remote-tracking branch 'origin/main'

Author: Phinease

backend/consts/model.py

@@ -23,24 +23,6 @@ def get_value(cls, status: Optional[str]) -> str:
             return cls.NOT_DETECTED.value
         return status
 
-
-# Request models for user authentication
-class UserSignUpRequest(BaseModel):
-    """User registration request model"""
-    email: EmailStr
-    password: str = Field(..., min_length=6)
-
-class UserSignInRequest(BaseModel):
-    """User login request model"""
-    email: EmailStr
-    password: str
-
-class UserUpdateRequest(BaseModel):
-    """User information update request model"""
-    email: Optional[EmailStr] = None
-    password: Optional[str] = Field(None, min_length=6)
-    role: Optional[str] = None
-
 # Response models for user management
 class ServiceResponse(BaseModel):
     code: int

frontend/app/chat/layout/chatLeftSidebar.tsx

@@ -31,9 +31,6 @@ interface ChatSidebarProps {
   onDropdownOpenChange: (open: boolean, id: string | null) => void
   onToggleSidebar: () => void
   expanded: boolean
-  userEmail?: string | null
-  userAvatarUrl?: string | null
-  userRole?: string
 }
 
 // 辅助函数 - 对话分类

frontend/app/chat/page.tsx

@@ -3,11 +3,15 @@
 import { useEffect } from "react"
 import { ChatInterface } from "@/app/chat/internal/chatInterface"
 import { useConfig } from "@/hooks/useConfig"
+import { configService } from "@/services/configService"
 
 export default function ChatPage() {
   const { appConfig } = useConfig()
 
   useEffect(() => {
+    // Load config from backend when entering chat page
+    configService.loadConfigToFrontend()
+
     if (appConfig.appName) {
       document.title = `ModelEngine | ${appConfig.appName}`
     }

frontend/app/setup/layout/index.tsx

@@ -84,28 +84,20 @@ interface NavigationProps {
   onBackToFirstPage: () => void;
   onCompleteConfig: () => void;
   isSavingConfig: boolean;
-  userRole?: string;
 }
 
 function Navigation({
   selectedKey,
   onBackToFirstPage,
   onCompleteConfig,
   isSavingConfig,
-  userRole
 }: NavigationProps) {
   return (
     <div className="mt-3 flex justify-between px-6">
       {selectedKey !== "1" && (
         <button
           onClick={onBackToFirstPage}
-          disabled={userRole !== "admin"}
-          className={
-            `px-6 py-2.5 rounded-md flex items-center text-sm font-medium ` +
-            (userRole !== "admin"
-              ? "bg-gray-200 text-gray-400 cursor-not-allowed border border-gray-200"
-              : "bg-gray-100 text-gray-700 hover:bg-gray-200 cursor-pointer")
-          }
+          className={"px-6 py-2.5 rounded-md flex items-center text-sm font-medium bg-gray-100 text-gray-700 hover:bg-gray-200 cursor-pointer"}
         >
           上一步
         </button>
@@ -134,7 +126,6 @@ interface LayoutProps {
   onBackToFirstPage: () => void;
   onCompleteConfig: () => void;
   isSavingConfig: boolean;
-  userRole?: string;
 }
 
 function Layout({
@@ -147,7 +138,6 @@ function Layout({
   onBackToFirstPage,
   onCompleteConfig,
   isSavingConfig,
-  userRole
 }: LayoutProps) {
   return (
     <div className="min-h-screen bg-gray-50 font-sans">
@@ -168,7 +158,6 @@ function Layout({
             onBackToFirstPage={onBackToFirstPage}
             onCompleteConfig={onCompleteConfig}
             isSavingConfig={isSavingConfig}
-            userRole={userRole}
           />
         </div>
       </div>

frontend/app/setup/modelSetup/appConfig.tsx

@@ -41,7 +41,7 @@ export const AppConfigSection: React.FC = () => {
   const [isAvatarModalOpen, setIsAvatarModalOpen] = useState(false);
   const [selectedIconKey, setSelectedIconKey] = useState<string>(presetIcons[0].key);
   const [tempIconKey, setTempIconKey] = useState<string>(presetIcons[0].key);
-  const [tempColor, setTempColor] = useState<string>("#235fe1");
+  const [tempColor, setTempColor] = useState<string>("#2689cb");
   const [avatarType, setAvatarType] = useState<"preset" | "custom">(appConfig.iconType);
   const [tempAvatarType, setTempAvatarType] = useState<"preset" | "custom">(appConfig.iconType);
   const [customAvatarUrl, setCustomAvatarUrl] = useState<string | null>(appConfig.customIconUrl);

frontend/app/setup/modelSetup/config.tsx

@@ -3,7 +3,7 @@
 import { useState, useEffect, useRef } from "react"
 import { Layout, Typography, Row, Col } from "antd"
 import { AppConfigSection } from './appConfig'
-import { ModelConfigSection, ModelConfigSectionRef } from './model/modelConfig'
+import { ModelConfigSection, ModelConfigSectionRef } from './modelConfig'
 import { useConfig } from '@/hooks/useConfig'
 
 // 重构：是否有必要引入

frontend/app/setup/modelSetup/model/ModelListCard.tsx

@@ -109,25 +109,6 @@ const fetchModelStatus = async () => {
   }
 };
 
-// 启动全局定时器，确保只有一个定时器运行
-const startGlobalTimer = () => {
-  if (globalTimerRef === null) {
-    
-    // 立即执行一次获取，以尽快更新UI
-    setTimeout(fetchModelStatus, 1000);
-    
-    // 设置周期性定时器
-    globalTimerRef = setInterval(fetchModelStatus, 5000); // 每5秒更新一次
-  }
-  
-  return () => {
-    if (globalTimerRef && modelUpdateRegistry.size === 0) {
-      clearInterval(globalTimerRef);
-      globalTimerRef = null;
-    }
-  };
-};
-
 interface ModelListCardProps {
   type: ModelType
   modelId: string