Merge branch 'main' of https://github.com/danny-avila/LibreChat into …

…main
danny-avila · danny-avila · Jul 24, 2023 · Jun 27, 2023 · Jun 27, 2023 · Jun 27, 2023
commit c5f9da253d6818f18c391e4621fd1fa05ad94e6c
diff --git a/client/src/components/Endpoints/Google/Settings.jsx b/client/src/components/Endpoints/Google/Settings.jsx
@@ -144,7 +144,7 @@ function Settings(props) {
                 <HoverCardTrigger className="grid w-full items-center gap-2">
                   <div className="flex justify-between">
                     <Label htmlFor="top-p-int" className="text-left text-sm font-medium">
-                      {localize(lang, 'com_endpoint_top_p')} <small className="opacity-40">({localize(lang, 'com_endpoint_default')}: 0.95)</small>
+                      {localize(lang, 'com_endpoint_top_p')} <small className="opacity-40">({localize(lang, 'com_endpoint_default_with_num', 0.95)})</small>
                     </Label>
                     <InputNumber
                       id="top-p-int"
@@ -182,7 +182,7 @@ function Settings(props) {
                 <HoverCardTrigger className="grid w-full items-center gap-2">
                   <div className="flex justify-between">
                     <Label htmlFor="top-k-int" className="text-left text-sm font-medium">
-                      {localize(lang, 'com_endpoint_top_k')} <small className="opacity-40">({localize(lang, 'com_endpoint_default')}: 40)</small>
+                      {localize(lang, 'com_endpoint_top_k')} <small className="opacity-40">({localize(lang, 'com_endpoint_default_with_num', 40)})</small>
                     </Label>
                     <InputNumber
                       id="top-k-int"
@@ -221,7 +221,7 @@ function Settings(props) {
             <HoverCardTrigger className="grid w-full items-center gap-2">
               <div className="flex justify-between">
                 <Label htmlFor="max-tokens-int" className="text-left text-sm font-medium">
-                  {localize(lang, 'com_endpoint_max_ooutput_tokens')} <small className="opacity-40">(({localize(lang, 'com_endpoint_default')}: 1024)</small>
+                  {localize(lang, 'com_endpoint_max_output_tokens')} <small className="opacity-40">({localize(lang, 'com_endpoint_default_with_num', 1024)})</small>
                 </Label>
                 <InputNumber
                   id="max-tokens-int"

diff --git a/client/src/components/Endpoints/OpenAI/OptionHover.jsx b/client/src/components/Endpoints/OpenAI/OptionHover.jsx
@@ -13,10 +13,6 @@ const types = {
 };
 
 function OptionHover({ type, side }) {
-  // const options = {};
-  // if (type === 'pres') {
-  //   options.sideOffset = 45;
-  // }
   const lang = useRecoilValue(store.lang);
 
   return (

diff --git a/client/src/components/Endpoints/OpenAI/Settings.jsx b/client/src/components/Endpoints/OpenAI/Settings.jsx
@@ -107,7 +107,7 @@ function Settings(props) {
                 <Label htmlFor="temp-int" className="text-left text-sm font-medium">
                   {localize(lang, 'com_endpoint_temperature')}{' '}
                   <small className="opacity-40">
-                    ({localize(lang, 'com_endpoint_default')}: {isOpenAI ? '1' : '0'})
+                    ({localize(lang, 'com_endpoint_default_with_num', isOpenAI ? '1' : '0')})
                   </small>
                 </Label>
                 <InputNumber

diff --git a/client/src/components/Endpoints/Plugins/Settings.jsx b/client/src/components/Endpoints/Plugins/Settings.jsx
@@ -70,7 +70,8 @@ function Settings(props) {
           <>
             <div className="grid w-full items-center gap-2">
               <Label htmlFor="chatGptLabel" className="text-left text-sm font-medium">
-                {localize(lang, 'com_endpoint_custom_name')} <small className="opacity-40">({localize(lang, 'com_endpoint_default_empty')} | {localize(lang, 'com_endpoint_disabled_with_tools')})</small>
+                {localize(lang, 'com_endpoint_custom_name')}{' '}
+                <small className="opacity-40">({localize(lang, 'com_endpoint_default_empty')} | {localize(lang, 'com_endpoint_disabled_with_tools')})</small>
               </Label>
               <Input
                 id="chatGptLabel"
@@ -90,7 +91,8 @@ function Settings(props) {
             </div>
             <div className="grid w-full items-center gap-2">
               <Label htmlFor="promptPrefix" className="text-left text-sm font-medium">
-                {localize(lang, 'com_endpoint_prompt_prefix')} <small className="opacity-40">({localize(lang, 'com_endpoint_default_empty')} | {localize(lang, 'com_endpoint_disabled_with_tools')})</small>
+                {localize(lang, 'com_endpoint_prompt_prefix')}{' '}
+                <small className="opacity-40">({localize(lang, 'com_endpoint_default_empty')} | {localize(lang, 'com_endpoint_disabled_with_tools')})</small>
               </Label>
               <TextareaAutosize
                 id="promptPrefix"

diff --git a/client/src/localization/Translation.tsx b/client/src/localization/Translation.tsx
@@ -46,4 +46,4 @@ export const localize = (langCode: string, phraseKey: string, ...values: string[
 
   // Fall back logic to cover untranslated phrases
   return English[phraseKey].format(...values);
-};
+};
diff --git a/client/src/localization/languages/Eng.tsx b/client/src/localization/languages/Eng.tsx
@@ -105,22 +105,22 @@ export default {
   com_endpoint_default: 'default',
   com_endpoint_top_p: 'Top P',
   com_endpoint_top_k: 'Top K',
-  com_endpoint_max_ooutput_tokens: 'Max Output Tokens',
+  com_endpoint_max_output_tokens: 'Max Output Tokens',
   com_endpoint_openai_temp: 'Higher values = more random, while lower values = more focused and deterministic. We recommend altering this or Top P but not both.',
   com_endpoint_openai_max: "The max tokens to generate. The total length of input tokens and generated tokens is limited by the model's context length.",
   com_endpoint_openai_topp: 'An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. We recommend altering this or temperature but not both.',
   com_endpoint_openai_freq: "Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim.",
   com_endpoint_openai_pres: "Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics.",
   com_endpoint_openai_custom_name_placeholder: 'Set a custom name for ChatGPT',
-  com_endpoint_openai_prompt_prefix_placeholder: "Set custom instructions. Defaults to: 'You are ChatGPT, a large language model trained by OpenAI.'",
+  com_endpoint_openai_prompt_prefix_placeholder: 'Set custom instructions to include in System Message. Default: none',
   com_endpoint_frequency_penalty: 'Frequency Penalty',
   com_endpoint_presence_penalty: 'Presence Penalty',
   com_endpoint_plug_use_functions: 'Use Functions',
   com_endpoint_plug_skip_completion: 'Skip Completion',
   com_endpoint_disabled_with_tools: 'disabled with tools',
   com_endpoint_disabled_with_tools_placeholder: 'Disabled with Tools Selected',
   com_endpoint_plug_set_custom_name_for_gpt_placeholder: 'Set a custom name for ChatGPT.',
-  com_endpoint_plug_set_custom_instructions_for_gpt_placeholder: "Set custom instructions. Defaults to: 'You are ChatGPT, a large language model trained by OpenAI.'",
+  com_endpoint_plug_set_custom_instructions_for_gpt_placeholder: "Set custom instructions to include in System Message. Default: none",
   com_endpoint_set_custom_name: 'Set a custom name, in case you can find this preset',
   com_endpoint_preset_name: 'Preset Name',
   com_endpoint: 'Endpoint',
-Original file line number
+Diff line change
@@ Expand Up @@
       // Fall back logic to cover untranslated phrases
       return English[phraseKey].format(...values);
-    };
+    };