Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🔌 fix: Minor Plugins Improvements (#1766)

Danny Avilad2494e6b3b7c
diff --git a/api/app/clients/PluginsClient.js b/api/app/clients/PluginsClient.js
index 6118c3547a..ab04dd133e 100644
--- a/api/app/clients/PluginsClient.js
+++ b/api/app/clients/PluginsClient.js
@@ -30,7 +30,7 @@ class PluginsClient extends OpenAIClient {
super.setOptions(options);
- if (this.functionsAgent && this.agentOptions.model && !this.useOpenRouter) {
+ if (this.functionsAgent && this.agentOptions.model && !this.useOpenRouter && !this.azure) {
this.agentOptions.model = this.getFunctionModelName(this.agentOptions.model);
}
diff --git a/api/app/clients/specs/PluginsClient.test.js b/api/app/clients/specs/PluginsClient.test.js
index b4e42b1fc5..9a4663934f 100644
--- a/api/app/clients/specs/PluginsClient.test.js
+++ b/api/app/clients/specs/PluginsClient.test.js
@@ -2,8 +2,8 @@ const { HumanChatMessage, AIChatMessage } = require('langchain/schema');
const PluginsClient = require('../PluginsClient');
const crypto = require('crypto');
-jest.mock('../../../lib/db/connectDb');
-jest.mock('../../../models/Conversation', () => {
+jest.mock('~/lib/db/connectDb');
+jest.mock('~/models/Conversation', () => {
return function () {
return {
save: jest.fn(),
@@ -12,6 +12,12 @@ jest.mock('../../../models/Conversation', () => {
};
});
+const defaultAzureOptions = {
+ azureOpenAIApiInstanceName: 'your-instance-name',
+ azureOpenAIApiDeploymentName: 'your-deployment-name',
+ azureOpenAIApiVersion: '2020-07-01-preview',
+};
+
describe('PluginsClient', () => {
let TestAgent;
let options = {
@@ -187,4 +193,30 @@ describe('PluginsClient', () => {
expect(client.getFunctionModelName('')).toBe('gpt-3.5-turbo');
});
});
+ describe('Azure OpenAI tests specific to Plugins', () => {
+ // TODO: add more tests for Azure OpenAI integration with Plugins
+ // let client;
+ // beforeEach(() => {
+ // client = new PluginsClient('dummy_api_key');
+ // });
+
+ test('should not call getFunctionModelName when azure options are set', () => {
+ const spy = jest.spyOn(PluginsClient.prototype, 'getFunctionModelName');
+ const model = 'gpt-4-turbo';
+
+ // note, without the azure change in PR #1766, `getFunctionModelName` is called twice
+ const testClient = new PluginsClient('dummy_api_key', {
+ agentOptions: {
+ model,
+ agent: 'functions',
+ },
+ azure: defaultAzureOptions,
+ });
+
+ expect(spy).not.toHaveBeenCalled();
+ expect(testClient.agentOptions.model).toBe(model);
+
+ spy.mockRestore();
+ });
+ });
});
diff --git a/client/src/components/Chat/Messages/Content/Markdown.tsx b/client/src/components/Chat/Messages/Content/Markdown.tsx
index e1d0268b5d..8761e2f8c2 100644
--- a/client/src/components/Chat/Messages/Content/Markdown.tsx
+++ b/client/src/components/Chat/Messages/Content/Markdown.tsx
@@ -72,7 +72,13 @@ const Markdown = memo(({ content, message, showCursor }: TContentProps) => {
if (isInitializing) {
rehypePlugins.pop();
- return <span className="result-thinking" />;
+ return (
+ <div className="absolute">
+ <p className="relative">
+ <span className="result-thinking" />
+ </p>
+ </div>
+ );
}
let isValidIframe: string | boolean | null = false;
diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsx
index 2415259aea..b47fa0c140 100644
--- a/client/src/components/Chat/Messages/Content/MessageContent.tsx
+++ b/client/src/components/Chat/Messages/Content/MessageContent.tsx
@@ -127,7 +127,7 @@ const MessageContent = ({
{showText ? (
<DisplayMessage
key={`display-${messageId}-${idx}`}
- showCursor={isLastIndex && isLast}
+ showCursor={isLastIndex && isLast && isSubmitting}
text={currentText}
{...props}
/>
diff --git a/client/src/components/Messages/Content/Plugin.tsx b/client/src/components/Messages/Content/Plugin.tsx
index ed78c97175..86e6b79bfe 100644
--- a/client/src/components/Messages/Content/Plugin.tsx
+++ b/client/src/components/Messages/Content/Plugin.tsx
@@ -86,7 +86,7 @@ const Plugin: React.FC<PluginProps> = ({ plugin }) => {
<div
className={cn(
plugin.loading ? 'bg-green-100' : 'bg-gray-20',
- 'flex items-center rounded p-3 text-xs text-gray-900',
+ 'my-1 flex items-center rounded p-3 text-xs text-gray-900',
)}
>
<div>
diff --git a/client/src/style.css b/client/src/style.css
index 30e5589507..4f8fcfd49a 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -1815,7 +1815,7 @@ html {
display:block;
height:12px;
position:absolute;
- top:32px;
+ top:-11px;
-webkit-transform:translateZ(0);
transform:translateZ(0);
-webkit-transform-origin:center;