❎ feat: Known Endpoint, xAI (#4632)

* feat: Known Endpoint, xAI * chore: update librechat-data-provider version to 0.7.53 * ci: name property removal * feat: add XAI_API_KEY to example environment variables
danny-avila · Nov 4, 2024 · 3428c3c · 3428c3c
1 parent fc41032
commit 3428c3c
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 12 deletions.
diff --git a/.env.example b/.env.example
@@ -76,6 +76,7 @@ PROXY=
 # SHUTTLEAI_API_KEY=
 # TOGETHERAI_API_KEY=
 # UNIFY_API_KEY=
+# XAI_API_KEY=
 
 #============#
 # Anthropic  #

diff --git a/api/app/clients/ChatGPTClient.js b/api/app/clients/ChatGPTClient.js
@@ -678,7 +678,6 @@ ${botMessage.message}
 
     const instructionsPayload = {
       role: 'system',
-      name: 'instructions',
       content: promptPrefix,
     };
 

diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.js
@@ -553,7 +553,6 @@ class OpenAIClient extends BaseClient {
       promptPrefix = `Instructions:\n${promptPrefix.trim()}`;
       instructions = {
         role: 'system',
-        name: 'instructions',
         content: promptPrefix,
       };
 

diff --git a/api/app/clients/PluginsClient.js b/api/app/clients/PluginsClient.js
@@ -458,7 +458,6 @@ class PluginsClient extends OpenAIClient {
 
     const instructionsPayload = {
       role: 'system',
-      name: 'instructions',
       content: promptPrefix,
     };
 

diff --git a/api/app/clients/specs/OpenAIClient.test.js b/api/app/clients/specs/OpenAIClient.test.js
@@ -446,7 +446,7 @@ describe('OpenAIClient', () => {
         promptPrefix: 'Test Prefix',
       });
       expect(result).toHaveProperty('prompt');
-      const instructions = result.prompt.find((item) => item.name === 'instructions');
+      const instructions = result.prompt.find((item) => item.content.includes('Test Prefix'));
       expect(instructions).toBeDefined();
       expect(instructions.content).toContain('Test Prefix');
     });
@@ -476,15 +476,17 @@ describe('OpenAIClient', () => {
       const result = await client.buildMessages(messages, parentMessageId, {
         isChatCompletion: true,
       });
-      const instructions = result.prompt.find((item) => item.name === 'instructions');
+      const instructions = result.prompt.find((item) =>
+        item.content.includes('Test Prefix from options'),
+      );
       expect(instructions.content).toContain('Test Prefix from options');
     });
 
     it('should handle case when neither promptPrefix argument nor options.promptPrefix is set', async () => {
       const result = await client.buildMessages(messages, parentMessageId, {
         isChatCompletion: true,
       });
-      const instructions = result.prompt.find((item) => item.name === 'instructions');
+      const instructions = result.prompt.find((item) => item.content.includes('Test Prefix'));
       expect(instructions).toBeUndefined();
     });
 

diff --git a/client/public/assets/xai.svg b/client/public/assets/xai.svg
diff --git a/client/src/components/Chat/Menus/Endpoints/UnknownIcon.tsx b/client/src/components/Chat/Menus/Endpoints/UnknownIcon.tsx
@@ -1,6 +1,7 @@
 import { EModelEndpoint, KnownEndpoints } from 'librechat-data-provider';
 import { CustomMinimalIcon } from '~/components/svg';
 import { IconContext } from '~/common';
+import { cn } from '~/utils';
 
 const knownEndpointAssets = {
   [KnownEndpoints.anyscale]: '/assets/anyscale.png',
@@ -18,12 +19,19 @@ const knownEndpointAssets = {
   [KnownEndpoints.shuttleai]: '/assets/shuttleai.png',
   [KnownEndpoints['together.ai']]: '/assets/together.png',
   [KnownEndpoints.unify]: '/assets/unify.webp',
+  [KnownEndpoints.xai]: '/assets/xai.svg',
 };
 
 const knownEndpointClasses = {
   [KnownEndpoints.cohere]: {
     [IconContext.landing]: 'p-2',
   },
+  [KnownEndpoints.xai]: {
+    [IconContext.landing]: 'p-2',
+    [IconContext.menuItem]: 'bg-white',
+    [IconContext.message]: 'bg-white',
+    [IconContext.nav]: 'bg-white',
+  },
 };
 
 const getKnownClass = ({
@@ -39,10 +47,10 @@ const getKnownClass = ({
     return className;
   }
 
-  const match = knownEndpointClasses[currentEndpoint]?.[context];
+  const match = knownEndpointClasses[currentEndpoint]?.[context] ?? '';
   const defaultClass = context === IconContext.landing ? '' : className;
 
-  return match ?? defaultClass;
+  return cn(match, defaultClass);
 };
 
 export default function UnknownIcon({
@@ -61,7 +69,6 @@ export default function UnknownIcon({
     return <CustomMinimalIcon className={className} />;
   }
 
-  console.log('UnknownIcon', endpoint);
   const currentEndpoint = endpoint.toLowerCase();
 
   if (iconURL) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/data-provider/package.json b/packages/data-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.7.52",
+  "version": "0.7.53",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
@@ -550,6 +550,7 @@ export enum KnownEndpoints {
   shuttleai = 'shuttleai',
   'together.ai' = 'together.ai',
   unify = 'unify',
+  xai = 'xai',
 }
 
 export enum FetchTokenConfig {
@@ -584,7 +585,8 @@ export const alternateName = {
   [EModelEndpoint.anthropic]: 'Anthropic',
   [EModelEndpoint.custom]: 'Custom',
   [EModelEndpoint.bedrock]: 'AWS Bedrock',
-  ollama: 'Ollama',
+  [KnownEndpoints.ollama]: 'Ollama',
+  [KnownEndpoints.xai]: 'xAI',
 };
 
 const sharedOpenAIModels = [