Yuki Takei 1 год назад
Родитель
Сommit
c15484b891

+ 4 - 4
apps/app/src/interfaces/ai.ts

@@ -1,6 +1,6 @@
-export const aiServiceType = {
-  OPEN_AI: 'openai',
+export const OpenaiServiceType = {
+  OPENAI: 'openai',
   AZURE_OPENAI: 'azure-openai',
 } as const;
-export type aiServiceType = typeof aiServiceType[keyof typeof aiServiceType];
-export const aiServiceTypes = Object.values(aiServiceType);
+export type OpenaiServiceType = typeof OpenaiServiceType[keyof typeof OpenaiServiceType];
+export const OpenaiServiceTypes = Object.values(OpenaiServiceType);

+ 3 - 3
apps/app/src/server/middlewares/certify-ai-service.ts

@@ -1,6 +1,6 @@
 import type { NextFunction, Request, Response } from 'express';
 
-import { aiServiceTypes } from '~/interfaces/ai';
+import { OpenaiServiceTypes } from '~/interfaces/ai';
 import { configManager } from '~/server/service/config-manager';
 import loggerFactory from '~/utils/logger';
 
@@ -8,7 +8,7 @@ const logger = loggerFactory('growi:middlewares:certify-ai-service');
 
 export const certifyAiService = (req: Request, res: Response & { apiv3Err }, next: NextFunction): void => {
   const aiEnabled = configManager.getConfig('crowi', 'app:aiEnabled');
-  const aiServiceType = configManager.getConfig('crowi', 'app:aiServiceType');
+  const openaiServiceType = configManager.getConfig('crowi', 'app:openaiServiceType');
 
   if (!aiEnabled) {
     const message = 'AI_ENABLED is not true';
@@ -16,7 +16,7 @@ export const certifyAiService = (req: Request, res: Response & { apiv3Err }, nex
     return res.apiv3Err(message, 403);
   }
 
-  if (aiServiceType == null || !aiServiceTypes.includes(aiServiceType)) {
+  if (openaiServiceType == null || !OpenaiServiceTypes.includes(openaiServiceType)) {
     const message = 'AI_SERVICE_TYPE is missing or contains an invalid value';
     logger.error(message);
     return res.apiv3Err(message, 403);

+ 1 - 1
apps/app/src/server/service/config-loader.ts

@@ -744,7 +744,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   },
   AI_SERVICE_TYPE: {
     ns: 'crowi',
-    key: 'app:aiServiceType',
+    key: 'app:openaiServiceType',
     type: ValueType.STRING,
     default: null,
   },

+ 5 - 5
apps/app/src/server/service/openai/client-delegator/get-client.ts

@@ -1,20 +1,20 @@
-import { aiServiceType } from '~/interfaces/ai';
+import { OpenaiServiceType } from '~/interfaces/ai';
 
 import { AzureOpenaiClientDelegator } from './azure-openai-client-delegator';
 import type { IOpenaiClientDelegator } from './interfaces';
 import { OpenaiClientDelegator } from './openai-client-delegator';
 
 type GetDelegatorOptions = {
-  aiServiceType: aiServiceType;
+  openaiServiceType: OpenaiServiceType;
 }
-type Delegator<Opts = GetDelegatorOptions> = Opts extends { aiServiceType: 'openai' }
+type Delegator<Opts = GetDelegatorOptions> = Opts extends { openaiServiceType: 'openai' }
   ? OpenaiClientDelegator
-  : Opts extends { aiServiceType: 'azure-openai' }
+  : Opts extends { openaiServiceType: 'azure-openai' }
     ? AzureOpenaiClientDelegator
     : IOpenaiClientDelegator;
 
 export const getClient = (opts: GetDelegatorOptions): Delegator => {
-  if (opts.aiServiceType === aiServiceType.AZURE_OPENAI) {
+  if (opts.openaiServiceType === OpenaiServiceType.AZURE_OPENAI) {
     return new AzureOpenaiClientDelegator();
   }
   return new OpenaiClientDelegator();

+ 2 - 2
apps/app/src/server/service/openai/openai.ts

@@ -23,8 +23,8 @@ class OpenaiService implements IOpenaiService {
   }
 
   private get client() {
-    const aiServiceType = configManager.getConfig('crowi', 'app:aiServiceType');
-    return getClient(aiServiceType);
+    const openaiServiceType = configManager.getConfig('crowi', 'app:openaiServiceType');
+    return getClient(openaiServiceType);
   }
 
   async rebuildVectorStore() {