🚧 chore: merge latest dev build to main repo (#3844)

* agents - phase 1 (#30) * chore: copy assistant files * feat: frontend and data-provider * feat: backend get endpoint test * fix(MessageEndpointIcon): switched to AgentName and AgentAvatar * fix: small fixes * fix: agent endpoint config * fix: show Agent Builder * chore: install agentus * chore: initial scaffolding for agents * fix: updated Assistant logic to Agent Logic for some Agent components * WIP first pass, demo of agent package * WIP: initial backend infra for agents * fix: agent list error * wip: agents routing * chore: Refactor useSSE hook to handle different data events * wip: correctly emit events * chore: Update @librechat/agentus npm dependency to version 1.0.9 * remove comment * first pass: streaming agent text * chore: Remove @librechat/agentus root-level workspace npm dependency * feat: Agent Schema and Model * fix: content handling fixes * fix: content message save * WIP: new content data * fix: run step issue with tool calls * chore: Update @librechat/agentus npm dependency to version 1.1.5 * feat: update controller and agent routes * wip: initial backend tool and tool error handling support * wip: tool chunks * chore: Update @librechat/agentus npm dependency to version 1.1.7 * chore: update tool_call typing, add test conditions and logs * fix: create agent * fix: create agent * first pass: render completed content parts * fix: remove logging, fix step handler typing * chore: Update @librechat/agentus npm dependency to version 1.1.9 * refactor: cleanup maps on unmount * chore: Update BaseClient.js to safely count tokens for string, number, and boolean values * fix: support subsequent messages with tool_calls * chore: export order * fix: select agent * fix: tool call types and handling * chore: switch to anthropic for testing * fix: AgentSelect * refactor: experimental: OpenAIClient to use array for intermediateReply * fix(useSSE): revert old condition for streaming legacy client tokens * fix: lint * revert `agent_id` to `id` * chore: update localization keys for agent-related components * feat: zod schema handling for actions * refactor(actions): if no params, no zodSchema * chore: Update @librechat/agentus npm dependency to version 1.2.1 * feat: first pass, actions * refactor: empty schema for actions without params * feat: Update createRun function to accept additional options * fix: message payload formatting; feat: add more client options * fix: ToolCall component rendering when action has no args but has output * refactor(ToolCall): allow non-stringy args * WIP: first pass, correctly formatted tool_calls between providers * refactor: Remove duplicate import of 'roles' module * refactor: Exclude 'vite.config.ts' from TypeScript compilation * refactor: fix agent related types > - no need to use endpoint/model fields for identifying agent metadata > - add `provider` distinction for agent-configured 'endpoint' - no need for agent-endpoint map - reduce complexity of tools as functions into tools as string[] - fix types related to above changes - reduce unnecessary variables for queries/mutations and corresponding react-query keys * refactor: Add tools and tool_kwargs fields to agent schema * refactor: Remove unused code and update dependencies * refactor: Update updateAgentHandler to use req.body directly * refactor: Update AgentSelect component to use localized hooks * refactor: Update agent schema to include tools and provider fields * refactor(AgentPanel): add scrollbar gutter, add provider field to form, fix agent schema required values * refactor: Update AgentSwitcher component to use selectedAgentId instead of selectedAgent * refactor: Update AgentPanel component to include alternateName import and defaultAgentFormValues * refactor(SelectDropDown): allow setting value as option while still supporting legacy usage (string values only) * refactor: SelectDropdown changes - Only necessary when the available values are objects with label/value fields and the selected value is expected to be a string. * refactor: TypeError issues and handle provider as option * feat: Add placeholder for provider selection in AgentPanel component * refactor: Update agent schema to include author and provider fields * fix: show expected 'create agent' placeholder when creating agent * chore: fix localization strings, hide capabilities form for now * chore: typing * refactor: import order and use compact agents schema for now * chore: typing * refactor: Update AgentForm type to use AgentCapabilities * fix agent form agent selection issues * feat: responsive agent selection * fix: Handle cancelled fetch in useSelectAgent hook * fix: reset agent form on accordion close/open * feat: Add agent_id to default conversation for agents endpoint * feat: agents endpoint request handling * refactor: reset conversation model on agent select * refactor: add `additional_instructions` to conversation schema, organize other fields * chore: casing * chore: types * refactor(loadAgentTools): explicitly pass agent_id, do not pass `model` to loadAgentTools for now, load action sets by agent_id * WIP: initial draft of real agent client initialization * WIP: first pass, anthropic agent requests * feat: remember last selected agent * feat: openai and azure connected * fix: prioritize agent model for runs unless an explicit override model is passed from client * feat: Agent Actions * fix: save agent id to convo * feat: model panel (#29) * feat: model panel * bring back comments * fix: method still null * fix: AgentPanel FormContext * feat: add more parameters * fix: style issues; refactor: Agent Controller * fix: cherry-pick * fix: Update AgentAvatar component to use AssistantIcon instead of BrainCircuit * feat: OGDialog for delete agent; feat(assistant): update Agent types, introduced `model_parameters` * feat: icon and general `model_parameters` update * feat: use react-hook-form better * fix: agent builder form reset issue when switching panels * refactor: modularize agent builder form --------- Co-authored-by: Danny Avila <danny@librechat.ai> * fix: AgentPanel and ModelPanel type issues and use `useFormContext` and `watch` instead of `methods` directly and `useWatch`. * fix: tool call issues due to invalid input (anthropic) of empty string * fix: handle empty text in Part component --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com> * refactor: remove form ModelPanel and fixed nested ternary expressions in AgentConfig * fix: Model Parameters not saved correctly * refactor: remove console log * feat: avatar upload and get for Agents (#36) Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com> * chore: update to public package * fix: typing, optional chaining * fix: cursor not showing for content parts * chore: conditionally enable agents * ci: fix azure test * ci: fix frontend tests, fix eslint api * refactor: Remove unused errorContentPart variable * continue of the agent message PR (#40) * last fixes * fix: agentMap * pr merge test (#41) * fix: model icon not fetching correctly * remove console logs * feat: agent name * refactor: pass documentsMap as a prop to allow re-render of assistant form * refactor: pass documentsMap as a prop to allow re-render of assistant form * chore: Bump version to 0.7.419 * fix: TypeError: Cannot read properties of undefined (reading 'id') * refactor: update AgentSwitcher component to use ControlCombobox instead of Combobox --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
2025-12-17 08:50:15 +01:00 · 2024-08-31 16:33:51 -04:00 · 2024-08-31 16:33:51 -04:00 · a0291ed155
commit a0291ed155
parent 618be4bf2b
141 changed files with 14473 additions and 5714 deletions
--- a/api/server/services/Endpoints/openAI/llm.js
+++ b/api/server/services/Endpoints/openAI/llm.js
@ -0,0 +1,120 @@
+const { HttpsProxyAgent } = require('https-proxy-agent');
+const { sanitizeModelName, constructAzureURL } = require('~/utils');
+const { isEnabled } = require('~/server/utils');
+
+/**
+ * Generates configuration options for creating a language model (LLM) instance.
+ * @param {string} apiKey - The API key for authentication.
+ * @param {Object} options - Additional options for configuring the LLM.
+ * @param {Object} [options.modelOptions] - Model-specific options.
+ * @param {string} [options.modelOptions.model] - The name of the model to use.
+ * @param {number} [options.modelOptions.temperature] - Controls randomness in output generation (0-2).
+ * @param {number} [options.modelOptions.top_p] - Controls diversity via nucleus sampling (0-1).
+ * @param {number} [options.modelOptions.frequency_penalty] - Reduces repetition of token sequences (-2 to 2).
+ * @param {number} [options.modelOptions.presence_penalty] - Encourages discussing new topics (-2 to 2).
+ * @param {number} [options.modelOptions.max_tokens] - The maximum number of tokens to generate.
+ * @param {string[]} [options.modelOptions.stop] - Sequences where the API will stop generating further tokens.
+ * @param {string} [options.reverseProxyUrl] - URL for a reverse proxy, if used.
+ * @param {boolean} [options.useOpenRouter] - Flag to use OpenRouter API.
+ * @param {Object} [options.headers] - Additional headers for API requests.
+ * @param {string} [options.proxy] - Proxy server URL.
+ * @param {Object} [options.azure] - Azure-specific configurations.
+ * @param {boolean} [options.streaming] - Whether to use streaming mode.
+ * @param {Object} [options.addParams] - Additional parameters to add to the model options.
+ * @param {string[]} [options.dropParams] - Parameters to remove from the model options.
+ * @returns {Object} Configuration options for creating an LLM instance.
+ */
+function getLLMConfig(apiKey, options = {}) {
+  const {
+    modelOptions = {},
+    reverseProxyUrl,
+    useOpenRouter,
+    headers,
+    proxy,
+    azure,
+    streaming = true,
+    addParams,
+    dropParams,
+  } = options;
+
+  let llmConfig = {
+    model: 'gpt-4o-mini',
+    streaming,
+  };
+
+  Object.assign(llmConfig, modelOptions);
+
+  if (addParams && typeof addParams === 'object') {
+    Object.assign(llmConfig, addParams);
+  }
+
+  if (dropParams && Array.isArray(dropParams)) {
+    dropParams.forEach((param) => {
+      delete llmConfig[param];
+    });
+  }
+
+  const configOptions = {};
+
+  // Handle OpenRouter or custom reverse proxy
+  if (useOpenRouter || reverseProxyUrl === 'https://openrouter.ai/api/v1') {
+    configOptions.basePath = 'https://openrouter.ai/api/v1';
+    configOptions.baseOptions = {
+      headers: Object.assign(
+        {
+          'HTTP-Referer': 'https://librechat.ai',
+          'X-Title': 'LibreChat',
+        },
+        headers,
+      ),
+    };
+  } else if (reverseProxyUrl) {
+    configOptions.basePath = reverseProxyUrl;
+    if (headers) {
+      configOptions.baseOptions = { headers };
+    }
+  }
+
+  if (proxy) {
+    const proxyAgent = new HttpsProxyAgent(proxy);
+    Object.assign(configOptions, {
+      httpAgent: proxyAgent,
+      httpsAgent: proxyAgent,
+    });
+  }
+
+  if (azure) {
+    const useModelName = isEnabled(process.env.AZURE_USE_MODEL_AS_DEPLOYMENT_NAME);
+    azure.azureOpenAIApiDeploymentName = useModelName
+      ? sanitizeModelName(llmConfig.model)
+      : azure.azureOpenAIApiDeploymentName;
+
+    if (process.env.AZURE_OPENAI_DEFAULT_MODEL) {
+      llmConfig.model = process.env.AZURE_OPENAI_DEFAULT_MODEL;
+    }
+
+    if (configOptions.basePath) {
+      const azureURL = constructAzureURL({
+        baseURL: configOptions.basePath,
+        azureOptions: azure,
+      });
+      azure.azureOpenAIBasePath = azureURL.split(`/${azure.azureOpenAIApiDeploymentName}`)[0];
+    }
+
+    Object.assign(llmConfig, azure);
+    llmConfig.model = llmConfig.azureOpenAIApiDeploymentName;
+  } else {
+    llmConfig.openAIApiKey = apiKey;
+    // Object.assign(llmConfig, {
+    //   configuration: { apiKey },
+    // });
+  }
+
+  if (process.env.OPENAI_ORGANIZATION && this.azure) {
+    llmConfig.organization = process.env.OPENAI_ORGANIZATION;
+  }
+
+  return { llmConfig, configOptions };
+}
+
+module.exports = { getLLMConfig };