From ca91d3697904d8551c0c3725b6daac1d4f52e20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:01:07 +0000 Subject: [PATCH 01/35] build(deps): bump pydantic from 2.10.4 to 2.10.6 in /application Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.4 to 2.10.6. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.10.4...v2.10.6) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- application/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/requirements.txt b/application/requirements.txt index 5732809b..426f4d49 100644 --- a/application/requirements.txt +++ b/application/requirements.txt @@ -62,7 +62,7 @@ prompt-toolkit==3.0.48 protobuf==5.29.3 psycopg2-binary==2.9.10 py==1.11.0 -pydantic==2.10.4 +pydantic==2.10.6 pydantic-core==2.27.2 pydantic-settings==2.7.1 pymongo==4.10.1 From 307c2e1682153bcce32c35878514c8a1346b5173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 14:49:26 +0000 Subject: [PATCH 02/35] build(deps): bump openapi-schema-validator in /application Bumps [openapi-schema-validator](https://github.com/python-openapi/openapi-schema-validator) from 0.6.2 to 0.6.3. - [Release notes](https://github.com/python-openapi/openapi-schema-validator/releases) - [Commits](https://github.com/python-openapi/openapi-schema-validator/compare/0.6.2...0.6.3) --- updated-dependencies: - dependency-name: openapi-schema-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- application/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/requirements.txt b/application/requirements.txt index 1707ad80..cc986daf 100644 --- a/application/requirements.txt +++ b/application/requirements.txt @@ -46,7 +46,7 @@ mypy-extensions==1.0.0 networkx==3.4.2 numpy==2.2.1 openai==1.59.5 -openapi-schema-validator==0.6.2 +openapi-schema-validator==0.6.3 openapi-spec-validator==0.6.0 openapi3-parser==1.1.19 orjson==3.10.14 From e1da69040d3589bcf1f37fe0b46b65901b97868c Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Wed, 19 Feb 2025 16:44:35 +0530 Subject: [PATCH 03/35] (fix/merge error) tool config modal --- frontend/src/modals/ConfigToolModal.tsx | 39 ------------------------- 1 file changed, 39 deletions(-) diff --git a/frontend/src/modals/ConfigToolModal.tsx b/frontend/src/modals/ConfigToolModal.tsx index 0e443ac7..04553677 100644 --- a/frontend/src/modals/ConfigToolModal.tsx +++ b/frontend/src/modals/ConfigToolModal.tsx @@ -77,45 +77,6 @@ export default function ConfigToolModal({ > {t('modals.configTool.closeButton')} -
-

- {t('modals.configTool.title')} -

-

- {t('modals.configTool.type')}:{' '} - {tool?.name} -

-
- - {t('modals.configTool.apiKeyLabel')} - - setAuthKey(e.target.value)} - borderVariant="thin" - placeholder={t('modals.configTool.apiKeyPlaceholder')} - > -
-
- - -
-
From 3cfb1abf6294252d244fcfb78575dee3c7d68334 Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Wed, 19 Feb 2025 16:55:36 +0530 Subject: [PATCH 04/35] (fix/merge) revert dropdown skeletons --- frontend/src/settings/Analytics.tsx | 65 +++++++++++++----------- frontend/src/settings/Logs.tsx | 78 +++++++++++++++-------------- 2 files changed, 76 insertions(+), 67 deletions(-) diff --git a/frontend/src/settings/Analytics.tsx b/frontend/src/settings/Analytics.tsx index 89f8010d..53538833 100644 --- a/frontend/src/settings/Analytics.tsx +++ b/frontend/src/settings/Analytics.tsx @@ -192,36 +192,41 @@ export default function Analytics() { return (
-
-

- {t('settings.analytics.filterByChatbot')} -

- ({ - label: chatbot.name, - value: chatbot.id, - })), - { label: t('settings.analytics.none'), value: '' }, - ]} - placeholder={t('settings.analytics.selectChatbot')} - onSelect={(chatbot: { label: string; value: string }) => { - setSelectedChatbot( - chatbots.find((item) => item.id === chatbot.value), - ); - }} - selectedValue={ - (selectedChatbot && { - label: selectedChatbot.name, - value: selectedChatbot.id, - }) || - null - } - rounded="3xl" - border="border" - /> -
+ {loadingChatbots ? ( + + ) : ( +
+

+ {t('settings.analytics.filterByChatbot')} +

+ ({ + label: chatbot.name, + value: chatbot.id, + })), + { label: t('settings.analytics.none'), value: '' }, + ]} + placeholder={t('settings.analytics.selectChatbot')} + onSelect={(chatbot: { label: string; value: string }) => { + setSelectedChatbot( + chatbots.find((item) => item.id === chatbot.value), + ); + }} + selectedValue={ + (selectedChatbot && { + label: selectedChatbot.name, + value: selectedChatbot.id, + }) || + null + } + rounded="3xl" + border="border" + borderColor="gray-700" + /> +
+ )} {/* Messages Analytics */}
diff --git a/frontend/src/settings/Logs.tsx b/frontend/src/settings/Logs.tsx index 4066f69c..970df332 100644 --- a/frontend/src/settings/Logs.tsx +++ b/frontend/src/settings/Logs.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useEffect, useRef, useState } from 'react'; +import React, { useState, useEffect, useRef, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import userService from '../api/services/userService'; @@ -67,42 +67,46 @@ export default function Logs() { return (
-
- - ({ - label: chatbot.name, - value: chatbot.id, - })), - { label: t('settings.logs.none'), value: '' }, - ]} - placeholder={t('settings.logs.selectChatbot')} - onSelect={(chatbot: { label: string; value: string }) => { - setSelectedChatbot( - chatbots.find((item) => item.id === chatbot.value), - ); - setLogs([]); - setPage(1); - setHasMore(true); - }} - selectedValue={ - (selectedChatbot && { - label: selectedChatbot.name, - value: selectedChatbot.id, - }) || - null - } - rounded="3xl" - border="border" - /> -
+ {loadingChatbots ? ( + + ) : ( +
+ + ({ + label: chatbot.name, + value: chatbot.id, + })), + { label: t('settings.logs.none'), value: '' }, + ]} + placeholder={t('settings.logs.selectChatbot')} + onSelect={(chatbot: { label: string; value: string }) => { + setSelectedChatbot( + chatbots.find((item) => item.id === chatbot.value), + ); + setLogs([]); + setPage(1); + setHasMore(true); + }} + selectedValue={ + (selectedChatbot && { + label: selectedChatbot.name, + value: selectedChatbot.id, + }) || + null + } + rounded="3xl" + border="border" + /> +
+ )}
From 006aeeebb09a9b4f271b2c58531e9aea3bde31f7 Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Wed, 19 Feb 2025 16:56:15 +0530 Subject: [PATCH 05/35] (fix:typo) copy --- frontend/src/settings/Logs.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/settings/Logs.tsx b/frontend/src/settings/Logs.tsx index 970df332..49a2e7a5 100644 --- a/frontend/src/settings/Logs.tsx +++ b/frontend/src/settings/Logs.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import userService from '../api/services/userService'; import ChevronRight from '../assets/chevron-right.svg'; -import CoppyButton from '../components/CopyButton'; +import CopyButton from '../components/CopyButton'; import Dropdown from '../components/Dropdown'; import SkeletonLoader from '../components/SkeletonLoader'; import { useLoaderState } from '../hooks'; @@ -193,7 +193,7 @@ function Log({ log }: { log: LogData }) { {JSON.stringify(filteredLog, null, 2)}

- From b22d965b7b63557da16514eee1b56d6072c9e0ad Mon Sep 17 00:00:00 2001 From: ManishMadan2882 Date: Thu, 20 Feb 2025 01:39:25 +0530 Subject: [PATCH 06/35] (fix:chatbots) ui --- frontend/src/locale/en.json | 3 +- frontend/src/locale/es.json | 3 +- frontend/src/locale/jp.json | 3 +- frontend/src/locale/ru.json | 3 +- frontend/src/locale/zh-TW.json | 3 +- frontend/src/locale/zh.json | 3 +- frontend/src/settings/APIKeys.tsx | 148 ++++++++++++++-------------- frontend/src/settings/Documents.tsx | 14 ++- 8 files changed, 97 insertions(+), 83 deletions(-) diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json index df7895ed..1081ddf0 100644 --- a/frontend/src/locale/en.json +++ b/frontend/src/locale/en.json @@ -81,7 +81,8 @@ "sourceDoc": "Source Document", "createNew": "Create New", "noData": "No existing Chatbots", - "deleteConfirmation": "Are you sure you want to delete the API key '{{name}}'?" + "deleteConfirmation": "Are you sure you want to delete the API key '{{name}}'?", + "description": "Here you can create and manage your chatbots. Chatbots can be deployed to websites as widgets or used inside your applications." }, "analytics": { "label": "Analytics", diff --git a/frontend/src/locale/es.json b/frontend/src/locale/es.json index 123f9fdd..e699a3c6 100644 --- a/frontend/src/locale/es.json +++ b/frontend/src/locale/es.json @@ -81,7 +81,8 @@ "sourceDoc": "Documento Fuente", "createNew": "Crear Nuevo", "noData": "No hay chatbots existentes", - "deleteConfirmation": "¿Estás seguro de que quieres eliminar la clave API '{{name}}'?" + "deleteConfirmation": "¿Estás seguro de que quieres eliminar la clave API '{{name}}'?", + "description": "Aquí puede crear y gestionar sus chatbots. Los chatbots se pueden implementar en sitios web como widgets o utilizarse dentro de sus aplicaciones." }, "analytics": { "label": "Analítica", diff --git a/frontend/src/locale/jp.json b/frontend/src/locale/jp.json index b4cd1531..7c716135 100644 --- a/frontend/src/locale/jp.json +++ b/frontend/src/locale/jp.json @@ -80,7 +80,8 @@ "sourceDoc": "ソースドキュメント", "createNew": "新規作成", "noData": "既存のチャットボットはありません", - "deleteConfirmation": "APIキー '{{name}}' を削除してもよろしいですか？" + "deleteConfirmation": "APIキー '{{name}}' を削除してもよろしいですか？", + "description": "ここでチャットボットを作成・管理できます。チャットボットはウィジェットとしてウェブサイトに導入したり、アプリケーション内で使用したりすることができます。" }, "analytics": { "label": "分析", diff --git a/frontend/src/locale/ru.json b/frontend/src/locale/ru.json index d6bc2bdf..3ec75bfb 100644 --- a/frontend/src/locale/ru.json +++ b/frontend/src/locale/ru.json @@ -81,7 +81,8 @@ "sourceDoc": "Источник документа", "createNew": "Создать новый", "noData": "Нет существующих чатботов", - "deleteConfirmation": "Вы уверены, что хотите удалить API ключ '{{name}}'?" + "deleteConfirmation": "Вы уверены, что хотите удалить API ключ '{{name}}'?", + "description": "Здесь вы можете создавать и управлять чат-ботами. Чат-боты могут быть развернуты на веб-сайтах в виде виджетов или использоваться внутри ваших приложений." }, "analytics": { "label": "Аналитика", diff --git a/frontend/src/locale/zh-TW.json b/frontend/src/locale/zh-TW.json index 8eef9e56..eb0240a0 100644 --- a/frontend/src/locale/zh-TW.json +++ b/frontend/src/locale/zh-TW.json @@ -81,7 +81,8 @@ "sourceDoc": "來源文件", "createNew": "建立新的", "noData": "沒有現有的聊天機器人", - "deleteConfirmation": "您確定要刪除 API 金鑰 '{{name}}' 嗎？" + "deleteConfirmation": "您確定要刪除 API 金鑰 '{{name}}' 嗎？", + "description": "在這裡，您可以創建和管理您的聊天機器人。聊天機器人可以作為小部件部署到網站上，或在您的應用程序中使用。" }, "analytics": { "label": "分析", diff --git a/frontend/src/locale/zh.json b/frontend/src/locale/zh.json index eb9d1e21..245333c3 100644 --- a/frontend/src/locale/zh.json +++ b/frontend/src/locale/zh.json @@ -81,7 +81,8 @@ "sourceDoc": "源文档", "createNew": "创建新的", "noData": "没有现有的聊天机器人", - "deleteConfirmation": "您确定要删除 API 密钥 '{{name}}' 吗？" + "deleteConfirmation": "您确定要删除 API 密钥 '{{name}}' 吗？", + "description": "在这里，您可以创建和管理您的聊天机器人。聊天机器人可以作为小部件部署到网站上，或在您的应用程序中使用。" }, "analytics": { "label": "分析", diff --git a/frontend/src/settings/APIKeys.tsx b/frontend/src/settings/APIKeys.tsx index 642566f1..a81644fa 100644 --- a/frontend/src/settings/APIKeys.tsx +++ b/frontend/src/settings/APIKeys.tsx @@ -98,9 +98,15 @@ export default function APIKeys() { }, []); return ( -
-
-
+
+
+
+

+ {t('settings.apiKeys.description')} +

+
+ +
+ +
+
+ + + + + + + + + + + {loading ? ( + + ) : !apiKeys?.length ? ( + + + + ) : ( + Array.isArray(apiKeys) && + apiKeys.map((element, index) => ( + + + + + + + )) + )} + +
+ {t('settings.apiKeys.name')} + + {t('settings.apiKeys.sourceDoc')} + + {t('settings.apiKeys.key')} + + Actions +
+ {t('settings.apiKeys.noData')} +
{element.name}{element.source} + {element.key} + + {`Delete + setKeyToDelete({ + id: element.id, + name: element.name, + }) + } + /> +
+
+
+ {isCreateModalOpen && ( setKeyToDelete(null)} /> )} -
-
-
-
-
- - - - - - - - - - - {loading ? ( - - ) : !apiKeys?.length ? ( - - - - ) : ( - Array.isArray(apiKeys) && - apiKeys.map((element, index) => ( - - - - - - - )) - )} - -
- {t('settings.apiKeys.name')} - - {t('settings.apiKeys.sourceDoc')} - - {t('settings.apiKeys.key')} -
- {t('settings.apiKeys.noData')} -
{element.name}{element.source}{element.key} - {`Delete - setKeyToDelete({ - id: element.id, - name: element.name, - }) - } - /> -
-
-
-
-
-
); diff --git a/frontend/src/settings/Documents.tsx b/frontend/src/settings/Documents.tsx index e72a6e16..d6b7dd3f 100644 --- a/frontend/src/settings/Documents.tsx +++ b/frontend/src/settings/Documents.tsx @@ -183,7 +183,7 @@ export default function Documents({ {t('settings.documents.title')}
-
+