Skip to content

Commit d2e0226

Browse files
github-roushangithub-roushan
authored
Merge branch 'dev' into sidebar-improv
2 parents 00b47fa + e7fcc80 commit d2e0226

File tree

17 files changed

+1220
-174
lines changed

17 files changed

+1220
-174
lines changed

‎.github/workflows/template-tauri-build-windows-x64-external.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
# Update tauri.conf.json
5050
jq --arg version "${{ inputs.new_version }}" '.version = $version | .bundle.createUpdaterArtifacts = false' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
5151
mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json
52+
jq '.bundle.windows.nsis.template = "tauri.bundle.windows.nsis.template"' ./src-tauri/tauri.windows.conf.json > /tmp/tauri.windows.conf.json
53+
mv /tmp/tauri.windows.conf.json ./src-tauri/tauri.windows.conf.json
5254
jq '.bundle.windows.signCommand = "echo External build - skipping signature: %1"' ./src-tauri/tauri.windows.conf.json > /tmp/tauri.windows.conf.json
5355
mv /tmp/tauri.windows.conf.json ./src-tauri/tauri.windows.conf.json
5456
jq --arg version "${{ inputs.new_version }}" '.version = $version' web-app/package.json > /tmp/package.json
@@ -80,6 +82,36 @@ jobs:
8082
echo "---------./src-tauri/Cargo.toml---------"
8183
cat ./src-tauri/Cargo.toml
8284
85+
generate_build_version() {
86+
### Examble
87+
### input 0.5.6 output will be 0.5.6 and 0.5.6.0
88+
### input 0.5.6-rc2-beta output will be 0.5.6 and 0.5.6.2
89+
### input 0.5.6-1213 output will be 0.5.6 and and 0.5.6.1213
90+
local new_version="$1"
91+
local base_version
92+
local t_value
93+
# Check if it has a "-"
94+
if [[ "$new_version" == *-* ]]; then
95+
base_version="${new_version%%-*}" # part before -
96+
suffix="${new_version#*-}" # part after -
97+
# Check if it is rcX-beta
98+
if [[ "$suffix" =~ ^rc([0-9]+)-beta$ ]]; then
99+
t_value="${BASH_REMATCH[1]}"
100+
else
101+
t_value="$suffix"
102+
fi
103+
else
104+
base_version="$new_version"
105+
t_value="0"
106+
fi
107+
# Export two values
108+
new_base_version="$base_version"
109+
new_build_version="${base_version}.${t_value}"
110+
}
111+
generate_build_version ${{ inputs.new_version }}
112+
sed -i "s/jan_version/$new_base_version/g" ./src-tauri/tauri.bundle.windows.nsis.template
113+
sed -i "s/jan_build/$new_build_version/g" ./src-tauri/tauri.bundle.windows.nsis.template
114+
83115
if [ "${{ inputs.channel }}" != "stable" ]; then
84116
jq '.plugins.updater.endpoints = ["https://delta.jan.ai/${{ inputs.channel }}/latest.json"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
85117
mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json
@@ -103,7 +135,14 @@ jobs:
103135
chmod +x .github/scripts/rename-workspace.sh
104136
.github/scripts/rename-workspace.sh ./package.json ${{ inputs.channel }}
105137
cat ./package.json
138+
sed -i "s/jan_productname/Jan-${{ inputs.channel }}/g" ./src-tauri/tauri.bundle.windows.nsis.template
139+
sed -i "s/jan_mainbinaryname/jan-${{ inputs.channel }}/g" ./src-tauri/tauri.bundle.windows.nsis.template
140+
else
141+
sed -i "s/jan_productname/Jan/g" ./src-tauri/tauri.bundle.windows.nsis.template
142+
sed -i "s/jan_mainbinaryname/jan/g" ./src-tauri/tauri.bundle.windows.nsis.template
106143
fi
144+
echo "---------nsis.template---------"
145+
cat ./src-tauri/tauri.bundle.windows.nsis.template
107146
- name: Build app
108147
shell: bash
109148
run: |

‎.github/workflows/template-tauri-build-windows-x64.yml‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,15 @@ jobs:
9898
# Update tauri.conf.json
9999
jq --arg version "${{ inputs.new_version }}" '.version = $version | .bundle.createUpdaterArtifacts = true' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
100100
mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json
101+
jq '.bundle.windows.nsis.template = "tauri.bundle.windows.nsis.template"' ./src-tauri/tauri.windows.conf.json > /tmp/tauri.windows.conf.json
102+
mv /tmp/tauri.windows.conf.json ./src-tauri/tauri.windows.conf.json
101103
jq --arg version "${{ inputs.new_version }}" '.version = $version' web-app/package.json > /tmp/package.json
102104
mv /tmp/package.json web-app/package.json
103105
106+
# Add sign commands to tauri.windows.conf.json
107+
jq '.bundle.windows.signCommand = "powershell -ExecutionPolicy Bypass -File ./sign.ps1 %1"' ./src-tauri/tauri.windows.conf.json > /tmp/tauri.windows.conf.json
108+
mv /tmp/tauri.windows.conf.json ./src-tauri/tauri.windows.conf.json
109+
104110
# Update tauri plugin versions
105111
106112
jq --arg version "${{ inputs.new_version }}" '.version = $version' ./src-tauri/plugins/tauri-plugin-hardware/package.json > /tmp/package.json
@@ -127,9 +133,35 @@ jobs:
127133
echo "---------./src-tauri/Cargo.toml---------"
128134
cat ./src-tauri/Cargo.toml
129135
130-
# Add sign commands to tauri.windows.conf.json
131-
jq '.bundle.windows.signCommand = "powershell -ExecutionPolicy Bypass -File ./sign.ps1 %1"' ./src-tauri/tauri.windows.conf.json > /tmp/tauri.windows.conf.json
132-
mv /tmp/tauri.windows.conf.json ./src-tauri/tauri.windows.conf.json
136+
generate_build_version() {
137+
### Example
138+
### input 0.5.6 output will be 0.5.6 and 0.5.6.0
139+
### input 0.5.6-rc2-beta output will be 0.5.6 and 0.5.6.2
140+
### input 0.5.6-1213 output will be 0.5.6 and and 0.5.6.1213
141+
local new_version="$1"
142+
local base_version
143+
local t_value
144+
# Check if it has a "-"
145+
if [[ "$new_version" == *-* ]]; then
146+
base_version="${new_version%%-*}" # part before -
147+
suffix="${new_version#*-}" # part after -
148+
# Check if it is rcX-beta
149+
if [[ "$suffix" =~ ^rc([0-9]+)-beta$ ]]; then
150+
t_value="${BASH_REMATCH[1]}"
151+
else
152+
t_value="$suffix"
153+
fi
154+
else
155+
base_version="$new_version"
156+
t_value="0"
157+
fi
158+
# Export two values
159+
new_base_version="$base_version"
160+
new_build_version="${base_version}.${t_value}"
161+
}
162+
generate_build_version ${{ inputs.new_version }}
163+
sed -i "s/jan_version/$new_base_version/g" ./src-tauri/tauri.bundle.windows.nsis.template
164+
sed -i "s/jan_build/$new_build_version/g" ./src-tauri/tauri.bundle.windows.nsis.template
133165
134166
echo "---------tauri.windows.conf.json---------"
135167
cat ./src-tauri/tauri.windows.conf.json
@@ -163,7 +195,14 @@ jobs:
163195
chmod +x .github/scripts/rename-workspace.sh
164196
.github/scripts/rename-workspace.sh ./package.json ${{ inputs.channel }}
165197
cat ./package.json
198+
sed -i "s/jan_productname/Jan-${{ inputs.channel }}/g" ./src-tauri/tauri.bundle.windows.nsis.template
199+
sed -i "s/jan_mainbinaryname/jan-${{ inputs.channel }}/g" ./src-tauri/tauri.bundle.windows.nsis.template
200+
else
201+
sed -i "s/jan_productname/Jan/g" ./src-tauri/tauri.bundle.windows.nsis.template
202+
sed -i "s/jan_mainbinaryname/jan/g" ./src-tauri/tauri.bundle.windows.nsis.template
166203
fi
204+
echo "---------nsis.template---------"
205+
cat ./src-tauri/tauri.bundle.windows.nsis.template
167206
168207
- name: Install AzureSignTool
169208
run: |

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ lint: install-and-build
117117
test: lint
118118
yarn download:bin
119119
ifeq ($(OS),Windows_NT)
120-
yarn download:windows-installer
121120
endif
122121
yarn test
123122
yarn copy:assets:tauri

‎extensions/llamacpp-extension/src/index.ts‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,14 @@ export default class llamacpp_extension extends AIEngine {
332332
)
333333
// Clear the invalid stored preference
334334
this.clearStoredBackendType()
335-
bestAvailableBackendString =
336-
await this.determineBestBackend(version_backends)
335+
bestAvailableBackendString = await this.determineBestBackend(
336+
version_backends
337+
)
337338
}
338339
} else {
339-
bestAvailableBackendString =
340-
await this.determineBestBackend(version_backends)
340+
bestAvailableBackendString = await this.determineBestBackend(
341+
version_backends
342+
)
341343
}
342344

343345
let settings = structuredClone(SETTINGS)
@@ -2151,7 +2153,12 @@ export default class llamacpp_extension extends AIEngine {
21512153
if (mmprojPath && !this.isAbsolutePath(mmprojPath))
21522154
mmprojPath = await joinPath([await getJanDataFolderPath(), path])
21532155
try {
2154-
const result = await planModelLoadInternal(path, this.memoryMode, mmprojPath, requestedCtx)
2156+
const result = await planModelLoadInternal(
2157+
path,
2158+
this.memoryMode,
2159+
mmprojPath,
2160+
requestedCtx
2161+
)
21552162
return result
21562163
} catch (e) {
21572164
throw new Error(String(e))
@@ -2279,12 +2286,18 @@ export default class llamacpp_extension extends AIEngine {
22792286
}
22802287

22812288
// Calculate text tokens
2282-
const messages = JSON.stringify({ messages: opts.messages })
2289+
// Use chat_template_kwargs from opts if provided, otherwise default to disable enable_thinking
2290+
const tokenizeRequest = {
2291+
messages: opts.messages,
2292+
chat_template_kwargs: opts.chat_template_kwargs || {
2293+
enable_thinking: false,
2294+
},
2295+
}
22832296

22842297
let parseResponse = await fetch(`${baseUrl}/apply-template`, {
22852298
method: 'POST',
22862299
headers: headers,
2287-
body: messages,
2300+
body: JSON.stringify(tokenizeRequest),
22882301
})
22892302

22902303
if (!parseResponse.ok) {

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
"copy:assets:mobile": "cpx \"pre-install/*.tgz\" \"src-tauri/resources/pre-install/\" && cpx \"LICENSE\" \"src-tauri/resources/\"",
3636
"download:lib": "node ./scripts/download-lib.mjs",
3737
"download:bin": "node ./scripts/download-bin.mjs",
38-
"download:windows-installer": "node ./scripts/download-win-installer-deps.mjs",
39-
"build:tauri:win32": "yarn download:bin && yarn download:windows-installer && yarn tauri build",
38+
"build:tauri:win32": "yarn download:bin && yarn tauri build",
4039
"build:tauri:linux": "yarn download:bin && NO_STRIP=1 ./src-tauri/build-utils/shim-linuxdeploy.sh yarn tauri build && ./src-tauri/build-utils/buildAppImage.sh",
4140
"build:tauri:darwin": "yarn download:bin && yarn tauri build --target universal-apple-darwin",
4241
"build:tauri": "yarn build:icon && yarn copy:assets:tauri && run-script-os",

‎scripts/download-win-installer-deps.mjs‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)