feat: chatbi verbose

meta-d · meta-d · commit 4fdf462a46ad · 2024-09-29T17:43:50.000+08:00
diff --git a/apps/cloud/src/app/features/semantic-model/model/entity/preview/preview.component.html b/apps/cloud/src/app/features/semantic-model/model/entity/preview/preview.component.html
@@ -22,7 +22,7 @@
       <div class="flex flex-col p-4">
         <label>{{ 'PAC.KEY_WORDS.Variables' | translate: {Default: "Variables"}  }}</label>
         @for (variable of variableList(); track variable.name) {
-          <ngm-variable [label]="variable.caption" displayDensity="compact"
+          <ngm-variable [label]="variable.caption" displayDensity="cosy"
             [dataSettings]="dataSettings()"
             [variable]="variable"
             [ngModel]="variables()[variable.name]"
diff --git a/apps/cloud/src/app/features/setting/knowledgebase/knowledgebase/configuration/configuration.component.html b/apps/cloud/src/app/features/setting/knowledgebase/knowledgebase/configuration/configuration.component.html
@@ -63,8 +63,8 @@
         >💡</span>
     </ngm-slider-input>
 
-    <div class="flex justify-end">
-      <button mat-flat-button (click)="cancel()">
+    <div class="flex justify-end gap-2">
+      <button mat-flat-button type="button" (click)="cancel()">
         {{ 'PAC.KEY_WORDS.Cancel' | translate: {Default: 'Cancel'} }}
       </button>
       <button mat-raised-button color="primary" [disabled]="loading() || formGroup.invalid || formGroup.pristine" (click)="save()">
diff --git a/apps/cloud/src/app/features/setting/knowledgebase/knowledgebase/configuration/configuration.component.ts b/apps/cloud/src/app/features/setting/knowledgebase/knowledgebase/configuration/configuration.component.ts
@@ -5,7 +5,9 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula
 import { ActivatedRoute, Router, RouterModule } from '@angular/router'
 import { AI_PROVIDERS, AiModelCapability, AiProviderRole, isNil } from '@metad/copilot'
 import { NgmCommonModule } from '@metad/ocap-angular/common'
+import { DisplayBehaviour } from '@metad/ocap-core'
 import { TranslateModule } from '@ngx-translate/core'
+import { upperFirst } from 'lodash-es'
 import { startWith } from 'rxjs'
 import {
   IKnowledgebase,
@@ -19,8 +21,6 @@ import {
 } from '../../../../../@core'
 import { AvatarEditorComponent, MaterialModule, TranslationBaseComponent } from '../../../../../@shared'
 import { KnowledgebaseComponent } from '../knowledgebase.component'
-import { DisplayBehaviour } from '@metad/ocap-core'
-import { upperFirst } from 'lodash-es'
 
 @Component({
   standalone: true,
@@ -105,11 +105,15 @@ export class KnowledgeConfigurationComponent extends TranslationBaseComponent {
       })
       items.push(
         ...models
-        .filter((_) => _.id !== copilot.defaultModel && (isNil(_.capabilities) || _.capabilities.includes(AiModelCapability.Embed)))
-        .map((item) => ({
-          key: item.id,
-          caption: item.name
-        }))
+          .filter(
+            (_) =>
+              _.id !== copilot.defaultModel &&
+              (isNil(_.capabilities) || _.capabilities.includes(AiModelCapability.Embed))
+          )
+          .map((item) => ({
+            key: item.id,
+            caption: item.name
+          }))
       )
     }
     return items
@@ -161,6 +165,6 @@ export class KnowledgeConfigurationComponent extends TranslationBaseComponent {
   }
 
   cancel() {
-    this.#router.navigate(['..', '..'], { relativeTo: this.#route })
+    this.#router.navigate(['../..'], { relativeTo: this.#route })
   }
 }
diff --git a/libs/story-angular/designer/settings-panel/settings-panel.component.html b/libs/story-angular/designer/settings-panel/settings-panel.component.html
@@ -1,4 +1,4 @@
-<mat-drawer-container class="h-full" autoresize waResizeBox="content-box" (waResizeObserver)="onResize($event)">
+<mat-drawer-container class="h-full" displayDensity="compact" autoresize waResizeBox="content-box" (waResizeObserver)="onResize($event)">
     <mat-drawer #drawer mode="over" position="end" [(opened)]="drawerOpened" class="ngm-settings-panel__drawer">
         <mat-toolbar class="ngm-settings-panel__drawer-drawer flex justify-start items-center gap-2">
             <button mat-icon-button type="button" displayDensity="cosy" (click)="closeDrawer()">
diff --git a/packages/analytics/src/chatbi/commands/handlers/chatbi.handler.ts b/packages/analytics/src/chatbi/commands/handlers/chatbi.handler.ts
@@ -70,7 +70,12 @@ export class ChatBIHandler implements ICommandHandler<ChatBICommand> {
 		}
 
 		// Ask
-		conversation.ask(input.text).then()
+		conversation.ask(input.text).then().catch((err) => {
+			larkService.errorMessage(
+				input,
+				new Error(`Internal Error!`)
+			).catch((err) => console.error(err))
+		})
 
 		return
 	}
diff --git a/packages/analytics/src/chatbi/conversation.ts b/packages/analytics/src/chatbi/conversation.ts
@@ -52,6 +52,7 @@ import { createIndicatorTool } from './tools/indicator'
  */
 export class ChatBIConversation implements IChatBIConversation {
 	private readonly logger = new Logger(ChatBIConversation.name)
+	static readonly toolCallTimeout = 10000
 	readonly commandName = 'chatbi'
 
 	public id: string = null
@@ -96,6 +97,7 @@ export class ChatBIConversation implements IChatBIConversation {
 
 	private status: 'init' | 'idle' | 'running' | 'error' = 'init'
 	private chatStack: ChatStack[] = []
+	
 	constructor(
 		private readonly chatContext: ChatBILarkContext,
 		private readonly chatModel: BaseChatModel,
@@ -388,7 +390,9 @@ ${createAgentStepsInstructions(
 		}
 
 		// Few-shot prompt
+		this.logger.verbose(`ExampleFewShot start for user input: ${text}`)
 		const content = await this.exampleFewShotPrompt.format({ input: text })
+		this.logger.verbose(`ExampleFewShot got content: ${content}`)
 
 		const streamResults = await this.graph.stream(
 			{
@@ -466,7 +470,7 @@ ${createAgentStepsInstructions(
 				end = true
 			} else {
 				// larkService.errorMessage(input, err)
-				errorWithEndMessage(this.chatContext, err.message, this)
+				await errorWithEndMessage(this.chatContext, err.message, this)
 			}
 		}
 
diff --git a/packages/analytics/src/chatbi/tools/answer.ts b/packages/analytics/src/chatbi/tools/answer.ts
@@ -31,7 +31,9 @@ import {
 	tryFixVariableSlicer,
 	workOutTimeRangeSlicers
 } from '@metad/ocap-core'
+import { race } from '@metad/server-common'
 import { firstValueFrom, Subject, takeUntil } from 'rxjs'
+import { ChatBIConversation } from '../conversation'
 import { ChatLarkMessage } from '../message'
 import { ChatAnswerSchema, ChatBILarkContext, ChatContext, IChatBIConversation } from '../types'
 import { createBaseChart } from './charts/chart'
@@ -55,41 +57,55 @@ export type ChatAnswer = {
 	orders: OrderBy[]
 }
 
-
 export function createChatAnswerTool(context: ChatContext, larkContext: ChatBILarkContext) {
 	const { chatId, logger, dsCoreService, conversation } = context
 	return tool(
 		async (answer): Promise<string> => {
 			logger.debug(`Execute copilot action 'answerQuestion':`, JSON.stringify(answer, null, 2))
 			try {
-				let entityType = null
-				if (answer.dataSettings) {
-					// Make sure datasource exists
-					const _dataSource = await dsCoreService._getDataSource(answer.dataSettings.dataSource)
-					const entity = await firstValueFrom(
-						dsCoreService.selectEntitySet(answer.dataSettings.dataSource, answer.dataSettings.entitySet)
-					)
-					entityType = entity.entityType
-				}
-
-				// Fetch data for chart or table or kpi
-				if (answer.dimensions?.length || answer.measures?.length) {
-					const { categoryMembers } = await drawChartMessage(
-						{ ...context, entityType: entityType || context.entityType },
-						conversation,
-						answer as ChatAnswer
-					)
-					// Max limit 20 members
-					const members = categoryMembers
-						? JSON.stringify(Object.values(categoryMembers).slice(0, 20))
-						: 'Empty'
-
-					return `The analysis data has been displayed to the user. The dimension members involved in this data analysis are:
+				try {
+					// 限制总体超时时间
+					return await race(
+						ChatBIConversation.toolCallTimeout,
+						(async () => {
+							let entityType = null
+							if (answer.dataSettings) {
+								// Make sure datasource exists
+								const _dataSource = await dsCoreService._getDataSource(answer.dataSettings.dataSource)
+								const entity = await firstValueFrom(
+									dsCoreService.selectEntitySet(
+										answer.dataSettings.dataSource,
+										answer.dataSettings.entitySet
+									)
+								)
+								entityType = entity.entityType
+							}
+
+							// Fetch data for chart or table or kpi
+							if (answer.dimensions?.length || answer.measures?.length) {
+								const { categoryMembers } = await drawChartMessage(
+									{ ...context, entityType: entityType || context.entityType },
+									conversation,
+									answer as ChatAnswer
+								)
+								// Max limit 20 members
+								const members = categoryMembers
+									? JSON.stringify(Object.values(categoryMembers).slice(0, 20))
+									: 'Empty'
+
+								return `The analysis data has been displayed to the user. The dimension members involved in this data analysis are:
 ${members}
 Please give more analysis suggestions about other dimensions or filter by dimensioin members, 3 will be enough.`
-				}
+							}
 
-				return `图表答案已经回复给用户了，请不要重复回答了。`
+							return `图表答案已经回复给用户了，请不要重复回答了。`
+						})()
+					)
+				} catch (err) {
+					throw new Error(
+						`Timeout in getting cube context (dataSource=${answer.dataSettings.dataSource}, cube=${answer.dataSettings.entitySet})`
+					)
+				}
 			} catch (err) {
 				logger.error(err)
 				return `Error: ${err}。如果需要用户提供更多信息，请直接提醒用户。`
@@ -333,63 +349,6 @@ function createLineChart(
 		unit = shortUnit
 	} else {
 		throw Error(`图形配置错误`)
-		// let categoryProperty: PropertyHierarchy = null
-		// const fields = []
-		// if (chartAnnotation.dimensions?.length > 1) {
-		// 	const dimensions = chartAnnotation.dimensions.filter((d) => d.role !== ChartDimensionRoleType.Time)
-		// 	const series = getChartSeries(chartAnnotation) || dimensions[1] || dimensions[0]
-		// 	if (!series) {
-		// 		throw new Error(
-		// 			`Cannot find series dimension in chart dimensions: '${JSON.stringify(chartAnnotation.dimensions)}'`
-		// 		)
-		// 	}
-		// 	const seriesName = getPropertyHierarchy(series)
-		// 	const property = getEntityHierarchy(entityType, seriesName)
-		// 	if (!property) {
-		// 		throw new Error(`Cannot find hierarchy for series dimension '${JSON.stringify(series)}'`)
-		// 	}
-		// 	const seriesCaption = property.memberCaption
-		// 	chart_spec.seriesField = seriesCaption
-		// 	fields.push(seriesCaption)
-		// 	categoryProperty = getEntityHierarchy(
-		// 		entityType,
-		// 		chartAnnotation.dimensions.filter((d) => d.dimension !== series.dimension)[0]
-		// 	)
-		// 	const categoryCaption = categoryProperty.memberCaption
-		// 	chart_spec[categoryField] = categoryCaption
-		// 	fields.push(categoryCaption)
-		// } else if (chartAnnotation.dimensions?.length) {
-		// 	categoryProperty = getEntityHierarchy(entityType, chartAnnotation.dimensions[0])
-		// 	if (!categoryProperty) {
-		// 		throw new Error(`Not found dimension '${chartAnnotation.dimensions[0].dimension}'`)
-		// 	}
-		// 	const categoryCaption = categoryProperty.memberCaption
-		// 	chart_spec[categoryField] = categoryCaption
-		// 	fields.push(categoryCaption)
-		// }
-
-		// chartAnnotation.measures?.forEach((measure) => {
-		// 	const property = getEntityProperty<PropertyMeasure>(entityType, measure)
-		// 	// // Type: measure
-		// 	// _data.forEach((item, index) => {
-		// 	// 	item['type'] = property.caption || property.name
-		// 	// })
-		// 	if (property.formatting?.unit === '%') {
-		// 		_data.forEach((item, index) => {
-		// 			item[property.name] = isNil(data[index][property.name])
-		// 					? null
-		// 					: (data[index][property.name] * 100).toFixed(1)
-		// 		})
-		// 	} else {
-		// 		const result = formatDataValues(data, _data, property.name)
-		// 		_data = result.values
-		// 		unit = result.unit
-		// 	}
-		// })
-
-		// chart_spec.data = {
-		// 	values: _data // 此处传入数据。
-		// }
 	}
 
 	categoryMembers = {}
diff --git a/packages/analytics/src/chatbi/tools/cube-context.ts b/packages/analytics/src/chatbi/tools/cube-context.ts
@@ -1,50 +1,60 @@
 import { tool } from '@langchain/core/tools'
 import { isEntitySet, markdownModelCube } from '@metad/ocap-core'
+import { race } from '@metad/server-common'
 import { firstValueFrom, switchMap } from 'rxjs'
-import { z } from 'zod'
-import { ChatContext, GetCubesContextSchema } from '../types'
 import { ChatBIModelService } from '../../chatbi-model/'
+import { ChatContext, GetCubesContextSchema } from '../types'
+import { ChatBIConversation } from '../conversation'
 
 export function createCubeContextTool(context: ChatContext, modelService: ChatBIModelService) {
 	const { logger, dsCoreService, conversation } = context
 	return tool(
 		async ({ cubes }): Promise<string> => {
 			logger.debug(`Tool 'getCubeContext' params:`, JSON.stringify(cubes))
-			let context = ''
-			for await (const item of cubes) {
-				logger.debug(`  get context for:`, item.modelId, item.name)
+			try {
+				// 限制总体超时时间
+				return await race(ChatBIConversation.toolCallTimeout,
+					(async () => {
+						let context = ''
+						for await (const item of cubes) {
+							logger.debug(`  get context for:`, item.modelId, item.name)
 
-				let entityType = await conversation.getCubeCache(item.modelId, item.name)
-				if (!entityType) {
-					const entitySet = await firstValueFrom(
-						dsCoreService.getDataSource(item.modelId).pipe(
-							switchMap((dataSource) => dataSource.selectEntitySet(item.name)),
-						)
-					)
-					if (isEntitySet(entitySet)) {
-						entityType = entitySet.entityType
-						await conversation.setCubeCache(item.modelId, item.name, entityType)
-					} else {
-						logger.error(`  get context error: `, entitySet.message)
-					}
-				}
-				if (entityType) {
-					if (context) {
-						context += '\n'
-					}
+							let entityType = await conversation.getCubeCache(item.modelId, item.name)
+							if (!entityType) {
+								const entitySet = await firstValueFrom(
+									dsCoreService
+										.getDataSource(item.modelId)
+										.pipe(switchMap((dataSource) => dataSource.selectEntitySet(item.name)))
+								)
+								if (isEntitySet(entitySet)) {
+									entityType = entitySet.entityType
+									await conversation.setCubeCache(item.modelId, item.name, entityType)
+								} else {
+									logger.error(`  get context error: `, entitySet.message)
+								}
+							}
+							if (entityType) {
+								if (context) {
+									context += '\n'
+								}
 
-					context += markdownModelCube({
-						modelId: item.modelId,
-						dataSource: item.modelId,
-						cube: entityType
-					})
+								context += markdownModelCube({
+									modelId: item.modelId,
+									dataSource: item.modelId,
+									cube: entityType
+								})
 
-					// Record visit
-					await modelService.visit(item.modelId, item.name)
-				}
-			}
+								// Record visit
+								await modelService.visit(item.modelId, item.name)
+							}
+						}
 
-			return context
+						return context
+					})()
+				)
+			} catch (err) {
+				return 'Error:' + err.message
+			}
 		},
 		{
 			name: 'getCubeContext',
diff --git a/packages/angular/common/input/_input.component.scss b/packages/angular/common/input/_input.component.scss
@@ -69,6 +69,12 @@ $prefix: (ngm, color);
   .ngm-input__suffix {
     @apply absolute right-1;
   }
+  .ngm-input-element__clear {
+    @apply w-6 h-6;
+    .material-icons {
+      font-size: 20px;
+    }
+  }
 }
 
 .ngm-density__compact {
diff --git a/packages/angular/common/select/select/select.component.html b/packages/angular/common/select/select/select.component.html
@@ -32,7 +32,7 @@
 } @else {
   <div class="relative">
     <input class="ngm-input-element w-full relative"
-      type="text"
+      #searInput type="text"
       [placeholder]="placeholder()"
       matInput
       [matAutocomplete]="auto"
diff --git a/packages/angular/common/select/select/select.component.ts b/packages/angular/common/select/select/select.component.ts
diff --git a/packages/angular/controls/variable/variable.component.html b/packages/angular/controls/variable/variable.component.html
diff --git a/packages/common/src/utils/index.ts b/packages/common/src/utils/index.ts
diff --git a/packages/common/src/utils/race.ts b/packages/common/src/utils/race.ts
diff --git a/packages/server-ai/src/copilot-knowledge/copilot-knowledge.service.ts b/packages/server-ai/src/copilot-knowledge/copilot-knowledge.service.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<mat-drawer-container class="h-full" autoresize waResizeBox="content-box" (waResizeObserver)="onResize($event)">`
	`1`	`+<mat-drawer-container class="h-full" displayDensity="compact" autoresize waResizeBox="content-box" (waResizeObserver)="onResize($event)">`
`2`	`2`	`<mat-drawer #drawer mode="over" position="end" [(opened)]="drawerOpened" class="ngm-settings-panel__drawer">`
`3`	`3`	`<mat-toolbar class="ngm-settings-panel__drawer-drawer flex justify-start items-center gap-2">`
`4`	`4`	`<button mat-icon-button type="button" displayDensity="cosy" (click)="closeDrawer()">`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,12 @@ export class ChatBIHandler implements ICommandHandler<ChatBICommand> {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// Ask`
`73`		`- conversation.ask(input.text).then()`
	`73`	`+ conversation.ask(input.text).then().catch((err) => {`
	`74`	`+ larkService.errorMessage(`
	`75`	`+ input,`
	`76`	+ new Error(`Internal Error!`)
	`77`	`+ ).catch((err) => console.error(err))`
	`78`	`+ })`
`74`	`79`
`75`	`80`	`return`
`76`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,12 @@ $prefix: (ngm, color);`
`69`	`69`	`.ngm-input__suffix {`
`70`	`70`	`@apply absolute right-1;`
`71`	`71`	`}`
	`72`	`+ .ngm-input-element__clear {`
	`73`	`+ @apply w-6 h-6;`
	`74`	`+ .material-icons {`
	`75`	`+ font-size: 20px;`
	`76`	`+ }`
	`77`	`+ }`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`.ngm-density__compact {`