[ADVAPP-896]: Improve processing speed for chat in the Enterprise AI Assistant

app-modules/ai/resources/js/chat.js

@@ -197,7 +197,7 @@ document.addEventListener('alpine:init', () => {
                 this.isIncomplete = false;
                 this.error = null;
 
-                this.$dispatch(`message-sent-${threadId}`);
+                this.$dispatch('message-sent', { threadId: threadId });
 
                 this.latestMessage = this.message;
 
@@ -235,7 +235,7 @@ document.addEventListener('alpine:init', () => {
                 this.isIncomplete = false;
                 this.error = null;
 
-                this.$dispatch(`message-sent-${threadId}`);
+                this.$dispatch('message-sent', { threadId: threadId });
 
                 this.$nextTick(async () => {
                     await this.handleMessageResponse({
@@ -261,7 +261,7 @@ document.addEventListener('alpine:init', () => {
                 this.isIncomplete = false;
                 this.error = null;
 
-                this.$dispatch(`message-sent-${threadId}`);
+                this.$dispatch('message-sent', { threadId: threadId });
 
                 this.$nextTick(async () => {
                     await this.handleMessageResponse({

app-modules/ai/resources/js/chats.js

@@ -32,7 +32,11 @@
 </COPYRIGHT>
 */
 document.addEventListener('alpine:init', () => {
-    Alpine.data('chats', () => ({
+    Alpine.data('chats', ($wire) => ({
+        loading: {
+            type: null,
+            identifier: null,
+        },
         threadId: null,
         startFolder: null,
         dragging: false,
@@ -91,5 +95,59 @@ document.addEventListener('alpine:init', () => {
         expanded(folderId) {
             return this.expandedFolder === folderId;
         },
+        async selectThread(thread) {
+            this.loading.type = 'thread';
+            this.loading.identifier = thread.id;
+
+            await $wire.selectThread(thread);
+
+            this.loading.type = null;
+            this.loading.identifier = null;
+        },
+        async moveThread(threadId) {
+            this.loading.type = 'moveThreadAction';
+            this.loading.identifier = threadId;
+
+            await $wire.mountAction('moveThread', { thread: threadId });
+
+            this.loading.type = null;
+            this.loading.identifier = null;
+        },
+        async editThread(threadId) {
+            this.loading.type = 'editThreadAction';
+            this.loading.identifier = threadId;
+
+            await $wire.mountAction('editThread', { thread: threadId });
+
+            this.loading.type = null;
+            this.loading.identifier = null;
+        },
+        async deleteThread(threadId) {
+            this.loading.type = 'deleteThreadAction';
+            this.loading.identifier = threadId;
+
+            await $wire.mountAction('deleteThread', { thread: threadId });
+
+            this.loading.type = null;
+            this.loading.identifier = null;
+        },
+        async renameFolder(folderId) {
+            this.loading.type = 'renameFolderAction';
+            this.loading.identifier = folderId;
+
+            await $wire.mountAction('renameFolder', { folder: folderId });
+
+            this.loading.type = null;
+            this.loading.identifier = null;
+        },
+        async deleteFolder(folderId) {
+            this.loading.type = 'deleteFolderAction';
+            this.loading.identifier = folderId;
+
+            await $wire.mountAction('deleteFolder', { folder: folderId });
+
+            this.loading.type = null;
+            this.loading.identifier = null;
+        },
     }));
 });

app-modules/ai/src/Filament/Pages/Assistant/Concerns/CanManageFolders.php

@@ -37,9 +37,10 @@
 namespace AdvisingApp\Ai\Filament\Pages\Assistant\Concerns;
 
 use Exception;
+use App\Models\User;
 use Filament\Actions\Action;
+use Livewire\Attributes\Locked;
 use Illuminate\Http\JsonResponse;
-use Livewire\Attributes\Computed;
 use Filament\Actions\StaticAction;
 use AdvisingApp\Ai\Models\AiThread;
 use Filament\Forms\Components\Select;
@@ -49,14 +50,23 @@
 use AdvisingApp\Ai\Models\AiThreadFolder;
 use Symfony\Component\HttpFoundation\Response;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 
 trait CanManageFolders
 {
-    #[Computed]
-    public function folders(): EloquentCollection
+    #[Locked]
+    public array $folders = [];
+
+    public function mountCanManageFolders(): void
     {
-        return auth()->user()
+        $this->folders = $this->getFolders();
+    }
+
+    public function getFolders(): array
+    {
+        /** @var User $user */
+        $user = auth()->user();
+
+        return $user
             ->aiThreadFolders()
             ->where('application', static::APPLICATION)
             ->with([
@@ -65,7 +75,8 @@ public function folders(): EloquentCollection
                     ->withMax('messages', 'created_at'),
             ])
             ->orderBy('name')
-            ->get();
+            ->get()
+            ->toArray();
     }
 
     public function newFolderAction(): Action
@@ -126,7 +137,7 @@ public function renameFolderAction(): Action
                     ->find($arguments['folder'])
                     ?->update(['name' => $data['name']]);
 
-                unset($this->folders);
+                $this->folders = $this->getFolders();
             })
             ->icon('heroicon-m-pencil')
             ->color('warning')
@@ -149,7 +160,7 @@ public function deleteFolderAction(): Action
                     ->find($arguments['folder'])
                     ?->delete();
 
-                unset($this->folders);
+                $this->folders = $this->getFolders();
             })
             ->icon('heroicon-m-trash')
             ->color('danger')
@@ -257,6 +268,7 @@ protected function moveThread(AiThread $thread, ?AiThreadFolder $folder): void
                 ->save();
         }
 
-        unset($this->threadsWithoutAFolder, $this->folders);
+        $this->threadsWithoutAFolder = $this->getThreadsWithoutAFolder();
+        $this->folders = $this->getFolders();
     }
 }

app-modules/ai/src/Filament/Pages/Assistant/Concerns/CanManageThreads.php

@@ -63,11 +63,9 @@
 use AdvisingApp\Report\Jobs\RecordTrackedEvent;
 use AdvisingApp\Ai\Jobs\PrepareAiThreadEmailing;
 use AdvisingApp\Ai\Services\Contracts\AiServiceLifecycleHooks;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 
 /**
  * @property-read array $customAssistants
- * @property-read EloquentCollection $threadsWithoutAFolder
  */
 trait CanManageThreads
 {
@@ -78,6 +76,14 @@ trait CanManageThreads
 
     public $assistantSwitcherMobile = null;
 
+    #[Locked]
+    public array $threadsWithoutAFolder = [];
+
+    public function mountCanManageThreads(): void
+    {
+        $this->threadsWithoutAFolder = $this->getThreadsWithoutAFolder();
+    }
+
     #[Computed]
     public function customAssistants(): array
     {
@@ -171,23 +177,26 @@ public function createThread(?AiAssistant $assistant = null): void
         $this->thread = app(CreateThread::class)(static::APPLICATION, $assistant);
     }
 
-    #[Computed]
-    public function threadsWithoutAFolder(): EloquentCollection
+    public function getThreadsWithoutAFolder(): array
     {
-        return auth()->user()
+        /** @var User $user */
+        $user = auth()->user();
+
+        return $user
             ->aiThreads()
             ->withMax('messages', 'created_at')
             ->whereRelation('assistant', 'application', static::APPLICATION)
             ->whereNotNull('name')
             ->doesntHave('folder')
             ->latest('updated_at')
-            ->with('assistant')
-            ->get();
+            ->get()
+            ->each->append('last_engaged_at')
+            ->toArray();
     }
 
     public function loadFirstThread(): void
     {
-        $this->selectThread($this->threadsWithoutAFolder->whereNull('assistant.archived_at')->first());
+        $this->selectThread(collect($this->threadsWithoutAFolder)->whereNull('assistant.archived_at')->first());
 
         if ($this->thread) {
             $service = $this->thread->assistant->model->getService();
@@ -202,12 +211,14 @@ public function loadFirstThread(): void
         $this->createThread();
     }
 
-    public function selectThread(?AiThread $thread): void
+    public function selectThread(?array $thread): void
     {
         if (! $thread) {
             return;
         }
 
+        $thread = AiThread::find($thread['id']);
+
         if (
             $this->thread &&
             blank($this->thread->name) &&
@@ -264,13 +275,13 @@ public function saveThreadAction(): Action
                     ->find($data['folder']);
 
                 if (! $folder) {
-                    unset($this->threadsWithoutAFolder);
+                    $this->threadsWithoutAFolder = $this->getThreadsWithoutAFolder();
 
                     return;
                 }
 
                 $this->moveThread($this->thread, $folder);
-                unset($this->folders);
+                $this->folders = $this->getFolders();
             });
     }
 
@@ -294,7 +305,8 @@ public function deleteThreadAction(): Action
                     $this->createThread();
                 }
 
-                unset($this->threadsWithoutAFolder, $this->folders);
+                $this->threadsWithoutAFolder = $this->getThreadsWithoutAFolder();
+                $this->folders = $this->getFolders();
             })
             ->icon('heroicon-m-trash')
             ->color('danger')
@@ -335,7 +347,8 @@ public function editThreadAction(): Action
                 $thread->name = $data['name'];
                 $thread->save();
 
-                unset($this->threadsWithoutAFolder, $this->folders);
+                $this->threadsWithoutAFolder = $this->getThreadsWithoutAFolder();
+                $this->folders = $this->getFolders();
             })
             ->icon('heroicon-m-pencil')
             ->color('warning')

app-modules/ai/src/Models/AiThread.php

@@ -38,6 +38,7 @@
 
 use Carbon\Carbon;
 use App\Models\User;
+use Livewire\Wireable;
 use App\Models\BaseModel;
 use Carbon\CarbonInterface;
 use App\Settings\DisplaySettings;
@@ -55,7 +56,7 @@
 /**
  * @mixin IdeHelperAiThread
  */
-class AiThread extends BaseModel
+class AiThread extends BaseModel implements Wireable
 {
     use CanAddAssistantLicenseGlobalScope;
     use SoftDeletes;
@@ -117,6 +118,19 @@ public function prunable(): Builder
             ->whereDoesntHave('messages', fn (Builder $query) => $query->withTrashed());
     }
 
+    public function toLivewire()
+    {
+        return [
+            'id' => $this->getKey(),
+            'name' => $this->name,
+        ];
+    }
+
+    public static function fromLivewire($value)
+    {
+        return AiThread::query()->find($value['id']);
+    }
+
     protected function lastEngagedAt(): Attribute
     {
         return Attribute::make(

app-modules/ai/tests/Feature/Filament/Pages/AIAssistantPageTest.php

@@ -244,7 +244,7 @@
         ]);
 
     Livewire::test(PersonalAssistant::class)
-        ->call('selectThread', $thread)
+        ->call('selectThread', $thread->toArray())
         ->callAction('saveThread', [
             'name' => $name = Str::random(),
         ])
@@ -274,7 +274,7 @@
         ]);
 
     Livewire::test(PersonalAssistant::class)
-        ->call('selectThread', $thread)
+        ->call('selectThread', $thread->toArray())
         ->callAction('saveThread', [
             'name' => $name = Str::random(),
             'folder' => $folder->getKey(),
@@ -319,7 +319,7 @@
     Livewire::test(PersonalAssistant::class)
         ->call('loadFirstThread')
         ->assertSet('thread.id', $thread->id)
-        ->call('selectThread', $newThread)
+        ->call('selectThread', $newThread->toArray())
         ->assertSet('thread.id', $newThread->id);
 });
 
@@ -338,7 +338,7 @@
     Livewire::test(PersonalAssistant::class)
         ->call('loadFirstThread')
         ->assertSet('thread.id', $thread->id)
-        ->call('selectThread', $newThread)
+        ->call('selectThread', $newThread->toArray())
         ->assertNotFound();
 });
 

composer.json

@@ -69,6 +69,7 @@
         "google/apiclient": "^2.17",
         "guzzlehttp/guzzle": "^7.2",
         "internachi/modular": "^2.2",
+        "itsgoingd/clockwork": "^5.2",
         "kirschbaum-development/eloquent-power-joins": "^3.5",
         "laravel/framework": "^10.48",
         "laravel/octane": "^2.5",