Skip to content

Commit e424938

Browse files
louis-janlouis-jan
committed
Merge branch 'dev' into release/v0.6.6
# Conflicts: # .github/workflows/template-tauri-build-windows-x64.yml # Makefile # extensions/engine-management-extension/engines.mjs
2 parents fceecff + e82e5e1 commit e424938

File tree

8 files changed

+117
-25
lines changed

8 files changed

+117
-25
lines changed

‎.github/dependabot.yaml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#package-ecosystem-
22
version: 2
33
updates:
4-
- package-ecosystem: "cargo"
5-
directory: "src-tauri"
4+
- package-ecosystem: 'cargo'
5+
directory: 'src-tauri'
66
schedule:
7-
interval: "weekly"
8-
- package-ecosystem: "npm"
7+
interval: 'weekly'
8+
open-pull-requests-limit: 0
9+
- package-ecosystem: 'npm'
910
directories:
10-
- "/"
11-
- "core"
12-
- "docs"
13-
- "extensions"
14-
- "extensions/*"
15-
- "web-app"
11+
- '/'
12+
- 'core'
13+
- 'docs'
14+
- 'extensions'
15+
- 'extensions/*'
16+
- 'web-app'
1617
schedule:
17-
interval: "weekly"
18+
interval: 'weekly'
19+
open-pull-requests-limit: 0

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ test: lint
4343
yarn download:bin
4444
yarn download:lib
4545
yarn test
46-
# yarn build:icon
47-
# yarn copy:assets:tauri
48-
# cargo test --manifest-path src-tauri/Cargo.toml
4946

5047
# Builds and publishes the app
5148
build-and-publish: install-and-build

‎docs/src/pages/docs/mcp.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ you will need to wait for a response). Efficient management of tools and their o
124124

125125
To illustrate how MCPs can be used within Jan, we will walk through an example using the [Browser MCP](https://browsermcp.io/).
126126

127-
Before we begin, you will need to enable Jan's MCP functionality at `Settings` > `MCP Servers`, and toggle
127+
Before we begin, you will need to enable experimental features at `General` > `Advanced`. Next, go to `Settings` > `MCP Servers`, and toggle
128128
the `Allow All MCP Tool Permission` switch ON.
129129

130130
![Turn on the MCP Host](./_assets/mcp-on.png)

‎web-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@radix-ui/react-accordion": "^1.2.10",
2020
"@radix-ui/react-dialog": "^1.1.11",
2121
"@radix-ui/react-dropdown-menu": "^2.1.11",
22-
"@radix-ui/react-hover-card": "^1.1.11",
22+
"@radix-ui/react-hover-card": "^1.1.14",
2323
"@radix-ui/react-popover": "^1.1.13",
2424
"@radix-ui/react-progress": "^1.1.4",
2525
"@radix-ui/react-slider": "^1.3.2",

‎web-app/public/images/model-provider/huggingface.svg‎

Lines changed: 29 additions & 0 deletions
Loading

‎web-app/src/lib/utils.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export function getProviderLogo(provider: string) {
1212
return '/images/model-provider/llamacpp.svg'
1313
case 'anthropic':
1414
return '/images/model-provider/anthropic.svg'
15+
case 'huggingface':
16+
return '/images/model-provider/huggingface.svg'
1517
case 'mistral':
1618
return '/images/model-provider/mistral.svg'
1719
case 'martian':
@@ -47,6 +49,8 @@ export const getProviderTitle = (provider: string) => {
4749
return 'OpenRouter'
4850
case 'gemini':
4951
return 'Gemini'
52+
case 'huggingface':
53+
return 'Hugging Face'
5054
default:
5155
return provider.charAt(0).toUpperCase() + provider.slice(1)
5256
}

‎web-app/src/mock/data.ts‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,4 +281,64 @@ export const predefinedProviders = [
281281
],
282282
models: [],
283283
},
284+
{
285+
active: true,
286+
api_key: '',
287+
base_url: 'https://router.huggingface.co/v1',
288+
explore_models_url:
289+
'https://huggingface.co/models?pipeline_tag=text-generation&inference_provider=all',
290+
provider: 'huggingface',
291+
settings: [
292+
{
293+
key: 'api-key',
294+
title: 'API Key',
295+
description:
296+
"The Hugging Face API uses tokens for authentication. Visit your [Access Tokens](https://huggingface.co/settings/tokens) page to retrieve the token you'll use in your requests.",
297+
controller_type: 'input',
298+
controller_props: {
299+
placeholder: 'Insert API Token',
300+
value: '',
301+
type: 'password',
302+
input_actions: ['unobscure', 'copy'],
303+
},
304+
},
305+
{
306+
key: 'base-url',
307+
title: 'Base URL',
308+
description:
309+
'The base endpoint to use. See the [Hugging Face Inference Providers documentation](https://huggingface.co/docs/inference-providers) for more information.',
310+
controller_type: 'input',
311+
controller_props: {
312+
placeholder: 'https://router.huggingface.co/v1',
313+
value: 'https://router.huggingface.co/v1',
314+
},
315+
},
316+
],
317+
models: [
318+
{
319+
id: 'moonshotai/Kimi-K2-Instruct:groq',
320+
name: 'Kimi-K2-Instruct',
321+
version: '1.0',
322+
description:
323+
'1T parameters Moonshot chat model tuned for tool-aware, nuanced responses.',
324+
capabilities: ['completion', 'tools'],
325+
},
326+
{
327+
id: 'deepseek-ai/DeepSeek-R1-0528',
328+
name: 'DeepSeek-R1-0528',
329+
version: '1.0',
330+
description:
331+
"DeepSeek's flagship reasoning engine with open weights and advanced tool control.",
332+
capabilities: ['completion', 'tools'],
333+
},
334+
{
335+
id: 'deepseek-ai/DeepSeek-V3-0324',
336+
name: 'DeepSeek-V3-0324',
337+
version: '1.0',
338+
description:
339+
'Streamlined DeepSeek model focused on fast, high-quality completions and tool use.',
340+
capabilities: ['completion', 'tools'],
341+
},
342+
],
343+
},
284344
]

‎yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2572,7 +2572,7 @@ __metadata:
25722572
"@radix-ui/react-accordion": "npm:^1.2.10"
25732573
"@radix-ui/react-dialog": "npm:^1.1.11"
25742574
"@radix-ui/react-dropdown-menu": "npm:^2.1.11"
2575-
"@radix-ui/react-hover-card": "npm:^1.1.11"
2575+
"@radix-ui/react-hover-card": "npm:^1.1.14"
25762576
"@radix-ui/react-popover": "npm:^1.1.13"
25772577
"@radix-ui/react-progress": "npm:^1.1.4"
25782578
"@radix-ui/react-slider": "npm:^1.3.2"
@@ -3889,18 +3889,18 @@ __metadata:
38893889
languageName: node
38903890
linkType: hard
38913891

3892-
"@radix-ui/react-hover-card@npm:^1.1.11":
3893-
version: 1.1.11
3894-
resolution: "@radix-ui/react-hover-card@npm:1.1.11"
3892+
"@radix-ui/react-hover-card@npm:^1.1.14":
3893+
version: 1.1.14
3894+
resolution: "@radix-ui/react-hover-card@npm:1.1.14"
38953895
dependencies:
38963896
"@radix-ui/primitive": "npm:1.1.2"
38973897
"@radix-ui/react-compose-refs": "npm:1.1.2"
38983898
"@radix-ui/react-context": "npm:1.1.2"
3899-
"@radix-ui/react-dismissable-layer": "npm:1.1.7"
3900-
"@radix-ui/react-popper": "npm:1.2.4"
3901-
"@radix-ui/react-portal": "npm:1.1.6"
3899+
"@radix-ui/react-dismissable-layer": "npm:1.1.10"
3900+
"@radix-ui/react-popper": "npm:1.2.7"
3901+
"@radix-ui/react-portal": "npm:1.1.9"
39023902
"@radix-ui/react-presence": "npm:1.1.4"
3903-
"@radix-ui/react-primitive": "npm:2.1.0"
3903+
"@radix-ui/react-primitive": "npm:2.1.3"
39043904
"@radix-ui/react-use-controllable-state": "npm:1.2.2"
39053905
peerDependencies:
39063906
"@types/react": "*"
@@ -3912,7 +3912,7 @@ __metadata:
39123912
optional: true
39133913
"@types/react-dom":
39143914
optional: true
3915-
checksum: 10c0/bb309a27a37edad7c31a7d8ec392d27f0d62fafb0011624f0dbc607038773091e2981c68aefb96eb24ec3bc18b390a0f8acabe011e6ef57e979e0e72140f6e0e
3915+
checksum: 10c0/f352bab22dd81ac2ef1140ca1a8426913010851becd03df9d8b8476bdf6ef7001f0559f6a61c4f98ff8033d6cedacd4c86ad47e4c391385254430e266329a2a0
39163916
languageName: node
39173917
linkType: hard
39183918

0 commit comments

Comments
 (0)