Revert "chore: use node specify llm to auto generate prompt" (#6555)

This commit is contained in:
Joel
2024-07-23 13:31:32 +08:00
committed by GitHub
parent e80412df23
commit d726473c6d
9 changed files with 57 additions and 98 deletions

View File

@@ -9,7 +9,6 @@ import { useTranslation } from 'react-i18next'
import { useBoolean } from 'ahooks'
import { BlockEnum, EditionType } from '../../../../types'
import type {
ModelConfig,
Node,
NodeOutPutVar,
Variable,
@@ -59,7 +58,6 @@ type Props = {
availableNodes?: Node[]
isSupportPromptGenerator?: boolean
onGenerated?: (prompt: string) => void
modelConfig?: ModelConfig
// for jinja
isSupportJinja?: boolean
editionType?: EditionType
@@ -92,7 +90,6 @@ const Editor: FC<Props> = ({
varList = [],
handleAddVariable,
onGenerated,
modelConfig,
}) => {
const { t } = useTranslation()
const { eventEmitter } = useEventEmitterContextContext()
@@ -133,7 +130,7 @@ const Editor: FC<Props> = ({
<div className='flex items-center'>
<div className='leading-[18px] text-xs font-medium text-gray-500'>{value?.length || 0}</div>
{isSupportPromptGenerator && (
<PromptGeneratorBtn className='ml-[5px]' onGenerated={onGenerated} modelConfig={modelConfig} />
<PromptGeneratorBtn className='ml-[5px]' onGenerated={onGenerated} />
)}
<div className='w-px h-3 ml-2 mr-2 bg-gray-200'></div>

View File

@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState } from 'react'
import { uniqueId } from 'lodash-es'
import { useTranslation } from 'react-i18next'
import { RiQuestionLine } from '@remixicon/react'
import type { ModelConfig, PromptItem, Variable } from '../../../types'
import type { PromptItem, Variable } from '../../../types'
import { EditionType } from '../../../types'
import { useWorkflowStore } from '../../../store'
import Editor from '@/app/components/workflow/nodes/_base/components/prompt/editor'
@@ -38,7 +38,6 @@ type Props = {
availableNodes: any
varList: Variable[]
handleAddVariable: (payload: any) => void
modelConfig?: ModelConfig
}
const roleOptions = [
@@ -78,7 +77,6 @@ const ConfigPromptItem: FC<Props> = ({
availableNodes,
varList,
handleAddVariable,
modelConfig,
}) => {
const { t } = useTranslation()
const workflowStore = useWorkflowStore()
@@ -140,7 +138,6 @@ const ConfigPromptItem: FC<Props> = ({
availableNodes={availableNodes}
isSupportPromptGenerator={payload.role === PromptRole.system}
onGenerated={handleGenerated}
modelConfig={modelConfig}
isSupportJinja
editionType={payload.edition_type}
onEditionTypeChange={onEditionTypeChange}

View File

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
import produce from 'immer'
import { ReactSortable } from 'react-sortablejs'
import { v4 as uuid4 } from 'uuid'
import type { ModelConfig, PromptItem, ValueSelector, Var, Variable } from '../../../types'
import type { PromptItem, ValueSelector, Var, Variable } from '../../../types'
import { EditionType, PromptRole } from '../../../types'
import useAvailableVarList from '../../_base/hooks/use-available-var-list'
import { useWorkflowStore } from '../../../store'
@@ -33,7 +33,6 @@ type Props = {
}
varList?: Variable[]
handleAddVariable: (payload: any) => void
modelConfig: ModelConfig
}
const ConfigPrompt: FC<Props> = ({
@@ -48,7 +47,6 @@ const ConfigPrompt: FC<Props> = ({
hasSetBlockStatus,
varList = [],
handleAddVariable,
modelConfig,
}) => {
const { t } = useTranslation()
const workflowStore = useWorkflowStore()
@@ -201,7 +199,6 @@ const ConfigPrompt: FC<Props> = ({
availableNodes={availableNodesWithParent}
varList={varList}
handleAddVariable={handleAddVariable}
modelConfig={modelConfig}
/>
</div>
)
@@ -237,7 +234,6 @@ const ConfigPrompt: FC<Props> = ({
onEditionTypeChange={handleCompletionEditionTypeChange}
handleAddVariable={handleAddVariable}
onGenerated={handleGenerated}
modelConfig={modelConfig}
/>
</div>
)}

View File

@@ -7,19 +7,14 @@ import { Generator } from '@/app/components/base/icons/src/vender/other'
import GetAutomaticResModal from '@/app/components/app/configuration/config/automatic/get-automatic-res'
import { AppType } from '@/types/app'
import type { AutomaticRes } from '@/service/debug'
import type { ModelConfig } from '@/app/components/workflow/types'
import type { Model } from '@/types/app'
type Props = {
className?: string
onGenerated?: (prompt: string) => void
modelConfig?: ModelConfig
}
const PromptGeneratorBtn: FC<Props> = ({
className,
onGenerated,
modelConfig,
}) => {
const [showAutomatic, { setTrue: showAutomaticTrue, setFalse: showAutomaticFalse }] = useBoolean(false)
const handleAutomaticRes = useCallback((res: AutomaticRes) => {
@@ -37,7 +32,6 @@ const PromptGeneratorBtn: FC<Props> = ({
isShow={showAutomatic}
onClose={showAutomaticFalse}
onFinished={handleAutomaticRes}
model={modelConfig as Model}
isInLLMNode
/>
)}

View File

@@ -178,7 +178,6 @@ const Panel: FC<NodePanelProps<LLMNodeType>> = ({
hasSetBlockStatus={hasSetBlockStatus}
varList={inputs.prompt_config?.jinja2_variables || []}
handleAddVariable={handleAddVariable}
modelConfig={model}
/>
)}