Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Obs AI Assistant] Keep connection open, limit no of field names to analyze #186811

Merged
merged 4 commits into from
Jun 26, 2024
Merged

[Obs AI Assistant] Keep connection open, limit no of field names to analyze #186811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
def9be2
[Obs AI Assistant] Keep connection open
dgieselaar Jun 24, 2024
b728e9c
Set max no of fields to analyze
dgieselaar Jun 24, 2024
34afa20
Split indices on comma
dgieselaar Jun 24, 2024
d819e2b
Merge branch 'main' of github.com:elastic/kibana into obs-ai-assistan…
dgieselaar Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .../observability_ai_assistant/server/functions/get_dataset_info/get_relevant_field_names.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function getRelevantFieldNames({
messages: Message[];
chat: FunctionCallChatFunction;
signal: AbortSignal;
}): Promise<{ fields: string[] }> {
}): Promise<{ fields: string[]; stats: { analyzed: number; total: number } }> {
const dataViewsService = await dataViews.dataViewsServiceFactory(savedObjectsClient, esClient);

const hasAnyHitsResponse = await esClient.search({
Expand Down Expand Up @@ -89,8 +89,13 @@ export async function getRelevantFieldNames({

const shortIdTable = new ShortIdTable();

const MAX_CHUNKS = 5;
const FIELD_NAMES_PER_CHUNK = 250;

const fieldNamesToAnalyze = fieldNames.slice(0, MAX_CHUNKS * FIELD_NAMES_PER_CHUNK);

const relevantFields = await Promise.all(
chunk(fieldNames, 250).map(async (fieldsInChunk) => {
chunk(fieldNamesToAnalyze, FIELD_NAMES_PER_CHUNK).map(async (fieldsInChunk) => {
const chunkResponse$ = (
await chat('get_relevant_dataset_names', {
signal,
Expand Down Expand Up @@ -165,5 +170,8 @@ export async function getRelevantFieldNames({
})
);

return { fields: relevantFields.flat() };
return {
fields: relevantFields.flat(),
stats: { analyzed: fieldNamesToAnalyze.length, total: fieldNames.length },
};
}
4 changes: 2 additions & 2 deletions ...ervability_solution/observability_ai_assistant/server/functions/get_dataset_info/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function registerGetDatasetInfoFunction({

try {
const body = await esClient.asCurrentUser.indices.resolveIndex({
name: index === '' ? '*' : index,
name: index === '' ? '*' : index.split(','),
expand_wildcards: 'open',
});
indices = [
Expand Down Expand Up @@ -87,11 +87,11 @@ export function registerGetDatasetInfoFunction({
signal,
chat,
});

return {
content: {
indices: [index],
fields: relevantFieldNames.fields,
stats: relevantFieldNames.stats,
},
};
}
Expand Down
22 changes: 14 additions & 8 deletions ...ins/observability_solution/observability_ai_assistant/server/service/util/flush_buffer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { repeat } from 'lodash';
import { identity, Observable, OperatorFunction } from 'rxjs';
import { Observable, OperatorFunction } from 'rxjs';
import {
BufferFlushEvent,
StreamingChatResponseEventType,
Expand All @@ -22,10 +22,6 @@ import {
export function flushBuffer<T extends StreamingChatResponseEventWithoutError | TokenCountEvent>(
isCloud: boolean
): OperatorFunction<T, T | BufferFlushEvent> {
if (!isCloud) {
return identity;
}

return (source: Observable<T>) =>
new Observable<T | BufferFlushEvent>((subscriber) => {
const cloudProxyBufferSize = 4096;
Expand All @@ -41,7 +37,15 @@ export function flushBuffer<T extends StreamingChatResponseEventWithoutError | T
}
};

const intervalId = setInterval(flushBufferIfNeeded, 250);
const keepAlive = () => {
subscriber.next({
data: '0',
type: StreamingChatResponseEventType.BufferFlush,
});
};

const flushIntervalId = isCloud ? setInterval(flushBufferIfNeeded, 250) : undefined;
const keepAliveIntervalId = setInterval(keepAlive, 30_000);
Comment on lines +47 to +48
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be handled at the proxy layer?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keepAlive not necessarily, flush, hell yes. There's been an open issue for the team that handles the Cloud Proxy to do this.


source.subscribe({
next: (value) => {
Expand All @@ -52,11 +56,13 @@ export function flushBuffer<T extends StreamingChatResponseEventWithoutError | T
subscriber.next(value);
},
error: (error) => {
clearInterval(intervalId);
clearInterval(flushIntervalId);
clearInterval(keepAliveIntervalId);
subscriber.error(error);
},
complete: () => {
clearInterval(intervalId);
clearInterval(flushIntervalId);
clearInterval(keepAliveIntervalId);
subscriber.complete();
},
});
Expand Down