Feat/2.3.0 beta2 (#1826)

Author: Liwenru88

src/backend/bisheng/database/models/user_group.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List, Optional
 
-from sqlalchemy import Column, DateTime, delete, text
+from sqlalchemy import Column, DateTime, delete, text, INT
 from sqlmodel import Field, select
 
 from bisheng.common.models.base import SQLModelSerializable
@@ -30,7 +30,7 @@ class UserGroupBase(SQLModelSerializable):
 
 
 class UserGroup(UserGroupBase, table=True):
-    id: Optional[int] = Field(default=None, primary_key=True)
+    id: Optional[int] = Field(default=None, sa_column=Column(INT, primary_key=True, autoincrement=True))
 
 
 class UserGroupRead(UserGroupBase):

src/backend/bisheng/user/domain/models/user_role.py

@@ -2,7 +2,7 @@
 from typing import List, Optional
 
 from pydantic import BaseModel
-from sqlalchemy import Column, DateTime, text, delete
+from sqlalchemy import Column, DateTime, text, delete,INT
 from sqlmodel import Field, select
 
 from bisheng.common.models.base import SQLModelSerializable
@@ -28,7 +28,7 @@ class UserRoleBase(SQLModelSerializable):
 
 
 class UserRole(UserRoleBase, table=True):
-    id: Optional[int] = Field(default=None, primary_key=True)
+    id: Optional[int] = Field(default=None, sa_column=Column(INT, primary_key=True, autoincrement=True))
 
 
 class UserRoleRead(UserRoleBase):

src/frontend/client/src/components/Chat/Messages/MessagesView.tsx

@@ -91,8 +91,11 @@ export default function MessagesView({
             className="flex items-center h-8 justify-center gap-2 rounded-2xl bg-blue-100 px-4 py-1 font-medium text-blue-main hover:bg-blue-200"
             disabled={readOnly}
             onClick={() => {
-              newConvo();
-              navigate('/c/new');
+              document.getElementById('create-convo-btn')?.click();
+              // hack
+              setTimeout(() => {
+                document.getElementById('create-convo-btn')?.click();
+              }, 300);
             }}
             aria-label={localize('com_ui_new_chat')}
           >

src/frontend/client/src/components/Conversations/Convo.tsx

@@ -1,17 +1,20 @@
-import { Check, X } from 'lucide-react';
-import type { FocusEvent, KeyboardEvent, MouseEvent } from 'react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import { useRecoilValue } from 'recoil';
-import { NotificationSeverity } from '~/common';
-import { useGetEndpointsQuery, useUpdateConversationMutation } from '~/data-provider';
-import type { TConversation } from '~/data-provider/data-provider/src';
-import { Constants } from '~/data-provider/data-provider/src';
-import { useLocalize, useMediaQuery, useNavigateToConvo } from '~/hooks';
-import { useToastContext } from '~/Providers';
-import store from '~/store';
-import { cn } from '~/utils';
-import { ConvoOptions } from './ConvoOptions';
+import { Check, X } from "lucide-react";
+import type { FocusEvent, KeyboardEvent, MouseEvent } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useNavigate, useParams } from "react-router-dom";
+import { useRecoilValue } from "recoil";
+import { NotificationSeverity } from "~/common";
+import {
+  useGetEndpointsQuery,
+  useUpdateConversationMutation,
+} from "~/data-provider";
+import type { TConversation } from "~/data-provider/data-provider/src";
+import { Constants } from "~/data-provider/data-provider/src";
+import { useLocalize, useMediaQuery, useNavigateToConvo } from "~/hooks";
+import { useToastContext } from "~/Providers";
+import store from "~/store";
+import { cn } from "~/utils";
+import { ConvoOptions } from "./ConvoOptions";
 
 type KeyEvent = KeyboardEvent<HTMLInputElement>;
 
@@ -30,8 +33,13 @@ export default function Conversation({
 }: ConversationProps) {
   const params = useParams();
 
-  const currentConvoId = useMemo(() => params.conversationId, [params.conversationId]);
-  const updateConvoMutation = useUpdateConversationMutation(currentConvoId ?? '');
+  const currentConvoId = useMemo(
+    () => params.conversationId,
+    [params.conversationId]
+  );
+  const updateConvoMutation = useUpdateConversationMutation(
+    currentConvoId ?? ""
+  );
   const activeConvos = useRecoilValue(store.allConversationsSelector);
   const { data: endpointsConfig } = useGetEndpointsQuery();
   const { navigateWithLastTools } = useNavigateToConvo();
@@ -41,7 +49,7 @@ export default function Conversation({
   const [titleInput, setTitleInput] = useState(title);
   const [renaming, setRenaming] = useState(false);
   const [isPopoverActive, setIsPopoverActive] = useState(false);
-  const isSmallScreen = useMediaQuery('(max-width: 768px)');
+  const isSmallScreen = useMediaQuery("(max-width: 768px)");
   const localize = useLocalize();
   const navigate = useNavigate();
 
@@ -60,14 +68,14 @@ export default function Conversation({
     toggleNav();
 
     // set document title
-    if (typeof title === 'string' && title.length > 0) {
+    if (typeof title === "string" && title.length > 0) {
       // document.title = title;
     }
 
     /* Note: Latest Message should not be reset if existing convo */
     navigateWithLastTools(
       conversation,
-      !(conversationId ?? '') || conversationId === Constants.NEW_CONVO,
+      !(conversationId ?? "") || conversationId === Constants.NEW_CONVO
     );
   };
 
@@ -84,43 +92,57 @@ export default function Conversation({
   }, [renaming]);
 
   const onRename = useCallback(
-    (e: MouseEvent<HTMLButtonElement> | FocusEvent<HTMLInputElement> | KeyEvent) => {
+    (
+      e: MouseEvent<HTMLButtonElement> | FocusEvent<HTMLInputElement> | KeyEvent
+    ) => {
       e.preventDefault();
       setRenaming(false);
       if (titleInput === title) {
         return;
       }
-      if (typeof conversationId !== 'string' || conversationId === '') {
+      if (typeof conversationId !== "string" || conversationId === "") {
         return;
       }
 
       updateConvoMutation.mutate(
-        { conversationId, title: titleInput ?? '', flowType: conversation.flowType },
+        {
+          conversationId,
+          title: titleInput ?? "",
+          flowId: conversation.flowId,
+          flowType: conversation.flowType,
+        },
         {
           onError: () => {
             setTitleInput(title);
             showToast({
-              message: 'Failed to rename conversation',
+              message: "Failed to rename conversation",
               severity: NotificationSeverity.ERROR,
               showIcon: true,
             });
           },
-        },
+        }
       );
     },
-    [title, titleInput, conversationId, showToast, conversation, updateConvoMutation],
+    [
+      title,
+      titleInput,
+      conversationId,
+      showToast,
+      conversation,
+      updateConvoMutation,
+    ]
   );
 
   const handleKeyDown = useCallback(
     (e: KeyEvent) => {
-      if (e.key === 'Escape') {
+      if (e.key === "Escape") {
         setTitleInput(title);
         setRenaming(false);
-      } else if (e.key === 'Enter') {
+      } else if (e.key === "Enter") {
         onRename(e);
       }
     },
-    [title, onRename],
+    [title, onRename]
   );
 
   const cancelRename = useCallback(
@@ -129,25 +151,25 @@ export default function Conversation({
       setTitleInput(title);
       setRenaming(false);
     },
-    [title],
+    [title]
   );
 
   const isActiveConvo: boolean = useMemo(
     () =>
       currentConvoId === conversationId ||
       (isLatestConvo &&
-        currentConvoId === 'new' &&
+        currentConvoId === "new" &&
         activeConvos[0] != null &&
-        activeConvos[0] !== 'new'),
-    [currentConvoId, conversationId, isLatestConvo, activeConvos],
+        activeConvos[0] !== "new"),
+    [currentConvoId, conversationId, isLatestConvo, activeConvos]
   );
 
   return (
     <div
       className={cn(
-        'group relative mt-2 flex h-10 w-full items-center rounded-lg hover:bg-[#EBEFF8]',
-        isActiveConvo ? 'bg-[#EBEFF8]' : '',
-        isSmallScreen ? 'h-12' : '',
+        "group relative mt-2 flex h-10 w-full items-center rounded-lg hover:bg-[#EBEFF8]",
+        isActiveConvo ? "bg-[#EBEFF8]" : "",
+        isSmallScreen ? "h-12" : ""
       )}
     >
       {renaming ? (
@@ -156,15 +178,19 @@ export default function Conversation({
             ref={inputRef}
             type="text"
             className="w-full rounded bg-transparent p-0.5 text-sm leading-tight focus-visible:outline-none"
-            value={titleInput ?? ''}
+            value={titleInput ?? ""}
             onChange={(e) => setTitleInput(e.target.value)}
             onKeyDown={handleKeyDown}
-            aria-label={`${localize('com_ui_rename')} ${localize('com_ui_chat')}`}
+            aria-label={`${localize("com_ui_rename")} ${localize(
+              "com_ui_chat"
+            )}`}
           />
           <div className="flex gap-1">
             <button
               onClick={cancelRename}
-              aria-label={`${localize('com_ui_cancel')} ${localize('com_ui_rename')}`}
+              aria-label={`${localize("com_ui_cancel")} ${localize(
+                "com_ui_rename"
+              )}`}
             >
               <X
                 aria-hidden={true}
@@ -173,7 +199,9 @@ export default function Conversation({
             </button>
             <button
               onClick={onRename}
-              aria-label={`${localize('com_ui_submit')} ${localize('com_ui_rename')}`}
+              aria-label={`${localize("com_ui_submit")} ${localize(
+                "com_ui_rename"
+              )}`}
             >
               <Check
                 aria-hidden={true}
@@ -189,10 +217,10 @@ export default function Conversation({
           data-testid="convo-item"
           onClick={clickHandler}
           className={cn(
-            'flex grow cursor-pointer items-center gap-2 overflow-hidden whitespace-nowrap break-all rounded-lg px-2 py-2',
-            isActiveConvo ? 'bg-[#EBEFF8]' : '',
+            "flex grow cursor-pointer items-center gap-2 overflow-hidden whitespace-nowrap break-all rounded-lg px-2 py-2",
+            isActiveConvo ? "bg-[#EBEFF8]" : ""
           )}
-          title={title ?? ''}
+          title={title ?? ""}
         >
           {/* <EndpointIcon
             conversation={conversation}
@@ -210,7 +238,16 @@ export default function Conversation({
             }}
             alt={conversation?.flowType}
           >
-            <img src={__APP_ENV__.BASE_URL + (conversation?.flowType === 20 ? "/assets/linsi.png" : "/assets/talk.png")} className='size-6 inline-block mr-2.5' alt="" />
+            <img
+              src={
+                __APP_ENV__.BASE_URL +
+                (conversation?.flowType === 20
+                  ? "/assets/linsi.png"
+                  : "/assets/talk.png")
+              }
+              className="size-6 inline-block mr-2.5"
+              alt=""
+            />
             {title}
           </div>
           {isActiveConvo ? (
@@ -222,10 +259,10 @@ export default function Conversation({
       )}
       <div
         className={cn(
-          'mr-2',
+          "mr-2",
           isPopoverActive || isActiveConvo
-            ? 'flex'
-            : 'hidden group-focus-within:flex group-hover:flex',
+            ? "flex"
+            : "hidden group-focus-within:flex group-hover:flex"
         )}
       >
         {!renaming && (

src/frontend/client/src/components/Nav/NewChat.tsx

@@ -85,13 +85,13 @@ export default function NewChat({
   const clickHandler = (event: React.MouseEvent<HTMLAnchorElement>) => {
     if (event.button === 0 && !(event.ctrlKey || event.metaKey)) {
       event.preventDefault();
+      newConvo();
+      navigate('/c/new');
+      toggleNav();
       queryClient.setQueryData<TMessage[]>(
         [QueryKeys.messages, conversation?.conversationId ?? Constants.NEW_CONVO],
         [],
       );
-      newConvo();
-      navigate('/c/new');
-      toggleNav();
     }
   };
 
@@ -117,6 +117,7 @@ export default function NewChat({
           </Button>
           {/* 新建btn */}
           <Button
+            id="create-convo-btn"
             variant="outline" className="shadow-sm h-10 rounded-xl px-3 flex-shrink-0"
             onClick={clickHandler}
             aria-label={localize('com_ui_new_chat')}

src/frontend/client/src/locales/en/translation.json

@@ -1038,6 +1038,7 @@
     "403": "No permission to perform this action",
     "404": "Resource not found",
     "500": "Server error",
+    "503": "System is busy, please wait.",
     "10001": "SFT service not found",
     "10002": "Invalid operation",
     "10003": "Resource download failed",
@@ -1110,7 +1111,7 @@
     "10532": "Workflow version upgraded. Contact owner to re-edit",
     "10540": "Server thread limit reached. Please try again later",
     "10541": "Workflow execution failed: {{exception}}",
-    "10599": "No write permission",
+    "10599": "No permission to view",
     "10600": "Incorrect username or password",
     "10601": "Password expired. Please update it",
     "10602": "Password not set. Contact admin to reset",

src/frontend/client/src/locales/ja/translation.json

@@ -958,6 +958,7 @@
     "403": "操作権限がありません",
     "404": "リソースが見つかりません",
     "500": "サーバーエラー",
+    "503": "ただいまシステムが混み合っております。少々お待ちください。",
     "10001": "SFTサービスが見つかりません",
     "10002": "無効な操作です",
     "10003": "リソースのダウンロードに失敗しました",

src/frontend/client/src/locales/zh-Hans/translation.json

@@ -958,6 +958,7 @@
     "403": "暂无操作权限",
     "404": "资源不存在",
     "500": "服务器错误",
+    "503": "系统正忙，请稍候",
     "10001": "未找到SFT服务",
     "10002": "无效操作",
     "10003": "资源下载失败",
@@ -1030,7 +1031,7 @@
     "10532": "工作流版本已升级，请联系创建者重新编排",
     "10540": "服务器线程数已满，请稍候再试",
     "10541": "工作流任务执行失败：{{exception}}",
-    "10599": "没有应用写权限",
+    "10599": "暂无查看权限",
     "10600": "账号或密码错误",
     "10601": "您的密码已过期，请及时修改",
     "10602": "用户尚未设置密码，请先联系管理员重置密码",