Skip to content

Commit 32966f9

Browse files
louis-janlouis-jan
authored
Merge pull request #5801 from menloresearch/release/v0.6.5
Sync release/0.6.5 into dev to start new development cycle
2 parents 333cd3a + c283979 commit 32966f9

File tree

24 files changed

+234
-59
lines changed

24 files changed

+234
-59
lines changed

‎extensions/engine-management-extension/rolldown.config.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default defineConfig([
1515
`http://127.0.0.1:${process.env.CORTEX_API_PORT ?? '39291'}`
1616
),
1717
PLATFORM: JSON.stringify(process.platform),
18-
CORTEX_ENGINE_VERSION: JSON.stringify('b5509'),
18+
CORTEX_ENGINE_VERSION: JSON.stringify('b5857'),
1919
DEFAULT_REMOTE_ENGINES: JSON.stringify(engines),
2020
DEFAULT_REMOTE_MODELS: JSON.stringify(models),
2121
DEFAULT_REQUEST_PAYLOAD_TRANSFORM: JSON.stringify(
@@ -38,7 +38,7 @@ export default defineConfig([
3838
file: 'dist/node/index.cjs.js',
3939
},
4040
define: {
41-
CORTEX_ENGINE_VERSION: JSON.stringify('b5509'),
41+
CORTEX_ENGINE_VERSION: JSON.stringify('b5857'),
4242
},
4343
},
4444
])

‎extensions/inference-cortex-extension/download.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set BIN_PATH=./bin
33
set SHARED_PATH=./../../electron/shared
44
set /p CORTEX_VERSION=<./bin/version.txt
5-
set ENGINE_VERSION=b5509
5+
set ENGINE_VERSION=b5857
66

77
@REM Download llama.cpp binaries
88
set DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/%ENGINE_VERSION%/llama-%ENGINE_VERSION%-bin-win

‎extensions/inference-cortex-extension/download.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Read CORTEX_VERSION
44
CORTEX_VERSION=$(cat ./bin/version.txt)
5-
ENGINE_VERSION=b5509
5+
ENGINE_VERSION=b5857
66
CORTEX_RELEASE_URL="https://github.com/menloresearch/cortex.cpp/releases/download"
77
ENGINE_DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/${ENGINE_VERSION}/llama-${ENGINE_VERSION}-bin
88
CUDA_DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/${ENGINE_VERSION}

‎extensions/inference-cortex-extension/rolldown.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default defineConfig([
1919
CORTEX_SOCKET_URL: JSON.stringify(
2020
`ws://127.0.0.1:${process.env.CORTEX_API_PORT ?? '39291'}`
2121
),
22-
CORTEX_ENGINE_VERSION: JSON.stringify('b5509'),
22+
CORTEX_ENGINE_VERSION: JSON.stringify('b5857'),
2323
},
2424
},
2525
{

‎src-tauri/binaries/download.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off
22

33
set CORTEX_VERSION=1.0.14
4-
set ENGINE_VERSION=b5509
4+
set ENGINE_VERSION=b5857
55
set ENGINE_DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/%ENGINE_VERSION%/llama-%ENGINE_VERSION%-bin-win
66
set ENGINE_DOWNLOAD_GGML_URL=https://github.com/ggml-org/llama.cpp/releases/download/%ENGINE_VERSION%/llama-%ENGINE_VERSION%-bin-win
77
set CUDA_DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/%ENGINE_VERSION%
@@ -35,7 +35,7 @@ for %%F in (%SUBFOLDERS%) do (
3535

3636
@REM Move cu*.dll files
3737
for %%D in (.\engines\engines\llama.cpp\%%F\%ENGINE_VERSION%\cu*.dll) do (
38-
move "%%D" "%BIN_PATH%"
38+
move "%%D" "%BIN_PATH%"
3939
)
4040
)
4141

‎src-tauri/binaries/download.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ download() {
1515

1616
# Read CORTEX_VERSION
1717
CORTEX_VERSION=1.0.14
18-
ENGINE_VERSION=b5509
18+
ENGINE_VERSION=b5857
1919
CORTEX_RELEASE_URL="https://github.com/menloresearch/cortex.cpp/releases/download"
2020
ENGINE_DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/${ENGINE_VERSION}/llama-${ENGINE_VERSION}-bin
2121
CUDA_DOWNLOAD_URL=https://github.com/menloresearch/llama.cpp/releases/download/${ENGINE_VERSION}

‎src-tauri/tauri.bundle.windows.nsis.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ${StrLoc}
3333
!define VERSION "jan_version"
3434
!define VERSIONWITHBUILD "jan_build"
3535
!define HOMEPAGE ""
36-
!define INSTALLMODE "both"
36+
!define INSTALLMODE "currentUser"
3737
!define LICENSE ""
3838
!define INSTALLERICON "D:\a\jan\jan\src-tauri\icons\icon.ico"
3939
!define SIDEBARIMAGE ""

‎web-app/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"react-i18next": "^15.5.1",
5959
"react-joyride": "^2.9.3",
6060
"react-markdown": "^10.1.0",
61+
"react-resizable-panels": "^3.0.3",
6162
"react-syntax-highlighter": "^15.6.1",
6263
"react-syntax-highlighter-virtualized-renderer": "^1.1.0",
6364
"react-textarea-autosize": "^8.5.9",
@@ -68,7 +69,7 @@
6869
"remark-math": "^6.0.0",
6970
"sonner": "^2.0.3",
7071
"tailwindcss": "^4.1.4",
71-
"token.js": "npm:[email protected].12",
72+
"token.js": "npm:[email protected].15",
7273
"tw-animate-css": "^1.2.7",
7374
"ulidx": "^2.4.1",
7475
"unified": "^11.0.5",

‎web-app/src/components/ui/resizable.tsx‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import * as React from 'react'
2+
import { GripVerticalIcon } from 'lucide-react'
3+
import * as ResizablePrimitive from 'react-resizable-panels'
4+
5+
import { cn } from '@/lib/utils'
6+
7+
function ResizablePanelGroup({
8+
className,
9+
...props
10+
}: React.ComponentProps<typeof ResizablePrimitive.PanelGroup>) {
11+
return (
12+
<ResizablePrimitive.PanelGroup
13+
data-slot="resizable-panel-group"
14+
className={cn(
15+
'flex h-full w-full data-[panel-group-direction=vertical]:flex-col',
16+
className
17+
)}
18+
{...props}
19+
/>
20+
)
21+
}
22+
23+
function ResizablePanel({
24+
...props
25+
}: React.ComponentProps<typeof ResizablePrimitive.Panel>) {
26+
return <ResizablePrimitive.Panel data-slot="resizable-panel" {...props} />
27+
}
28+
29+
function ResizableHandle({
30+
withHandle,
31+
className,
32+
...props
33+
}: React.ComponentProps<typeof ResizablePrimitive.PanelResizeHandle> & {
34+
withHandle?: boolean
35+
}) {
36+
return (
37+
<ResizablePrimitive.PanelResizeHandle
38+
data-slot="resizable-handle"
39+
className={cn(
40+
'bg-border focus-visible:ring-ring relative flex w-px items-center justify-center after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:outline-hidden data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:translate-x-0 data-[panel-group-direction=vertical]:after:-translate-y-1/2 [&[data-panel-group-direction=vertical]>div]:rotate-90',
41+
className
42+
)}
43+
{...props}
44+
>
45+
{withHandle && (
46+
<div className="bg-main-view z-10 flex h-4 w-3 items-center justify-center rounded-xs border border-main-view-fg/10 relative left-0.5">
47+
<GripVerticalIcon className="size-2.5 text-main-view-fg" />
48+
</div>
49+
)}
50+
</ResizablePrimitive.PanelResizeHandle>
51+
)
52+
}
53+
54+
export { ResizablePanelGroup, ResizablePanel, ResizableHandle }

‎web-app/src/containers/DownloadManegement.tsx‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ export function DownloadManagement() {
182182
getProviders().then(setProviders)
183183
toast.success(t('common:toast.downloadComplete.title'), {
184184
id: 'download-complete',
185-
description: t('common:toast.downloadComplete.description', { modelId: state.modelId }),
185+
description: t('common:toast.downloadComplete.description', {
186+
modelId: state.modelId,
187+
}),
186188
})
187189
},
188190
[removeDownload, removeLocalDownloadingModel, setProviders, t]
@@ -237,10 +239,14 @@ export function DownloadManagement() {
237239
<PopoverTrigger asChild>
238240
{isLeftPanelOpen ? (
239241
<div className="bg-left-panel-fg/10 hover:bg-left-panel-fg/12 p-2 rounded-md my-1 relative border border-left-panel-fg/10 cursor-pointer text-left">
240-
<div className="bg-primary font-bold size-5 rounded-full absolute -top-2 -right-1 flex items-center justify-center text-primary-fg">
241-
{downloadCount}
242+
<div className="text-left-panel-fg/80 font-medium flex gap-2">
243+
<span>{t('downloads')}</span>
244+
<span>
245+
<div className="bg-primary font-bold size-5 rounded-full flex items-center justify-center text-primary-fg">
246+
{downloadCount}
247+
</div>
248+
</span>
242249
</div>
243-
<p className="text-left-panel-fg/80 font-medium">{t('downloads')}</p>
244250
<div className="mt-2 flex items-center justify-between space-x-2">
245251
<Progress value={overallProgress * 100} />
246252
<span className="text-xs font-medium text-left-panel-fg/80 shrink-0">
@@ -252,7 +258,7 @@ export function DownloadManagement() {
252258
<div className="fixed bottom-4 left-4 z-50 size-10 bg-main-view border-2 border-main-view-fg/10 rounded-full shadow-md cursor-pointer flex items-center justify-center">
253259
<div className="relative">
254260
<IconDownload
255-
className="text-left-panel-fg/50 -mt-1"
261+
className="text-main-view-fg/50 -mt-1"
256262
size={20}
257263
/>
258264
<div className="bg-primary font-bold size-5 rounded-full absolute -top-4 -right-4 flex items-center justify-center text-primary-fg">
@@ -272,7 +278,9 @@ export function DownloadManagement() {
272278
>
273279
<div className="flex flex-col">
274280
<div className="p-2 py-1.5 bg-main-view-fg/5 border-b border-main-view-fg/6">
275-
<p className="text-xs text-main-view-fg/70">{t('downloading')}</p>
281+
<p className="text-xs text-main-view-fg/70">
282+
{t('downloading')}
283+
</p>
276284
</div>
277285
<div className="p-2 max-h-[300px] overflow-y-auto space-y-2">
278286
{appUpdateState.isDownloading && (
@@ -309,10 +317,15 @@ export function DownloadManagement() {
309317
title="Cancel download"
310318
onClick={() => {
311319
abortDownload(download.name).then(() => {
312-
toast.info(t('common:toast.downloadCancelled.title'), {
313-
id: 'cancel-download',
314-
description: t('common:toast.downloadCancelled.description'),
315-
})
320+
toast.info(
321+
t('common:toast.downloadCancelled.title'),
322+
{
323+
id: 'cancel-download',
324+
description: t(
325+
'common:toast.downloadCancelled.description'
326+
),
327+
}
328+
)
316329
if (downloadProcesses.length === 0) {
317330
setIsPopoverOpen(false)
318331
}

0 commit comments

Comments
 (0)