From 8d31afd3f924037793c8e8e4f443a6f5bbb47e15 Mon Sep 17 00:00:00 2001 From: 1vn Date: Thu, 15 Aug 2024 13:48:30 +0200 Subject: [PATCH 1/7] fix check --- src/backend/tools/google_drive/tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/tools/google_drive/tool.py b/src/backend/tools/google_drive/tool.py index 0bb31169cf..716cde4391 100644 --- a/src/backend/tools/google_drive/tool.py +++ b/src/backend/tools/google_drive/tool.py @@ -45,7 +45,7 @@ class GoogleDrive(BaseTool): @classmethod def is_available(cls) -> bool: - return cls.CLIENT_ID is not None and cls.CLIENT_ID is not None + return cls.CLIENT_ID is not None and cls.CLIENT_SECRET is not None def _handle_tool_specific_errors(cls, error: Exception, **kwargs: Any): message = "[Google Drive] Tool Error: {}".format(str(error)) From 522d7759804ac4f1ed59c26120afa446e1d1b703 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:21:54 +0200 Subject: [PATCH 2/7] chore(deps): bump axios from 1.6.8 to 1.7.4 in /src/interfaces/coral_web (#668) Bumps [axios](https://github.com/axios/axios) from 1.6.8 to 1.7.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.8...v1.7.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Khalil Najjar --- src/interfaces/coral_web/package-lock.json | 8 ++++---- src/interfaces/coral_web/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interfaces/coral_web/package-lock.json b/src/interfaces/coral_web/package-lock.json index f73a244548..6ec9a2eacf 100644 --- a/src/interfaces/coral_web/package-lock.json +++ b/src/interfaces/coral_web/package-lock.json @@ -21,7 +21,7 @@ "@types/mdast": "^4.0.3", "@types/react": "^18.2.18", "autoprefixer": "^10.4.7", - "axios": "^1.6.7", + "axios": "^1.7.4", "class-variance-authority": "^0.7.0", "classnames": "^2.5.1", "cross-fetch": "^4.0.0", @@ -3654,9 +3654,9 @@ } }, "node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/src/interfaces/coral_web/package.json b/src/interfaces/coral_web/package.json index 45bca9522c..d4ef3de511 100644 --- a/src/interfaces/coral_web/package.json +++ b/src/interfaces/coral_web/package.json @@ -35,7 +35,7 @@ "@types/mdast": "^4.0.3", "@types/react": "^18.2.18", "autoprefixer": "^10.4.7", - "axios": "^1.6.7", + "axios": "^1.7.4", "class-variance-authority": "^0.7.0", "classnames": "^2.5.1", "cross-fetch": "^4.0.0", From 03ad1738f39870393ce53d4fa0c9a9602692af0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:22:45 +0200 Subject: [PATCH 3/7] build(deps): bump postcss from 7.0.39 to 8.4.39 in /src/interfaces/assistants_web (#469) build(deps): bump postcss in /src/interfaces/assistants_web Bumps [postcss](https://github.com/postcss/postcss) from 7.0.39 to 8.4.39. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.39...8.4.39) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Khalil Najjar --- src/interfaces/assistants_web/package-lock.json | 10 +++++----- src/interfaces/assistants_web/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interfaces/assistants_web/package-lock.json b/src/interfaces/assistants_web/package-lock.json index 4e7c3f2c24..52dd6a9815 100644 --- a/src/interfaces/assistants_web/package-lock.json +++ b/src/interfaces/assistants_web/package-lock.json @@ -39,7 +39,7 @@ "next-themes": "^0.3.0", "node-html-parser": "^6.1.4", "parse-domain": "^8.0.1", - "postcss": "^8.4.31", + "postcss": "^8.4.39", "postcss-viewport-height-correction": "^1.1.1", "react": "^18.2.0", "react-aria": "^3.24.0", @@ -16649,9 +16649,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", + "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", "funding": [ { "type": "opencollective", @@ -16668,7 +16668,7 @@ ], "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "source-map-js": "^1.2.0" }, "engines": { diff --git a/src/interfaces/assistants_web/package.json b/src/interfaces/assistants_web/package.json index cb3825d612..ff2a97ac8e 100644 --- a/src/interfaces/assistants_web/package.json +++ b/src/interfaces/assistants_web/package.json @@ -55,7 +55,7 @@ "next-themes": "^0.3.0", "node-html-parser": "^6.1.4", "parse-domain": "^8.0.1", - "postcss": "^8.4.31", + "postcss": "^8.4.39", "postcss-viewport-height-correction": "^1.1.1", "react": "^18.2.0", "react-aria": "^3.24.0", From 19f846f09400af6fc26e3bf85eb4a90e61cffc29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 13:23:19 +0200 Subject: [PATCH 4/7] chore(deps): bump axios from 1.7.2 to 1.7.4 in /src/interfaces/slack_bot (#669) Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Khalil Najjar --- src/interfaces/slack_bot/package-lock.json | 8 ++++---- src/interfaces/slack_bot/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interfaces/slack_bot/package-lock.json b/src/interfaces/slack_bot/package-lock.json index d402e9bdd9..09e792d43c 100644 --- a/src/interfaces/slack_bot/package-lock.json +++ b/src/interfaces/slack_bot/package-lock.json @@ -17,7 +17,7 @@ "@types/offscreencanvas": "^2019.7.3", "@types/word-extractor": "^1.0.2", "@vitest/ui": "^1.6.0", - "axios": "^1.7.2", + "axios": "^1.7.4", "dotenv": "^16.0.3", "eslint": "^9.3.0", "form-data": "^4.0.0", @@ -2079,9 +2079,9 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/src/interfaces/slack_bot/package.json b/src/interfaces/slack_bot/package.json index d2f78a791c..659378577c 100644 --- a/src/interfaces/slack_bot/package.json +++ b/src/interfaces/slack_bot/package.json @@ -31,7 +31,7 @@ "@types/offscreencanvas": "^2019.7.3", "@types/word-extractor": "^1.0.2", "@vitest/ui": "^1.6.0", - "axios": "^1.7.2", + "axios": "^1.7.4", "dotenv": "^16.0.3", "eslint": "^9.3.0", "form-data": "^4.0.0", From 7e020ae27a6b0dc3dfec0ae3682c1aaa7d037c25 Mon Sep 17 00:00:00 2001 From: Tomeu Date: Thu, 15 Aug 2024 13:24:20 +0200 Subject: [PATCH 5/7] feat: arrow up inside of composer will fill with the last user message (#663) * feat: arrow up inside of composer will fill with the last user message * fix: take the last user message instead the first one * refactor: run format --------- Co-authored-by: Khalil Najjar --- .../src/components/Conversation/Composer/index.tsx | 12 ++++++++++++ .../src/components/Conversation/index.tsx | 1 + 2 files changed, 13 insertions(+) diff --git a/src/interfaces/assistants_web/src/components/Conversation/Composer/index.tsx b/src/interfaces/assistants_web/src/components/Conversation/Composer/index.tsx index e7351e6a97..2a93db9006 100644 --- a/src/interfaces/assistants_web/src/components/Conversation/Composer/index.tsx +++ b/src/interfaces/assistants_web/src/components/Conversation/Composer/index.tsx @@ -27,6 +27,7 @@ type Props = { agent?: AgentPublic; tools?: ManagedTool[]; chatWindowRef?: React.RefObject; + lastUserMessage?: ChatMessage; }; export const Composer: React.FC = ({ @@ -39,6 +40,7 @@ export const Composer: React.FC = ({ onStop, onUploadFile, chatWindowRef, + lastUserMessage, }) => { const isDesktop = useIsDesktop(); const breakpoint = useBreakpoint(); @@ -65,6 +67,16 @@ export const Composer: React.FC = ({ onChange(''); } } + + if (e.key === 'ArrowUp' && value.trim() === '' && !isStreaming) { + onChange(lastUserMessage?.text || ''); + setTimeout(() => { + textareaRef.current?.setSelectionRange( + textareaRef.current?.value.length, + textareaRef.current?.value.length + ); + }, 0); + } }; const handleChange = (e: React.ChangeEvent) => { diff --git a/src/interfaces/assistants_web/src/components/Conversation/index.tsx b/src/interfaces/assistants_web/src/components/Conversation/index.tsx index e5471c8fa4..91350790fb 100644 --- a/src/interfaces/assistants_web/src/components/Conversation/index.tsx +++ b/src/interfaces/assistants_web/src/components/Conversation/index.tsx @@ -87,6 +87,7 @@ const Conversation: React.FC = ({ agent, tools, startOptionsEnabled = fal onSend={handleSend} onStop={handleStop} onUploadFile={handleUploadFile} + lastUserMessage={messages.findLast((m) => m.type === 'user')} /> } From dcac9bc44f2d9295758a25a10c502e5b753d0517 Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Thu, 15 Aug 2024 08:18:26 -0400 Subject: [PATCH 6/7] Revert "chore(deps-dev): bump nltk from 3.8.1 to 3.8.2 (#653)" (#673) This reverts commit c507489be1d620f4f8ed8db6eaf206a7bf99d774. --- poetry.lock | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/poetry.lock b/poetry.lock index de88bdcd8b..5d1bef59ff 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "aiohappyeyeballs" @@ -3093,13 +3093,13 @@ test = ["pytest (>=7.2)", "pytest-cov (>=4.0)"] [[package]] name = "nltk" -version = "3.8.2" +version = "3.8.1" description = "Natural Language Toolkit" optional = false -python-versions = ">=3.8" +python-versions = ">=3.7" files = [ - {file = "nltk-3.8.2-py3-none-any.whl", hash = "sha256:bae044ae22ebe0b694a87c0012233373209f27d5c76d3572599c842740a62fe0"}, - {file = "nltk-3.8.2.tar.gz", hash = "sha256:9c051aa981c6745894906d5c3aad27417f3d1c10d91eefca50382fc922966f31"}, + {file = "nltk-3.8.1-py3-none-any.whl", hash = "sha256:fd5c9109f976fa86bcadba8f91e47f5e9293bd034474752e92a520f81c93dda5"}, + {file = "nltk-3.8.1.zip", hash = "sha256:1834da3d0682cba4f2cede2f9aad6b0fafb6461ba451db0efb6f9c39798d64d3"}, ] [package.dependencies] @@ -3300,7 +3300,6 @@ description = "Nvidia JIT LTO Library" optional = false python-versions = ">=3" files = [ - {file = "nvidia_nvjitlink_cu12-12.5.82-py3-none-manylinux2014_aarch64.whl", hash = "sha256:98103729cc5226e13ca319a10bbf9433bbbd44ef64fe72f45f067cacc14b8d27"}, {file = "nvidia_nvjitlink_cu12-12.5.82-py3-none-manylinux2014_x86_64.whl", hash = "sha256:f9b37bc5c8cf7509665cb6ada5aaa0ce65618f2332b7d3e78e9790511f111212"}, {file = "nvidia_nvjitlink_cu12-12.5.82-py3-none-win_amd64.whl", hash = "sha256:e782564d705ff0bf61ac3e1bf730166da66dd2fe9012f111ede5fc49b64ae697"}, ] @@ -3611,8 +3610,6 @@ files = [ {file = "orjson-3.10.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:960db0e31c4e52fa0fc3ecbaea5b2d3b58f379e32a95ae6b0ebeaa25b93dfd34"}, {file = "orjson-3.10.6-cp312-none-win32.whl", hash = "sha256:a6ea7afb5b30b2317e0bee03c8d34c8181bc5a36f2afd4d0952f378972c4efd5"}, {file = "orjson-3.10.6-cp312-none-win_amd64.whl", hash = "sha256:874ce88264b7e655dde4aeaacdc8fd772a7962faadfb41abe63e2a4861abc3dc"}, - {file = "orjson-3.10.6-cp313-none-win32.whl", hash = "sha256:efdf2c5cde290ae6b83095f03119bdc00303d7a03b42b16c54517baa3c4ca3d0"}, - {file = "orjson-3.10.6-cp313-none-win_amd64.whl", hash = "sha256:8e190fe7888e2e4392f52cafb9626113ba135ef53aacc65cd13109eb9746c43e"}, {file = "orjson-3.10.6-cp38-cp38-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:66680eae4c4e7fc193d91cfc1353ad6d01b4801ae9b5314f17e11ba55e934183"}, {file = "orjson-3.10.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:caff75b425db5ef8e8f23af93c80f072f97b4fb3afd4af44482905c9f588da28"}, {file = "orjson-3.10.6-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3722fddb821b6036fd2a3c814f6bd9b57a89dc6337b9924ecd614ebce3271394"}, From 2af48142c7d978cabe26459235f546e89e7e903f Mon Sep 17 00:00:00 2001 From: Ivan Zhang Date: Thu, 15 Aug 2024 16:04:53 +0200 Subject: [PATCH 7/7] Update poetry.lock --- poetry.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 4fa019228f..4b6af249fa 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,6 +1,5 @@ # This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. - [[package]] name = "aiohappyeyeballs" version = "2.3.5"