Skip to content

ADK changes #322

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ADK changes #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions src/app/components/chat/chat.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,4 +1204,38 @@ describe('ChatComponent', () => {
});
});
});

describe('Artifacts', () => {
it(
'should only fetch artifact version once for the same artifactId and versionId',
async () => {
mockArtifactService.getArtifactVersion.and.returnValue(
of({
inlineData: {
mimeType: 'image/png',
data: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=',
},
}),
);
const sseEvent = {
id: 'event-1',
author: 'bot',
content: {role: 'bot', parts: []},
actions: {
artifactDelta: {'artifact-1': 'version-1'},
},
};
component.userInput = 'test message';

await component.sendMessage(
new KeyboardEvent('keydown', {key: 'Enter'}),
);
mockAgentService.runSseResponse.next(sseEvent);
mockAgentService.runSseResponse.next(sseEvent);
fixture.detectChanges();

expect(mockArtifactService.getArtifactVersion).toHaveBeenCalledTimes(1);
},
);
});
});
110 changes: 78 additions & 32 deletions src/app/components/chat/chat.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,29 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
return `data:${mimeType};base64,${fixedBase64Data}`;
}

private handleArtifactFetchFailure(
placeholderIndex: number, artifactId: string, versionId: string) {
this.openSnackBar(
'Failed to fetch artifact data',
'OK',
);
// Remove placeholder message and artifact on failure
this.messages.update(
messages => messages.filter((m, i) => i !== placeholderIndex));
this.artifacts = this.artifacts.filter(
a => a.id !== artifactId || a.versionId !== versionId);
}

private renderArtifact(artifactId: string, versionId: string) {
// If artifact/version already exists, do nothing.
const artifactExists = this.artifacts.some(
(artifact) =>
artifact.id === artifactId && artifact.versionId === versionId,
);
if (artifactExists) {
return;
}

// Add a placeholder message for the artifact
// Feed the placeholder with the artifact data after it's fetched
let message = {
Expand All @@ -819,8 +841,19 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {

const currentMessages = this.messages();
const lastMessage = currentMessages[currentMessages.length - 1];
const currentIndex = lastMessage?.isLoading ? currentMessages.length - 2 :
currentMessages.length - 1;
const placeholderIndex = lastMessage?.isLoading ?
currentMessages.length - 2 :
currentMessages.length - 1;

// Add placeholder artifact.
const placeholderArtifact = {
id: artifactId,
versionId,
data: '',
mimeType: 'image/png',
mediaType: MediaType.IMAGE,
};
this.artifacts = [...this.artifacts, placeholderArtifact];

this.artifactService
.getArtifactVersion(
Expand All @@ -830,40 +863,53 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
artifactId,
versionId,
)
.subscribe((res) => {
const mimeType = res.inlineData.mimeType;
const base64Data =
this.formatBase64Data(res.inlineData.data, mimeType);
.subscribe({
next: (res) => {
const {mimeType, data} = res.inlineData ?? {};
if (!mimeType || !data) {
this.handleArtifactFetchFailure(
placeholderIndex, artifactId, versionId);
return;
}
const base64Data =
this.formatBase64Data(data, mimeType);

const mediaType = getMediaTypeFromMimetype(mimeType);
const mediaType = getMediaTypeFromMimetype(mimeType);

let inlineData = {
name: this.createDefaultArtifactName(mimeType),
data: base64Data,
mimeType: mimeType,
mediaType,
};

this.messages.update(messages => {
const newMessages = [...messages];
newMessages[currentIndex] = {
role: 'bot',
inlineData,
const inlineData = {
name: this.createDefaultArtifactName(mimeType),
data: base64Data,
mimeType: mimeType,
mediaType,
};
return newMessages;
});

// To trigger ngOnChanges in the artifact tab component
this.artifacts = [
...this.artifacts,
{
id: artifactId,
data: base64Data,
mimeType,
versionId,
mediaType: getMediaTypeFromMimetype(mimeType),
},
];
this.messages.update(messages => {
const newMessages = [...messages];
newMessages[placeholderIndex] = {
role: 'bot',
inlineData,
};
return newMessages;
});

// Update placeholder artifact with fetched data.
this.artifacts = this.artifacts.map(artifact => {
if (artifact.id === artifactId && artifact.versionId === versionId) {
return {
id: artifactId,
versionId,
data: base64Data,
mimeType,
mediaType,
};
}
return artifact;
});
},
error: (err) => {
this.handleArtifactFetchFailure(
placeholderIndex, artifactId, versionId);
}
});
}

Expand Down
3 changes: 2 additions & 1 deletion src/app/core/services/interfaces/artifact.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {Part} from '../../models/types';

import {InjectionToken} from '@angular/core';
import {Observable} from 'rxjs';
Expand All @@ -36,5 +37,5 @@ export declare abstract class ArtifactService {
sessionId: string,
artifactName: string,
versionId: string,
): Observable<any>;
): Observable<Part>;
}