xiongzhu 2 лет назад
Родитель
Сommit
31c5e94349
5 измененных файлов с 20 добавлено и 11 удалено
  1. 4 3
      .env
  2. 4 3
      .env.production
  3. 1 1
      src/danmu/danmu.service.ts
  4. 2 1
      src/game/game.module.ts
  5. 9 3
      src/game/game.service.ts

+ 4 - 3
.env

@@ -48,9 +48,10 @@ ALIYUN_OSS_CDN=https://cdn.raex.vip
 ALIYUN_SMS_SIGN=走马信息
 ALIYUN_SMS_TEMPLATE_CODE=SMS_175485688
 
-AZURE_OPENAI_KEY=beb32e4625a94b65ba8bc0ba1688c4d2
-AZURE_OPENAI_ENDPOINT=https://zouma.openai.azure.com
-AZURE_OPENAI_DEPLOYMENT=gpt35
+AZURE_OPENAI_KEY=62dd8a1466524c64967810c692f0197e
+AZURE_OPENAI_INSTANCE=zouma1
+AZURE_OPENAI_ENDPOINT=https://zouma1.openai.azure.com
+AZURE_OPENAI_DEPLOYMENT=gpt-35-turbo
 AZURE_OPENAI_VERSION=2023-03-15-preview
 
 OPENAI_API_KEY=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

+ 4 - 3
.env.production

@@ -48,9 +48,10 @@ ALIYUN_OSS_CDN=https://cdn.raex.vip
 ALIYUN_SMS_SIGN=走马信息
 ALIYUN_SMS_TEMPLATE_CODE=SMS_175485688
 
-AZURE_OPENAI_KEY=beb32e4625a94b65ba8bc0ba1688c4d2
-AZURE_OPENAI_ENDPOINT=https://zouma.openai.azure.com
-AZURE_OPENAI_DEPLOYMENT=gpt35
+AZURE_OPENAI_KEY=62dd8a1466524c64967810c692f0197e
+AZURE_OPENAI_INSTANCE=zouma1
+AZURE_OPENAI_ENDPOINT=https://zouma1.openai.azure.com
+AZURE_OPENAI_DEPLOYMENT=gpt-35-turbo
 AZURE_OPENAI_VERSION=2023-03-15-preview
 
 OPENAI_API_KEY=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

+ 1 - 1
src/danmu/danmu.service.ts

@@ -36,7 +36,7 @@ export class DanmuService implements OnModuleInit {
         })
 
         // Connect to Twitch:
-        client.connect()
+        // client.connect()
     }
 
     async getTwitchAppAccessToken() {

+ 2 - 1
src/game/game.module.ts

@@ -7,9 +7,10 @@ import { GameRound } from './entities/game-round.entity'
 import { Charactor } from './entities/charactors.entity'
 import { EventsModule } from '../events/events.module'
 import { PromptModule } from '../prompt/prompt.module'
+import { SysConfigModule } from 'src/sys-config/sys-config.module'
 
 @Module({
-    imports: [TypeOrmModule.forFeature([Game, GameRound, Charactor]), forwardRef(() => EventsModule), PromptModule],
+    imports: [TypeOrmModule.forFeature([Game, GameRound, Charactor]), forwardRef(() => EventsModule), PromptModule, SysConfigModule],
     controllers: [GameController],
     providers: [GameService],
     exports: [GameService]

+ 9 - 3
src/game/game.service.ts

@@ -1,3 +1,4 @@
+import { SysConfigService } from './../sys-config/sys-config.service'
 import { Inject, Injectable, Logger, NotFoundException, OnModuleInit, forwardRef } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { Repository } from 'typeorm'
@@ -43,13 +44,18 @@ export class GameService implements OnModuleInit {
         private readonly charactorRepository: Repository<Charactor>,
         @Inject(forwardRef(() => EventsGateway))
         private readonly eventsGateway: EventsGateway,
-        private readonly promptService: PromptService
+        private readonly promptService: PromptService,
+        private readonly sysConfigService: SysConfigService
     ) {}
 
     onModuleInit() {
         this.llm = new ChatOpenAI({
-            openAIApiKey: process.env.OPENAI_API_KEY,
-            modelName: 'gpt-3.5-turbo-0613',
+            // openAIApiKey: process.env.OPENAI_API_KEY,
+            // modelName: 'gpt-3.5-turbo-0613',
+            azureOpenAIApiKey: process.env.AZURE_OPENAI_KEY,
+            azureOpenAIApiVersion: process.env.AZURE_OPENAI_VERSION,
+            azureOpenAIApiInstanceName: process.env.AZURE_OPENAI_INSTANCE,
+            azureOpenAIApiDeploymentName: process.env.AZURE_OPENAI_DEPLOYMENT,
             callbackManager: CallbackManager.fromHandlers({
                 async handleLLMStart(llm: Serialized, prompts: string[]) {
                     Logger.log(`LLM: ${JSON.stringify(llm)}`, 'LLM Start')