From a28230caaad5a614fa65b10ee409b694a70d26b9 Mon Sep 17 00:00:00 2001 From: hiento09 <136591877+hiento09@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:01:38 +0700 Subject: [PATCH 1/5] Add run codesign for huggingface extension (#2163) Co-authored-by: Service Account --- extensions/monitoring-extension/package.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/monitoring-extension/package.json b/extensions/monitoring-extension/package.json index 582f7cd7b..0501b0378 100644 --- a/extensions/monitoring-extension/package.json +++ b/extensions/monitoring-extension/package.json @@ -8,13 +8,17 @@ "license": "AGPL-3.0", "scripts": { "build": "tsc -b . && webpack --config webpack.config.js", - "build:publish": "rimraf *.tgz --glob && npm run build && npm pack && cpx *.tgz ../../pre-install" + "build:publish:win32": "rimraf *.tgz --glob && npm run build && npm pack && cpx *.tgz ../../pre-install", + "build:publish:linux": "rimraf *.tgz --glob && npm run build && npm pack && cpx *.tgz ../../pre-install", + "build:publish:darwin": "rimraf *.tgz --glob && npm run build && ../../.github/scripts/auto-sign.sh && npm pack && cpx *.tgz ../../pre-install", + "build:publish": "run-script-os" }, "devDependencies": { "rimraf": "^3.0.2", "webpack": "^5.88.2", "webpack-cli": "^5.1.4", - "ts-loader": "^9.5.0" + "ts-loader": "^9.5.0", + "run-script-os": "^1.1.6" }, "dependencies": { "@janhq/core": "file:../../core", From 9078bbebea964858b0f025d5581ed3cd71facc2d Mon Sep 17 00:00:00 2001 From: hiento09 <136591877+hiento09@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:35:11 +0700 Subject: [PATCH 2/5] Huggingface extension add codesign step for building on darwin (#2166) Co-authored-by: Hien To --- extensions/huggingface-extension/package.json | 5 ++++- extensions/monitoring-extension/package.json | 8 ++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/extensions/huggingface-extension/package.json b/extensions/huggingface-extension/package.json index 283b989ce..e71dc7406 100644 --- a/extensions/huggingface-extension/package.json +++ b/extensions/huggingface-extension/package.json @@ -12,7 +12,10 @@ "download:llama:linux": "LLAMA_CPP_VERSION=$(cat ./scripts/version.txt) && download https://github.com/ggerganov/llama.cpp/archive/refs/tags/${LLAMA_CPP_VERSION}.tar.gz -o . --filename ./scripts/llama.cpp.tar.gz && tar -xzf ./scripts/llama.cpp.tar.gz --wildcards '*/convert.py' '*/convert-hf-to-gguf.py' '*/gguf-py' && cpx \"./llama.cpp-$LLAMA_CPP_VERSION/**\" \"scripts\" && rimraf \"./scripts/llama.cpp.tar.gz\" && rimraf \"./llama.cpp-$LLAMA_CPP_VERSION\"", "download:llama:darwin": "LLAMA_CPP_VERSION=$(cat ./scripts/version.txt) && download https://github.com/ggerganov/llama.cpp/archive/refs/tags/${LLAMA_CPP_VERSION}.tar.gz -o . --filename ./scripts/llama.cpp.tar.gz && tar -xzf ./scripts/llama.cpp.tar.gz '*/convert.py' '*/convert-hf-to-gguf.py' '*/gguf-py' && cpx \"./llama.cpp-$LLAMA_CPP_VERSION/**\" \"scripts\" && rimraf \"./scripts/llama.cpp.tar.gz\" && rimraf \"./llama.cpp-$LLAMA_CPP_VERSION\"", "download:llama:win32": "download.bat", - "build:publish": "rimraf *.tgz --glob && npm run build && npm run download:llama && cpx \"scripts/**\" \"dist/scripts\" && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install" + "build:publish:linux": "rimraf *.tgz --glob && npm run build && npm run download:llama && cpx \"scripts/**\" \"dist/scripts\" && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install", + "build:publish:darwin": "rimraf *.tgz --glob && npm run build && npm run download:llama && cpx \"scripts/**\" \"dist/scripts\" && cpx \"bin/**\" \"dist/bin\" && ../../.github/scripts/auto-sign.sh && npm pack && cpx *.tgz ../../pre-install", + "build:publish:win32": "rimraf *.tgz --glob && npm run build && npm run download:llama && cpx \"scripts/**\" \"dist/scripts\" && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install", + "build:publish": "run-script-os" }, "exports": { ".": "./dist/index.js", diff --git a/extensions/monitoring-extension/package.json b/extensions/monitoring-extension/package.json index 0501b0378..582f7cd7b 100644 --- a/extensions/monitoring-extension/package.json +++ b/extensions/monitoring-extension/package.json @@ -8,17 +8,13 @@ "license": "AGPL-3.0", "scripts": { "build": "tsc -b . && webpack --config webpack.config.js", - "build:publish:win32": "rimraf *.tgz --glob && npm run build && npm pack && cpx *.tgz ../../pre-install", - "build:publish:linux": "rimraf *.tgz --glob && npm run build && npm pack && cpx *.tgz ../../pre-install", - "build:publish:darwin": "rimraf *.tgz --glob && npm run build && ../../.github/scripts/auto-sign.sh && npm pack && cpx *.tgz ../../pre-install", - "build:publish": "run-script-os" + "build:publish": "rimraf *.tgz --glob && npm run build && npm pack && cpx *.tgz ../../pre-install" }, "devDependencies": { "rimraf": "^3.0.2", "webpack": "^5.88.2", "webpack-cli": "^5.1.4", - "ts-loader": "^9.5.0", - "run-script-os": "^1.1.6" + "ts-loader": "^9.5.0" }, "dependencies": { "@janhq/core": "file:../../core", From 00e5c4e5a76a4f62fd5b74773fd52b7eeadbf82b Mon Sep 17 00:00:00 2001 From: Service Account Date: Tue, 27 Feb 2024 04:51:51 +0000 Subject: [PATCH 3/5] janhq/jan: Update README.md with nightly build artifact URL --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ca5f3284c..c99900854 100644 --- a/README.md +++ b/README.md @@ -76,31 +76,31 @@ Jan is an open-source ChatGPT alternative that runs 100% offline on your compute Experimental (Nightly Build) - + jan.exe - + Intel - + M1/M2 - + jan.deb - + jan.AppImage From b1e748b9582f98b866bac767fb2889d805febe12 Mon Sep 17 00:00:00 2001 From: Faisal Amir Date: Tue, 27 Feb 2024 13:24:32 +0700 Subject: [PATCH 4/5] fix: system monitor expand overlap tooltip ribbon (#2158) --- web/containers/Layout/Ribbon/index.tsx | 49 ++++++++++++++------------ 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/web/containers/Layout/Ribbon/index.tsx b/web/containers/Layout/Ribbon/index.tsx index 4545e60ce..c0bc46586 100644 --- a/web/containers/Layout/Ribbon/index.tsx +++ b/web/containers/Layout/Ribbon/index.tsx @@ -2,6 +2,7 @@ import { Tooltip, TooltipContent, TooltipTrigger, + TooltipPortal, TooltipArrow, } from '@janhq/uikit' import { motion as m } from 'framer-motion' @@ -118,24 +119,26 @@ export default function RibbonNav() { /> )} - {serverEnabled && - primary.state === MainViewState.Thread ? ( - - - Threads are disabled while the server is running - - - - ) : ( - - {primary.name} - - - )} + + {serverEnabled && + primary.state === MainViewState.Thread ? ( + + + Threads are disabled while the server is running + + + + ) : ( + + {primary.name} + + + )} + ) @@ -168,10 +171,12 @@ export default function RibbonNav() { /> )} - - {secondary.name} - - + + + {secondary.name} + + + ) From fbee7536075345c867e1f2847823537c99cb9208 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 27 Feb 2024 14:43:47 +0800 Subject: [PATCH 5/5] fix: wrong profile parameter in docker command (#2159) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c99900854..d91366581 100644 --- a/README.md +++ b/README.md @@ -304,7 +304,7 @@ This will build the app MacOS m1/m2 for production (with code signing already do ```bash # GPU mode with default file system - docker compose --profile gpu up -d + docker compose --profile gpu-fs up -d # GPU mode with S3 file system docker compose --profile gpu-s3fs up -d