Merge branch 'dev' into release/v0.6.6
# Conflicts: # .github/workflows/template-tauri-build-windows-x64.yml # Makefile # extensions/engine-management-extension/engines.mjs
This commit is contained in:
Louis
commit
e424938e02
24
.github/dependabot.yaml
vendored
24
.github/dependabot.yaml
vendored
@ -1,17 +1,19 @@
|
||||
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#package-ecosystem-
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "cargo"
|
||||
directory: "src-tauri"
|
||||
- package-ecosystem: 'cargo'
|
||||
directory: 'src-tauri'
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
- package-ecosystem: "npm"
|
||||
interval: 'weekly'
|
||||
open-pull-requests-limit: 0
|
||||
- package-ecosystem: 'npm'
|
||||
directories:
|
||||
- "/"
|
||||
- "core"
|
||||
- "docs"
|
||||
- "extensions"
|
||||
- "extensions/*"
|
||||
- "web-app"
|
||||
- '/'
|
||||
- 'core'
|
||||
- 'docs'
|
||||
- 'extensions'
|
||||
- 'extensions/*'
|
||||
- 'web-app'
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
interval: 'weekly'
|
||||
open-pull-requests-limit: 0
|
||||
|
||||
3
Makefile
3
Makefile
@ -43,9 +43,6 @@ test: lint
|
||||
yarn download:bin
|
||||
yarn download:lib
|
||||
yarn test
|
||||
# yarn build:icon
|
||||
# yarn copy:assets:tauri
|
||||
# cargo test --manifest-path src-tauri/Cargo.toml
|
||||
|
||||
# Builds and publishes the app
|
||||
build-and-publish: install-and-build
|
||||
|
||||
@ -124,7 +124,7 @@ you will need to wait for a response). Efficient management of tools and their o
|
||||
|
||||
To illustrate how MCPs can be used within Jan, we will walk through an example using the [Browser MCP](https://browsermcp.io/).
|
||||
|
||||
Before we begin, you will need to enable Jan's MCP functionality at `Settings` > `MCP Servers`, and toggle
|
||||
Before we begin, you will need to enable experimental features at `General` > `Advanced`. Next, go to `Settings` > `MCP Servers`, and toggle
|
||||
the `Allow All MCP Tool Permission` switch ON.
|
||||
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
"@radix-ui/react-accordion": "^1.2.10",
|
||||
"@radix-ui/react-dialog": "^1.1.11",
|
||||
"@radix-ui/react-dropdown-menu": "^2.1.11",
|
||||
"@radix-ui/react-hover-card": "^1.1.11",
|
||||
"@radix-ui/react-hover-card": "^1.1.14",
|
||||
"@radix-ui/react-popover": "^1.1.13",
|
||||
"@radix-ui/react-progress": "^1.1.4",
|
||||
"@radix-ui/react-slider": "^1.3.2",
|
||||
|
||||
29
web-app/public/images/model-provider/huggingface.svg
Normal file
29
web-app/public/images/model-provider/huggingface.svg
Normal file
@ -0,0 +1,29 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="95" height="88" fill="none"
|
||||
><path fill="#FFD21E" d="M47.21 76.5a34.75 34.75 0 1 0 0-69.5 34.75 34.75 0 0 0 0 69.5Z" /><path
|
||||
fill="#FF9D0B"
|
||||
d="M81.96 41.75a34.75 34.75 0 1 0-69.5 0 34.75 34.75 0 0 0 69.5 0Zm-73.5 0a38.75 38.75 0 1 1 77.5 0 38.75 38.75 0 0 1-77.5 0Z"
|
||||
/><path
|
||||
fill="#3A3B45"
|
||||
d="M58.5 32.3c1.28.44 1.78 3.06 3.07 2.38a5 5 0 1 0-6.76-2.07c.61 1.15 2.55-.72 3.7-.32Zm-23.55 0c-1.28.44-1.79 3.06-3.07 2.38a5 5 0 1 1 6.76-2.07c-.61 1.15-2.56-.72-3.7-.32Z"
|
||||
/><path
|
||||
fill="#FF323D"
|
||||
d="M46.96 56.29c9.83 0 13-8.76 13-13.26 0-2.34-1.57-1.6-4.09-.36-2.33 1.15-5.46 2.74-8.9 2.74-7.19 0-13-6.88-13-2.38s3.16 13.26 13 13.26Z"
|
||||
/><path
|
||||
fill="#3A3B45"
|
||||
fill-rule="evenodd"
|
||||
d="M39.43 54a8.7 8.7 0 0 1 5.3-4.49c.4-.12.81.57 1.24 1.28.4.68.82 1.37 1.24 1.37.45 0 .9-.68 1.33-1.35.45-.7.89-1.38 1.32-1.25a8.61 8.61 0 0 1 5 4.17c3.73-2.94 5.1-7.74 5.1-10.7 0-2.34-1.57-1.6-4.09-.36l-.14.07c-2.31 1.15-5.39 2.67-8.77 2.67s-6.45-1.52-8.77-2.67c-2.6-1.29-4.23-2.1-4.23.29 0 3.05 1.46 8.06 5.47 10.97Z"
|
||||
clip-rule="evenodd"
|
||||
/><path
|
||||
fill="#FF9D0B"
|
||||
d="M70.71 37a3.25 3.25 0 1 0 0-6.5 3.25 3.25 0 0 0 0 6.5Zm-46.5 0a3.25 3.25 0 1 0 0-6.5 3.25 3.25 0 0 0 0 6.5Zm-6.69 11a5.2 5.2 0 0 0-4.07 1.87 5.97 5.97 0 0 0-1.33 3.76 7.1 7.1 0 0 0-1.94-.3c-1.55 0-2.95.59-3.94 1.66a5.8 5.8 0 0 0-.8 7 5.3 5.3 0 0 0-1.79 2.82c-.24.9-.48 2.8.8 4.74a5.22 5.22 0 0 0-.37 5.02c1.02 2.32 3.57 4.14 8.52 6.1 3.07 1.22 5.89 2 5.91 2.01a44.33 44.33 0 0 0 10.93 1.6c5.86 0 10.05-1.8 12.46-5.34 3.88-5.69 3.33-10.9-1.7-15.92-2.77-2.78-4.62-6.87-5-7.77-.78-2.66-2.84-5.62-6.25-5.62a5.7 5.7 0 0 0-4.6 2.46c-1-1.26-1.98-2.25-2.86-2.82A7.4 7.4 0 0 0 17.52 48Zm0 4c.51 0 1.14.22 1.82.65 2.14 1.36 6.25 8.43 7.76 11.18.5.92 1.37 1.31 2.14 1.31 1.55 0 2.75-1.53.15-3.48-3.92-2.93-2.55-7.72-.68-8.01.08-.02.17-.02.24-.02 1.7 0 2.45 2.93 2.45 2.93s2.2 5.52 5.98 9.3c3.77 3.77 3.97 6.8 1.22 10.83-1.88 2.75-5.47 3.58-9.16 3.58-3.81 0-7.73-.9-9.92-1.46-.11-.03-13.45-3.8-11.76-7 .28-.54.75-.76 1.34-.76 2.38 0 6.7 3.54 8.57 3.54.41 0 .7-.17.83-.6.79-2.85-12.06-4.05-10.98-8.17.2-.73.71-1.02 1.44-1.02 3.14 0 10.2 5.53 11.68 5.53.11 0 .2-.03.24-.1.74-1.2.33-2.04-4.9-5.2-5.21-3.16-8.88-5.06-6.8-7.33.24-.26.58-.38 1-.38 3.17 0 10.66 6.82 10.66 6.82s2.02 2.1 3.25 2.1c.28 0 .52-.1.68-.38.86-1.46-8.06-8.22-8.56-11.01-.34-1.9.24-2.85 1.31-2.85Z"
|
||||
/><path
|
||||
fill="#FFD21E"
|
||||
d="M38.6 76.69c2.75-4.04 2.55-7.07-1.22-10.84-3.78-3.77-5.98-9.3-5.98-9.3s-.82-3.2-2.69-2.9c-1.87.3-3.24 5.08.68 8.01 3.91 2.93-.78 4.92-2.29 2.17-1.5-2.75-5.62-9.82-7.76-11.18-2.13-1.35-3.63-.6-3.13 2.2.5 2.79 9.43 9.55 8.56 11-.87 1.47-3.93-1.71-3.93-1.71s-9.57-8.71-11.66-6.44c-2.08 2.27 1.59 4.17 6.8 7.33 5.23 3.16 5.64 4 4.9 5.2-.75 1.2-12.28-8.53-13.36-4.4-1.08 4.11 11.77 5.3 10.98 8.15-.8 2.85-9.06-5.38-10.74-2.18-1.7 3.21 11.65 6.98 11.76 7.01 4.3 1.12 15.25 3.49 19.08-2.12Z"
|
||||
/><path
|
||||
fill="#FF9D0B"
|
||||
d="M77.4 48c1.62 0 3.07.66 4.07 1.87a5.97 5.97 0 0 1 1.33 3.76 7.1 7.1 0 0 1 1.95-.3c1.55 0 2.95.59 3.94 1.66a5.8 5.8 0 0 1 .8 7 5.3 5.3 0 0 1 1.78 2.82c.24.9.48 2.8-.8 4.74a5.22 5.22 0 0 1 .37 5.02c-1.02 2.32-3.57 4.14-8.51 6.1-3.08 1.22-5.9 2-5.92 2.01a44.33 44.33 0 0 1-10.93 1.6c-5.86 0-10.05-1.8-12.46-5.34-3.88-5.69-3.33-10.9 1.7-15.92 2.78-2.78 4.63-6.87 5.01-7.77.78-2.66 2.83-5.62 6.24-5.62a5.7 5.7 0 0 1 4.6 2.46c1-1.26 1.98-2.25 2.87-2.82A7.4 7.4 0 0 1 77.4 48Zm0 4c-.51 0-1.13.22-1.82.65-2.13 1.36-6.25 8.43-7.76 11.18a2.43 2.43 0 0 1-2.14 1.31c-1.54 0-2.75-1.53-.14-3.48 3.91-2.93 2.54-7.72.67-8.01a1.54 1.54 0 0 0-.24-.02c-1.7 0-2.45 2.93-2.45 2.93s-2.2 5.52-5.97 9.3c-3.78 3.77-3.98 6.8-1.22 10.83 1.87 2.75 5.47 3.58 9.15 3.58 3.82 0 7.73-.9 9.93-1.46.1-.03 13.45-3.8 11.76-7-.29-.54-.75-.76-1.34-.76-2.38 0-6.71 3.54-8.57 3.54-.42 0-.71-.17-.83-.6-.8-2.85 12.05-4.05 10.97-8.17-.19-.73-.7-1.02-1.44-1.02-3.14 0-10.2 5.53-11.68 5.53-.1 0-.19-.03-.23-.1-.74-1.2-.34-2.04 4.88-5.2 5.23-3.16 8.9-5.06 6.8-7.33-.23-.26-.57-.38-.98-.38-3.18 0-10.67 6.82-10.67 6.82s-2.02 2.1-3.24 2.1a.74.74 0 0 1-.68-.38c-.87-1.46 8.05-8.22 8.55-11.01.34-1.9-.24-2.85-1.31-2.85Z"
|
||||
/><path
|
||||
fill="#FFD21E"
|
||||
d="M56.33 76.69c-2.75-4.04-2.56-7.07 1.22-10.84 3.77-3.77 5.97-9.3 5.97-9.3s.82-3.2 2.7-2.9c1.86.3 3.23 5.08-.68 8.01-3.92 2.93.78 4.92 2.28 2.17 1.51-2.75 5.63-9.82 7.76-11.18 2.13-1.35 3.64-.6 3.13 2.2-.5 2.79-9.42 9.55-8.55 11 .86 1.47 3.92-1.71 3.92-1.71s9.58-8.71 11.66-6.44c2.08 2.27-1.58 4.17-6.8 7.33-5.23 3.16-5.63 4-4.9 5.2.75 1.2 12.28-8.53 13.36-4.4 1.08 4.11-11.76 5.3-10.97 8.15.8 2.85 9.05-5.38 10.74-2.18 1.69 3.21-11.65 6.98-11.76 7.01-4.31 1.12-15.26 3.49-19.08-2.12Z"
|
||||
/></svg
|
||||
>
|
||||
|
After Width: | Height: | Size: 4.5 KiB |
@ -12,6 +12,8 @@ export function getProviderLogo(provider: string) {
|
||||
return '/images/model-provider/llamacpp.svg'
|
||||
case 'anthropic':
|
||||
return '/images/model-provider/anthropic.svg'
|
||||
case 'huggingface':
|
||||
return '/images/model-provider/huggingface.svg'
|
||||
case 'mistral':
|
||||
return '/images/model-provider/mistral.svg'
|
||||
case 'martian':
|
||||
@ -47,6 +49,8 @@ export const getProviderTitle = (provider: string) => {
|
||||
return 'OpenRouter'
|
||||
case 'gemini':
|
||||
return 'Gemini'
|
||||
case 'huggingface':
|
||||
return 'Hugging Face'
|
||||
default:
|
||||
return provider.charAt(0).toUpperCase() + provider.slice(1)
|
||||
}
|
||||
|
||||
@ -281,4 +281,64 @@ export const predefinedProviders = [
|
||||
],
|
||||
models: [],
|
||||
},
|
||||
{
|
||||
active: true,
|
||||
api_key: '',
|
||||
base_url: 'https://router.huggingface.co/v1',
|
||||
explore_models_url:
|
||||
'https://huggingface.co/models?pipeline_tag=text-generation&inference_provider=all',
|
||||
provider: 'huggingface',
|
||||
settings: [
|
||||
{
|
||||
key: 'api-key',
|
||||
title: 'API Key',
|
||||
description:
|
||||
"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.",
|
||||
controller_type: 'input',
|
||||
controller_props: {
|
||||
placeholder: 'Insert API Token',
|
||||
value: '',
|
||||
type: 'password',
|
||||
input_actions: ['unobscure', 'copy'],
|
||||
},
|
||||
},
|
||||
{
|
||||
key: 'base-url',
|
||||
title: 'Base URL',
|
||||
description:
|
||||
'The base endpoint to use. See the [Hugging Face Inference Providers documentation](https://huggingface.co/docs/inference-providers) for more information.',
|
||||
controller_type: 'input',
|
||||
controller_props: {
|
||||
placeholder: 'https://router.huggingface.co/v1',
|
||||
value: 'https://router.huggingface.co/v1',
|
||||
},
|
||||
},
|
||||
],
|
||||
models: [
|
||||
{
|
||||
id: 'moonshotai/Kimi-K2-Instruct:groq',
|
||||
name: 'Kimi-K2-Instruct',
|
||||
version: '1.0',
|
||||
description:
|
||||
'1T parameters Moonshot chat model tuned for tool-aware, nuanced responses.',
|
||||
capabilities: ['completion', 'tools'],
|
||||
},
|
||||
{
|
||||
id: 'deepseek-ai/DeepSeek-R1-0528',
|
||||
name: 'DeepSeek-R1-0528',
|
||||
version: '1.0',
|
||||
description:
|
||||
"DeepSeek's flagship reasoning engine with open weights and advanced tool control.",
|
||||
capabilities: ['completion', 'tools'],
|
||||
},
|
||||
{
|
||||
id: 'deepseek-ai/DeepSeek-V3-0324',
|
||||
name: 'DeepSeek-V3-0324',
|
||||
version: '1.0',
|
||||
description:
|
||||
'Streamlined DeepSeek model focused on fast, high-quality completions and tool use.',
|
||||
capabilities: ['completion', 'tools'],
|
||||
},
|
||||
],
|
||||
},
|
||||
]
|
||||
|
||||
18
yarn.lock
18
yarn.lock
@ -2572,7 +2572,7 @@ __metadata:
|
||||
"@radix-ui/react-accordion": "npm:^1.2.10"
|
||||
"@radix-ui/react-dialog": "npm:^1.1.11"
|
||||
"@radix-ui/react-dropdown-menu": "npm:^2.1.11"
|
||||
"@radix-ui/react-hover-card": "npm:^1.1.11"
|
||||
"@radix-ui/react-hover-card": "npm:^1.1.14"
|
||||
"@radix-ui/react-popover": "npm:^1.1.13"
|
||||
"@radix-ui/react-progress": "npm:^1.1.4"
|
||||
"@radix-ui/react-slider": "npm:^1.3.2"
|
||||
@ -3889,18 +3889,18 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@radix-ui/react-hover-card@npm:^1.1.11":
|
||||
version: 1.1.11
|
||||
resolution: "@radix-ui/react-hover-card@npm:1.1.11"
|
||||
"@radix-ui/react-hover-card@npm:^1.1.14":
|
||||
version: 1.1.14
|
||||
resolution: "@radix-ui/react-hover-card@npm:1.1.14"
|
||||
dependencies:
|
||||
"@radix-ui/primitive": "npm:1.1.2"
|
||||
"@radix-ui/react-compose-refs": "npm:1.1.2"
|
||||
"@radix-ui/react-context": "npm:1.1.2"
|
||||
"@radix-ui/react-dismissable-layer": "npm:1.1.7"
|
||||
"@radix-ui/react-popper": "npm:1.2.4"
|
||||
"@radix-ui/react-portal": "npm:1.1.6"
|
||||
"@radix-ui/react-dismissable-layer": "npm:1.1.10"
|
||||
"@radix-ui/react-popper": "npm:1.2.7"
|
||||
"@radix-ui/react-portal": "npm:1.1.9"
|
||||
"@radix-ui/react-presence": "npm:1.1.4"
|
||||
"@radix-ui/react-primitive": "npm:2.1.0"
|
||||
"@radix-ui/react-primitive": "npm:2.1.3"
|
||||
"@radix-ui/react-use-controllable-state": "npm:1.2.2"
|
||||
peerDependencies:
|
||||
"@types/react": "*"
|
||||
@ -3912,7 +3912,7 @@ __metadata:
|
||||
optional: true
|
||||
"@types/react-dom":
|
||||
optional: true
|
||||
checksum: 10c0/bb309a27a37edad7c31a7d8ec392d27f0d62fafb0011624f0dbc607038773091e2981c68aefb96eb24ec3bc18b390a0f8acabe011e6ef57e979e0e72140f6e0e
|
||||
checksum: 10c0/f352bab22dd81ac2ef1140ca1a8426913010851becd03df9d8b8476bdf6ef7001f0559f6a61c4f98ff8033d6cedacd4c86ad47e4c391385254430e266329a2a0
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user