Merge pull request #391 from Quickchive/develop

Develop to master

Author: stae1102

package-lock.json

@@ -56,6 +56,7 @@
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
     "form-data": "^4.0.0",
+    "groq-sdk": "^0.15.0",
     "ioredis": "^5.3.2",
     "joi": "^17.6.0",
     "openai": "^4.80.0",

package.json

@@ -0,0 +1,10 @@
+export interface AiService {
+  chat(chatRequest: {
+    messages: any[];
+    model: string;
+    temperature: number;
+    responseType: string;
+  }): Promise<string | null>;
+}
+
+export const AiService = Symbol('AiService');

src/ai/ai.service.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import Groq from 'groq-sdk';
+import { AiService } from '../ai.service';
+
+@Injectable()
+export class GroqService implements AiService {
+  private readonly groq: Groq;
+
+  constructor(private readonly configService: ConfigService) {
+    this.groq = new Groq({
+      apiKey: this.configService.get('GROQ_API_KEY'),
+    });
+  }
+  async chat({
+    messages,
+    model,
+    temperature,
+    responseType,
+  }: {
+    messages: any[];
+    model: string;
+    temperature: number;
+    responseType: string;
+  }): Promise<string | null> {
+    const response = await this.groq.chat.completions.create({
+      messages,
+      model,
+      temperature,
+      response_format: {
+        type: responseType as 'text' | 'json_object' | undefined,
+      },
+    });
+
+    return response.choices[0].message.content;
+  }
+}

src/ai/groq/groq.service.ts

@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { GroqService } from './groq/groq.service';
+import { AiService } from './ai.service';
+
+@Module({
+  providers: [{ provide: AiService, useClass: GroqService }],
+  exports: [{ provide: AiService, useClass: GroqService }],
+})
+export class AiModule {}

src/ai/openai.module.ts

@@ -1,12 +1,16 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 
-import { CreateCompletionBodyDto } from './dto/create-completion.dto';
 import OpenAI from 'openai';
-import { ChatCompletion } from 'openai/resources';
+import {
+  ResponseFormatJSONObject,
+  ResponseFormatJSONSchema,
+  ResponseFormatText,
+} from 'openai/resources';
+import { AiService } from '../ai.service';
 
 @Injectable()
-export class OpenaiService {
+export class OpenaiService implements AiService {
   private readonly openAIApi: OpenAI;
   constructor(private readonly configService: ConfigService) {
     this.openAIApi = new OpenAI({
@@ -15,26 +19,31 @@ export class OpenaiService {
     });
   }
 
-  async createChatCompletion({
-    question,
+  async chat({
+    messages,
     model,
     temperature,
     responseType,
-  }: CreateCompletionBodyDto): Promise<ChatCompletion> {
+  }: {
+    messages: any[];
+    model: string;
+    temperature: number;
+    responseType: string;
+  }): Promise<string | null> {
     try {
       const response = await this.openAIApi.chat.completions.create({
         model: model || 'gpt-4o-mini',
-        messages: [
-          {
-            role: 'user',
-            content: question,
-          },
-        ],
+        messages,
         temperature: temperature || 0.1,
-        ...(responseType && { response_format: responseType }),
+        ...(responseType && {
+          response_format: responseType as unknown as
+            | ResponseFormatText
+            | ResponseFormatJSONObject
+            | ResponseFormatJSONSchema,
+        }),
       });
 
-      return response;
+      return response.choices[0].message.content;
     } catch (e) {
       throw e;
     }

src/openai/dto/create-completion.dto.ts renamed to src/ai/openai/dto/create-completion.dto.ts

@@ -12,7 +12,7 @@ import { CollectionsModule } from './collections/collections.module';
 import { BatchModule } from './batch/batch.module';
 import { SummaryModule } from './summary/summary.module';
 import { TypeOrmConfigService } from './database/typerom-config.service';
-import { OpenaiModule } from './openai/openai.module';
+import { AiModule } from './ai/openai.module';
 import { AppController } from './app.controller';
 import { AopModule } from './common/aop/aop.module';
 import { InfraModule } from './infra/infra.module';
@@ -106,7 +106,6 @@ import { InfraModule } from './infra/infra.module';
         ? process.env.NAVER_CLOVA_SUMMARY_REQUEST_URL
         : '',
     }),
-    OpenaiModule,
     AopModule,
     InfraModule,
   ],

src/openai/openai.service.spec.ts renamed to src/ai/openai/openai.service.spec.ts

@@ -130,13 +130,4 @@ export class OAuthController {
   async appleLogin(@Query('code') code: string): Promise<LoginOutput> {
     return this.oauthService.appleLogin(code);
   }
-
-  @ApiOperation({
-    summary: '카카오 로그인 요청',
-    description: 'accessToken을 받아 카카오 로그인을 요청합니다.',
-  })
-  @Post('kakao')
-  async createOneWithKakao(@Body() kakaoLoginRequest: KakaoLoginRequest) {
-    return this.oauthService.createOneWithKakao(kakaoLoginRequest);
-  }
 }