Просмотр исходного кода

limitLearnablePageCount -> limitLearnablePageCountPerAssistant

Shun Miyazawa 1 год назад
Родитель
Сommit
cc717f3564

+ 3 - 3
apps/app/src/features/openai/client/components/AiAssistant/AiAssistantManagementModal/AiAssistantManagementEditPages.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { ModalBody } from 'reactstrap';
 import { ModalBody } from 'reactstrap';
 
 
 import type { IPageForItem } from '~/interfaces/page';
 import type { IPageForItem } from '~/interfaces/page';
-import { useLimitLearnablePageCount } from '~/stores-universal/context';
+import { useLimitLearnablePageCountPerAssistant } from '~/stores-universal/context';
 import { usePageSelectModal } from '~/stores/modal';
 import { usePageSelectModal } from '~/stores/modal';
 
 
 import type { SelectedPage } from '../../../../interfaces/selected-page';
 import type { SelectedPage } from '../../../../interfaces/selected-page';
@@ -21,7 +21,7 @@ type Props = {
 
 
 export const AiAssistantManagementEditPages = (props: Props): JSX.Element => {
 export const AiAssistantManagementEditPages = (props: Props): JSX.Element => {
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const { data: limitLearnablePageCount } = useLimitLearnablePageCount();
+  const { data: limitLearnablePageCountPerAssistant } = useLimitLearnablePageCountPerAssistant();
 
 
   const { selectedPages, onSelect, onRemove } = props;
   const { selectedPages, onSelect, onRemove } = props;
 
 
@@ -39,7 +39,7 @@ export const AiAssistantManagementEditPages = (props: Props): JSX.Element => {
         <p
         <p
           className="text-secondary py-1"
           className="text-secondary py-1"
           // eslint-disable-next-line react/no-danger
           // eslint-disable-next-line react/no-danger
-          dangerouslySetInnerHTML={{ __html: t('modal_ai_assistant.edit_page_description', { limitLearnablePageCount }) }}
+          dangerouslySetInnerHTML={{ __html: t('modal_ai_assistant.edit_page_description', { limitLearnablePageCountPerAssistant }) }}
         />
         />
 
 
         <button
         <button

+ 3 - 3
apps/app/src/features/openai/client/components/AiAssistant/AiAssistantManagementModal/AiAssistantManagementHome.tsx

@@ -7,7 +7,7 @@ import {
 
 
 import { AiAssistantShareScope, AiAssistantAccessScope } from '~/features/openai/interfaces/ai-assistant';
 import { AiAssistantShareScope, AiAssistantAccessScope } from '~/features/openai/interfaces/ai-assistant';
 import type { PopulatedGrantedGroup } from '~/interfaces/page-grant';
 import type { PopulatedGrantedGroup } from '~/interfaces/page-grant';
-import { useCurrentUser, useLimitLearnablePageCount } from '~/stores-universal/context';
+import { useCurrentUser, useLimitLearnablePageCountPerAssistant } from '~/stores-universal/context';
 
 
 import type { SelectedPage } from '../../../../interfaces/selected-page';
 import type { SelectedPage } from '../../../../interfaces/selected-page';
 import { determineShareScope } from '../../../../utils/determine-share-scope';
 import { determineShareScope } from '../../../../utils/determine-share-scope';
@@ -48,7 +48,7 @@ export const AiAssistantManagementHome = (props: Props): JSX.Element => {
 
 
   const { t } = useTranslation();
   const { t } = useTranslation();
   const { data: currentUser } = useCurrentUser();
   const { data: currentUser } = useCurrentUser();
-  const { data: limitLearnablePageCount } = useLimitLearnablePageCount();
+  const { data: limitLearnablePageCountPerAssistant } = useLimitLearnablePageCountPerAssistant();
   const { close: closeAiAssistantManagementModal, changePageMode } = useAiAssistantManagementModal();
   const { close: closeAiAssistantManagementModal, changePageMode } = useAiAssistantManagementModal();
 
 
   const [isShareScopeWarningModalOpen, setIsShareScopeWarningModalOpen] = useState(false);
   const [isShareScopeWarningModalOpen, setIsShareScopeWarningModalOpen] = useState(false);
@@ -70,7 +70,7 @@ export const AiAssistantManagementHome = (props: Props): JSX.Element => {
       : t(baseLabel);
       : t(baseLabel);
   }, [currentUser?.username, t]);
   }, [currentUser?.username, t]);
 
 
-  const canUpsert = name !== '' && selectedPages.length !== 0 && (limitLearnablePageCount ?? 3000) >= totalSelectedPageCount;
+  const canUpsert = name !== '' && selectedPages.length !== 0 && (limitLearnablePageCountPerAssistant ?? 3000) >= totalSelectedPageCount;
 
 
   const upsertAiAssistantHandler = useCallback(async() => {
   const upsertAiAssistantHandler = useCallback(async() => {
     const shouldWarning = () => {
     const shouldWarning = () => {

+ 2 - 2
apps/app/src/features/openai/server/services/openai.ts

@@ -992,8 +992,8 @@ class OpenaiService implements IOpenaiService {
 
 
     logger.debug('TotalPageCount: ', totalPageCount);
     logger.debug('TotalPageCount: ', totalPageCount);
 
 
-    const limitLearnablePageCount = configManager.getConfig('openai:limitLearnablePageCount');
-    return totalPageCount > limitLearnablePageCount;
+    const limitLearnablePageCountPerAssistant = configManager.getConfig('openai:limitLearnablePageCountPerAssistant');
+    return totalPageCount > limitLearnablePageCountPerAssistant;
   }
   }
 
 
 }
 }

+ 4 - 4
apps/app/src/pages/[[...path]].page.tsx

@@ -46,7 +46,7 @@ import {
   useElasticsearchMaxBodyLengthToIndex,
   useElasticsearchMaxBodyLengthToIndex,
   useIsLocalAccountRegistrationEnabled,
   useIsLocalAccountRegistrationEnabled,
   useIsRomUserAllowedToComment,
   useIsRomUserAllowedToComment,
-  useIsAiEnabled, useLimitLearnablePageCount,
+  useIsAiEnabled, useLimitLearnablePageCountPerAssistant,
 } from '~/stores-universal/context';
 } from '~/stores-universal/context';
 import { useEditingMarkdown } from '~/stores/editor';
 import { useEditingMarkdown } from '~/stores/editor';
 import {
 import {
@@ -195,7 +195,7 @@ type Props = CommonProps & {
   rendererConfig: RendererConfig,
   rendererConfig: RendererConfig,
 
 
   aiEnabled: boolean,
   aiEnabled: boolean,
-  limitLearnablePageCount: number,
+  limitLearnablePageCountPerAssistant: number,
 };
 };
 
 
 const Page: NextPageWithLayout<Props> = (props: Props) => {
 const Page: NextPageWithLayout<Props> = (props: Props) => {
@@ -249,7 +249,7 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
   useIsRomUserAllowedToComment(props.isRomUserAllowedToComment);
   useIsRomUserAllowedToComment(props.isRomUserAllowedToComment);
 
 
   useIsAiEnabled(props.aiEnabled);
   useIsAiEnabled(props.aiEnabled);
-  useLimitLearnablePageCount(props.limitLearnablePageCount);
+  useLimitLearnablePageCountPerAssistant(props.limitLearnablePageCountPerAssistant);
 
 
   const { pageWithMeta } = props;
   const { pageWithMeta } = props;
 
 
@@ -568,7 +568,7 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
   } = crowi;
   } = crowi;
 
 
   props.aiEnabled = configManager.getConfig('app:aiEnabled');
   props.aiEnabled = configManager.getConfig('app:aiEnabled');
-  props.limitLearnablePageCount = configManager.getConfig('openai:limitLearnablePageCount');
+  props.limitLearnablePageCountPerAssistant = configManager.getConfig('openai:limitLearnablePageCountPerAssistant');
 
 
   props.isSearchServiceConfigured = searchService.isConfigured;
   props.isSearchServiceConfigured = searchService.isConfigured;
   props.isSearchServiceReachable = searchService.isReachable;
   props.isSearchServiceReachable = searchService.isReachable;

+ 3 - 3
apps/app/src/server/service/config-manager/config-definition.ts

@@ -260,7 +260,7 @@ export const CONFIG_KEYS = [
   'openai:vectorStoreFileDeletionCronExpression',
   'openai:vectorStoreFileDeletionCronExpression',
   'openai:vectorStoreFileDeletionBarchSize',
   'openai:vectorStoreFileDeletionBarchSize',
   'openai:vectorStoreFileDeletionApiCallInterval',
   'openai:vectorStoreFileDeletionApiCallInterval',
-  'openai:limitLearnablePageCount',
+  'openai:limitLearnablePageCountPerAssistant',
 
 
   // OpenTelemetry Settings
   // OpenTelemetry Settings
   'otel:enabled',
   'otel:enabled',
@@ -1126,8 +1126,8 @@ Guideline as a RAG:
     envVarName: 'OPENAI_SEARCH_ASSISTANT_INSTRUCTIONS',
     envVarName: 'OPENAI_SEARCH_ASSISTANT_INSTRUCTIONS',
     defaultValue: '',
     defaultValue: '',
   }),
   }),
-  'openai:limitLearnablePageCount': defineConfig<number>({
-    envVarName: 'OPENAI_LIMIT_LEARNABLE_PAGE_COUNT',
+  'openai:limitLearnablePageCountPerAssistant': defineConfig<number>({
+    envVarName: 'OPENAI_LIMIT_LEARNABLE_PAGE_COUNT_PER_ASSISTANT',
     defaultValue: 3000,
     defaultValue: 3000,
   }),
   }),
 
 

+ 2 - 2
apps/app/src/stores-universal/context.tsx

@@ -208,8 +208,8 @@ export const useIsAiEnabled = (initialData?: boolean): SWRResponse<boolean, Erro
   return useContextSWR('isAiEnabled', initialData);
   return useContextSWR('isAiEnabled', initialData);
 };
 };
 
 
-export const useLimitLearnablePageCount = (initialData?: number): SWRResponse<number, Error> => {
-  return useContextSWR('limitLearnablePageCount', initialData);
+export const useLimitLearnablePageCountPerAssistant = (initialData?: number): SWRResponse<number, Error> => {
+  return useContextSWR('limitLearnablePageCountPerAssistant', initialData);
 };
 };
 
 
 /** **********************************************************
 /** **********************************************************