Merge pull request #67 from boldare/feat/annotations

Annotations - displaying numbers and dedicated section in the message

Author: sebastianmusial

apps/spa/src/app/components/chat/chat-annotation/chat-annotation.component.html

@@ -0,0 +1,7 @@
+<div
+  class="annotation"
+  (mouseover)="showDetails()"
+  [matTooltip]="fileDetails ? fileDetails.filename : 'Reading data...'"
+  matTooltipPosition="above">
+  [{{ index }}]
+</div>

apps/spa/src/app/components/chat/chat-annotation/chat-annotation.component.scss

@@ -0,0 +1,9 @@
+@import 'settings';
+
+.annotation {
+  cursor: pointer;
+
+  &:hover {
+    background-color: rgba(0, 0, 0, 0.15);
+  }
+}

apps/spa/src/app/components/chat/chat-annotation/chat-annotation.component.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChatAnnotationComponent } from './chat-annotation.component';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+
+describe('ChatAnnotationComponent', () => {
+  let component: ChatAnnotationComponent;
+  let fixture: ComponentFixture<ChatAnnotationComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ChatAnnotationComponent, HttpClientTestingModule],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ChatAnnotationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

apps/spa/src/app/components/chat/chat-annotation/chat-annotation.component.ts

@@ -0,0 +1,39 @@
+import { Component, Input } from '@angular/core';
+import { MatTooltip } from '@angular/material/tooltip';
+import { Annotation } from 'openai/resources/beta/threads';
+import { ChatClientService } from '../../../modules/+chat/shared/chat-client.service';
+import { FileObject } from 'openai/resources';
+import { isFileCitation } from '../../../pipes/annotation.pipe';
+import { take } from 'rxjs';
+
+@Component({
+  selector: 'ai-chat-annotation',
+  standalone: true,
+  templateUrl: './chat-annotation.component.html',
+  styleUrl: './chat-annotation.component.scss',
+  imports: [MatTooltip],
+})
+export class ChatAnnotationComponent {
+  @Input() annotation!: Annotation;
+  @Input() index = 1;
+  fileDetails!: FileObject;
+
+  get fileId(): string {
+    return isFileCitation(this.annotation)
+      ? this.annotation.file_citation.file_id
+      : this.annotation.file_path.file_id;
+  }
+
+  constructor(private chatClientService: ChatClientService) {}
+
+  showDetails() {
+    if (!this.fileId || !!this.fileDetails) {
+      return;
+    }
+
+    this.chatClientService
+      .retriveFile(this.fileId)
+      .pipe(take(1))
+      .subscribe(details => (this.fileDetails = details));
+  }
+}

apps/spa/src/app/components/chat/chat-annotations/chat-annotations.component.html

@@ -0,0 +1,13 @@
+@if (message && message.type === 'text' && message.text.annotations.length) {
+  <div class="title">Annotations:</div>
+  <div class="content">
+    @for (
+      annotation of message.text.annotations;
+      track annotation.text + $index
+    ) {
+      <ai-chat-annotation [annotation]="annotation" [index]="$index + 1">
+        [{{ $index + 1 }}]
+      </ai-chat-annotation>
+    }
+  </div>
+}

apps/spa/src/app/components/chat/chat-annotations/chat-annotations.component.scss

@@ -0,0 +1,33 @@
+@import 'settings';
+
+:host {
+  display: flex;
+  align-items: baseline;
+  gap: $size-2;
+  border-top: 1px dashed var(--color-grey-500);
+  margin-top: $size-3;
+  padding-top: $size-3;
+  font-size: 12px;
+
+  &:empty {
+    display: none;
+  }
+}
+
+.title {
+  font-weight: 500;
+}
+
+.content {
+  display: flex;
+  gap: $size-1;
+  margin-top: $size-2;
+}
+
+.annotation {
+  cursor: pointer;
+
+  &:hover {
+    background-color: rgba(0, 0, 0, 0.15);
+  }
+}

apps/spa/src/app/components/chat/chat-annotations/chat-annotations.component.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MarkdownModule } from 'ngx-markdown';
+import { ChatAnnotationsComponent } from './chat-annotations.component';
+
+describe('ChatAnnotationsComponent', () => {
+  let component: ChatAnnotationsComponent;
+  let fixture: ComponentFixture<ChatAnnotationsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ChatAnnotationsComponent, MarkdownModule.forRoot()],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ChatAnnotationsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

apps/spa/src/app/components/chat/chat-annotations/chat-annotations.component.ts

@@ -0,0 +1,15 @@
+import { Component, Input } from '@angular/core';
+import { MatTooltip } from '@angular/material/tooltip';
+import { MessageContent } from 'openai/resources/beta/threads';
+import { ChatAnnotationComponent } from '../chat-annotation/chat-annotation.component';
+
+@Component({
+  selector: 'ai-chat-annotations',
+  standalone: true,
+  templateUrl: './chat-annotations.component.html',
+  styleUrl: './chat-annotations.component.scss',
+  imports: [MatTooltip, ChatAnnotationComponent],
+})
+export class ChatAnnotationsComponent {
+  @Input() message!: MessageContent;
+}

apps/spa/src/app/components/chat/chat-audio/chat-audio.component.html

@@ -1,4 +1,4 @@
-@if (getMessageText) {
+@if (isAudioEnabled && message && (message | messageText)) {
   <span class="chat-audio" [ngClass]="'chat-audio--' + message.role">
     @if (!isStarted) {
       <mat-icon (click)="speech()">play_circle</mat-icon>

apps/spa/src/app/components/chat/chat-audio/chat-audio.component.ts

@@ -2,36 +2,33 @@ import { Component, Input, OnInit } from '@angular/core';
 import { MatIconModule } from '@angular/material/icon';
 import { delay } from 'rxjs';
 import { ChatAudioResponse, PostSpeechDto } from '@boldare/openai-assistant';
-import { NgClass } from '@angular/common';
-import { getMessageText } from '../../controls/message-content/message-content.helpers';
+import { CommonModule } from '@angular/common';
 import { ChatClientService } from '../../../modules/+chat/shared/chat-client.service';
 import {
   ChatMessage,
   SpeechVoice,
 } from '../../../modules/+chat/shared/chat.model';
+import { MessageTextPipe } from '../../../pipes/message-text.pipe';
 import { environment } from '../../../../environments/environment';
 
 @Component({
   selector: 'ai-chat-audio',
   standalone: true,
-  imports: [MatIconModule, NgClass],
+  imports: [MatIconModule, CommonModule, MessageTextPipe],
+  providers: [MessageTextPipe],
   templateUrl: './chat-audio.component.html',
   styleUrl: './chat-audio.component.scss',
 })
 export class ChatAudioComponent implements OnInit {
   @Input() message!: ChatMessage;
   isStarted = false;
   audio = new Audio();
+  isAudioEnabled = environment.isAudioEnabled;
 
-  get getMessageText(): string {
-    if (!environment.isAudioEnabled || !this.message) {
-      return '';
-    }
-
-    return getMessageText(this.message);
-  }
-
-  constructor(private readonly chatService: ChatClientService) {}
+  constructor(
+    private readonly chatService: ChatClientService,
+    private readonly messageTextPipe: MessageTextPipe,
+  ) {}
 
   ngOnInit(): void {
     this.audio.onended = this.onEnded.bind(this);
@@ -50,7 +47,9 @@ export class ChatAudioComponent implements OnInit {
   }
 
   speech(): void {
-    if (!this.getMessageText) {
+    const content = this.messageTextPipe.transform(this.message);
+
+    if (!content) {
       return;
     }
 
@@ -62,7 +61,7 @@ export class ChatAudioComponent implements OnInit {
     }
 
     const payload: PostSpeechDto = {
-      content: getMessageText(this.message),
+      content,
       voice: SpeechVoice.Onyx,
     };