ngskcloud
/
gcgj-dify-1.7.0
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/rag-2' into feat/rag-2

Browse Source
feat/rag-2
jyong 7 months ago
parent 98ef4ffb4d 761d717656
commit 5401299e6e
23 changed files with 414 additions and 215 deletions
Show Stats Download Patch File Download Diff File

12
web/app/components/base/icons/assets/public/knowledge/option-card-effect-teal.svg
Unescape Escape View File

@ -0,0 +1,12 @@
<svg width="212" height="92" viewBox="0 0 212 92" fill="none" xmlns="http://www.w3.org/2000/svg">
<g opacity="0.8" filter="url(#filter0_f_9981_52393)">
<circle cx="24" cy="24" r="28" fill="#0E9384"/>
</g>
<defs>
<filter id="filter0_f_9981_52393" x="-164" y="-164" width="376" height="376" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="80" result="effect1_foregroundBlur_9981_52393"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 599 B

89
web/app/components/base/icons/src/public/knowledge/OptionCardEffectTeal.json
Unescape Escape View File

@ -0,0 +1,89 @@
{
"icon": {
"type": "element",
"isRootNode": true,
"name": "svg",
"attributes": {
"width": "212",
"height": "92",
"viewBox": "0 0 212 92",
"fill": "none",
"xmlns": "http://www.w3.org/2000/svg"
},
"children": [
{
"type": "element",
"name": "g",
"attributes": {
"opacity": "0.8",
"filter": "url(#filter0_f_9981_52393)"
},
"children": [
{
"type": "element",
"name": "circle",
"attributes": {
"cx": "24",
"cy": "24",
"r": "28",
"fill": "#0E9384"
},
"children": []
}
]
},
{
"type": "element",
"name": "defs",
"attributes": {},
"children": [
{
"type": "element",
"name": "filter",
"attributes": {
"id": "filter0_f_9981_52393",
"x": "-164",
"y": "-164",
"width": "376",
"height": "376",
"filterUnits": "userSpaceOnUse",
"color-interpolation-filters": "sRGB"
},
"children": [
{
"type": "element",
"name": "feFlood",
"attributes": {
"flood-opacity": "0",
"result": "BackgroundImageFix"
},
"children": []
},
{
"type": "element",
"name": "feBlend",
"attributes": {
"mode": "normal",
"in": "SourceGraphic",
"in2": "BackgroundImageFix",
"result": "shape"
},
"children": []
},
{
"type": "element",
"name": "feGaussianBlur",
"attributes": {
"stdDeviation": "80",
"result": "effect1_foregroundBlur_9981_52393"
},
"children": []
}
]
}
]
}
]
},
"name": "OptionCardEffectTeal"
}

20
web/app/components/base/icons/src/public/knowledge/OptionCardEffectTeal.tsx
Unescape Escape View File

@ -0,0 +1,20 @@
// GENERATE BY script
// DON NOT EDIT IT MANUALLY
import * as React from 'react'
import data from './OptionCardEffectTeal.json'
import IconBase from '@/app/components/base/icons/IconBase'
import type { IconData } from '@/app/components/base/icons/IconBase'
const Icon = (
{
ref,
...props
}: React.SVGProps<SVGSVGElement> & {
ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
},
) => <IconBase {...props} ref={ref} data={data as IconData} />
Icon.displayName = 'OptionCardEffectTeal'
export default Icon

1
web/app/components/base/icons/src/public/knowledge/index.ts
Unescape Escape View File

@ -3,5 +3,6 @@ export { default as OptionCardEffectBlueLight } from './OptionCardEffectBlueLigh
export { default as OptionCardEffectBlue } from './OptionCardEffectBlue'
export { default as OptionCardEffectOrange } from './OptionCardEffectOrange'
export { default as OptionCardEffectPurple } from './OptionCardEffectPurple'
export { default as OptionCardEffectTeal } from './OptionCardEffectTeal'
export { default as SelectionMod } from './SelectionMod'
export { default as Watercrawl } from './Watercrawl'

2
web/app/components/base/icons/src/public/llm/OpenaiTeal.json
Unescape Escape View File

@ -34,4 +34,4 @@
]
},
"name": "OpenaiTeal"
}
}

2
web/app/components/base/icons/src/public/llm/OpenaiYellow.json
Unescape Escape View File

@ -34,4 +34,4 @@
]
},
"name": "OpenaiYellow"
}
}

247
web/app/components/base/icons/src/public/tracing/AliyunIcon.json
View File

File diff suppressed because one or more lines are too long

14
web/app/components/base/icons/src/public/tracing/AliyunIcon.tsx
Unescape Escape View File

@ -4,12 +4,16 @@
import * as React from 'react'
import data from './AliyunIcon.json'
import IconBase from '@/app/components/base/icons/IconBase'
import type { IconBaseProps, IconData } from '@/app/components/base/icons/IconBase'
import type { IconData } from '@/app/components/base/icons/IconBase'
const Icon = React.forwardRef<React.MutableRefObject<SVGElement>, Omit<IconBaseProps, 'data'>>((
props,
ref,
) => <IconBase {...props} ref={ref} data={data as IconData} />)
const Icon = (
{
ref,
...props
}: React.SVGProps<SVGSVGElement> & {
ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
},
) => <IconBase {...props} ref={ref} data={data as IconData} />
Icon.displayName = 'AliyunIcon'

186
web/app/components/base/icons/src/public/tracing/AliyunIconBig.json
View File

File diff suppressed because one or more lines are too long

14
web/app/components/base/icons/src/public/tracing/AliyunIconBig.tsx
Unescape Escape View File

@ -4,12 +4,16 @@
import * as React from 'react'
import data from './AliyunIconBig.json'
import IconBase from '@/app/components/base/icons/IconBase'
import type { IconBaseProps, IconData } from '@/app/components/base/icons/IconBase'
import type { IconData } from '@/app/components/base/icons/IconBase'
const Icon = React.forwardRef<React.MutableRefObject<SVGElement>, Omit<IconBaseProps, 'data'>>((
props,
ref,
) => <IconBase {...props} ref={ref} data={data as IconData} />)
const Icon = (
{
ref,
...props
}: React.SVGProps<SVGSVGElement> & {
ref?: React.RefObject<React.MutableRefObject<HTMLOrSVGElement>>;
},
) => <IconBase {...props} ref={ref} data={data as IconData} />
Icon.displayName = 'AliyunIconBig'

2
web/app/components/base/icons/src/public/tracing/ArizeIcon.json
Unescape Escape View File

@ -119,4 +119,4 @@
]
},
"name": "ArizeIcon"
}
}

2
web/app/components/base/icons/src/public/tracing/ArizeIconBig.json
Unescape Escape View File

@ -119,4 +119,4 @@
]
},
"name": "ArizeIconBig"
}
}

2
web/app/components/base/icons/src/public/tracing/PhoenixIcon.json
Unescape Escape View File

@ -850,4 +850,4 @@
]
},
"name": "PhoenixIcon"
}
}

2
web/app/components/base/icons/src/public/tracing/PhoenixIconBig.json
Unescape Escape View File

@ -850,4 +850,4 @@
]
},
"name": "PhoenixIconBig"
}
}

4
web/app/components/base/icons/src/public/tracing/index.ts
Unescape Escape View File

@ -1,3 +1,5 @@
export { default as AliyunIconBig } from './AliyunIconBig'
export { default as AliyunIcon } from './AliyunIcon'
export { default as ArizeIconBig } from './ArizeIconBig'
export { default as ArizeIcon } from './ArizeIcon'
export { default as LangfuseIconBig } from './LangfuseIconBig'
@ -11,5 +13,3 @@ export { default as PhoenixIcon } from './PhoenixIcon'
export { default as TracingIcon } from './TracingIcon'
export { default as WeaveIconBig } from './WeaveIconBig'
export { default as WeaveIcon } from './WeaveIcon'
export { default as AliyunIconBig } from './AliyunIconBig'
export { default as AliyunIcon } from './AliyunIcon'

6
web/app/components/header/account-setting/data-source-page-new/card.tsx
Unescape Escape View File

@ -32,7 +32,7 @@ const Card = ({
icon,
label,
author,
provider,
name,
credentials_list,
credential_schema,
} = item
@ -98,8 +98,8 @@ const Card = ({
</div>
<div className='system-xs-regular flex h-4 items-center text-text-tertiary'>
{author}
<div className='text-text-quaternary'>/</div>
{provider}
<div className='mx-0.5 text-text-quaternary'>/</div>
{name}
</div>
</div>
<Configure

2
web/app/components/header/account-setting/data-source-page-new/hooks/use-marketplace-all-plugins.ts
Unescape Escape View File

@ -13,7 +13,7 @@ import { getMarketplacePluginsByCollectionId } from '@/app/components/plugins/ma
export const useMarketplaceAllPlugins = (providers: any[], searchText: string) => {
const exclude = useMemo(() => {
return providers.map(provider => provider.provider.replace(/(.+)\/([^/]+)$/, '$1'))
return providers.map(provider => provider.plugin_id)
}, [providers])
const [collectionPlugins, setCollectionPlugins] = useState<Plugin[]>([])

2
web/app/components/header/account-setting/data-source-page-new/index.tsx
Unescape Escape View File

@ -23,7 +23,7 @@ const DataSourcePage = () => {
{
enable_marketplace && (
<InstallFromMarketplace
providers={[]}
providers={data?.result || []}
searchText={''}
/>
)

2
web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
Unescape Escape View File

@ -100,7 +100,7 @@ const AddOAuthButton = ({
{
redirect_uri && (
<div className='system-sm-medium flex w-full py-0.5'>
<div className='w-0 grow break-words'>{redirect_uri}</div>
<div className='w-0 grow break-words break-all'>{redirect_uri}</div>
<ActionButton
className='shrink-0'
onClick={() => {

10
web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/hooks.tsx
Unescape Escape View File

@ -39,9 +39,17 @@ export const useChunkStructure = () => {
}
const QuestionAnswerOption: Option = {
id: ChunkStructureEnum.question_answer,
icon: <QuestionAndAnswer className='h-[18px] w-[18px] text-text-tertiary' />,
icon: (isActive: boolean) => (
<QuestionAndAnswer
className={cn(
'h-[18px] w-[18px] text-text-tertiary group-hover:text-util-colors-teal-teal-600',
isActive && 'text-util-colors-teal-teal-600',
)}
/>
),
title: 'Question-Answer',
description: t('datasetCreation.stepTwo.qaTip'),
effectColor: 'teal',
}
const optionMap: Record<ChunkStructureEnum, Option> = {

2
web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
Unescape Escape View File

@ -74,7 +74,7 @@ const IndexMethod = ({
effectColor='orange'
></OptionCard>
{
chunkStructure !== ChunkStructureEnum.parent_child && (
chunkStructure === ChunkStructureEnum.general && (
<OptionCard
id={IndexMethodEnum.ECONOMICAL}
selectedId={indexMethod}

4
web/app/components/workflow/nodes/knowledge-base/components/option-card.tsx
Unescape Escape View File

@ -11,6 +11,7 @@ import {
OptionCardEffectBlueLight,
OptionCardEffectOrange,
OptionCardEffectPurple,
OptionCardEffectTeal,
} from '@/app/components/base/icons/src/public/knowledge'
import { ArrowShape } from '@/app/components/base/icons/src/vender/knowledge'
@ -19,6 +20,7 @@ const HEADER_EFFECT_MAP: Record<string, ReactNode> = {
'blue-light': <OptionCardEffectBlueLight />,
'orange': <OptionCardEffectOrange />,
'purple': <OptionCardEffectPurple />,
'teal': <OptionCardEffectTeal />,
}
type OptionCardProps<T> = {
id?: T
@ -139,6 +141,6 @@ const OptionCard = memo(({
}
</div>
)
}) as <T>(props: OptionCardProps<T>) => JSX.Element
}) as <T>(props: OptionCardProps<T>) => React.ReactElement
export default OptionCard

2
web/app/components/workflow/nodes/knowledge-base/hooks/use-config.ts
Unescape Escape View File

@ -39,7 +39,7 @@ export const useConfig = (id: string) => {
const { indexing_technique } = nodeData?.data
handleNodeDataUpdate({
chunk_structure: chunkStructure,
indexing_technique: chunkStructure === ChunkStructureEnum.parent_child ? IndexMethodEnum.QUALIFIED : indexing_technique,
indexing_technique: (chunkStructure === ChunkStructureEnum.parent_child || chunkStructure === ChunkStructureEnum.question_answer) ? IndexMethodEnum.QUALIFIED : indexing_technique,
})
}, [handleNodeDataUpdate, getNodeData])

Write Preview
Loading…
Cancel
Save