From 0117589bbf0379ce70d5a49a2d4e54180216c803 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Fri, 8 Mar 2024 12:51:58 -0800 Subject: [PATCH 1/7] pin prisma versions to be the same --- server/package.json | 6 +++--- server/yarn.lock | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/package.json b/server/package.json index e521d4b6..c5654c36 100644 --- a/server/package.json +++ b/server/package.json @@ -26,7 +26,7 @@ "@google/generative-ai": "^0.1.3", "@googleapis/youtube": "^9.0.0", "@pinecone-database/pinecone": "^2.0.1", - "@prisma/client": "5.3.0", + "@prisma/client": "5.3.1", "@qdrant/js-client-rest": "^1.4.0", "@xenova/transformers": "^2.14.0", "@zilliz/milvus2-sdk-node": "^2.3.5", @@ -52,7 +52,7 @@ "openai": "^3.2.1", "pinecone-client": "^1.1.0", "posthog-node": "^3.1.1", - "prisma": "^5.3.1", + "prisma": "5.3.1", "slugify": "^1.6.6", "sqlite": "^4.2.1", "sqlite3": "^5.1.6", @@ -78,4 +78,4 @@ "nodemon": "^2.0.22", "prettier": "^3.0.3" } -} +} \ No newline at end of file diff --git a/server/yarn.lock b/server/yarn.lock index 61b29e3a..4cfbb7ff 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -649,17 +649,17 @@ resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.0.tgz#7d8dacb7fdef0e4387caf7396cbd77f179867d06" integrity sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ== -"@prisma/client@5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.3.0.tgz#47f07e5639993cffcf1c740a144495410562f279" - integrity sha512-cduYBlwj6oBfAUx2OI5i7t3NlpVeOtkN7pAqv0cw0B6gs4y8cY1mr8ZYywja0NUCOCqEWDkcZWBTVBwm6mnRIw== +"@prisma/client@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.3.1.tgz#fc7fc2d91e814cc4fe18a4bc5e78bf851c26985e" + integrity sha512-ArOKjHwdFZIe1cGU56oIfy7wRuTn0FfZjGuU/AjgEBOQh+4rDkB6nF+AGHP8KaVpkBIiHGPQh3IpwQ3xDMdO0Q== dependencies: - "@prisma/engines-version" "5.3.0-36.e90b936d84779543cbe0e494bc8b9d7337fad8e4" + "@prisma/engines-version" "5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59" -"@prisma/engines-version@5.3.0-36.e90b936d84779543cbe0e494bc8b9d7337fad8e4": - version "5.3.0-36.e90b936d84779543cbe0e494bc8b9d7337fad8e4" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.3.0-36.e90b936d84779543cbe0e494bc8b9d7337fad8e4.tgz#46ee2884e04cdba1163461ef856cec882d31c836" - integrity sha512-uftIog5FQ/OUR8Vb9TzpNBJ6L+zJnBgmd1A0uPJUzuvGMU32UmeyobpdXVzST5UprKryTdWOYXQFVyiQ2OU4Nw== +"@prisma/engines-version@5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59": + version "5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59.tgz#7eb6f5c6b7628b8b39df55c903f411528a6f761c" + integrity sha512-y5qbUi3ql2Xg7XraqcXEdMHh0MocBfnBzDn5GbV1xk23S3Mq8MGs+VjacTNiBh3dtEdUERCrUUG7Z3QaJ+h79w== "@prisma/engines@5.3.1": version "5.3.1" @@ -4455,7 +4455,7 @@ prettier@^3.0.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== -prisma@^5.3.1: +prisma@5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.3.1.tgz#a0932c1c1a5ed4ff449d064b193d9c7e94e8bf77" integrity sha512-Wp2msQIlMPHe+5k5Od6xnsI/WNG7UJGgFUJgqv/ygc7kOECZapcSz/iU4NIEzISs3H1W9sFLjAPbg/gOqqtB7A== From c472598bfcf8e17a4140684d350d76b9fbf9a1f6 Mon Sep 17 00:00:00 2001 From: Francis Mercier Date: Fri, 8 Mar 2024 19:40:27 -0500 Subject: [PATCH 2/7] HOW_TO_USE_DOCKER.md - Missing -ItemType File for .env creation (#879) Update HOW_TO_USE_DOCKER.md Missing New-Item -ItemType for .env default to a folder when it should be a file (Docker won't run when that happen since a file is expected) --- docker/HOW_TO_USE_DOCKER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/HOW_TO_USE_DOCKER.md b/docker/HOW_TO_USE_DOCKER.md index 812119a6..9532fea0 100644 --- a/docker/HOW_TO_USE_DOCKER.md +++ b/docker/HOW_TO_USE_DOCKER.md @@ -75,7 +75,7 @@ mintplexlabs/anythingllm # Run this in powershell terminal $env:STORAGE_LOCATION="$HOME\Documents\anythingllm"; ` If(!(Test-Path $env:STORAGE_LOCATION)) {New-Item $env:STORAGE_LOCATION -ItemType Directory}; ` -If(!(Test-Path "$env:STORAGE_LOCATION\.env")) {New-Item "$env:STORAGE_LOCATION\.env"}; ` +If(!(Test-Path "$env:STORAGE_LOCATION\.env")) {New-Item "$env:STORAGE_LOCATION\.env" -ItemType File}; ` docker run -d -p 3001:3001 ` --cap-add SYS_ADMIN ` -v "$env:STORAGE_LOCATION`:/app/server/storage" ` From 0f31e43fd4e7e26bf83b6068ec314b97e7be0439 Mon Sep 17 00:00:00 2001 From: Timothy Carambat Date: Mon, 11 Mar 2024 10:57:53 -0700 Subject: [PATCH 3/7] bump YT metadata lib for YT api fix rot (#888) --- collector/package.json | 2 +- collector/yarn.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/collector/package.json b/collector/package.json index 01cf26b6..d145ab86 100644 --- a/collector/package.json +++ b/collector/package.json @@ -40,7 +40,7 @@ "uuid": "^9.0.0", "wavefile": "^11.0.0", "youtube-transcript": "^1.0.6", - "youtubei.js": "^8.0.0" + "youtubei.js": "^9.1.0" }, "devDependencies": { "nodemon": "^2.0.22", diff --git a/collector/yarn.lock b/collector/yarn.lock index e181b245..bf979c86 100644 --- a/collector/yarn.lock +++ b/collector/yarn.lock @@ -40,9 +40,9 @@ js-tokens "^4.0.0" "@fastify/busboy@^2.0.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.0.tgz#0709e9f4cb252351c609c6e6d8d6779a8d25edff" - integrity sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA== + version "2.1.1" + resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d" + integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA== "@googleapis/youtube@^9.0.0": version "9.0.0" @@ -258,9 +258,9 @@ accepts@~1.3.8: negotiator "0.6.3" acorn@^8.8.0: - version "8.11.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b" - integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== agent-base@6: version "6.0.2" @@ -3152,9 +3152,9 @@ undici-types@~5.26.4: integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== undici@^5.19.1: - version "5.28.2" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.2.tgz#fea200eac65fc7ecaff80a023d1a0543423b4c91" - integrity sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w== + version "5.28.3" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b" + integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA== dependencies: "@fastify/busboy" "^2.0.0" @@ -3322,10 +3322,10 @@ youtube-transcript@^1.0.6: dependencies: phin "^3.5.0" -youtubei.js@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-8.0.0.tgz#0fcbe332e263d9be6afe4e3d1917e9ddc1ffbed3" - integrity sha512-kUwHvqoB5vfaGaY1quAGcX5JPIyjr5fjj9Zj/ZwUDCrermz/r5uIkNiJ5cNHkmAJbZP9fdygzNMvGHd7fM445g== +youtubei.js@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.1.0.tgz#bcf154c9fa21d3c8c1d00a5e10360d0a065c660e" + integrity sha512-C5GBJ4LgnS6vGAUkdIdQNOFFb5EZ1p3xBvUELNXmIG3Idr6vxWrKNBNy8ClZT3SuDVXaAJqDgF9b5jvY8lNKcg== dependencies: jintr "^1.1.0" tslib "^2.5.0" From d9fce5f65e2c724462e2a6305cfb77aceb732627 Mon Sep 17 00:00:00 2001 From: Sean Hatfield Date: Tue, 12 Mar 2024 10:45:03 -0700 Subject: [PATCH 4/7] [FEAT] Settings pages UI updates (#833) * WIP main sidebar designs * hover states and active states for main sidebar * main and settings sidebar UI updates & improve performance using Link instead of * update borders to match rest of UI in all pages * update borders of all containers to match rest of UI * remove unneeded conditional * custom messages component redesign and appearance settings layout changes * improve UX of custom logo file uploader component to match designs * fix sizing on custom logo upload field * WIP footer customization new UI * implement new UI for custom footer icon selection * update workspace chats to match new settings UI * update system preferences to match new settings UI * update export workspace chats button border * update invitations settings page to match new settings UI * update instance workspaces settings page to match new settings UI * update instance workspaces to match new settings UI * update api keys settings to match new settings UI * update LLM preferences settings to match new settings UI * update embedding preferences settings to match new settings UI * update vector db preferences settings to match new settings UI * align all buttons in settings pages * update ui for data connectors to match rest of settings ui * update UI for embed chat * updated ui for logging page * fix duplicate attributes left from merge conflicts * fix dynamic class to use ternary * remove transition classes where it is not needed --- .../components/EditingChatBubble/index.jsx | 83 ++++----- .../src/components/SettingsSidebar/index.jsx | 4 +- .../Sidebar/ActiveWorkspaces/index.jsx | 6 +- frontend/src/components/Sidebar/index.jsx | 12 +- .../src/pages/Admin/Invitations/index.jsx | 25 +-- frontend/src/pages/Admin/Logging/index.jsx | 22 +-- frontend/src/pages/Admin/System/index.jsx | 128 +++++++------- frontend/src/pages/Admin/Users/index.jsx | 18 +- frontend/src/pages/Admin/Workspaces/index.jsx | 17 +- .../pages/GeneralSettings/ApiKeys/index.jsx | 19 ++- .../Appearance/CustomLogo/index.jsx | 124 ++++++++------ .../Appearance/CustomMessages/index.jsx | 31 ++-- .../FooterCustomization/NewIconForm/index.jsx | 161 ++++++++++-------- .../Appearance/FooterCustomization/index.jsx | 136 +++++---------- .../Appearance/SupportEmail/index.jsx | 10 +- .../GeneralSettings/Appearance/index.jsx | 12 +- .../src/pages/GeneralSettings/Chats/index.jsx | 68 ++++---- .../Connectors/Github/index.jsx | 14 +- .../Connectors/Youtube/index.jsx | 12 +- .../GeneralSettings/DataConnectors/index.jsx | 21 ++- .../GeneralSettings/EmbedChats/index.jsx | 12 +- .../GeneralSettings/EmbedConfigs/index.jsx | 16 +- .../EmbeddingPreference/index.jsx | 123 +++++++------ .../GeneralSettings/LLMPreference/index.jsx | 16 +- .../GeneralSettings/VectorDatabase/index.jsx | 34 ++-- 25 files changed, 569 insertions(+), 555 deletions(-) diff --git a/frontend/src/components/EditingChatBubble/index.jsx b/frontend/src/components/EditingChatBubble/index.jsx index ba5cc480..0aa2a078 100644 --- a/frontend/src/components/EditingChatBubble/index.jsx +++ b/frontend/src/components/EditingChatBubble/index.jsx @@ -13,49 +13,52 @@ export default function EditingChatBubble({ const isUser = type === "user"; return ( -
- +
+

+ {isUser ? "User" : "AnythingLLM Chat Assistant"} +

setIsEditing(true)} > - {isEditing ? ( - setTempMessage(e.target.value)} - onBlur={() => { - handleMessageChange(index, type, tempMessage); - setIsEditing(false); - }} - autoFocus - className="w-full" - /> - ) : ( - tempMessage && ( -

- {tempMessage} -

- ) - )} + +
setIsEditing(true)} + > + {isEditing ? ( + setTempMessage(e.target.value)} + onBlur={() => { + handleMessageChange(index, type, tempMessage); + setIsEditing(false); + }} + autoFocus + className={`w-full ${ + isUser ? "bg-[#41444C] text-white" : "bg-[#2E3036] text-white" + }`} + /> + ) : ( + tempMessage && ( +

+ {tempMessage} +

+ ) + )} +
); diff --git a/frontend/src/components/SettingsSidebar/index.jsx b/frontend/src/components/SettingsSidebar/index.jsx index 112b641b..84b78064 100644 --- a/frontend/src/components/SettingsSidebar/index.jsx +++ b/frontend/src/components/SettingsSidebar/index.jsx @@ -149,7 +149,9 @@ export default function SettingsSidebar() {
-