Merge branch 'ztjhz:main' into main

huangzt · Apr 5, 2023 · 735c819 · 735c819
2 parents 8805849 + 7e7df20
commit 735c819
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/api/api.ts b/src/api/api.ts
@@ -1,16 +1,20 @@
 import { ShareGPTSubmitBodyInterface } from '@type/api';
 import { ConfigInterface, MessageInterface } from '@type/chat';
+import { isAzureEndpoint } from '@utils/api';
 
 export const getChatCompletion = async (
   endpoint: string,
   messages: MessageInterface[],
   config: ConfigInterface,
-  apiKey?: string
+  apiKey?: string,
+  customHeaders?: Record<string, string>
 ) => {
   const headers: HeadersInit = {
     'Content-Type': 'application/json',
+    ...customHeaders,
   };
   if (apiKey) headers.Authorization = `Bearer ${apiKey}`;
+  if (isAzureEndpoint(endpoint) && apiKey) headers['api-key'] = apiKey;
 
   const response = await fetch(endpoint, {
     method: 'POST',
@@ -31,12 +35,15 @@ export const getChatCompletionStream = async (
   endpoint: string,
   messages: MessageInterface[],
   config: ConfigInterface,
-  apiKey?: string
+  apiKey?: string,
+  customHeaders?: Record<string, string>
 ) => {
   const headers: HeadersInit = {
     'Content-Type': 'application/json',
+    ...customHeaders,
   };
   if (apiKey) headers.Authorization = `Bearer ${apiKey}`;
+  if (isAzureEndpoint(endpoint) && apiKey) headers['api-key'] = apiKey;
 
   const response = await fetch(endpoint, {
     method: 'POST',

diff --git a/src/components/Chat/ChatContent/Message/MessageContent.tsx b/src/components/Chat/ChatContent/Message/MessageContent.tsx
@@ -434,7 +434,7 @@ const EditView = ({
       >
         <textarea
           ref={textareaRef}
-          className='m-0 resize-none rounded-lg bg-transparent overflow-y-hidden focus:ring-0 focus-visible:ring-0 leading-7 w-full'
+          className='m-0 resize-none rounded-lg bg-transparent overflow-y-hidden focus:ring-0 focus-visible:ring-0 leading-7 w-full placeholder:text-gray-500/40'
           onChange={(e) => {
             _setContent(e.target.value);
           }}

diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx
@@ -37,7 +37,7 @@ const Menu = () => {
       >
         <div className='flex h-full min-h-0 flex-col'>
           <div className='flex h-full w-full flex-1 items-start border-white/20'>
-            <nav className='flex h-full flex-1 flex-col space-y-1 p-2'>
+            <nav className='flex h-full flex-1 flex-col space-y-1 px-2 pt-2'>
               <NewChat />
               <ChatHistoryList />
               <MenuOptions />

diff --git a/src/utils/api.ts b/src/utils/api.ts
@@ -0,0 +1,3 @@
+export const isAzureEndpoint = (endpoint: string) => {
+  return endpoint.includes('openai.azure.com');
+};