Merge branch 'dev' of https://github.com/janhq/cortex into api-update

Author: irfanpena

cortex-js/package.json

@@ -9,9 +9,12 @@
   },
   "scripts": {
     "dev": "nest dev",
-    "build": "yarn build:extensions && nest build && cp -r cpuinfo/bin ./dist/",
+    "build": "yarn build:extensions && nest build && cpx \"cpuinfo/bin/**\" dist/bin",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "build:extensions": "for dir in ./src/extensions/*/; do (cd \"$dir\" && yarn && yarn build); done",
+    "build:extensions": "run-script-os",
+    "build:extensions:windows": "powershell -command \"$jobs = Get-ChildItem -Path './src/extensions' -Directory | ForEach-Object { Start-Job -Name ($_.Name) -ScriptBlock { param($_dir); try { Set-Location $_dir; yarn; yarn build; Write-Output 'Build successful in ' + $_dir } catch { Write-Error 'Error in ' + $_dir; throw } } -ArgumentList $_.FullName }; $jobs | Wait-Job; $jobs | ForEach-Object { Receive-Job -Job $_ -Keep } | ForEach-Object { Write-Host $_ }; $failed = $jobs | Where-Object { $_.State -ne 'Completed' -or $_.ChildJobs[0].JobStateInfo.State -ne 'Completed' }; if ($failed) { Exit 1 }\"",
+    "build:extensions:linux": "for dir in ./src/extensions/*/; do (cd \"$dir\" && yarn && yarn build); done",
+    "build:extensions:macos": "for dir in ./src/extensions/*/; do (cd \"$dir\" && yarn && yarn build); done",
     "start": "nest start",
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
@@ -53,6 +56,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
+    "cpx": "^1.5.0",
     "@nestjs/cli": "^10.0.0",
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
@@ -76,7 +80,8 @@
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.3",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.3",
+    "run-script-os": "^1.1.6"
   },
   "files": [
     "dist"

cortex-js/src/infrastructure/controllers/assistants.controller.ts

@@ -1,4 +1,12 @@
-import { Body, Controller, Delete, Get, Param, Post } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Post,
+  UseInterceptors,
+} from '@nestjs/common';
 import { AssistantsUsecases } from '@/usecases/assistants/assistants.usecases';
 import { CreateAssistantDto } from '@/infrastructure/dtos/assistants/create-assistant.dto';
 import { DeleteAssistantResponseDto } from '@/infrastructure/dtos/assistants/delete-assistant.dto';
@@ -11,9 +19,11 @@ import {
   ApiResponse
 } from '@nestjs/swagger';
 import { AssistantEntity } from '../entities/assistant.entity';
+import { TransformInterceptor } from '../interceptors/transform.interceptor';
 
 @ApiTags('Assistants')
 @Controller('assistants')
+@UseInterceptors(TransformInterceptor)
 export class AssistantsController {
   constructor(private readonly assistantsService: AssistantsUsecases) {}
 

cortex-js/src/infrastructure/controllers/messages.controller.ts

@@ -7,6 +7,7 @@ import {
   Param,
   HttpCode,
   Delete,
+  UseInterceptors,
 } from '@nestjs/common';
 import { MessagesUsecases } from '@/usecases/messages/messages.usecases';
 import { CreateMessageDto } from '@/infrastructure/dtos/messages/create-message.dto';
@@ -22,9 +23,11 @@ import {
   ApiTags,
   ApiResponse
 } from '@nestjs/swagger';
+import { TransformInterceptor } from '../interceptors/transform.interceptor';
 
 @ApiTags('Messages')
 @Controller('messages')
+@UseInterceptors(TransformInterceptor)
 export class MessagesController {
   constructor(private readonly messagesUsecases: MessagesUsecases) {}
 

cortex-js/src/infrastructure/controllers/models.controller.ts

@@ -6,7 +6,8 @@ import {
   Patch,
   Param,
   Delete,
-  HttpCode
+  HttpCode,
+  UseInterceptors,
 } from '@nestjs/common';
 import { ModelsUsecases } from '@/usecases/models/models.usecases';
 import { CreateModelDto } from '@/infrastructure/dtos/models/create-model.dto';
@@ -25,9 +26,11 @@ import {
 } from '@nestjs/swagger';
 import { StartModelSuccessDto } from '@/infrastructure/dtos/models/start-model-success.dto';
 import { ModelSettingParamsDto } from '../dtos/models/model-setting-params.dto';
+import { TransformInterceptor } from '../interceptors/transform.interceptor';
 
 @ApiTags('Models')
 @Controller('models')
+@UseInterceptors(TransformInterceptor)
 export class ModelsController {
   constructor(private readonly modelsUsecases: ModelsUsecases) {}
 

cortex-js/src/infrastructure/controllers/threads.controller.ts

@@ -7,6 +7,7 @@ import {
   Param,
   Delete,
   HttpCode
+  UseInterceptors,
 } from '@nestjs/common';
 import { ThreadsUsecases } from '@/usecases/threads/threads.usecases';
 import { CreateThreadDto } from '@/infrastructure/dtos/threads/create-thread.dto';
@@ -21,9 +22,11 @@ import {
   ApiTags,
   ApiResponse
 } from '@nestjs/swagger';
+import { TransformInterceptor } from '../interceptors/transform.interceptor';
 
 @ApiTags('Threads')
 @Controller('threads')
+@UseInterceptors(TransformInterceptor)
 export class ThreadsController {
   constructor(private readonly threadsService: ThreadsUsecases) {}
 

cortex-js/src/infrastructure/interceptors/transform.interceptor.ts

@@ -0,0 +1,33 @@
+import {
+  CallHandler,
+  ExecutionContext,
+  Injectable,
+  NestInterceptor,
+} from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+export interface Response<T> {
+  data: T;
+}
+
+@Injectable()
+export class TransformInterceptor<T>
+  implements NestInterceptor<T, Response<T>>
+{
+  intercept(
+    context: ExecutionContext,
+    next: CallHandler,
+  ): Observable<Response<T>> {
+    return next.handle().pipe(
+      map((data) => {
+        return Array.isArray(data)
+          ? {
+              object: 'list',
+              data,
+            }
+          : data;
+      }),
+    );
+  }
+}