Skip to content

Commit d44305a

Browse files
hoonjicopybara-github
hoonji
authored and
copybara-github
committed
ADK changes
PiperOrigin-RevId: 820070481
1 parent 2236505 commit d44305a

File tree

63 files changed

+718
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+718
-181
lines changed

‎src/app/app.component.spec.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ import {ActivatedRoute} from '@angular/router';
2323
import {of} from 'rxjs';
2424

2525
import {AppComponent} from './app.component';
26-
import {AGENT_SERVICE} from './core/services/agent.service';
27-
import {ARTIFACT_SERVICE} from './core/services/artifact.service';
28-
import {AUDIO_PLAYING_SERVICE} from './core/services/audio-playing.service';
29-
import {AUDIO_RECORDING_SERVICE} from './core/services/audio-recording.service';
30-
import {DOWNLOAD_SERVICE} from './core/services/download.service';
31-
import {EVAL_SERVICE} from './core/services/eval.service';
32-
import {EVENT_SERVICE} from './core/services/event.service';
33-
import {FEATURE_FLAG_SERVICE} from './core/services/feature-flag.service';
34-
import {GRAPH_SERVICE} from './core/services/graph.service';
26+
import {AGENT_SERVICE} from './core/services/interfaces/agent';
27+
import {ARTIFACT_SERVICE} from './core/services/interfaces/artifact';
28+
import {AUDIO_PLAYING_SERVICE} from './core/services/interfaces/audio-playing';
29+
import {AUDIO_RECORDING_SERVICE} from './core/services/interfaces/audio-recording';
30+
import {DOWNLOAD_SERVICE} from './core/services/interfaces/download';
31+
import {EVAL_SERVICE} from './core/services/interfaces/eval';
32+
import {EVENT_SERVICE} from './core/services/interfaces/event';
33+
import {FEATURE_FLAG_SERVICE} from './core/services/interfaces/feature-flag';
34+
import {GRAPH_SERVICE} from './core/services/interfaces/graph';
3535
import {LOCAL_FILE_SERVICE} from './core/services/interfaces/localfile';
3636
import {SAFE_VALUES_SERVICE} from './core/services/interfaces/safevalues';
3737
import {STRING_TO_COLOR_SERVICE} from './core/services/interfaces/string-to-color';
38-
import {SESSION_SERVICE} from './core/services/session.service';
39-
import {STREAM_CHAT_SERVICE} from './core/services/stream-chat.service';
38+
import {SESSION_SERVICE} from './core/services/interfaces/session';
39+
import {STREAM_CHAT_SERVICE} from './core/services/interfaces/stream-chat';
4040
import {MockAgentService} from './core/services/testing/mock-agent.service';
4141
import {MockArtifactService} from './core/services/testing/mock-artifact.service';
4242
import {MockAudioPlayingService} from './core/services/testing/mock-audio-playing.service';
@@ -54,9 +54,9 @@ import {MockStringToColorService} from './core/services/testing/mock-string-to-c
5454
import {MockTraceService} from './core/services/testing/mock-trace.service';
5555
import {MockVideoService} from './core/services/testing/mock-video.service';
5656
import {MockWebSocketService} from './core/services/testing/mock-websocket.service';
57-
import {TRACE_SERVICE} from './core/services/trace.service';
58-
import {VIDEO_SERVICE} from './core/services/video.service';
59-
import {WEBSOCKET_SERVICE} from './core/services/websocket.service';
57+
import {TRACE_SERVICE} from './core/services/interfaces/trace';
58+
import {VIDEO_SERVICE} from './core/services/interfaces/video';
59+
import {WEBSOCKET_SERVICE} from './core/services/interfaces/websocket';
6060

6161
describe('AppComponent', () => {
6262
beforeEach(async () => {
@@ -78,7 +78,7 @@ describe('AppComponent', () => {
7878
const localFileService = new MockLocalFileService();
7979

8080
traceService.selectedTraceRow$.next(undefined);
81-
traceService.hoveredMessageIndicies$.next([]);
81+
traceService.hoveredMessageIndices$.next([]);
8282

8383
const graphService = new MockGraphService();
8484
graphService.render.and.returnValue(Promise.resolve('svg'));

‎src/app/components/artifact-tab/artifact-tab.component.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
import { ComponentFixture, TestBed } from '@angular/core/testing';
1919
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
2020
import { ArtifactTabComponent } from './artifact-tab.component';
21-
import { DOWNLOAD_SERVICE, DownloadService } from '../../core/services/download.service';
21+
import { DownloadService } from '../../core/services/download.service';
2222
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
2323
import { SAFE_VALUES_SERVICE } from '../../core/services/interfaces/safevalues';
24+
import {DOWNLOAD_SERVICE} from '../../core/services/interfaces/download';
2425
import { MockSafeValuesService } from '../../core/services/testing/mock-safevalues.service';
2526

2627
describe('ArtifactTabComponent', () => {

‎src/app/components/artifact-tab/artifact-tab.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {MatDialog, MatDialogModule} from '@angular/material/dialog';
2323
import {MatIcon} from '@angular/material/icon';
2424
import {MatSelect} from '@angular/material/select';
2525

26-
import {DOWNLOAD_SERVICE, DownloadService} from '../../core/services/download.service';
26+
import {DOWNLOAD_SERVICE, DownloadService} from '../../core/services/interfaces/download';
2727
import {SAFE_VALUES_SERVICE} from '../../core/services/interfaces/safevalues';
2828
import {AudioPlayerComponent} from '../audio-player/audio-player.component';
2929
import {ViewImageDialogComponent} from '../view-image-dialog/view-image-dialog.component';

‎src/app/components/chat-panel/chat-panel.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {DomSanitizer, SafeHtml} from '@angular/platform-browser';
3131
import {NgxJsonViewerModule} from 'ngx-json-viewer';
3232

3333
import type {EvalCase} from '../../core/models/Eval';
34-
import {FEATURE_FLAG_SERVICE} from '../../core/services/feature-flag.service';
34+
import {FEATURE_FLAG_SERVICE} from '../../core/services/interfaces/feature-flag';
3535
import {STRING_TO_COLOR_SERVICE} from '../../core/services/interfaces/string-to-color';
3636
import {MediaType,} from '../artifact-tab/artifact-tab.component';
3737
import {AudioPlayerComponent} from '../audio-player/audio-player.component';

‎src/app/components/chat/chat.component.spec.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
2929
import {BehaviorSubject, NEVER, of, Subject, throwError} from 'rxjs';
3030

3131
import {EvalCase} from '../../core/models/Eval';
32-
import {AGENT_SERVICE, AgentService} from '../../core/services/agent.service';
33-
import {ARTIFACT_SERVICE, ArtifactService,} from '../../core/services/artifact.service';
34-
import {DOWNLOAD_SERVICE, DownloadService,} from '../../core/services/download.service';
35-
import {EVAL_SERVICE, EvalService} from '../../core/services/eval.service';
36-
import {EVENT_SERVICE, EventService} from '../../core/services/event.service';
37-
import {FEATURE_FLAG_SERVICE, FeatureFlagService,} from '../../core/services/feature-flag.service';
38-
import {GRAPH_SERVICE, GraphService} from '../../core/services/graph.service';
32+
import {AGENT_SERVICE, AgentService} from '../../core/services/interfaces/agent';
33+
import {ARTIFACT_SERVICE, ArtifactService,} from '../../core/services/interfaces/artifact';
34+
import {DOWNLOAD_SERVICE, DownloadService,} from '../../core/services/interfaces/download';
35+
import {EVAL_SERVICE, EvalService} from '../../core/services/interfaces/eval';
36+
import {EVENT_SERVICE, EventService} from '../../core/services/interfaces/event';
37+
import {FEATURE_FLAG_SERVICE, FeatureFlagService,} from '../../core/services/interfaces/feature-flag';
38+
import {GRAPH_SERVICE, GraphService} from '../../core/services/interfaces/graph';
3939
import {LOCAL_FILE_SERVICE} from '../../core/services/interfaces/localfile';
4040
import {SAFE_VALUES_SERVICE} from '../../core/services/interfaces/safevalues';
4141
import {STRING_TO_COLOR_SERVICE} from '../../core/services/interfaces/string-to-color';
42-
import {SESSION_SERVICE, SessionService,} from '../../core/services/session.service';
43-
import {STREAM_CHAT_SERVICE} from '../../core/services/stream-chat.service';
42+
import {SESSION_SERVICE, SessionService,} from '../../core/services/interfaces/session';
43+
import {STREAM_CHAT_SERVICE} from '../../core/services/interfaces/stream-chat';
4444
import {MockAgentService} from '../../core/services/testing/mock-agent.service';
4545
import {MockArtifactService} from '../../core/services/testing/mock-artifact.service';
4646
import {MockDownloadService} from '../../core/services/testing/mock-download.service';
@@ -56,9 +56,9 @@ import {MockStringToColorService} from '../../core/services/testing/mock-string-
5656
import {MockTraceService} from '../../core/services/testing/mock-trace.service';
5757
import {MockVideoService} from '../../core/services/testing/mock-video.service';
5858
import {MockWebSocketService} from '../../core/services/testing/mock-websocket.service';
59-
import {TRACE_SERVICE, TraceService} from '../../core/services/trace.service';
60-
import {VIDEO_SERVICE, VideoService} from '../../core/services/video.service';
61-
import {WEBSOCKET_SERVICE, WebSocketService,} from '../../core/services/websocket.service';
59+
import {TRACE_SERVICE, TraceService} from '../../core/services/interfaces/trace';
60+
import {VIDEO_SERVICE, VideoService} from '../../core/services/interfaces/video';
61+
import {WEBSOCKET_SERVICE, WebSocketService,} from '../../core/services/interfaces/websocket';
6262
import {fakeAsync,
6363
tick} from '../../testing/utils';
6464
import {ChatPanelComponent} from '../chat-panel/chat-panel.component';
@@ -147,7 +147,7 @@ describe('ChatComponent', () => {
147147
mockSessionService.createSessionResponse.next(
148148
{id: SESSION_1_ID, state: {}});
149149
mockTraceService.selectedTraceRow$.next(undefined);
150-
mockTraceService.hoveredMessageIndicies$.next([]);
150+
mockTraceService.hoveredMessageIndices$.next([]);
151151
mockFeatureFlagService.isImportSessionEnabledResponse.next(true);
152152
mockFeatureFlagService.isEditFunctionArgsEnabledResponse.next(true);
153153
mockFeatureFlagService.isSessionUrlEnabledResponse.next(true);

‎src/app/components/chat/chat.component.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ import {AgentRunRequest} from '../../core/models/AgentRunRequest';
4242
import {EvalCase} from '../../core/models/Eval';
4343
import {Session, SessionState} from '../../core/models/Session';
4444
import {Event as AdkEvent} from '../../core/models/types';
45-
import {AGENT_SERVICE, AgentService} from '../../core/services/agent.service';
46-
import {ARTIFACT_SERVICE, ArtifactService} from '../../core/services/artifact.service';
47-
import {DOWNLOAD_SERVICE, DownloadService} from '../../core/services/download.service';
48-
import {EVAL_SERVICE, EvalService} from '../../core/services/eval.service';
49-
import {EVENT_SERVICE, EventService} from '../../core/services/event.service';
50-
import {FEATURE_FLAG_SERVICE, FeatureFlagService} from '../../core/services/feature-flag.service';
51-
import {GRAPH_SERVICE, GraphService} from '../../core/services/graph.service';
45+
import {AGENT_SERVICE, AgentService} from '../../core/services/interfaces/agent';
46+
import {ARTIFACT_SERVICE, ArtifactService} from '../../core/services/interfaces/artifact';
47+
import {DOWNLOAD_SERVICE, DownloadService} from '../../core/services/interfaces/download';
48+
import {EVAL_SERVICE, EvalService} from '../../core/services/interfaces/eval';
49+
import {EVENT_SERVICE, EventService} from '../../core/services/interfaces/event';
50+
import {FEATURE_FLAG_SERVICE, FeatureFlagService} from '../../core/services/interfaces/feature-flag';
51+
import {GRAPH_SERVICE, GraphService} from '../../core/services/interfaces/graph';
5252
import {LOCAL_FILE_SERVICE, LocalFileService} from '../../core/services/interfaces/localfile';
5353
import {SAFE_VALUES_SERVICE} from '../../core/services/interfaces/safevalues';
5454
import {STRING_TO_COLOR_SERVICE} from '../../core/services/interfaces/string-to-color';
55-
import {SESSION_SERVICE, SessionService} from '../../core/services/session.service';
56-
import {STREAM_CHAT_SERVICE, StreamChatService} from '../../core/services/stream-chat.service';
57-
import {TRACE_SERVICE, TraceService} from '../../core/services/trace.service';
55+
import {SESSION_SERVICE, SessionService} from '../../core/services/interfaces/session';
56+
import {STREAM_CHAT_SERVICE, StreamChatService} from '../../core/services/interfaces/stream-chat';
57+
import {TRACE_SERVICE, TraceService} from '../../core/services/interfaces/trace';
5858
import {ResizableBottomDirective} from '../../directives/resizable-bottom.directive';
5959
import {ResizableDrawerDirective} from '../../directives/resizable-drawer.directive';
6060
import {getMediaTypeFromMimetype, MediaType} from '../artifact-tab/artifact-tab.component';
@@ -330,7 +330,7 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
330330
}
331331
})
332332

333-
this.traceService.hoveredMessageIndicies$.subscribe(i => this.hoveredEventMessageIndices = i);
333+
this.traceService.hoveredMessageIndices$.subscribe(i => this.hoveredEventMessageIndices = i);
334334
}
335335

336336
ngAfterViewInit() {
@@ -383,7 +383,7 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
383383
this.sessionService.createSession(this.userId, this.appName)
384384
.subscribe((res) => {
385385
this.currentSessionState = res.state;
386-
this.sessionId = res.id;
386+
this.sessionId = res.id ?? '';
387387
this.sessionTab()?.refreshSession();
388388

389389
this.isSessionUrlEnabledObs.subscribe((enabled) => {

‎src/app/components/eval-tab/add-eval-session-dialog/add-eval-session-dialog/add-eval-session-dialog.component.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import {
2222
MatDialogRef,
2323
} from '@angular/material/dialog';
2424
import { AddEvalSessionDialogComponent } from './add-eval-session-dialog.component';
25-
import { EVAL_SERVICE, EvalService } from '../../../../core/services/eval.service';
25+
import { EvalService } from '../../../../core/services/eval.service';
2626
import { of } from 'rxjs';
2727
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
28+
import {EVAL_SERVICE} from '../../../../core/services/interfaces/eval';
2829

2930
describe('AddEvalSessionDialogComponent', () => {
3031
let component: AddEvalSessionDialogComponent;

‎src/app/components/eval-tab/add-eval-session-dialog/add-eval-session-dialog/add-eval-session-dialog.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import {Component, Inject} from '@angular/core';
1919
import { MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
2020
import { uuidv4 } from 'uuidv7';
21-
import {EvalService, EVAL_SERVICE} from '../../../../core/services/eval.service';
21+
import {EvalService, EVAL_SERVICE} from '../../../../core/services/interfaces/eval';
2222
import { CdkScrollable } from '@angular/cdk/scrolling';
2323
import { MatFormField } from '@angular/material/form-field';
2424
import { MatInput } from '@angular/material/input';

‎src/app/components/eval-tab/eval-tab.component.spec.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@
1818
import { ComponentFixture, TestBed } from '@angular/core/testing';
1919
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
2020
import { EvalTabComponent } from './eval-tab.component';
21-
import { EVAL_SERVICE, EvalService } from '../../core/services/eval.service';
22-
import { SESSION_SERVICE, SessionService } from '../../core/services/session.service';
21+
import { EvalService } from '../../core/services/eval.service';
22+
import { SessionService } from '../../core/services/session.service';
2323
import { of } from 'rxjs';
2424
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
2525
import { ActivatedRoute } from '@angular/router';
2626
import {
27-
FEATURE_FLAG_SERVICE,
2827
FeatureFlagService,
2928
} from '../../core/services/feature-flag.service';
29+
import {EVAL_SERVICE} from '../../core/services/interfaces/eval';
30+
import {SESSION_SERVICE} from '../../core/services/interfaces/session';
31+
import {FEATURE_FLAG_SERVICE} from '../../core/services/interfaces/feature-flag';
3032

3133
describe('EvalTabComponent', () => {
3234
let component: EvalTabComponent;

‎src/app/components/eval-tab/eval-tab.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import {catchError} from 'rxjs/operators';
2626
import {DEFAULT_EVAL_METRICS, EvalMetric, EvalCase} from '../../core/models/Eval';
2727
import {Session} from '../../core/models/Session';
2828
import {Invocation} from '../../core/models/Eval';
29-
import {EvalService, EVAL_SERVICE} from '../../core/services/eval.service';
30-
import {FeatureFlagService, FEATURE_FLAG_SERVICE} from '../../core/services/feature-flag.service';
31-
import {SessionService, SESSION_SERVICE} from '../../core/services/session.service';
29+
import {EvalService, EVAL_SERVICE} from '../../core/services/interfaces/eval';
30+
import {FeatureFlagService} from '../../core/services/feature-flag.service';
31+
import {SessionService, SESSION_SERVICE} from '../../core/services/interfaces/session';
3232

3333
import {AddEvalSessionDialogComponent} from './add-eval-session-dialog/add-eval-session-dialog/add-eval-session-dialog.component';
3434
import {NewEvalSetDialogComponentComponent} from './new-eval-set-dialog/new-eval-set-dialog-component/new-eval-set-dialog-component.component';

0 commit comments

Comments
 (0)