Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 10 additions & 0 deletions src/ai/ai.service.ts
Original file line number Diff line number Diff line change
@@ -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');
37 changes: 37 additions & 0 deletions src/ai/groq/groq.service.ts
Original file line number Diff line number Diff line change
@@ -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;
}
}
9 changes: 9 additions & 0 deletions src/ai/openai.module.ts
Original file line number Diff line number Diff line change
@@ -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 {}
File renamed without changes.
37 changes: 23 additions & 14 deletions src/openai/openai.service.ts → src/ai/openai/openai.service.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand All @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -106,7 +106,6 @@ import { InfraModule } from './infra/infra.module';
? process.env.NAVER_CLOVA_SUMMARY_REQUEST_URL
: '',
}),
OpenaiModule,
AopModule,
InfraModule,
],
Expand Down
4 changes: 2 additions & 2 deletions src/categories/category.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Module } from '@nestjs/common';
import { ContentsModule } from '../contents/contents.module';
import { CategoryService } from './category.service';
import { OpenaiModule } from '../openai/openai.module';
import { AiModule } from '../ai/openai.module';
import { UsersModule } from '../users/users.module';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Category } from './category.entity';
Expand All @@ -14,7 +14,7 @@ import { CategoryV2Controller } from './v2/category.v2.controller';
imports: [
TypeOrmModule.forFeature([Category]),
ContentsModule,
OpenaiModule,
AiModule,
UsersModule,
],
controllers: [CategoryController, CategoryV2Controller],
Expand Down
17 changes: 7 additions & 10 deletions src/categories/category.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
NotFoundException,
ConflictException,
InternalServerErrorException,
Inject,
} from '@nestjs/common';
import { EntityManager } from 'typeorm';
import {
Expand All @@ -13,8 +14,6 @@ import {
DeleteCategoryOutput,
RecentCategoryList,
RecentCategoryListWithSaveCount,
AutoCategorizeOutput,
AutoCategorizeBodyDto,
} from './dtos/category.dto';
import {
LoadPersonalCategoriesOutput,
Expand All @@ -25,7 +24,6 @@ import { Content } from '../contents/entities/content.entity';
import { CategoryRepository } from './category.repository';
import { ContentRepository } from '../contents/repository/content.repository';
import { getLinkContent, getLinkInfo } from '../contents/util/content.util';
import { OpenaiService } from '../openai/openai.service';
import { User } from '../users/entities/user.entity';
import { UserRepository } from '../users/repository/user.repository';
import {
Expand All @@ -35,14 +33,15 @@ import {
makeCategoryListWithSaveCount,
} from './utils/category.util';
import { Transactional } from '../common/aop/transactional';
import { AiService } from '../ai/ai.service';

@Injectable()
export class CategoryService {
constructor(
private readonly contentRepository: ContentRepository,
private readonly categoryRepository: CategoryRepository,
private readonly userRepository: UserRepository,
private readonly openaiService: OpenaiService,
@Inject(AiService) private readonly aiService: AiService,
) {}

@Transactional()
Expand Down Expand Up @@ -476,15 +475,13 @@ Present your reply options in JSON format below.
`;

try {
const response = await this.openaiService.createChatCompletion({
model: 'gpt-4o-mini',
question,
const categoryStr = await this.aiService.chat({
model: 'llama3-8b-8192',
messages: [{ role: 'user', content: question }],
temperature: 0,
responseType: { type: 'json_object' },
responseType: 'json_object',
});

const categoryStr = response.choices[0].message?.content;

if (categoryStr) {
const { id, name } = JSON.parse(
categoryStr.replace(/^```json|```$/g, '').trim(),
Expand Down
4 changes: 2 additions & 2 deletions src/contents/contents.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { Content } from './entities/content.entity';
import { ContentRepository } from './repository/content.repository';
import { CategoryRepository } from '../categories/category.repository';
import { UsersModule } from '../users/users.module';
import { OpenaiModule } from '../openai/openai.module';
import { AiModule } from '../ai/openai.module';

@Module({
imports: [TypeOrmModule.forFeature([Content]), UsersModule, OpenaiModule],
imports: [TypeOrmModule.forFeature([Content]), UsersModule, AiModule],
controllers: [ContentsController],
providers: [ContentsService, ContentRepository, CategoryRepository],
exports: [ContentsService],
Expand Down
8 changes: 0 additions & 8 deletions src/openai/openai.module.ts

This file was deleted.