Skip to content

Commit

Permalink
πŸ”ƒ refactor: Parent Message ID Handling on Error, Update Translations,…
Browse files Browse the repository at this point in the history
… Bump Agents (danny-avila#5833)

* πŸ“¦ chore: Update @librechat/agents to version 2.0.5

* fix: Update error handling in AskController and EditController to include overrideParentMessageId when catching errors

* fix: Update parentMessageId assignment in AgentController to prioritize overrideParentMessageId

* 🌍 i18n: Update translation.json with latest translations

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
danny-avila and github-actions[bot] authored Feb 12, 2025
1 parent 7f48030 commit 4fa13f4
Show file tree
Hide file tree
Showing 25 changed files with 10,570 additions and 11,969 deletions.
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@langchain/google-genai": "^0.1.7",
"@langchain/google-vertexai": "^0.1.8",
"@langchain/textsplitters": "^0.1.0",
"@librechat/agents": "^2.0.4",
"@librechat/agents": "^2.0.5",
"@waylaidwanderer/fetch-event-source": "^3.0.1",
"axios": "1.7.8",
"bcryptjs": "^2.4.3",
Expand Down
4 changes: 2 additions & 2 deletions api/server/controllers/AskController.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
} catch (error) {
const partialText = getText && getText();
handleAbortError(res, req, error, {
sender,
partialText,
conversationId,
sender,
messageId: responseMessageId,
parentMessageId: userMessageId ?? parentMessageId,
parentMessageId: overrideParentMessageId ?? userMessageId ?? parentMessageId,
}).catch((err) => {
logger.error('[AskController] Error in `handleAbortError`', err);
});
Expand Down
4 changes: 2 additions & 2 deletions api/server/controllers/EditController.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ const EditController = async (req, res, next, initializeClient) => {
} catch (error) {
const partialText = getText();
handleAbortError(res, req, error, {
sender,
partialText,
conversationId,
sender,
messageId: responseMessageId,
parentMessageId: userMessageId ?? parentMessageId,
parentMessageId: overrideParentMessageId ?? userMessageId ?? parentMessageId,
}).catch((err) => {
logger.error('[EditController] Error in `handleAbortError`', err);
});
Expand Down
2 changes: 1 addition & 1 deletion api/server/controllers/agents/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
conversationId,
sender,
messageId: responseMessageId,
parentMessageId: userMessageId ?? parentMessageId,
parentMessageId: overrideParentMessageId ?? userMessageId ?? parentMessageId,
}).catch((err) => {
logger.error('[api/server/controllers/agents/request] Error in `handleAbortError`', err);
});
Expand Down
83 changes: 0 additions & 83 deletions client/src/locales/ar/translation.json

Large diffs are not rendered by default.

83 changes: 0 additions & 83 deletions client/src/locales/de/translation.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions client/src/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"com_ui_analyzing": "Analyzing",
"com_ui_analyzing_finished": "Finished analyzing",
"chat_direction_left_to_right": "something needs to go here. was empty",
"chat_direction_right_to_left": "something needs to go here. was empty",
"com_a11y_ai_composing": "The AI is still composing.",
"com_a11y_end": "The AI has finished their reply.",
"com_a11y_start": "The AI has started their reply.",
Expand Down Expand Up @@ -215,6 +215,7 @@
"com_endpoint_plug_use_functions": "Use Functions",
"com_endpoint_presence_penalty": "Presence Penalty",
"com_endpoint_preset": "preset",
"com_endpoint_preset_custom_name_placeholder": "something needs to go here. was empty",
"com_endpoint_preset_default": "is now the default preset.",
"com_endpoint_preset_default_item": "Default:",
"com_endpoint_preset_default_none": "No default preset active.",
Expand All @@ -224,7 +225,6 @@
"com_endpoint_preset_import": "Preset Imported!",
"com_endpoint_preset_import_error": "There was an error importing your preset. Please try again.",
"com_endpoint_preset_name": "Preset Name",
"com_endpoint_preset_custom_name_placeholder": "something needs to go here. was empty",
"com_endpoint_preset_save_error": "There was an error saving your preset. Please try again.",
"com_endpoint_preset_selected": "Preset Active!",
"com_endpoint_preset_selected_title": "Active!",
Expand Down Expand Up @@ -263,6 +263,7 @@
"com_files_filter": "Filter files...",
"com_files_no_results": "No results.",
"com_files_number_selected": "{{0}} of {{1}} items(s) selected",
"com_files_table": "something needs to go here. was empty",
"com_generated_files": "Generated files:",
"com_hide_examples": "Hide Examples",
"com_nav_account_settings": "Account Settings",
Expand Down Expand Up @@ -455,6 +456,8 @@
"com_ui_agents_allow_use": "Allow using Agents",
"com_ui_all": "all",
"com_ui_all_proper": "All",
"com_ui_analyzing": "Analyzing",
"com_ui_analyzing_finished": "Finished analyzing",
"com_ui_api_key": "API Key",
"com_ui_archive": "Archive",
"com_ui_archive_error": "Failed to archive conversation",
Expand All @@ -479,6 +482,7 @@
"com_ui_authentication": "Authentication",
"com_ui_authentication_type": "Authentication Type",
"com_ui_avatar": "Avatar",
"com_ui_azure": "Azure",
"com_ui_back_to_chat": "Back to Chat",
"com_ui_back_to_prompts": "Back to Prompts",
"com_ui_basic": "Basic",
Expand Down Expand Up @@ -618,13 +622,12 @@
"com_ui_fork_split_target_setting": "Start fork from target message by default",
"com_ui_fork_success": "Successfully forked conversation",
"com_ui_fork_visible": "Visible messages only",
"com_ui_global_group": "something needs to go here. was empty",
"com_ui_go_back": "Go back",
"com_ui_go_to_conversation": "Go to conversation",
"com_ui_happy_birthday": "It's my 1st birthday!",
"com_ui_hide_qr": "Hide QR Code",
"com_ui_host": "Host",
"com_ui_azure": "Azure",
"com_ui_openai": "OpenAI",
"com_ui_image_gen": "Image Gen",
"com_ui_import_conversation": "Import",
"com_ui_import_conversation_error": "There was an error importing your conversations",
Expand Down Expand Up @@ -660,14 +663,17 @@
"com_ui_no_bookmarks": "it seems like you have no bookmarks yet. Click on a chat and add a new one",
"com_ui_no_category": "No category",
"com_ui_no_changes": "No changes to update",
"com_ui_no_data": "something needs to go here. was empty",
"com_ui_no_terms_content": "No terms and conditions content to display",
"com_ui_no_valid_items": "something needs to go here. was empty",
"com_ui_none": "None",
"com_ui_none_selected": "None selected",
"com_ui_nothing_found": "Nothing found",
"com_ui_oauth": "OAuth",
"com_ui_of": "of",
"com_ui_off": "Off",
"com_ui_on": "On",
"com_ui_openai": "OpenAI",
"com_ui_page": "Page",
"com_ui_prev": "Prev",
"com_ui_preview": "Preview",
Expand Down Expand Up @@ -778,11 +784,5 @@
"com_ui_yes": "Yes",
"com_ui_zoom": "Zoom",
"com_user_message": "You",
"com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint.",
"com_ui_no_data": "something needs to go here. was empty",
"com_files_table": "something needs to go here. was empty",
"com_ui_global_group": "something needs to go here. was empty",
"com_ui_no_valid_items": "something needs to go here. was empty",
"chat_direction_left_to_right": "something needs to go here. was empty",
"chat_direction_right_to_left": "something needs to go here. was empty"
}
"com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint."
}
Loading

0 comments on commit 4fa13f4

Please sign in to comment.