Merge branch '1.1.3-master' into 1.1.3-zyx

api/controllers/console/app/app.py

@@ -349,7 +349,7 @@ class AppPermissionApi(Resource):
     @account_initialization_required
     def get(self, app_model):
         app_service = AppService()
-        app_model = app_service.get_app(app_model)
+        app_model = app_service.get_app_by_id(app_model)
         if not app_model:
             raise NotFound("App not found.")
         read_permission_list = AppService.get_app_read_permission(app_model.id)
@@ -366,7 +366,7 @@ class AppPermissionApi(Resource):
     def post(self, app_model):
         # add app permission
         app_service = AppService()
-        app_model = app_service.get_app(app_model)
+        app_model = app_service.get_app_by_id(app_model)
 
         # 解析表单数据
         data = request.get_json()
@@ -374,7 +374,6 @@ class AppPermissionApi(Resource):
             raise NotFound("Invalid JSON")
 
         edit_auth = data.get("edit_auth")
-        print("edit_auth" + str(edit_auth))
         if edit_auth is None:
             return jsonify({"error": "Missing 'edit_auth' field"}), 400
 

api/services/app_service.py

@@ -201,6 +201,7 @@ class AppService:
         app.api_rph = args.get("api_rph", 0)
         app.api_rpm = args.get("api_rpm", 0)
         app.created_by = account.id
+        app.dept_id =account.dept_id
         app.updated_by = account.id
 
         db.session.add(app)
@@ -223,8 +224,10 @@ class AppService:
         return app
 
     def get_app_by_id(self, app: App) -> App:
+
         return app
 
+
     def get_app(self, app: App) -> App:
         """
         Get App
@@ -252,7 +255,6 @@ class AppService:
                         provider_type=agent_tool_entity.provider_type,
                         identity_id=f"AGENT.{app.id}",
                     )
-
                     # get decrypted parameters
                     if agent_tool_entity.tool_parameters:
                         parameters = manager.decrypt_tool_parameters(agent_tool_entity.tool_parameters or {})
@@ -267,12 +269,10 @@ class AppService:
 
             # override agent mode
             model_config.agent_mode = json.dumps(agent_mode)
-
             class ModifiedApp(App):
                 """
                 Modified App class
                 """
-
                 def __init__(self, app):
                     self.__dict__.update(app.__dict__)
 
@@ -281,7 +281,6 @@ class AppService:
                     return model_config
 
             app = ModifiedApp(app)
-
         return app
 
     def update_app(self, app: App, args: dict) -> App:
@@ -454,6 +453,7 @@ class AppService:
         app.edit_auth = edit_auth
         app.updated_by = current_user.id
         app.updated_at = datetime.now(UTC).replace(tzinfo=None)
+
         db.session.commit()
 
         return app

web/app/(commonLayout)/apps/Apps.tsx

@@ -41,6 +41,7 @@ const getKey = (
   keywords: string,
   dept: string,
   authType: number,
+  creator: string,
 ) => {
   if (!pageIndex || previousPageData.has_more) {
     const params: any = { url: 'apps', params: { page: pageIndex + 1, limit: 30, name: keywords, is_created_by_me: isCreatedByMe } }
@@ -53,9 +54,11 @@ const getKey = (
     if (tags.length)
       params.params.tag_ids = tags
     if (dept)
-      params.params.creatorDept = dept
+      params.params.creator_dept = dept
     if (authType)
-      params.params.authType = authType
+      params.params.auth_type = authType
+    if (creator)
+      params.params.creator = creator
     return params
   }
   return null
@@ -95,8 +98,17 @@ const Apps = () => {
     { name: '授权编辑', value: '3' },
     { name: '授权可见', value: '4' },
   ]
+  const [creator, setCreator] = useState('')
+  const [searchCreator, setSearchCreator] = useState('')
+  const { run: handleSearchCreator } = useDebounceFn(() => {
+    setSearchCreator(creator)
+  }, { wait: 500 })
+  const handleCreatorChange = (value: string) => {
+    setCreator(value)
+    handleSearchCreator()
+  }
   const { data, isLoading, setSize, mutate } = useSWRInfinite(
-    (pageIndex: number, previousPageData: AppListResponse) => getKey(pageIndex, previousPageData, activeTab, isCreatedByMe, tagIDs, searchKeywords, dept, authType),
+    (pageIndex: number, previousPageData: AppListResponse) => getKey(pageIndex, previousPageData, activeTab, isCreatedByMe, tagIDs, searchKeywords, dept, authType, searchCreator),
     fetchAppList,
     { revalidateFirstPage: true },
   )
@@ -168,6 +180,15 @@ const Apps = () => {
           options={options}
         />
         <div className='flex items-center gap-2'>
+          <Input
+            showLeftIcon
+            showClearIcon
+            wrapperClassName='w-[200px]'
+            value={creator}
+            onChange={e => handleCreatorChange(e.target.value)}
+            onClear={() => handleCreatorChange('')}
+            placeholder="请输入创建人"
+          />
           <SimpleSelect
             wrapperClassName="h-[32px] w-[200px]"
             defaultValue={authType}

web/app/(commonLayout)/apps/hooks/useAppsQueryState.ts

@@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 type AppsQuery = {
   tagIDs?: string[]
   keywords?: string
+  creator?: string
   isCreatedByMe?: boolean
 }
 

web/app/(commonLayout)/datasets/Container.tsx

@@ -68,6 +68,17 @@ const Container = () => {
     setKeywords(value)
     handleSearch()
   }
+
+  const [creator, setCreator] = useState('')
+  const [searchCreator, setSearchCreator] = useState('')
+  const { run: handleSearchCreator } = useDebounceFn(() => {
+    setSearchCreator(creator)
+  }, { wait: 500 })
+  const handleCreatorChange = (value: string) => {
+    setCreator(value)
+    handleSearchCreator()
+  }
+
   const [tagFilterValue, setTagFilterValue] = useState<string[]>([])
   const [tagIDs, setTagIDs] = useState<string[]>([])
   const { run: handleTagsUpdate } = useDebounceFn(() => {
@@ -127,6 +138,15 @@ const Container = () => {
         />
         {activeTab === 'dataset' && (
           <div className='flex items-center justify-center gap-2'>
+            <Input
+              showLeftIcon
+              showClearIcon
+              wrapperClassName='w-[200px]'
+              value={creator}
+              onChange={e => handleCreatorChange(e.target.value)}
+              onClear={() => handleCreatorChange('')}
+              placeholder="请输入创建人"
+            />
             <SimpleSelect
               wrapperClassName="h-[32px] w-[200px]"
               defaultValue={authType}
@@ -191,7 +211,7 @@ const Container = () => {
       </div>
       {activeTab === 'dataset' && (
         <>
-          <Datasets containerRef={containerRef} tags={tagIDs} keywords={searchKeywords} includeAll={includeAll} type={searchType} dept={dept} authType={authType} />
+          <Datasets containerRef={containerRef} tags={tagIDs} keywords={searchKeywords} includeAll={includeAll} type={searchType} dept={dept} authType={authType} creator={searchCreator} />
           <DatasetFooter />
           {showTagManagementModal && (
             <TagManagementModal type='knowledge' show={showTagManagementModal} />

web/app/(commonLayout)/datasets/Datasets.tsx

@@ -19,6 +19,7 @@ const getKey = (
   type: string,
   dept: string,
   authType: string,
+  creator: string,
 ) => {
   if (!pageIndex || previousPageData.has_more) {
     const params: FetchDatasetsParams = {
@@ -39,6 +40,8 @@ const getKey = (
       params.params.creatorDept = dept
     if (authType)
       params.params.authType = authType
+    if (creator)
+      params.params.creator = creator
     return params
   }
   return null
@@ -52,6 +55,7 @@ type Props = {
   type: string,
   dept: string,
   authType: string,
+  creator: string,
 }
 
 const Datasets = ({
@@ -62,10 +66,11 @@ const Datasets = ({
   type,
   dept,
   authType,
+  creator,
 }: Props) => {
   const { isCurrentWorkspaceEditor } = useAppContext()
   const { data, isLoading, setSize, mutate } = useSWRInfinite(
-    (pageIndex: number, previousPageData: DataSetListResponse) => getKey(pageIndex, previousPageData, tags, keywords, includeAll, type, dept, authType),
+    (pageIndex: number, previousPageData: DataSetListResponse) => getKey(pageIndex, previousPageData, tags, keywords, includeAll, type, dept, authType, creator),
     fetchDatasets,
     { revalidateFirstPage: false, revalidateAll: true },
   )

web/app/components/workflow/nodes/intent-recon-train/default.ts

@@ -10,17 +10,22 @@ import {
 const nodeDefault: NodeDefault<HttpNodeType> = {
   defaultValue: {
     variables: [],
-    method: Method.get,
-    url: '',
+    method: Method.post,
+    url: ['localhost', '1.95.78.201'].includes(location.hostname) ? 'http://1.95.78.201:30001/call' : 'http://10.76.102.168.:5006/call',
     authorization: {
       type: AuthorizationType.none,
       config: null,
     },
-    headers: '',
+    headers: 'accept:application/json\nContent-Type:application/json',
     params: '',
     body: {
-      type: BodyType.none,
-      data: [],
+      type: BodyType.rawText,
+      data: <any>[
+        {
+          type: 'text',
+          value: '{\n    "input": {\n      "text": ""\n    },\n    "parameters": {\n      "candidate_labels": []\n    }\n}',
+        },
+      ],
     },
     timeout: {
       max_connect_timeout: 0,

web/app/components/workflow/nodes/intent-recon-train/panel.tsx

@@ -9,12 +9,9 @@ import AuthorizationModal from './components/authorization'
 import type { HttpNodeType } from './types'
 import Timeout from './components/timeout'
 import CurlPanel from './components/curl-panel'
-import cn from '@/utils/classnames'
 import Field from '@/app/components/workflow/nodes/_base/components/field'
 import Split from '@/app/components/workflow/nodes/_base/components/split'
 import OutputVars, { VarItem } from '@/app/components/workflow/nodes/_base/components/output-vars'
-import { Settings01 } from '@/app/components/base/icons/src/vender/line/general'
-import { FileArrow01 } from '@/app/components/base/icons/src/vender/line/files'
 import type { NodePanelProps } from '@/app/components/workflow/types'
 import BeforeRunForm from '@/app/components/workflow/nodes/_base/components/before-run-form'
 import ResultPanel from '@/app/components/workflow/run/result-panel'
@@ -69,33 +66,33 @@ const Panel: FC<NodePanelProps<HttpNodeType>> = ({
       <div className='space-y-4 px-4 pb-4'>
         <Field
           title={t(`${i18nPrefix}.api`)}
-          operations={
-            <div className='flex'>
-              <div
-                onClick={showAuthorization}
-                className={cn(!readOnly && 'cursor-pointer hover:bg-gray-50', 'flex h-6 items-center space-x-1 rounded-md px-2 ')}
-              >
-                {!readOnly && <Settings01 className='h-3 w-3 text-gray-500' />}
-                <div className='text-xs font-medium text-gray-500'>
-                  {t(`${i18nPrefix}.authorization.authorization`)}
-                  <span className='ml-1 text-gray-700'>{t(`${i18nPrefix}.authorization.${inputs.authorization.type}`)}</span>
-                </div>
-              </div>
-              <div
-                onClick={showCurlPanel}
-                className={cn(!readOnly && 'cursor-pointer hover:bg-gray-50', 'flex h-6 items-center space-x-1 rounded-md px-2 ')}
-              >
-                {!readOnly && <FileArrow01 className='h-3 w-3 text-gray-500' />}
-                <div className='text-xs font-medium text-gray-500'>
-                  {t(`${i18nPrefix}.curl.title`)}
-                </div>
-              </div>
-            </div>
-          }
+          // operations={
+          //   <div className='flex'>
+          //     <div
+          //       onClick={showAuthorization}
+          //       className={cn(!readOnly && 'cursor-pointer hover:bg-gray-50', 'flex h-6 items-center space-x-1 rounded-md px-2 ')}
+          //     >
+          //       {!readOnly && <Settings01 className='h-3 w-3 text-gray-500' />}
+          //       <div className='text-xs font-medium text-gray-500'>
+          //         {t(`${i18nPrefix}.authorization.authorization`)}
+          //         <span className='ml-1 text-gray-700'>{t(`${i18nPrefix}.authorization.${inputs.authorization.type}`)}</span>
+          //       </div>
+          //     </div>
+          //     <div
+          //       onClick={showCurlPanel}
+          //       className={cn(!readOnly && 'cursor-pointer hover:bg-gray-50', 'flex h-6 items-center space-x-1 rounded-md px-2 ')}
+          //     >
+          //       {!readOnly && <FileArrow01 className='h-3 w-3 text-gray-500' />}
+          //       <div className='text-xs font-medium text-gray-500'>
+          //         {t(`${i18nPrefix}.curl.title`)}
+          //       </div>
+          //     </div>
+          //   </div>
+          // }
         >
           <ApiInput
             nodeId={id}
-            readonly={readOnly}
+            readonly={true}
             method={inputs.method}
             onMethodChange={handleMethodChange}
             url={inputs.url}

web/utils/app-redirection.ts

@@ -5,13 +5,13 @@ export const getRedirection = (
   app: { id: string, mode: AppMode },
   redirectionFunc: (href: string) => void,
 ) => {
-  if (!isCurrentWorkspaceEditor) {
-    redirectionFunc(`/app/${app.id}/overview`)
-  }
-  else {
-    if (app.mode === 'workflow' || app.mode === 'advanced-chat')
-      redirectionFunc(`/app/${app.id}/workflow`)
-    else
-      redirectionFunc(`/app/${app.id}/configuration`)
-  }
+  // if (!isCurrentWorkspaceEditor) {
+  //   redirectionFunc(`/app/${app.id}/overview`)
+  // }
+  // else {
+  if (app.mode === 'workflow' || app.mode === 'advanced-chat')
+    redirectionFunc(`/app/${app.id}/workflow`)
+  else
+    redirectionFunc(`/app/${app.id}/configuration`)
+  // }
 }