Merge branch 'main' into feat/openid-custom-data

.env.example

@@ -389,6 +389,9 @@ FACEBOOK_CALLBACK_URL=/oauth/facebook/callback
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 GITHUB_CALLBACK_URL=/oauth/github/callback
+# GitHub Eenterprise
+# GITHUB_ENTERPRISE_BASE_URL=
+# GITHUB_ENTERPRISE_USER_AGENT=
 
 # Google
 GOOGLE_CLIENT_ID=

api/app/clients/OpenAIClient.js

@@ -1282,6 +1282,7 @@ ${convo}
       if (
         this.isOmni === true &&
         (this.azure || /o1(?!-(?:mini|preview)).*$/.test(modelOptions.model)) &&
+        !/o3-.*$/.test(this.modelOptions.model) &&
         modelOptions.stream
       ) {
         delete modelOptions.stream;

api/server/services/ModelService.js

@@ -159,8 +159,9 @@ const fetchOpenAIModels = async (opts, _models = []) => {
   }
 
   if (baseURL === openaiBaseURL) {
-    const regex = /(text-davinci-003|gpt-|o1-)/;
-    models = models.filter((model) => regex.test(model));
+    const regex = /(text-davinci-003|gpt-|o\d+-)/;
+    const excludeRegex = /audio|realtime/;
+    models = models.filter((model) => regex.test(model) && !excludeRegex.test(model));
     const instructModels = models.filter((model) => model.includes('instruct'));
     const otherModels = models.filter((model) => !model.includes('instruct'));
     models = otherModels.concat(instructModels);

api/server/services/ToolService.js

@@ -101,6 +101,17 @@ function loadAndFormatTools({ directory, adminFilter = [], adminIncluded = [] })
   const basicToolInstances = [new Calculator(), ...createYouTubeTools({ override: true })];
   for (const toolInstance of basicToolInstances) {
     const formattedTool = formatToOpenAIAssistantTool(toolInstance);
+    let toolName = formattedTool[Tools.function].name;
+    toolName = toolkits.some((toolkit) => toolName.startsWith(toolkit.pluginKey))
+      ? toolName.split('_')[0]
+      : toolName;
+    if (filter.has(toolName) && included.size === 0) {
+      continue;
+    }
+
+    if (included.size > 0 && !included.has(toolName)) {
+      continue;
+    }
     tools.push(formattedTool);
   }
 

api/server/socialLogins.js

@@ -64,4 +64,4 @@ const configureSocialLogins = (app) => {
   }
 };
 
-module.exports = configureSocialLogins;
+module.exports = configureSocialLogins;

api/strategies/githubStrategy.js

@@ -20,6 +20,15 @@ module.exports = () =>
       callbackURL: `${process.env.DOMAIN_SERVER}${process.env.GITHUB_CALLBACK_URL}`,
       proxy: false,
       scope: ['user:email'],
+      ...(process.env.GITHUB_ENTERPRISE_BASE_URL && {
+        authorizationURL: `${process.env.GITHUB_ENTERPRISE_BASE_URL}/login/oauth/authorize`,
+        tokenURL: `${process.env.GITHUB_ENTERPRISE_BASE_URL}/login/oauth/access_token`,
+        userProfileURL: `${process.env.GITHUB_ENTERPRISE_BASE_URL}/api/v3/user`,
+        userEmailURL: `${process.env.GITHUB_ENTERPRISE_BASE_URL}/api/v3/user/emails`,
+        ...(process.env.GITHUB_ENTERPRISE_USER_AGENT && {
+          userAgent: process.env.GITHUB_ENTERPRISE_USER_AGENT,
+        }),
+      }),
     },
     githubLogin,
   );

api/strategies/index.js

@@ -18,4 +18,4 @@ module.exports = {
   facebookLogin,
   setupOpenId,
   ldapLogin,
-};
+};