feat: can not add context

This commit is contained in:
Joel 2024-03-20 19:34:49 +08:00
parent 137746387d
commit 17f572f23f
7 changed files with 65 additions and 48 deletions

View File

@ -49,6 +49,7 @@ export type PromptEditorProps = {
value?: string
editable?: boolean
outToolDisabled?: boolean
canNotAddContext?: boolean
onChange?: (text: string) => void
onBlur?: () => void
onFocus?: () => void
@ -88,6 +89,7 @@ const PromptEditor: FC<PromptEditorProps> = ({
value,
editable = true,
outToolDisabled = false,
canNotAddContext = false,
onChange,
onBlur,
onFocus,
@ -190,11 +192,13 @@ const PromptEditor: FC<PromptEditorProps> = ({
onAddContext={contextBlock.onAddContext}
onInsert={contextBlock.onInsert}
onDelete={contextBlock.onDelete}
canNotAddContext={canNotAddContext}
/>
<ContextBlockReplacementBlock
datasets={contextBlock.datasets}
onAddContext={contextBlock.onAddContext}
onInsert={contextBlock.onInsert}
canNotAddContext={canNotAddContext}
/>
</>
)

View File

@ -21,6 +21,7 @@ const ContextBlockReplacementBlock: FC<ContextBlockProps> = ({
datasets,
onAddContext,
onInsert,
canNotAddContext,
}) => {
const [editor] = useLexicalComposerContext()
@ -32,7 +33,7 @@ const ContextBlockReplacementBlock: FC<ContextBlockProps> = ({
const createContextBlockNode = useCallback((): ContextBlockNode => {
if (onInsert)
onInsert()
return $applyNodeReplacement($createContextBlockNode(datasets, onAddContext))
return $applyNodeReplacement($createContextBlockNode(datasets, onAddContext, canNotAddContext))
}, [datasets, onAddContext, onInsert])
const getMatch = useCallback((text: string) => {

View File

@ -18,12 +18,14 @@ type ContextBlockComponentProps = {
nodeKey: string
datasets?: Dataset[]
onAddContext: () => void
canNotAddContext?: boolean
}
const ContextBlockComponent: FC<ContextBlockComponentProps> = ({
nodeKey,
datasets = [],
onAddContext,
canNotAddContext,
}) => {
const { t } = useTranslation()
const [ref, isSelected] = useSelectOrDelete(nodeKey, DELETE_CONTEXT_BLOCK_COMMAND)
@ -44,52 +46,55 @@ const ContextBlockComponent: FC<ContextBlockComponentProps> = ({
`} ref={ref}>
<File05 className='mr-1 w-[14px] h-[14px]' />
<div className='mr-1 text-xs font-medium'>{t('common.promptEditor.context.item.title')}</div>
<PortalToFollowElem
open={open}
onOpenChange={setOpen}
placement='bottom-end'
offset={{
mainAxis: 3,
alignmentAxis: -147,
}}
>
<PortalToFollowElemTrigger ref={triggerRef}>
<div className={`
{!canNotAddContext && (
<PortalToFollowElem
open={open}
onOpenChange={setOpen}
placement='bottom-end'
offset={{
mainAxis: 3,
alignmentAxis: -147,
}}
>
<PortalToFollowElemTrigger ref={triggerRef}>
<div className={`
flex items-center justify-center w-[18px] h-[18px] text-[11px] font-semibold rounded cursor-pointer
${open ? 'bg-[#6938EF] text-white' : 'bg-white/50 group-hover:bg-white group-hover:shadow-xs'}
`}>{localDatasets.length}</div>
</PortalToFollowElemTrigger>
<PortalToFollowElemContent style={{ zIndex: 100 }}>
<div className='w-[360px] bg-white rounded-xl shadow-lg'>
<div className='p-4'>
<div className='mb-2 text-xs font-medium text-gray-500'>
{t('common.promptEditor.context.modal.title', { num: localDatasets.length })}
</div>
<div className='max-h-[270px] overflow-y-auto'>
{
localDatasets.map(dataset => (
<div key={dataset.id} className='flex items-center h-8'>
<div className='flex items-center justify-center shrink-0 mr-2 w-6 h-6 bg-[#F5F8FF] rounded-md border-[0.5px] border-[#EAECF5]'>
<Folder className='w-4 h-4 text-[#444CE7]' />
</div>
<div className='text-sm text-gray-800 truncate' title=''>{dataset.name}</div>
</div>
))
}
</div>
<div className='flex items-center h-8 text-[#155EEF] cursor-pointer' onClick={onAddContext}>
<div className='shrink-0 flex justify-center items-center mr-2 w-6 h-6 rounded-md border-[0.5px] border-gray-100'>
<Plus className='w-[14px] h-[14px]' />
</PortalToFollowElemTrigger>
<PortalToFollowElemContent style={{ zIndex: 100 }}>
<div className='w-[360px] bg-white rounded-xl shadow-lg'>
<div className='p-4'>
<div className='mb-2 text-xs font-medium text-gray-500'>
{t('common.promptEditor.context.modal.title', { num: localDatasets.length })}
</div>
<div className='text-[13px] font-medium' title=''>{t('common.promptEditor.context.modal.add')}</div>
<div className='max-h-[270px] overflow-y-auto'>
{
localDatasets.map(dataset => (
<div key={dataset.id} className='flex items-center h-8'>
<div className='flex items-center justify-center shrink-0 mr-2 w-6 h-6 bg-[#F5F8FF] rounded-md border-[0.5px] border-[#EAECF5]'>
<Folder className='w-4 h-4 text-[#444CE7]' />
</div>
<div className='text-sm text-gray-800 truncate' title=''>{dataset.name}</div>
</div>
))
}
</div>
<div className='flex items-center h-8 text-[#155EEF] cursor-pointer' onClick={onAddContext}>
<div className='shrink-0 flex justify-center items-center mr-2 w-6 h-6 rounded-md border-[0.5px] border-gray-100'>
<Plus className='w-[14px] h-[14px]' />
</div>
<div className='text-[13px] font-medium' title=''>{t('common.promptEditor.context.modal.add')}</div>
</div>
</div>
<div className='px-4 py-3 text-xs text-gray-500 bg-gray-50 border-t-[0.5px] border-gray-50 rounded-b-xl'>
{t('common.promptEditor.context.modal.footer')}
</div>
</div>
<div className='px-4 py-3 text-xs text-gray-500 bg-gray-50 border-t-[0.5px] border-gray-50 rounded-b-xl'>
{t('common.promptEditor.context.modal.footer')}
</div>
</div>
</PortalToFollowElemContent>
</PortalToFollowElem>
</PortalToFollowElemContent>
</PortalToFollowElem>
)}
</div>
)
}

View File

@ -26,12 +26,14 @@ export type ContextBlockProps = {
onAddContext: () => void
onInsert?: () => void
onDelete?: () => void
canNotAddContext?: boolean
}
const ContextBlock: FC<ContextBlockProps> = ({
datasets,
onAddContext,
onInsert,
onDelete,
canNotAddContext,
}) => {
const [editor] = useLexicalComposerContext()
@ -43,7 +45,7 @@ const ContextBlock: FC<ContextBlockProps> = ({
editor.registerCommand(
INSERT_CONTEXT_BLOCK_COMMAND,
() => {
const contextBlockNode = $createContextBlockNode(datasets, onAddContext)
const contextBlockNode = $createContextBlockNode(datasets, onAddContext, canNotAddContext)
$insertNodes([contextBlockNode])

View File

@ -3,11 +3,12 @@ import { DecoratorNode } from 'lexical'
import ContextBlockComponent from './component'
import type { Dataset } from './index'
export type SerializedNode = SerializedLexicalNode & { datasets: Dataset[]; onAddContext: () => void }
export type SerializedNode = SerializedLexicalNode & { datasets: Dataset[]; onAddContext: () => void; canNotAddContext: boolean }
export class ContextBlockNode extends DecoratorNode<JSX.Element> {
__datasets: Dataset[]
__onAddContext: () => void
__canNotAddContext: boolean
static getType(): string {
return 'context-block'
@ -21,11 +22,12 @@ export class ContextBlockNode extends DecoratorNode<JSX.Element> {
return true
}
constructor(datasets: Dataset[], onAddContext: () => void, key?: NodeKey) {
constructor(datasets: Dataset[], onAddContext: () => void, key?: NodeKey, canNotAddContext?: boolean) {
super(key)
this.__datasets = datasets
this.__onAddContext = onAddContext
this.__canNotAddContext = canNotAddContext || false
}
createDOM(): HTMLElement {
@ -44,6 +46,7 @@ export class ContextBlockNode extends DecoratorNode<JSX.Element> {
nodeKey={this.getKey()}
datasets={this.getDatasets()}
onAddContext={this.getOnAddContext()}
canNotAddContext={this.__canNotAddContext}
/>
)
}
@ -61,7 +64,7 @@ export class ContextBlockNode extends DecoratorNode<JSX.Element> {
}
static importJSON(serializedNode: SerializedNode): ContextBlockNode {
const node = $createContextBlockNode(serializedNode.datasets, serializedNode.onAddContext)
const node = $createContextBlockNode(serializedNode.datasets, serializedNode.onAddContext, serializedNode.canNotAddContext)
return node
}
@ -72,6 +75,7 @@ export class ContextBlockNode extends DecoratorNode<JSX.Element> {
version: 1,
datasets: this.getDatasets(),
onAddContext: this.getOnAddContext(),
canNotAddContext: this.__canNotAddContext,
}
}
@ -79,8 +83,8 @@ export class ContextBlockNode extends DecoratorNode<JSX.Element> {
return '{{#context#}}'
}
}
export function $createContextBlockNode(datasets: Dataset[], onAddContext: () => void): ContextBlockNode {
return new ContextBlockNode(datasets, onAddContext)
export function $createContextBlockNode(datasets: Dataset[], onAddContext: () => void, canNotAddContext?: boolean): ContextBlockNode {
return new ContextBlockNode(datasets, onAddContext, undefined, canNotAddContext)
}
export function $isContextBlockNode(

View File

@ -118,6 +118,7 @@ const Editor: FC<Props> = ({
style={isExpand ? { height: editorExpandHeight - 5 } : {}}
value={value}
outToolDisabled
canNotAddContext
contextBlock={{
show: justVar ? false : isShowContext,
selectable: !hasSetBlockStatus?.context,

View File

@ -167,7 +167,7 @@ const Panel: FC<NodePanelProps<LLMNodeType>> = ({
readOnly={readOnly}
isChatModel={isChatModel}
isChatApp={isChatMode}
isShowContext={inputs.context?.variable_selector?.length > 0}
isShowContext
payload={inputs.prompt_template}
variables={inputs.variables.map(item => item.variable)}
onChange={handlePromptChange}