Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into devdocs_update_to_modelid

Browse Source
This commit is contained in:
avb-is-me 2024-02-26 23:52:00 -08:00 committed by GitHub
commit e5726b3890
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -76,31 +76,31 @@ Jan is an open-source ChatGPT alternative that runs 100% offline on your compute
<tr style="text-align:center">
<td style="text-align:center"><b>Experimental (Nightly Build)</b></td>
<td style="text-align:center">
<a href='https://delta.jan.ai/latest/jan-win-x64-0.4.7-286.exe'>
<a href='https://delta.jan.ai/latest/jan-win-x64-0.4.7-289.exe'>
<img src='./docs/static/img/windows.png' style="height:14px; width: 14px" />
<b>jan.exe</b>
</a>
</td>
<td style="text-align:center">
<a href='https://delta.jan.ai/latest/jan-mac-x64-0.4.7-286.dmg'>
<a href='https://delta.jan.ai/latest/jan-mac-x64-0.4.7-289.dmg'>
<img src='./docs/static/img/mac.png' style="height:15px; width: 15px" />
<b>Intel</b>
</a>
</td>
<td style="text-align:center">
<a href='https://delta.jan.ai/latest/jan-mac-arm64-0.4.7-286.dmg'>
<a href='https://delta.jan.ai/latest/jan-mac-arm64-0.4.7-289.dmg'>
<img src='./docs/static/img/mac.png' style="height:15px; width: 15px" />
<b>M1/M2</b>
</a>
</td>
<td style="text-align:center">
<a href='https://delta.jan.ai/latest/jan-linux-amd64-0.4.7-286.deb'>
<a href='https://delta.jan.ai/latest/jan-linux-amd64-0.4.7-289.deb'>
<img src='./docs/static/img/linux.png' style="height:14px; width: 14px" />
<b>jan.deb</b>
</a>
</td>
<td style="text-align:center">
<a href='https://delta.jan.ai/latest/jan-linux-x86_64-0.4.7-286.AppImage'>
<a href='https://delta.jan.ai/latest/jan-linux-x86_64-0.4.7-289.AppImage'>
<img src='./docs/static/img/linux.png' style="height:14px; width: 14px" />
<b>jan.AppImage</b>
</a>
@ -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

5
extensions/huggingface-extension/package.json
View File

@ -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",

49
web/containers/Layout/Ribbon/index.tsx
View File

@ -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() {
/>
)}
</TooltipTrigger>
{serverEnabled &&
primary.state === MainViewState.Thread ? (
<TooltipContent
side="right"
sideOffset={10}
className="max-w-[180px]"
>
<span>
Threads are disabled while the server is running
</span>
<TooltipArrow />
</TooltipContent>
) : (
<TooltipContent side="right" sideOffset={10}>
<span>{primary.name}</span>
<TooltipArrow />
</TooltipContent>
)}
<TooltipPortal>
{serverEnabled &&
primary.state === MainViewState.Thread ? (
<TooltipContent
side="right"
sideOffset={10}
className="max-w-[180px]"
>
<span>
Threads are disabled while the server is running
</span>
<TooltipArrow />
</TooltipContent>
) : (
<TooltipContent side="right" sideOffset={10}>
<span>{primary.name}</span>
<TooltipArrow />
</TooltipContent>
)}
</TooltipPortal>
</Tooltip>
</div>
)
@ -168,10 +171,12 @@ export default function RibbonNav() {
/>
)}
</TooltipTrigger>
<TooltipContent side="right" sideOffset={10}>
<span>{secondary.name}</span>
<TooltipArrow />
</TooltipContent>
<TooltipPortal>
<TooltipContent side="right" sideOffset={10}>
<span>{secondary.name}</span>
<TooltipArrow />
</TooltipContent>
</TooltipPortal>
</Tooltip>
</div>
)