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

Merge branch 'dev' into more-groq-models

Browse Source
This commit is contained in:
Sharun 2024-11-07 12:24:11 -06:00 committed by GitHub
commit 091dd5af70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
205 changed files with 3167 additions and 4584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
.github/scripts/rename-app-beta.sh vendored
View File

@ -1,47 +0,0 @@
#!/bin/bash
# Check if the correct number of arguments is provided
if [ "$#" -ne 1 ]; then
echo "Usage: $0 <path_to_json_input_file>"
exit 1
fi
INPUT_JSON_FILE="$1"
# Check if the input file exists
if [ ! -f "$INPUT_JSON_FILE" ]; then
echo "Input file not found: $INPUT_JSON_FILE"
exit 1
fi
# Use jq to transform the content
jq '
.name = "jan-beta" |
.productName = "Jan-beta" |
.build.appId = "jan-beta.ai.app" |
.build.productName = "Jan-beta" |
.build.appId = "jan-beta.ai.app" |
.build.protocols[0].name = "Jan-beta" |
.build.protocols[0].schemes = ["jan-beta"] |
.build.artifactName = "jan-beta-${os}-${arch}-${version}.${ext}" |
.build.publish[0].channel = "beta"
' "$INPUT_JSON_FILE" > ./package.json.tmp
cat ./package.json.tmp
rm $INPUT_JSON_FILE
mv ./package.json.tmp $INPUT_JSON_FILE
# Update the layout file
LAYOUT_FILE_PATH="web/app/layout.tsx"
if [ ! -f "$LAYOUT_FILE_PATH" ]; then
echo "File does not exist: $LAYOUT_FILE_PATH"
exit 1
fi
# Perform the replacements
sed -i -e "s#Jan#Jan-beta#g" "$LAYOUT_FILE_PATH"
# Notify completion
echo "File has been updated: $LAYOUT_FILE_PATH"

55
.github/scripts/rename-app.sh vendored Normal file
View File

@ -0,0 +1,55 @@
#!/bin/bash
# Check if the correct number of arguments is provided
if [ "$#" -ne 2 ]; then
echo "Usage: $0 <path_to_json_input_file> <channel>"
exit 1
fi
INPUT_JSON_FILE="$1"
CHANNEL="$2"
if [ "$CHANNEL" == "nightly" ]; then
UPDATER="latest"
else
UPDATER="beta"
fi
# Check if the input file exists
if [ ! -f "$INPUT_JSON_FILE" ]; then
echo "Input file not found: $INPUT_JSON_FILE"
exit 1
fi
# Use jq to transform the content
jq --arg channel "$CHANNEL" --arg updater "$UPDATER" '
.name = "jan-\($channel)" |
.productName = "Jan-\($channel)" |
.build.appId = "jan-\($channel).ai.app" |
.build.productName = "Jan-\($channel)" |
.build.appId = "jan-\($channel).ai.app" |
.build.protocols[0].name = "Jan-\($channel)" |
.build.protocols[0].schemes = ["jan-\($channel)"] |
.build.artifactName = "jan-\($channel)-${os}-${arch}-${version}.${ext}" |
.build.publish[0].channel = $updater
' "$INPUT_JSON_FILE" > ./package.json.tmp
cat ./package.json.tmp
rm $INPUT_JSON_FILE
mv ./package.json.tmp $INPUT_JSON_FILE
# Update the layout file
LAYOUT_FILE_PATH="web/app/layout.tsx"
if [ ! -f "$LAYOUT_FILE_PATH" ]; then
echo "File does not exist: $LAYOUT_FILE_PATH"
exit 1
fi
# Perform the replacements
sed -i -e "s#Jan#Jan-$CHANNEL#g" "$LAYOUT_FILE_PATH"
# Notify completion
echo "File has been updated: $LAYOUT_FILE_PATH"

10
.github/scripts/rename-uninstaller-beta.sh → .github/scripts/rename-uninstaller.sh vendored
View File

@ -3,6 +3,14 @@
# File path to be modified # File path to be modified
FILE_PATH="electron/scripts/uninstaller.nsh" FILE_PATH="electron/scripts/uninstaller.nsh"
# Check if the correct number of arguments is provided
if [ "$#" -ne 1 ]; then
echo "Usage: $0 <channel>"
exit 1
fi
CHANNEL="$1"
# Check if the file exists # Check if the file exists
if [ ! -f "$FILE_PATH" ]; then if [ ! -f "$FILE_PATH" ]; then
echo "File does not exist: $FILE_PATH" echo "File does not exist: $FILE_PATH"
@ -10,7 +18,7 @@ if [ ! -f "$FILE_PATH" ]; then
fi fi
# Perform the replacements # Perform the replacements
sed -i -e "s#jan#jan-beta#g" "$FILE_PATH" sed -i -e "s#jan#jan-$CHANNEL#g" "$FILE_PATH"
# Notify completion # Notify completion
echo "File has been updated: $FILE_PATH" echo "File has been updated: $FILE_PATH"

4
.github/scripts/rename-workspace-beta.sh → .github/scripts/rename-workspace.sh vendored
View File

@ -3,6 +3,8 @@
# File path to be modified # File path to be modified
FILE_PATH="$1" FILE_PATH="$1"
CHANNEL="$2"
# Check if the file exists # Check if the file exists
if [ ! -f "$FILE_PATH" ]; then if [ ! -f "$FILE_PATH" ]; then
echo "File does not exist: $FILE_PATH" echo "File does not exist: $FILE_PATH"
@ -10,7 +12,7 @@ if [ ! -f "$FILE_PATH" ]; then
fi fi
# Perform the replacements # Perform the replacements
sed -i -e 's/yarn workspace jan/yarn workspace jan-beta/g' "$FILE_PATH" sed -i -e "s/yarn workspace jan/yarn workspace jan-$CHANNEL/g" "$FILE_PATH"
# Notify completion # Notify completion
echo "File has been updated: $FILE_PATH" echo "File has been updated: $FILE_PATH"

64
.github/workflows/jan-electron-build-nightly.yml vendored
View File

@ -114,8 +114,8 @@ jobs:
- name: Upload latest-mac.yml - name: Upload latest-mac.yml
if: ${{ needs.set-public-provider.outputs.public_provider == 'aws-s3' }} if: ${{ needs.set-public-provider.outputs.public_provider == 'aws-s3' }}
run: | run: |
aws s3 cp ./latest-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-latest/latest-mac.yml" aws s3 cp ./latest-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-nightly/latest-mac.yml"
aws s3 sync s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-latest/ s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/latest/ aws s3 sync s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-nightly/ s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/nightly/
env: env:
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
@ -123,35 +123,35 @@ jobs:
AWS_EC2_METADATA_DISABLED: "true" AWS_EC2_METADATA_DISABLED: "true"
noti-discord-nightly-and-update-url-readme: # noti-discord-nightly-and-update-url-readme:
needs: [build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64, get-update-version, set-public-provider, combine-latest-mac-yml] # needs: [build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64, get-update-version, set-public-provider, combine-latest-mac-yml]
secrets: inherit # secrets: inherit
if: github.event_name == 'schedule' # if: github.event_name == 'schedule'
uses: ./.github/workflows/template-noti-discord-and-update-url-readme.yml # uses: ./.github/workflows/template-noti-discord-and-update-url-readme.yml
with: # with:
ref: refs/heads/dev # ref: refs/heads/dev
build_reason: Nightly # build_reason: Nightly
push_to_branch: dev # push_to_branch: dev
new_version: ${{ needs.get-update-version.outputs.new_version }} # new_version: ${{ needs.get-update-version.outputs.new_version }}
noti-discord-pre-release-and-update-url-readme: # noti-discord-pre-release-and-update-url-readme:
needs: [build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64, get-update-version, set-public-provider, combine-latest-mac-yml] # needs: [build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64, get-update-version, set-public-provider, combine-latest-mac-yml]
secrets: inherit # secrets: inherit
if: github.event_name == 'push' # if: github.event_name == 'push'
uses: ./.github/workflows/template-noti-discord-and-update-url-readme.yml # uses: ./.github/workflows/template-noti-discord-and-update-url-readme.yml
with: # with:
ref: refs/heads/dev # ref: refs/heads/dev
build_reason: Pre-release # build_reason: Pre-release
push_to_branch: dev # push_to_branch: dev
new_version: ${{ needs.get-update-version.outputs.new_version }} # new_version: ${{ needs.get-update-version.outputs.new_version }}
noti-discord-manual-and-update-url-readme: # noti-discord-manual-and-update-url-readme:
needs: [build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64, get-update-version, set-public-provider, combine-latest-mac-yml] # needs: [build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64, get-update-version, set-public-provider, combine-latest-mac-yml]
secrets: inherit # secrets: inherit
if: github.event_name == 'workflow_dispatch' && github.event.inputs.public_provider == 'aws-s3' # if: github.event_name == 'workflow_dispatch' && github.event.inputs.public_provider == 'aws-s3'
uses: ./.github/workflows/template-noti-discord-and-update-url-readme.yml # uses: ./.github/workflows/template-noti-discord-and-update-url-readme.yml
with: # with:
ref: refs/heads/dev # ref: refs/heads/dev
build_reason: Manual # build_reason: Manual
push_to_branch: dev # push_to_branch: dev
new_version: ${{ needs.get-update-version.outputs.new_version }} # new_version: ${{ needs.get-update-version.outputs.new_version }}

7
.github/workflows/jan-electron-linter-and-test.yml vendored
View File

@ -319,6 +319,13 @@ jobs:
# TURBO_TEAM: 'linux' # TURBO_TEAM: 'linux'
# TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}' # TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: electron/playwright-report/
retention-days: 2
coverage-check: coverage-check:
runs-on: [self-hosted, Linux, ubuntu-desktop] runs-on: [self-hosted, Linux, ubuntu-desktop]
needs: base_branch_cov needs: base_branch_cov

17
.github/workflows/template-build-linux-x64.yml vendored
View File

@ -60,18 +60,25 @@ jobs:
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
mv /tmp/package.json web/package.json mv /tmp/package.json web/package.json
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/nightly", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-nightly", "channel": "latest"}]' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
cat electron/package.json cat electron/package.json
# chmod +x .github/scripts/rename-app.sh
# .github/scripts/rename-app.sh ./electron/package.json nightly
# chmod +x .github/scripts/rename-workspace.sh
# .github/scripts/rename-workspace.sh ./package.json nightly
# echo "------------------------"
# cat ./electron/package.json
# echo "------------------------"
- name: Change App Name for beta version - name: Change App Name for beta version
if: inputs.beta == true if: inputs.beta == true
shell: bash shell: bash
run: | run: |
chmod +x .github/scripts/rename-app-beta.sh chmod +x .github/scripts/rename-app.sh
.github/scripts/rename-app-beta.sh ./electron/package.json .github/scripts/rename-app.sh ./electron/package.json beta
chmod +x .github/scripts/rename-workspace-beta.sh chmod +x .github/scripts/rename-workspace.sh
.github/scripts/rename-workspace-beta.sh ./package.json .github/scripts/rename-workspace.sh ./package.json beta
echo "------------------------" echo "------------------------"
cat ./electron/package.json cat ./electron/package.json
echo "------------------------" echo "------------------------"

21
.github/workflows/template-build-macos-arm64.yml vendored
View File

@ -72,22 +72,29 @@ jobs:
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
mv /tmp/package.json web/package.json mv /tmp/package.json web/package.json
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/nightly", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-nightly", "channel": "latest"}]' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
cat electron/package.json # cat electron/package.json
# chmod +x .github/scripts/rename-app.sh
# .github/scripts/rename-app.sh ./electron/package.json nightly
# chmod +x .github/scripts/rename-workspace.sh
# .github/scripts/rename-workspace.sh ./package.json nightly
# echo "------------------------"
# cat ./electron/package.json
# echo "------------------------"
- name: Change App Name for beta version - name: Change App Name for beta version
if: inputs.beta == true if: inputs.beta == true
shell: bash shell: bash
run: | run: |
chmod +x .github/scripts/rename-app-beta.sh chmod +x .github/scripts/rename-app.sh
.github/scripts/rename-app-beta.sh ./electron/package.json .github/scripts/rename-app.sh ./electron/package.json beta
chmod +x .github/scripts/rename-workspace-beta.sh chmod +x .github/scripts/rename-workspace.sh
.github/scripts/rename-workspace-beta.sh ./package.json .github/scripts/rename-workspace.sh ./package.json beta
echo "------------------------" echo "------------------------"
cat ./electron/package.json cat ./electron/package.json
echo "------------------------" echo "------------------------"
@ -186,7 +193,7 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: jan-mac-arm64-${{ inputs.new_version }} name: jan-mac-arm64-${{ inputs.new_version }}
path: ./electron/dist/jan-mac-arm64-${{ inputs.new_version }}.dmg path: ./electron/dist/*.dmg
- name: Upload Artifact - name: Upload Artifact
if: inputs.beta == false if: inputs.beta == false

21
.github/workflows/template-build-macos-x64.yml vendored
View File

@ -72,22 +72,29 @@ jobs:
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
mv /tmp/package.json web/package.json mv /tmp/package.json web/package.json
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/nightly", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-nightly", "channel": "latest"}]' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
cat electron/package.json # cat electron/package.json
# chmod +x .github/scripts/rename-app.sh
# .github/scripts/rename-app.sh ./electron/package.json nightly
# chmod +x .github/scripts/rename-workspace.sh
# .github/scripts/rename-workspace.sh ./package.json nightly
# echo "------------------------"
# cat ./electron/package.json
# echo "------------------------"
- name: Change App Name for beta version - name: Change App Name for beta version
if: inputs.beta == true if: inputs.beta == true
shell: bash shell: bash
run: | run: |
chmod +x .github/scripts/rename-app-beta.sh chmod +x .github/scripts/rename-app.sh
.github/scripts/rename-app-beta.sh ./electron/package.json .github/scripts/rename-app.sh ./electron/package.json beta
chmod +x .github/scripts/rename-workspace-beta.sh chmod +x .github/scripts/rename-workspace.sh
.github/scripts/rename-workspace-beta.sh ./package.json .github/scripts/rename-workspace.sh ./package.json beta
echo "------------------------" echo "------------------------"
cat ./electron/package.json cat ./electron/package.json
echo "------------------------" echo "------------------------"
@ -186,7 +193,7 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: jan-mac-x64-${{ inputs.new_version }} name: jan-mac-x64-${{ inputs.new_version }}
path: ./electron/dist/jan-mac-x64-${{ inputs.new_version }}.dmg path: ./electron/dist/*.dmg
- name: Upload Artifact - name: Upload Artifact
if: inputs.beta == false if: inputs.beta == false

26
.github/workflows/template-build-windows-x64.yml vendored
View File

@ -73,23 +73,35 @@ jobs:
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
mv /tmp/package.json web/package.json mv /tmp/package.json web/package.json
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/nightly", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-nightly", "channel": "latest"}]' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
jq '.build.win.sign = "./sign.js"' electron/package.json > /tmp/package.json jq '.build.win.sign = "./sign.js"' electron/package.json > /tmp/package.json
mv /tmp/package.json electron/package.json mv /tmp/package.json electron/package.json
cat electron/package.json cat electron/package.json
# chmod +x .github/scripts/rename-app.sh
# .github/scripts/rename-app.sh ./electron/package.json nightly
# chmod +x .github/scripts/rename-workspace.sh
# .github/scripts/rename-workspace.sh ./package.json nightly
# chmod +x .github/scripts/rename-uninstaller.sh
# .github/scripts/rename-uninstaller.sh nightly
# echo "------------------------"
# cat ./electron/package.json
# echo "------------------------"
# cat ./package.json
# echo "------------------------"
- name: Change App Name for beta version - name: Change App Name for beta version
if: inputs.beta == true if: inputs.beta == true
shell: bash shell: bash
run: | run: |
chmod +x .github/scripts/rename-app-beta.sh chmod +x .github/scripts/rename-app.sh
.github/scripts/rename-app-beta.sh ./electron/package.json .github/scripts/rename-app.sh ./electron/package.json beta
chmod +x .github/scripts/rename-workspace-beta.sh chmod +x .github/scripts/rename-workspace.sh
.github/scripts/rename-workspace-beta.sh ./package.json .github/scripts/rename-workspace.sh ./package.json beta
chmod +x .github/scripts/rename-uninstaller-beta.sh chmod +x .github/scripts/rename-uninstaller.sh
.github/scripts/rename-uninstaller-beta.sh .github/scripts/rename-uninstaller.sh beta
echo "------------------------" echo "------------------------"
cat ./electron/package.json cat ./electron/package.json
echo "------------------------" echo "------------------------"

2
.husky/pre-commit
View File

@ -1 +1 @@
npm run lint --fix npx oxlint@latest --fix

35
core/src/browser/extension.ts
View File

@ -1,6 +1,8 @@
import { SettingComponentProps } from '../types' import { Model, ModelEvent, SettingComponentProps } from '../types'
import { getJanDataFolderPath, joinPath } from './core' import { getJanDataFolderPath, joinPath } from './core'
import { events } from './events'
import { fs } from './fs' import { fs } from './fs'
import { ModelManager } from './models'
export enum ExtensionTypeEnum { export enum ExtensionTypeEnum {
Assistant = 'assistant', Assistant = 'assistant',
@ -103,6 +105,22 @@ export abstract class BaseExtension implements ExtensionType {
return undefined return undefined
} }
/**
* Registers models - it persists in-memory shared ModelManager instance's data map.
* @param models
*/
async registerModels(models: Model[]): Promise<void> {
for (const model of models) {
ModelManager.instance().register(model)
}
events.emit(ModelEvent.OnModelsUpdate, {})
}
/**
* Register settings for the extension.
* @param settings
* @returns
*/
async registerSettings(settings: SettingComponentProps[]): Promise<void> { async registerSettings(settings: SettingComponentProps[]): Promise<void> {
if (!this.name) { if (!this.name) {
console.error('Extension name is not defined') console.error('Extension name is not defined')
@ -139,6 +157,12 @@ export abstract class BaseExtension implements ExtensionType {
} }
} }
/**
* Get the setting value for the key.
* @param key
* @param defaultValue
* @returns
*/
async getSetting<T>(key: string, defaultValue: T) { async getSetting<T>(key: string, defaultValue: T) {
const keySetting = (await this.getSettings()).find((setting) => setting.key === key) const keySetting = (await this.getSettings()).find((setting) => setting.key === key)
@ -168,6 +192,10 @@ export abstract class BaseExtension implements ExtensionType {
return return
} }
/**
* Get the settings for the extension.
* @returns
*/
async getSettings(): Promise<SettingComponentProps[]> { async getSettings(): Promise<SettingComponentProps[]> {
if (!this.name) return [] if (!this.name) return []
@ -189,6 +217,11 @@ export abstract class BaseExtension implements ExtensionType {
} }
} }
/**
* Update the settings for the extension.
* @param componentProps
* @returns
*/
async updateSettings(componentProps: Partial<SettingComponentProps>[]): Promise<void> { async updateSettings(componentProps: Partial<SettingComponentProps>[]): Promise<void> {
if (!this.name) return if (!this.name) return

8
core/src/browser/extensions/engines/AIEngine.test.ts
View File

@ -1,8 +1,6 @@
import { AIEngine } from './AIEngine' import { AIEngine } from './AIEngine'
import { events } from '../../events' import { events } from '../../events'
import { ModelEvent, Model, ModelFile, InferenceEngine } from '../../../types' import { ModelEvent, Model } from '../../../types'
import { EngineManager } from './EngineManager'
import { fs } from '../../fs'
jest.mock('../../events') jest.mock('../../events')
jest.mock('./EngineManager') jest.mock('./EngineManager')
@ -26,7 +24,7 @@ describe('AIEngine', () => {
}) })
it('should load model if provider matches', async () => { it('should load model if provider matches', async () => {
const model: ModelFile = { id: 'model1', engine: 'test-provider' } as any const model: any = { id: 'model1', engine: 'test-provider' } as any
await engine.loadModel(model) await engine.loadModel(model)
@ -34,7 +32,7 @@ describe('AIEngine', () => {
}) })
it('should not load model if provider does not match', async () => { it('should not load model if provider does not match', async () => {
const model: ModelFile = { id: 'model1', engine: 'other-provider' } as any const model: any = { id: 'model1', engine: 'other-provider' } as any
await engine.loadModel(model) await engine.loadModel(model)

54
core/src/browser/extensions/engines/AIEngine.ts
View File

@ -1,17 +1,14 @@
import { getJanDataFolderPath, joinPath } from '../../core'
import { events } from '../../events' import { events } from '../../events'
import { BaseExtension } from '../../extension' import { BaseExtension } from '../../extension'
import { fs } from '../../fs' import { MessageRequest, Model, ModelEvent } from '../../../types'
import { MessageRequest, Model, ModelEvent, ModelFile } from '../../../types'
import { EngineManager } from './EngineManager' import { EngineManager } from './EngineManager'
import { ModelManager } from '../../models/manager'
/** /**
* Base AIEngine * Base AIEngine
* Applicable to all AI Engines * Applicable to all AI Engines
*/ */
export abstract class AIEngine extends BaseExtension { export abstract class AIEngine extends BaseExtension {
private static modelsFolder = 'models'
// The inference engine // The inference engine
abstract provider: string abstract provider: string
@ -21,7 +18,7 @@ export abstract class AIEngine extends BaseExtension {
override onLoad() { override onLoad() {
this.registerEngine() this.registerEngine()
events.on(ModelEvent.OnModelInit, (model: ModelFile) => this.loadModel(model)) events.on(ModelEvent.OnModelInit, (model: Model) => this.loadModel(model))
events.on(ModelEvent.OnModelStop, (model: Model) => this.unloadModel(model)) events.on(ModelEvent.OnModelStop, (model: Model) => this.unloadModel(model))
} }
@ -32,53 +29,10 @@ export abstract class AIEngine extends BaseExtension {
EngineManager.instance().register(this) EngineManager.instance().register(this)
} }
async registerModels(models: Model[]): Promise<void> {
const modelFolderPath = await joinPath([await getJanDataFolderPath(), AIEngine.modelsFolder])
let shouldNotifyModelUpdate = false
for (const model of models) {
const modelPath = await joinPath([modelFolderPath, model.id])
const isExist = await fs.existsSync(modelPath)
if (isExist) {
await this.migrateModelIfNeeded(model, modelPath)
continue
}
await fs.mkdir(modelPath)
await fs.writeFileSync(
await joinPath([modelPath, 'model.json']),
JSON.stringify(model, null, 2)
)
shouldNotifyModelUpdate = true
}
if (shouldNotifyModelUpdate) {
events.emit(ModelEvent.OnModelsUpdate, {})
}
}
async migrateModelIfNeeded(model: Model, modelPath: string): Promise<void> {
try {
const modelJson = await fs.readFileSync(await joinPath([modelPath, 'model.json']), 'utf-8')
const currentModel: Model = JSON.parse(modelJson)
if (currentModel.version !== model.version) {
await fs.writeFileSync(
await joinPath([modelPath, 'model.json']),
JSON.stringify(model, null, 2)
)
events.emit(ModelEvent.OnModelsUpdate, {})
}
} catch (error) {
console.warn('Error while try to migrating model', error)
}
}
/** /**
* Loads the model. * Loads the model.
*/ */
async loadModel(model: ModelFile): Promise<any> { async loadModel(model: Model): Promise<any> {
if (model.engine.toString() !== this.provider) return Promise.resolve() if (model.engine.toString() !== this.provider) return Promise.resolve()
events.emit(ModelEvent.OnModelReady, model) events.emit(ModelEvent.OnModelReady, model)
return Promise.resolve() return Promise.resolve()

19
core/src/browser/extensions/engines/EngineManager.ts
View File

@ -1,3 +1,4 @@
import { InferenceEngine } from '../../../types'
import { AIEngine } from './AIEngine' import { AIEngine } from './AIEngine'
/** /**
@ -20,6 +21,22 @@ export class EngineManager {
* @returns The engine, if found. * @returns The engine, if found.
*/ */
get<T extends AIEngine>(provider: string): T | undefined { get<T extends AIEngine>(provider: string): T | undefined {
// Backward compatible provider
// nitro is migrated to cortex
if (
[
InferenceEngine.nitro,
InferenceEngine.cortex,
InferenceEngine.cortex_llamacpp,
InferenceEngine.cortex_onnx,
InferenceEngine.cortex_tensorrtllm,
InferenceEngine.cortex_onnx,
]
.map((e) => e.toString())
.includes(provider)
)
provider = InferenceEngine.cortex
return this.engines.get(provider) as T | undefined return this.engines.get(provider) as T | undefined
} }
@ -27,6 +44,6 @@ export class EngineManager {
* The instance of the engine manager. * The instance of the engine manager.
*/ */
static instance(): EngineManager { static instance(): EngineManager {
return window.core?.engineManager as EngineManager ?? new EngineManager() return (window.core?.engineManager as EngineManager) ?? new EngineManager()
} }
} }

8
core/src/browser/extensions/engines/LocalOAIEngine.test.ts
View File

@ -3,7 +3,7 @@
*/ */
import { LocalOAIEngine } from './LocalOAIEngine' import { LocalOAIEngine } from './LocalOAIEngine'
import { events } from '../../events' import { events } from '../../events'
import { ModelEvent, ModelFile, Model } from '../../../types' import { ModelEvent, Model } from '../../../types'
import { executeOnMain, systemInformation, dirName } from '../../core' import { executeOnMain, systemInformation, dirName } from '../../core'
jest.mock('../../core', () => ({ jest.mock('../../core', () => ({
@ -43,7 +43,7 @@ describe('LocalOAIEngine', () => {
}) })
it('should load model correctly', async () => { it('should load model correctly', async () => {
const model: ModelFile = { engine: 'testProvider', file_path: 'path/to/model' } as any const model: any = { engine: 'testProvider', file_path: 'path/to/model' } as any
const modelFolder = 'path/to' const modelFolder = 'path/to'
const systemInfo = { os: 'testOS' } const systemInfo = { os: 'testOS' }
const res = { error: null } const res = { error: null }
@ -66,7 +66,7 @@ describe('LocalOAIEngine', () => {
}) })
it('should handle load model error', async () => { it('should handle load model error', async () => {
const model: ModelFile = { engine: 'testProvider', file_path: 'path/to/model' } as any const model: any = { engine: 'testProvider', file_path: 'path/to/model' } as any
const modelFolder = 'path/to' const modelFolder = 'path/to'
const systemInfo = { os: 'testOS' } const systemInfo = { os: 'testOS' }
const res = { error: 'load error' } const res = { error: 'load error' }
@ -91,9 +91,7 @@ describe('LocalOAIEngine', () => {
it('should not unload model if engine does not match', async () => { it('should not unload model if engine does not match', async () => {
const model: Model = { engine: 'otherProvider' } as any const model: Model = { engine: 'otherProvider' } as any
await engine.unloadModel(model) await engine.unloadModel(model)
expect(executeOnMain).not.toHaveBeenCalled() expect(executeOnMain).not.toHaveBeenCalled()
expect(events.emit).not.toHaveBeenCalledWith(ModelEvent.OnModelStopped, {}) expect(events.emit).not.toHaveBeenCalledWith(ModelEvent.OnModelStopped, {})
}) })

18
core/src/browser/extensions/engines/LocalOAIEngine.ts
View File

@ -1,6 +1,6 @@
import { executeOnMain, systemInformation, dirName } from '../../core' import { executeOnMain, systemInformation, dirName, joinPath, getJanDataFolderPath } from '../../core'
import { events } from '../../events' import { events } from '../../events'
import { Model, ModelEvent, ModelFile } from '../../../types' import { Model, ModelEvent } from '../../../types'
import { OAIEngine } from './OAIEngine' import { OAIEngine } from './OAIEngine'
/** /**
@ -22,16 +22,16 @@ export abstract class LocalOAIEngine extends OAIEngine {
override onLoad() { override onLoad() {
super.onLoad() super.onLoad()
// These events are applicable to local inference providers // These events are applicable to local inference providers
events.on(ModelEvent.OnModelInit, (model: ModelFile) => this.loadModel(model)) events.on(ModelEvent.OnModelInit, (model: Model) => this.loadModel(model))
events.on(ModelEvent.OnModelStop, (model: Model) => this.unloadModel(model)) events.on(ModelEvent.OnModelStop, (model: Model) => this.unloadModel(model))
} }
/** /**
* Load the model. * Load the model.
*/ */
override async loadModel(model: ModelFile): Promise<void> { override async loadModel(model: Model & { file_path?: string }): Promise<void> {
if (model.engine.toString() !== this.provider) return if (model.engine.toString() !== this.provider) return
const modelFolder = await dirName(model.file_path) const modelFolder = 'file_path' in model && model.file_path ? await dirName(model.file_path) : await this.getModelFilePath(model.id)
const systemInfo = await systemInformation() const systemInfo = await systemInformation()
const res = await executeOnMain( const res = await executeOnMain(
this.nodeModule, this.nodeModule,
@ -63,4 +63,12 @@ export abstract class LocalOAIEngine extends OAIEngine {
events.emit(ModelEvent.OnModelStopped, {}) events.emit(ModelEvent.OnModelStopped, {})
}) })
} }
/// Legacy
private getModelFilePath = async (
id: string,
): Promise<string> => {
return joinPath([await getJanDataFolderPath(), 'models', id])
}
///
} }

17
core/src/browser/extensions/engines/OAIEngine.ts
View File

@ -55,7 +55,21 @@ export abstract class OAIEngine extends AIEngine {
* Inference request * Inference request
*/ */
override async inference(data: MessageRequest) { override async inference(data: MessageRequest) {
if (data.model?.engine?.toString() !== this.provider) return if (!data.model?.id) {
events.emit(MessageEvent.OnMessageResponse, {
status: MessageStatus.Error,
content: [
{
type: ContentType.Text,
text: {
value: 'No model ID provided',
annotations: [],
},
},
],
})
return
}
const timestamp = Date.now() const timestamp = Date.now()
const message: ThreadMessage = { const message: ThreadMessage = {
@ -89,7 +103,6 @@ export abstract class OAIEngine extends AIEngine {
model: model.id, model: model.id,
stream: true, stream: true,
...model.parameters, ...model.parameters,
...(this.provider === 'nitro' ? { engine: 'cortex.llamacpp'} : {}),
} }
if (this.transformPayload) { if (this.transformPayload) {
requestBody = this.transformPayload(requestBody) requestBody = this.transformPayload(requestBody)

6
core/src/browser/extensions/engines/helpers/sse.ts
View File

@ -10,7 +10,7 @@ export function requestInference(
requestBody: any, requestBody: any,
model: { model: {
id: string id: string
parameters: ModelRuntimeParams parameters?: ModelRuntimeParams
}, },
controller?: AbortController, controller?: AbortController,
headers?: HeadersInit, headers?: HeadersInit,
@ -22,7 +22,7 @@ export function requestInference(
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Origin': '*',
'Accept': model.parameters.stream ? 'text/event-stream' : 'application/json', 'Accept': model.parameters?.stream ? 'text/event-stream' : 'application/json',
...headers, ...headers,
}, },
body: JSON.stringify(requestBody), body: JSON.stringify(requestBody),
@ -45,7 +45,7 @@ export function requestInference(
subscriber.complete() subscriber.complete()
return return
} }
if (model.parameters.stream === false) { if (model.parameters?.stream === false) {
const data = await response.json() const data = await response.json()
if (transformResponse) { if (transformResponse) {
subscriber.next(transformResponse(data)) subscriber.next(transformResponse(data))

29
core/src/browser/extensions/model.ts
View File

@ -1,13 +1,5 @@
import { BaseExtension, ExtensionTypeEnum } from '../extension' import { BaseExtension, ExtensionTypeEnum } from '../extension'
import { import { Model, ModelInterface, OptionType } from '../../types'
GpuSetting,
HuggingFaceRepoData,
ImportingModel,
Model,
ModelFile,
ModelInterface,
OptionType,
} from '../../types'
/** /**
* Model extension for managing models. * Model extension for managing models.
@ -20,17 +12,10 @@ export abstract class ModelExtension extends BaseExtension implements ModelInter
return ExtensionTypeEnum.Model return ExtensionTypeEnum.Model
} }
abstract downloadModel( abstract getModels(): Promise<Model[]>
model: Model, abstract pullModel(model: string, id?: string, name?: string): Promise<void>
gpuSettings?: GpuSetting, abstract cancelModelPull(modelId: string): Promise<void>
network?: { proxy: string; ignoreSSL?: boolean } abstract importModel(model: string, modePath: string, name?: string, optionType?: OptionType): Promise<void>
): Promise<void> abstract updateModel(modelInfo: Partial<Model>): Promise<Model>
abstract cancelModelDownload(modelId: string): Promise<void> abstract deleteModel(model: string): Promise<void>
abstract deleteModel(model: ModelFile): Promise<void>
abstract getDownloadedModels(): Promise<ModelFile[]>
abstract getConfiguredModels(): Promise<ModelFile[]>
abstract importModels(models: ImportingModel[], optionType: OptionType): Promise<void>
abstract updateModelInfo(modelInfo: Partial<ModelFile>): Promise<ModelFile>
abstract fetchHuggingFaceRepoData(repoId: string): Promise<HuggingFaceRepoData>
abstract getDefaultModel(): Promise<Model>
} }

55
core/src/browser/index.test.ts
View File

@ -1,32 +1,37 @@
import * as Core from './core'; import * as Core from './core'
import * as Events from './events'; import * as Events from './events'
import * as FileSystem from './fs'; import * as FileSystem from './fs'
import * as Extension from './extension'; import * as Extension from './extension'
import * as Extensions from './extensions'; import * as Extensions from './extensions'
import * as Tools from './tools'; import * as Tools from './tools'
import * as Models from './models'
describe('Module Tests', () => { describe('Module Tests', () => {
it('should export Core module', () => { it('should export Core module', () => {
expect(Core).toBeDefined(); expect(Core).toBeDefined()
}); })
it('should export Event module', () => { it('should export Event module', () => {
expect(Events).toBeDefined(); expect(Events).toBeDefined()
}); })
it('should export Filesystem module', () => { it('should export Filesystem module', () => {
expect(FileSystem).toBeDefined(); expect(FileSystem).toBeDefined()
}); })
it('should export Extension module', () => { it('should export Extension module', () => {
expect(Extension).toBeDefined(); expect(Extension).toBeDefined()
}); })
it('should export all base extensions', () => { it('should export all base extensions', () => {
expect(Extensions).toBeDefined(); expect(Extensions).toBeDefined()
}); })
it('should export all base tools', () => { it('should export all base tools', () => {
expect(Tools).toBeDefined(); expect(Tools).toBeDefined()
}); })
});
it('should export all base tools', () => {
expect(Models).toBeDefined()
})
})

6
core/src/browser/index.ts
View File

@ -33,3 +33,9 @@ export * from './extensions'
* @module * @module
*/ */
export * from './tools' export * from './tools'
/**
* Export all base models.
* @module
*/
export * from './models'

10
core/src/browser/models/index.ts Normal file
View File

@ -0,0 +1,10 @@
/**
* Export ModelManager
* @module
*/
export { ModelManager } from './manager'
/**
* Export all utils
*/
export * from './utils'

47
core/src/browser/models/manager.ts Normal file
View File

@ -0,0 +1,47 @@
import { Model, ModelEvent } from '../../types'
import { events } from '../events'
/**
* Manages the registered models across extensions.
*/
export class ModelManager {
public models = new Map<string, Model>()
constructor() {
if (window) {
window.core.modelManager = this
}
}
/**
* Registers a model.
* @param model - The model to register.
*/
register<T extends Model>(model: T) {
if (this.models.has(model.id)) {
this.models.set(model.id, {
...model,
...this.models.get(model.id),
})
} else {
this.models.set(model.id, model)
}
events.emit(ModelEvent.OnModelsUpdate, {})
}
/**
* Retrieves a model by it's id.
* @param id - The id of the model to retrieve.
* @returns The model, if found.
*/
get<T extends Model>(id: string): T | undefined {
return this.models.get(id) as T | undefined
}
/**
* The instance of the tool manager.
*/
static instance(): ModelManager {
return (window.core?.modelManager as ModelManager) ?? new ModelManager()
}
}

47
web/utils/modelParam.test.ts → core/src/browser/models/utils.test.ts
View File

@ -1,7 +1,10 @@
// web/utils/modelParam.test.ts // web/utils/modelParam.test.ts
import { normalizeValue, validationRules } from './modelParam' import {
import { extractModelLoadParams } from './modelParam'; normalizeValue,
import { extractInferenceParams } from './modelParam'; validationRules,
extractModelLoadParams,
extractInferenceParams,
} from './utils'
describe('validationRules', () => { describe('validationRules', () => {
it('should validate temperature correctly', () => { it('should validate temperature correctly', () => {
@ -151,13 +154,12 @@ describe('validationRules', () => {
}) })
}) })
it('should normalize invalid values for keys not listed in validationRules', () => {
it('should normalize invalid values for keys not listed in validationRules', () => { expect(normalizeValue('invalid_key', 'invalid')).toBe('invalid')
expect(normalizeValue('invalid_key', 'invalid')).toBe('invalid') expect(normalizeValue('invalid_key', 123)).toBe(123)
expect(normalizeValue('invalid_key', 123)).toBe(123) expect(normalizeValue('invalid_key', true)).toBe(true)
expect(normalizeValue('invalid_key', true)).toBe(true) expect(normalizeValue('invalid_key', false)).toBe(false)
expect(normalizeValue('invalid_key', false)).toBe(false) })
})
describe('normalizeValue', () => { describe('normalizeValue', () => {
it('should normalize ctx_len correctly', () => { it('should normalize ctx_len correctly', () => {
@ -192,19 +194,16 @@ describe('normalizeValue', () => {
}) })
}) })
it('should handle invalid values correctly by falling back to originParams', () => {
const modelParams = { temperature: 'invalid', token_limit: -1 }
const originParams = { temperature: 0.5, token_limit: 100 }
expect(extractInferenceParams(modelParams as any, originParams)).toEqual(originParams)
})
it('should handle invalid values correctly by falling back to originParams', () => { it('should return an empty object when no modelParams are provided', () => {
const modelParams = { temperature: 'invalid', token_limit: -1 }; expect(extractModelLoadParams()).toEqual({})
const originParams = { temperature: 0.5, token_limit: 100 }; })
expect(extractInferenceParams(modelParams, originParams)).toEqual(originParams);
});
it('should return an empty object when no modelParams are provided', () => {
it('should return an empty object when no modelParams are provided', () => { expect(extractInferenceParams()).toEqual({})
expect(extractModelLoadParams()).toEqual({}); })
});
it('should return an empty object when no modelParams are provided', () => {
expect(extractInferenceParams()).toEqual({});
});

24
web/utils/modelParam.ts → core/src/browser/models/utils.ts
View File

@ -1,26 +1,20 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable @typescript-eslint/naming-convention */
import { ModelRuntimeParams, ModelSettingParams } from '@janhq/core' import { ModelParams, ModelRuntimeParams, ModelSettingParams } from '../../types'
import { ModelParams } from '@/types/model'
/** /**
* Validation rules for model parameters * Validation rules for model parameters
*/ */
export const validationRules: { [key: string]: (value: any) => boolean } = { export const validationRules: { [key: string]: (value: any) => boolean } = {
temperature: (value: any) => temperature: (value: any) => typeof value === 'number' && value >= 0 && value <= 2,
typeof value === 'number' && value >= 0 && value <= 2,
token_limit: (value: any) => Number.isInteger(value) && value >= 0, token_limit: (value: any) => Number.isInteger(value) && value >= 0,
top_k: (value: any) => typeof value === 'number' && value >= 0 && value <= 1, top_k: (value: any) => typeof value === 'number' && value >= 0 && value <= 1,
top_p: (value: any) => typeof value === 'number' && value >= 0 && value <= 1, top_p: (value: any) => typeof value === 'number' && value >= 0 && value <= 1,
stream: (value: any) => typeof value === 'boolean', stream: (value: any) => typeof value === 'boolean',
max_tokens: (value: any) => Number.isInteger(value) && value >= 0, max_tokens: (value: any) => Number.isInteger(value) && value >= 0,
stop: (value: any) => stop: (value: any) => Array.isArray(value) && value.every((v) => typeof v === 'string'),
Array.isArray(value) && value.every((v) => typeof v === 'string'), frequency_penalty: (value: any) => typeof value === 'number' && value >= 0 && value <= 1,
frequency_penalty: (value: any) => presence_penalty: (value: any) => typeof value === 'number' && value >= 0 && value <= 1,
typeof value === 'number' && value >= 0 && value <= 1,
presence_penalty: (value: any) =>
typeof value === 'number' && value >= 0 && value <= 1,
ctx_len: (value: any) => Number.isInteger(value) && value >= 0, ctx_len: (value: any) => Number.isInteger(value) && value >= 0,
ngl: (value: any) => Number.isInteger(value) && value >= 0, ngl: (value: any) => Number.isInteger(value) && value >= 0,
@ -76,6 +70,7 @@ export const extractInferenceParams = (
stop: undefined, stop: undefined,
frequency_penalty: undefined, frequency_penalty: undefined,
presence_penalty: undefined, presence_penalty: undefined,
engine: undefined,
} }
const runtimeParams: ModelRuntimeParams = {} const runtimeParams: ModelRuntimeParams = {}
@ -119,11 +114,18 @@ export const extractModelLoadParams = (
embedding: undefined, embedding: undefined,
n_parallel: undefined, n_parallel: undefined,
cpu_threads: undefined, cpu_threads: undefined,
pre_prompt: undefined,
system_prompt: undefined,
ai_prompt: undefined,
user_prompt: undefined,
prompt_template: undefined, prompt_template: undefined,
model_path: undefined,
llama_model_path: undefined, llama_model_path: undefined,
mmproj: undefined, mmproj: undefined,
cont_batching: undefined,
vision_model: undefined, vision_model: undefined,
text_model: undefined, text_model: undefined,
engine: undefined,
} }
const settingParams: ModelSettingParams = {} const settingParams: ModelSettingParams = {}

3
core/src/node/api/processors/download.test.ts
View File

@ -8,7 +8,8 @@ jest.mock('../../helper', () => ({
jest.mock('../../helper/path', () => ({ jest.mock('../../helper/path', () => ({
validatePath: jest.fn().mockReturnValue('path/to/folder'), validatePath: jest.fn().mockReturnValue('path/to/folder'),
normalizeFilePath: () => process.platform === 'win32' ? 'C:\\Users\path\\to\\file.gguf' : '/Users/path/to/file.gguf', normalizeFilePath: () =>
process.platform === 'win32' ? 'C:\\Users\\path\\to\\file.gguf' : '/Users/path/to/file.gguf',
})) }))
jest.mock( jest.mock(

5
core/src/node/api/processors/download.ts
View File

@ -50,11 +50,6 @@ export class Downloader implements Processor {
const initialDownloadState: DownloadState = { const initialDownloadState: DownloadState = {
modelId, modelId,
fileName, fileName,
time: {
elapsed: 0,
remaining: 0,
},
speed: 0,
percent: 0, percent: 0,
size: { size: {
total: 0, total: 0,

2
core/src/node/api/restful/helper/builder.ts
View File

@ -343,7 +343,7 @@ export const chatCompletions = async (request: any, reply: any) => {
// add engine for new cortex cpp engine // add engine for new cortex cpp engine
if (requestedModel.engine === 'nitro') { if (requestedModel.engine === 'nitro') {
request.body.engine = 'cortex.llamacpp' request.body.engine = 'llama-cpp'
} }
const fetch = require('node-fetch') const fetch = require('node-fetch')

9
core/src/node/api/restful/helper/consts.test.ts
View File

@ -1,6 +1,5 @@
import { CORTEX_DEFAULT_PORT } from './consts'
import { NITRO_DEFAULT_PORT } from './consts'; it('should test CORTEX_DEFAULT_PORT', () => {
expect(CORTEX_DEFAULT_PORT).toBe(39291)
it('should test NITRO_DEFAULT_PORT', () => { })
expect(NITRO_DEFAULT_PORT).toBe(3928);
});

14
core/src/node/api/restful/helper/consts.ts
View File

@ -1,19 +1,9 @@
// The PORT to use for the Nitro subprocess // The PORT to use for the Nitro subprocess
export const NITRO_DEFAULT_PORT = 3928 export const CORTEX_DEFAULT_PORT = 39291
// The HOST address to use for the Nitro subprocess // The HOST address to use for the Nitro subprocess
export const LOCAL_HOST = '127.0.0.1' export const LOCAL_HOST = '127.0.0.1'
export const SUPPORTED_MODEL_FORMAT = '.gguf' export const SUPPORTED_MODEL_FORMAT = '.gguf'
// The URL for the Nitro subprocess export const DEFAULT_CHAT_COMPLETION_URL = `http://${LOCAL_HOST}:${CORTEX_DEFAULT_PORT}/v1/chat/completions` // default nitro url
const NITRO_HTTP_SERVER_URL = `http://${LOCAL_HOST}:${NITRO_DEFAULT_PORT}`
// The URL for the Nitro subprocess to load a model
export const NITRO_HTTP_LOAD_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/server/loadmodel`
// The URL for the Nitro subprocess to validate a model
export const NITRO_HTTP_VALIDATE_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/server/modelstatus`
// The URL for the Nitro subprocess to kill itself
export const NITRO_HTTP_KILL_URL = `${NITRO_HTTP_SERVER_URL}/processmanager/destroy`
export const DEFAULT_CHAT_COMPLETION_URL = `http://${LOCAL_HOST}:${NITRO_DEFAULT_PORT}/inferences/server/chat_completion` // default nitro url

20
core/src/node/api/restful/helper/startStopModel.test.ts
View File

@ -1,16 +1,10 @@
import { startModel } from './startStopModel'
describe('startModel', () => {
it('test_startModel_error', async () => {
const modelId = 'testModelId'
const settingParams = undefined
import { startModel } from './startStopModel' expect(startModel(modelId, settingParams)).resolves.toThrow()
describe('startModel', () => {
it('test_startModel_error', async () => {
const modelId = 'testModelId'
const settingParams = undefined
const result = await startModel(modelId, settingParams)
expect(result).toEqual({
error: expect.any(Error),
})
})
}) })
})

75
core/src/node/api/restful/helper/startStopModel.ts
View File

@ -1,6 +1,5 @@
import { join } from 'path'
import { getJanDataFolderPath, getJanExtensionsPath, log } from '../../../helper'
import { ModelSettingParams } from '../../../../types' import { ModelSettingParams } from '../../../../types'
import { CORTEX_DEFAULT_PORT, LOCAL_HOST } from './consts'
/** /**
* Start a model * Start a model
@ -9,70 +8,18 @@ import { ModelSettingParams } from '../../../../types'
* @returns * @returns
*/ */
export const startModel = async (modelId: string, settingParams?: ModelSettingParams) => { export const startModel = async (modelId: string, settingParams?: ModelSettingParams) => {
try { return fetch(`http://${LOCAL_HOST}:${CORTEX_DEFAULT_PORT}/v1/models/start`, {
await runModel(modelId, settingParams) method: 'POST',
body: JSON.stringify({ model: modelId, ...settingParams }),
return { })
message: `Model ${modelId} started`,
}
} catch (e) {
return {
error: e,
}
}
} }
/**
* Run a model using installed cortex extension
* @param model
* @param settingParams
*/
const runModel = async (model: string, settingParams?: ModelSettingParams): Promise<void> => {
const janDataFolderPath = getJanDataFolderPath()
const modelFolder = join(janDataFolderPath, 'models', model)
let module = join(
getJanExtensionsPath(),
'@janhq',
'inference-cortex-extension',
'dist',
'node',
'index.cjs'
)
// Just reuse the cortex extension implementation, don't duplicate then lost of sync
return import(module).then((extension) =>
extension
.loadModel(
{
modelFolder,
model,
},
settingParams
)
.then(() => log(`[SERVER]::Debug: Model is loaded`))
.then({
message: 'Model started',
})
)
}
/* /*
* Stop model and kill nitro process. * Stop model.
*/ */
export const stopModel = async (_modelId: string) => { export const stopModel = async (modelId: string) => {
let module = join( return fetch(`http://${LOCAL_HOST}:${CORTEX_DEFAULT_PORT}/v1/models/stop`, {
getJanExtensionsPath(), method: 'POST',
'@janhq', body: JSON.stringify({ model: modelId }),
'inference-cortex-extension', })
'dist',
'node',
'index.cjs'
)
// Just reuse the cortex extension implementation, don't duplicate then lost of sync
return import(module).then((extension) =>
extension
.unloadModel()
.then(() => log(`[SERVER]::Debug: Model is unloaded`))
.then({
message: 'Model stopped',
})
)
} }

2
core/src/types/api/index.ts
View File

@ -72,6 +72,8 @@ export enum DownloadEvent {
onFileDownloadUpdate = 'onFileDownloadUpdate', onFileDownloadUpdate = 'onFileDownloadUpdate',
onFileDownloadError = 'onFileDownloadError', onFileDownloadError = 'onFileDownloadError',
onFileDownloadSuccess = 'onFileDownloadSuccess', onFileDownloadSuccess = 'onFileDownloadSuccess',
onFileDownloadStopped = 'onFileDownloadStopped',
onFileDownloadStarted = 'onFileDownloadStarted',
onFileUnzipSuccess = 'onFileUnzipSuccess', onFileUnzipSuccess = 'onFileUnzipSuccess',
} }

4
core/src/types/file/index.ts
View File

@ -6,8 +6,8 @@ export type FileStat = {
export type DownloadState = { export type DownloadState = {
modelId: string // TODO: change to download id modelId: string // TODO: change to download id
fileName: string fileName: string
time: DownloadTime time?: DownloadTime
speed: number speed?: number
percent: number percent: number
size: DownloadSize size: DownloadSize

25
core/src/types/model/modelEntity.ts
View File

@ -6,8 +6,8 @@ import { FileMetadata } from '../file'
*/ */
export type ModelInfo = { export type ModelInfo = {
id: string id: string
settings: ModelSettingParams settings?: ModelSettingParams
parameters: ModelRuntimeParams parameters?: ModelRuntimeParams
engine?: InferenceEngine engine?: InferenceEngine
} }
@ -15,7 +15,6 @@ export type ModelInfo = {
* Represents the inference engine. * Represents the inference engine.
* @stored * @stored
*/ */
export enum InferenceEngine { export enum InferenceEngine {
anthropic = 'anthropic', anthropic = 'anthropic',
mistral = 'mistral', mistral = 'mistral',
@ -28,11 +27,13 @@ export enum InferenceEngine {
nitro_tensorrt_llm = 'nitro-tensorrt-llm', nitro_tensorrt_llm = 'nitro-tensorrt-llm',
cohere = 'cohere', cohere = 'cohere',
nvidia = 'nvidia', nvidia = 'nvidia',
cortex_llamacpp = 'cortex.llamacpp', cortex = 'cortex',
cortex_onnx = 'cortex.onnx', cortex_llamacpp = 'llama-cpp',
cortex_tensorrtllm = 'cortex.tensorrt-llm', cortex_onnx = 'onnxruntime',
cortex_tensorrtllm = 'tensorrt-llm',
} }
// Represents an artifact of a model, including its filename and URL
export type ModelArtifact = { export type ModelArtifact = {
filename: string filename: string
url: string url: string
@ -104,6 +105,7 @@ export type Model = {
engine: InferenceEngine engine: InferenceEngine
} }
// Represents metadata associated with a model
export type ModelMetadata = { export type ModelMetadata = {
author: string author: string
tags: string[] tags: string[]
@ -124,14 +126,20 @@ export type ModelSettingParams = {
n_parallel?: number n_parallel?: number
cpu_threads?: number cpu_threads?: number
prompt_template?: string prompt_template?: string
pre_prompt?: string
system_prompt?: string system_prompt?: string
ai_prompt?: string ai_prompt?: string
user_prompt?: string user_prompt?: string
// path param
model_path?: string
// legacy path param
llama_model_path?: string llama_model_path?: string
// clip model path
mmproj?: string mmproj?: string
cont_batching?: boolean cont_batching?: boolean
vision_model?: boolean vision_model?: boolean
text_model?: boolean text_model?: boolean
engine?: boolean
} }
/** /**
@ -150,11 +158,12 @@ export type ModelRuntimeParams = {
engine?: string engine?: string
} }
// Represents a model that failed to initialize, including the error
export type ModelInitFailed = Model & { export type ModelInitFailed = Model & {
error: Error error: Error
} }
/** /**
* ModelFile is the model.json entity and it's file metadata * ModelParams types
*/ */
export type ModelFile = Model & FileMetadata export type ModelParams = ModelRuntimeParams | ModelSettingParams

2
core/src/types/model/modelImport.ts
View File

@ -1,4 +1,4 @@
export type OptionType = 'SYMLINK' | 'MOVE_BINARY_FILE' export type OptionType = 'symlink' | 'copy'
export type ModelImportOption = { export type ModelImportOption = {
type: OptionType type: OptionType

38
core/src/types/model/modelInterface.ts
View File

@ -1,5 +1,5 @@
import { GpuSetting } from '../miscellaneous' import { Model } from './modelEntity'
import { Model, ModelFile } from './modelEntity' import { OptionType } from './modelImport'
/** /**
* Model extension for managing models. * Model extension for managing models.
@ -8,38 +8,46 @@ export interface ModelInterface {
/** /**
* Downloads a model. * Downloads a model.
* @param model - The model to download. * @param model - The model to download.
* @param network - Optional object to specify proxy/whether to ignore SSL certificates.
* @returns A Promise that resolves when the model has been downloaded. * @returns A Promise that resolves when the model has been downloaded.
*/ */
downloadModel( pullModel(model: string, id?: string, name?: string): Promise<void>
model: ModelFile,
gpuSettings?: GpuSetting,
network?: { ignoreSSL?: boolean; proxy?: string }
): Promise<void>
/** /**
* Cancels the download of a specific model. * Cancels the download of a specific model.
* @param {string} modelId - The ID of the model to cancel the download for. * @param {string} modelId - The ID of the model to cancel the download for.
* @returns {Promise<void>} A promise that resolves when the download has been cancelled. * @returns {Promise<void>} A promise that resolves when the download has been cancelled.
*/ */
cancelModelDownload(modelId: string): Promise<void> cancelModelPull(model: string): Promise<void>
/** /**
* Deletes a model. * Deletes a model.
* @param modelId - The ID of the model to delete. * @param modelId - The ID of the model to delete.
* @returns A Promise that resolves when the model has been deleted. * @returns A Promise that resolves when the model has been deleted.
*/ */
deleteModel(model: ModelFile): Promise<void> deleteModel(model: string): Promise<void>
/** /**
* Gets a list of downloaded models. * Gets downloaded models.
* @returns A Promise that resolves with an array of downloaded models. * @returns A Promise that resolves with an array of downloaded models.
*/ */
getDownloadedModels(): Promise<ModelFile[]> getModels(): Promise<Model[]>
/** /**
* Gets a list of configured models. * Update a pulled model's metadata
* @returns A Promise that resolves with an array of configured models. * @param model - The model to update.
* @returns A Promise that resolves when the model has been updated.
*/ */
getConfiguredModels(): Promise<ModelFile[]> updateModel(model: Partial<Model>): Promise<Model>
/**
* Import an existing model file.
* @param model id of the model to import
* @param modelPath - path of the model file
*/
importModel(
model: string,
modePath: string,
name?: string,
optionType?: OptionType
): Promise<void>
} }

25
core/src/types/monitoring/index.test.ts
View File

@ -1,16 +1,13 @@
import * as monitoringInterface from './monitoringInterface'
import * as resourceInfo from './resourceInfo'
import * as monitoringInterface from './monitoringInterface'; import * as index from './index'
import * as resourceInfo from './resourceInfo';
import * as index from './index'; it('should re-export all symbols from monitoringInterface and resourceInfo', () => {
import * as monitoringInterface from './monitoringInterface'; for (const key in monitoringInterface) {
import * as resourceInfo from './resourceInfo'; expect(index[key]).toBe(monitoringInterface[key])
}
it('should re-export all symbols from monitoringInterface and resourceInfo', () => { for (const key in resourceInfo) {
for (const key in monitoringInterface) { expect(index[key]).toBe(resourceInfo[key])
expect(index[key]).toBe(monitoringInterface[key]); }
} })
for (const key in resourceInfo) {
expect(index[key]).toBe(resourceInfo[key]);
}
});

8
electron/package.json
View File

@ -18,7 +18,8 @@
"docs/**/*", "docs/**/*",
"scripts/**/*", "scripts/**/*",
"icons/**/*", "icons/**/*",
"themes" "themes",
"shared"
], ],
"asarUnpack": [ "asarUnpack": [
"pre-install", "pre-install",
@ -26,7 +27,8 @@
"docs", "docs",
"scripts", "scripts",
"icons", "icons",
"themes" "themes",
"shared"
], ],
"publish": [ "publish": [
{ {
@ -111,7 +113,7 @@
"@kirillvakalov/nut-tree__nut-js": "4.2.1-2" "@kirillvakalov/nut-tree__nut-js": "4.2.1-2"
}, },
"devDependencies": { "devDependencies": {
"@electron/notarize": "^2.1.0", "@electron/notarize": "^2.5.0",
"@playwright/test": "^1.38.1", "@playwright/test": "^1.38.1",
"@types/npmcli__arborist": "^5.6.4", "@types/npmcli__arborist": "^5.6.4",
"@types/pacote": "^11.1.7", "@types/pacote": "^11.1.7",

0
electron/shared/.gitkeep Normal file
View File

8
electron/tests/config/fixtures.ts
View File

@ -15,6 +15,8 @@ import {
import { Constants } from './constants' import { Constants } from './constants'
import { HubPage } from '../pages/hubPage' import { HubPage } from '../pages/hubPage'
import { CommonActions } from '../pages/commonActions' import { CommonActions } from '../pages/commonActions'
import { rmSync } from 'fs'
import * as path from 'path'
export let electronApp: ElectronApplication export let electronApp: ElectronApplication
export let page: Page export let page: Page
@ -103,10 +105,14 @@ export const test = base.extend<
}, },
{ auto: true }, { auto: true },
], ],
}) })
test.beforeAll(async () => { test.beforeAll(async () => {
await rmSync(path.join(__dirname, '../../test-data'), {
recursive: true,
force: true,
})
test.setTimeout(TIMEOUT) test.setTimeout(TIMEOUT)
await setupElectron() await setupElectron()
await page.waitForSelector('img[alt="Jan - Logo"]', { await page.waitForSelector('img[alt="Jan - Logo"]', {

3
electron/tests/e2e/hub.e2e.spec.ts
View File

@ -16,7 +16,8 @@ test.beforeAll(async () => {
test('explores hub', async ({ hubPage }) => { test('explores hub', async ({ hubPage }) => {
await hubPage.navigateByMenu() await hubPage.navigateByMenu()
await hubPage.verifyContainerVisible() await hubPage.verifyContainerVisible()
const useModelBtn= page.getByTestId(/^use-model-btn-.*/).first() await hubPage.scrollToBottom()
const useModelBtn = page.getByTestId(/^use-model-btn-.*/).first()
await expect(useModelBtn).toBeVisible({ await expect(useModelBtn).toBeVisible({
timeout: TIMEOUT, timeout: TIMEOUT,

11
electron/tests/pages/basePage.ts
View File

@ -8,9 +8,8 @@ export class BasePage {
constructor( constructor(
protected readonly page: Page, protected readonly page: Page,
readonly action: CommonActions, readonly action: CommonActions,
protected containerId: string, protected containerId: string
) { ) {}
}
public getValue(key: string) { public getValue(key: string) {
return this.action.getValue(key) return this.action.getValue(key)
@ -37,6 +36,12 @@ export class BasePage {
expect(container.isVisible()).toBeTruthy() expect(container.isVisible()).toBeTruthy()
} }
async scrollToBottom() {
await this.page.evaluate(() => {
window.scrollTo(0, document.body.scrollHeight)
})
}
async waitUpdateLoader() { async waitUpdateLoader() {
await this.isElementVisible('img[alt="Jan - Logo"]') await this.isElementVisible('img[alt="Jan - Logo"]')
} }

23
electron/utils/migration.ts
View File

@ -47,9 +47,6 @@ async function migrateThemes() {
const themes = readdirSync(join(appResourcePath(), 'themes')) const themes = readdirSync(join(appResourcePath(), 'themes'))
for (const theme of themes) { for (const theme of themes) {
const themePath = join(appResourcePath(), 'themes', theme) const themePath = join(appResourcePath(), 'themes', theme)
if (existsSync(themePath) && !lstatSync(themePath).isDirectory()) {
continue
}
await checkAndMigrateTheme(theme, themePath) await checkAndMigrateTheme(theme, themePath)
} }
} }
@ -64,21 +61,11 @@ async function checkAndMigrateTheme(
) )
if (existingTheme) { if (existingTheme) {
const desTheme = join(janDataThemesFolder, existingTheme) const desTheme = join(janDataThemesFolder, existingTheme)
if (!existsSync(desTheme) || !lstatSync(desTheme).isDirectory()) return console.debug('Updating theme', existingTheme)
rmdirSync(desTheme, { recursive: true })
const desThemeData = JSON.parse( cpSync(sourceThemePath, join(janDataThemesFolder, sourceThemeName), {
readFileSync(join(desTheme, 'theme.json'), 'utf-8') recursive: true,
) })
const sourceThemeData = JSON.parse(
readFileSync(join(sourceThemePath, 'theme.json'), 'utf-8')
)
if (desThemeData.version !== sourceThemeData.version) {
console.debug('Updating theme', existingTheme)
rmdirSync(desTheme, { recursive: true })
cpSync(sourceThemePath, join(janDataThemesFolder, sourceThemeName), {
recursive: true,
})
}
} else { } else {
console.debug('Adding new theme', sourceThemeName) console.debug('Adding new theme', sourceThemeName)
cpSync(sourceThemePath, join(janDataThemesFolder, sourceThemeName), { cpSync(sourceThemePath, join(janDataThemesFolder, sourceThemeName), {

115
extensions/assistant-extension/src/index.ts
View File

@ -63,39 +63,46 @@ export default class JanAssistantExtension extends AssistantExtension {
} }
async getAssistants(): Promise<Assistant[]> { async getAssistants(): Promise<Assistant[]> {
// get all the assistant directories try {
// get all the assistant metadata json // get all the assistant directories
const results: Assistant[] = [] // get all the assistant metadata json
const allFileName: string[] = await fs.readdirSync( const results: Assistant[] = []
JanAssistantExtension._homeDir
)
for (const fileName of allFileName) {
const filePath = await joinPath([
JanAssistantExtension._homeDir,
fileName,
])
if (!(await fs.fileStat(filePath))?.isDirectory) continue const allFileName: string[] = await fs.readdirSync(
const jsonFiles: string[] = (await fs.readdirSync(filePath)).filter( JanAssistantExtension._homeDir
(file: string) => file === 'assistant.json'
) )
if (jsonFiles.length !== 1) { for (const fileName of allFileName) {
// has more than one assistant file -> ignore const filePath = await joinPath([
continue JanAssistantExtension._homeDir,
fileName,
])
if (!(await fs.fileStat(filePath))?.isDirectory) continue
const jsonFiles: string[] = (await fs.readdirSync(filePath)).filter(
(file: string) => file === 'assistant.json'
)
if (jsonFiles.length !== 1) {
// has more than one assistant file -> ignore
continue
}
const content = await fs.readFileSync(
await joinPath([filePath, jsonFiles[0]]),
'utf-8'
)
const assistant: Assistant =
typeof content === 'object' ? content : JSON.parse(content)
results.push(assistant)
} }
const content = await fs.readFileSync( return results
await joinPath([filePath, jsonFiles[0]]), } catch (err) {
'utf-8' console.debug(err)
) return [this.defaultAssistant]
const assistant: Assistant =
typeof content === 'object' ? content : JSON.parse(content)
results.push(assistant)
} }
return results
} }
async deleteAssistant(assistant: Assistant): Promise<void> { async deleteAssistant(assistant: Assistant): Promise<void> {
@ -112,39 +119,39 @@ export default class JanAssistantExtension extends AssistantExtension {
} }
private async createJanAssistant(): Promise<void> { private async createJanAssistant(): Promise<void> {
const janAssistant: Assistant = { await this.createAssistant(this.defaultAssistant)
avatar: '', }
thread_location: undefined,
id: 'jan', private defaultAssistant: Assistant = {
object: 'assistant', avatar: '',
created_at: Date.now(), thread_location: undefined,
name: 'Jan', id: 'jan',
description: 'A default assistant that can use all downloaded models', object: 'assistant',
model: '*', created_at: Date.now(),
instructions: '', name: 'Jan',
tools: [ description: 'A default assistant that can use all downloaded models',
{ model: '*',
type: 'retrieval', instructions: '',
enabled: false, tools: [
useTimeWeightedRetriever: false, {
settings: { type: 'retrieval',
top_k: 2, enabled: false,
chunk_size: 1024, useTimeWeightedRetriever: false,
chunk_overlap: 64, settings: {
retrieval_template: `Use the following pieces of context to answer the question at the end. If you don't know the answer, just say that you don't know, don't try to make up an answer. top_k: 2,
chunk_size: 1024,
chunk_overlap: 64,
retrieval_template: `Use the following pieces of context to answer the question at the end. If you don't know the answer, just say that you don't know, don't try to make up an answer.
---------------- ----------------
CONTEXT: {CONTEXT} CONTEXT: {CONTEXT}
---------------- ----------------
QUESTION: {QUESTION} QUESTION: {QUESTION}
---------------- ----------------
Helpful Answer:`, Helpful Answer:`,
},
}, },
], },
file_ids: [], ],
metadata: undefined, file_ids: [],
} metadata: undefined,
await this.createAssistant(janAssistant)
} }
} }

2
extensions/assistant-extension/src/node/retrieval.ts
View File

@ -10,8 +10,6 @@ import { HNSWLib } from 'langchain/vectorstores/hnswlib'
import { OpenAIEmbeddings } from 'langchain/embeddings/openai' import { OpenAIEmbeddings } from 'langchain/embeddings/openai'
import { readEmbeddingEngine } from './engine' import { readEmbeddingEngine } from './engine'
import path from 'path'
export class Retrieval { export class Retrieval {
public chunkSize: number = 100 public chunkSize: number = 100
public chunkOverlap?: number = 0 public chunkOverlap?: number = 0

0
extensions/inference-nitro-extension/.gitignore → extensions/inference-cortex-extension/.gitignore vendored
View File

0
extensions/inference-nitro-extension/README.md → extensions/inference-cortex-extension/README.md
View File

1
extensions/inference-cortex-extension/bin/version.txt Normal file
View File

@ -0,0 +1 @@
1.0.2-rc4

41
extensions/inference-cortex-extension/download.bat Normal file
View File

@ -0,0 +1,41 @@
@echo off
set BIN_PATH=./bin
set SHARED_PATH=./../../electron/shared
set /p CORTEX_VERSION=<./bin/version.txt
@REM Download cortex.llamacpp binaries
set VERSION=v0.1.35
set DOWNLOAD_URL=https://github.com/janhq/cortex.llamacpp/releases/download/%VERSION%/cortex.llamacpp-0.1.35-windows-amd64
set CUDA_DOWNLOAD_URL=https://github.com/janhq/cortex.llamacpp/releases/download/%VERSION%
set SUBFOLDERS=noavx-cuda-12-0 noavx-cuda-11-7 avx2-cuda-12-0 avx2-cuda-11-7 noavx avx avx2 avx512 vulkan
call .\node_modules\.bin\download -e --strip 1 -o %BIN_PATH% https://github.com/janhq/cortex/releases/download/v%CORTEX_VERSION%/cortex-%CORTEX_VERSION%-windows-amd64.tar.gz
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2-cuda-12-0.tar.gz -e --strip 1 -o %BIN_PATH%/avx2-cuda-12-0/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2-cuda-11-7.tar.gz -e --strip 1 -o %BIN_PATH%/avx2-cuda-11-7/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx-cuda-12-0.tar.gz -e --strip 1 -o %BIN_PATH%/noavx-cuda-12-0/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx-cuda-11-7.tar.gz -e --strip 1 -o %BIN_PATH%/noavx-cuda-11-7/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx.tar.gz -e --strip 1 -o %BIN_PATH%/noavx/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx.tar.gz -e --strip 1 -o %BIN_PATH%/avx/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2.tar.gz -e --strip 1 -o %BIN_PATH%/avx2/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx512.tar.gz -e --strip 1 -o %BIN_PATH%/avx512/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-vulkan.tar.gz -e --strip 1 -o %BIN_PATH%/vulkan/engines/cortex.llamacpp
call .\node_modules\.bin\download %CUDA_DOWNLOAD_URL%/cuda-12-0-windows-amd64.tar.gz -e --strip 1 -o %SHARED_PATH%
call .\node_modules\.bin\download %CUDA_DOWNLOAD_URL%/cuda-11-7-windows-amd64.tar.gz -e --strip 1 -o %SHARED_PATH%
move %BIN_PATH%\cortex-server-beta.exe %BIN_PATH%\cortex-server.exe
del %BIN_PATH%\cortex-beta.exe
del %BIN_PATH%\cortex.exe
@REM Loop through each folder and move DLLs (excluding engine.dll)
for %%F in (%SUBFOLDERS%) do (
echo Processing folder: %BIN_PATH%\%%F
@REM Move all .dll files except engine.dll
for %%D in (%BIN_PATH%\%%F\engines\cortex.llamacpp\*.dll) do (
if /I not "%%~nxD"=="engine.dll" (
move "%%D" "%BIN_PATH%"
)
)
)
echo DLL files moved successfully.

47
extensions/inference-cortex-extension/download.sh Executable file
View File

@ -0,0 +1,47 @@
#!/bin/bash
# Read CORTEX_VERSION
CORTEX_VERSION=$(cat ./bin/version.txt)
CORTEX_RELEASE_URL="https://github.com/janhq/cortex/releases/download"
ENGINE_DOWNLOAD_URL="https://github.com/janhq/cortex.llamacpp/releases/download/v0.1.35/cortex.llamacpp-0.1.35"
CUDA_DOWNLOAD_URL="https://github.com/janhq/cortex.llamacpp/releases/download/v0.1.35"
# Detect platform
OS_TYPE=$(uname)
if [ "$OS_TYPE" == "Linux" ]; then
# Linux downloads
download "${CORTEX_RELEASE_URL}/v${CORTEX_VERSION}/cortex-${CORTEX_VERSION}-linux-amd64.tar.gz" -e --strip 1 -o "./bin"
mv ./bin/cortex-server-beta ./bin/cortex-server
rm -rf ./bin/cortex
rm -rf ./bin/cortex-beta
chmod +x "./bin/cortex-server"
# Download engines for Linux
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx.tar.gz" -e --strip 1 -o "./bin/noavx/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx.tar.gz" -e --strip 1 -o "./bin/avx/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2.tar.gz" -e --strip 1 -o "./bin/avx2/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx512.tar.gz" -e --strip 1 -o "./bin/avx512/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2-cuda-12-0.tar.gz" -e --strip 1 -o "./bin/avx2-cuda-12-0/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2-cuda-11-7.tar.gz" -e --strip 1 -o "./bin/avx2-cuda-11-7/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx-cuda-12-0.tar.gz" -e --strip 1 -o "./bin/noavx-cuda-12-0/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx-cuda-11-7.tar.gz" -e --strip 1 -o "./bin/noavx-cuda-11-7/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-vulkan.tar.gz" -e --strip 1 -o "./bin/vulkan/engines/cortex.llamacpp" 1
download "${CUDA_DOWNLOAD_URL}/cuda-12-0-linux-amd64.tar.gz" -e --strip 1 -o "../../electron/shared" 1
download "${CUDA_DOWNLOAD_URL}/cuda-11-7-linux-amd64.tar.gz" -e --strip 1 -o "../../electron/shared" 1
elif [ "$OS_TYPE" == "Darwin" ]; then
# macOS downloads
download "${CORTEX_RELEASE_URL}/v${CORTEX_VERSION}/cortex-${CORTEX_VERSION}-mac-universal.tar.gz" -e --strip 1 -o "./bin" 1
mv ./bin/cortex-server-beta ./bin/cortex-server
rm -rf ./bin/cortex
rm -rf ./bin/cortex-beta
chmod +x "./bin/cortex-server"
# Download engines for macOS
download "${ENGINE_DOWNLOAD_URL}-mac-arm64.tar.gz" -e --strip 1 -o ./bin/arm64/engines/cortex.llamacpp
download "${ENGINE_DOWNLOAD_URL}-mac-amd64.tar.gz" -e --strip 1 -o ./bin/x64/engines/cortex.llamacpp
else
echo "Unsupported operating system: $OS_TYPE"
exit 1
fi

0
extensions/inference-nitro-extension/jest.config.js → extensions/inference-cortex-extension/jest.config.js
View File

14
extensions/inference-nitro-extension/package.json → extensions/inference-cortex-extension/package.json
View File

@ -10,12 +10,12 @@
"scripts": { "scripts": {
"test": "jest", "test": "jest",
"build": "tsc --module commonjs && rollup -c rollup.config.ts", "build": "tsc --module commonjs && rollup -c rollup.config.ts",
"downloadnitro:linux:darwin": "./download.sh", "downloadcortex:linux:darwin": "./download.sh",
"downloadnitro:win32": "download.bat", "downloadcortex:win32": "download.bat",
"downloadnitro": "run-script-os", "downloadcortex": "run-script-os",
"build:publish:darwin": "rimraf *.tgz --glob && yarn build && npm run downloadnitro && ../../.github/scripts/auto-sign.sh && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install", "build:publish:darwin": "rimraf *.tgz --glob && yarn build && npm run downloadcortex && ../../.github/scripts/auto-sign.sh && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install",
"build:publish:win32:linux": "rimraf *.tgz --glob && yarn build && npm run downloadnitro && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install", "build:publish:win32:linux": "rimraf *.tgz --glob && yarn build && npm run downloadcortex && cpx \"bin/**\" \"dist/bin\" && npm pack && cpx *.tgz ../../pre-install",
"build:publish": "yarn test && run-script-os" "build:publish": "run-script-os"
}, },
"exports": { "exports": {
".": "./dist/index.js", ".": "./dist/index.js",
@ -50,6 +50,8 @@
"cpu-instructions": "^0.0.13", "cpu-instructions": "^0.0.13",
"decompress": "^4.2.1", "decompress": "^4.2.1",
"fetch-retry": "^5.0.6", "fetch-retry": "^5.0.6",
"ky": "^1.7.2",
"p-queue": "^8.0.1",
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
"tcp-port-used": "^1.0.2", "tcp-port-used": "^1.0.2",
"terminate": "2.6.1", "terminate": "2.6.1",

0
extensions/inference-nitro-extension/resources/default_settings.json → extensions/inference-cortex-extension/resources/default_settings.json
View File

2
extensions/inference-nitro-extension/resources/models/aya-23-35b/model.json → extensions/inference-cortex-extension/resources/models/aya-23-35b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["34B", "Finetuned"], "tags": ["34B", "Finetuned"],
"size": 21556982144 "size": 21556982144
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/aya-23-8b/model.json → extensions/inference-cortex-extension/resources/models/aya-23-8b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 5056982144 "size": 5056982144
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/bakllava-1/model.json → extensions/inference-cortex-extension/resources/models/bakllava-1/model.json
View File

@ -31,5 +31,5 @@
"tags": ["Vision"], "tags": ["Vision"],
"size": 5750000000 "size": 5750000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/codeninja-1.0-7b/model.json → extensions/inference-cortex-extension/resources/models/codeninja-1.0-7b/model.json
View File

@ -30,5 +30,5 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 4370000000 "size": 4370000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/codestral-22b/model.json → extensions/inference-cortex-extension/resources/models/codestral-22b/model.json
View File

@ -31,6 +31,6 @@
"tags": ["22B", "Finetuned", "Featured"], "tags": ["22B", "Finetuned", "Featured"],
"size": 13341237440 "size": 13341237440
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/command-r-34b/model.json → extensions/inference-cortex-extension/resources/models/command-r-34b/model.json
View File

@ -31,6 +31,6 @@
"tags": ["34B", "Finetuned"], "tags": ["34B", "Finetuned"],
"size": 21500000000 "size": 21500000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/deepseek-coder-1.3b/model.json → extensions/inference-cortex-extension/resources/models/deepseek-coder-1.3b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["Tiny"], "tags": ["Tiny"],
"size": 1430000000 "size": 1430000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/deepseek-coder-34b/model.json → extensions/inference-cortex-extension/resources/models/deepseek-coder-34b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["33B"], "tags": ["33B"],
"size": 19940000000 "size": 19940000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/gemma-1.1-2b/model.json → extensions/inference-cortex-extension/resources/models/gemma-1.1-2b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["2B", "Finetuned", "Tiny"], "tags": ["2B", "Finetuned", "Tiny"],
"size": 1630000000 "size": 1630000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/gemma-1.1-7b/model.json → extensions/inference-cortex-extension/resources/models/gemma-1.1-7b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 5330000000 "size": 5330000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/gemma-2-27b/model.json → extensions/inference-cortex-extension/resources/models/gemma-2-27b/model.json
View File

@ -37,5 +37,5 @@
], ],
"size": 16600000000 "size": 16600000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/gemma-2-2b/model.json → extensions/inference-cortex-extension/resources/models/gemma-2-2b/model.json
View File

@ -38,5 +38,5 @@
], ],
"size": 1710000000 "size": 1710000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/gemma-2-9b/model.json → extensions/inference-cortex-extension/resources/models/gemma-2-9b/model.json
View File

@ -37,5 +37,5 @@
], ],
"size": 5760000000 "size": 5760000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama2-chat-70b/model.json → extensions/inference-cortex-extension/resources/models/llama2-chat-70b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["70B", "Foundational Model"], "tags": ["70B", "Foundational Model"],
"size": 43920000000 "size": 43920000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama2-chat-7b/model.json → extensions/inference-cortex-extension/resources/models/llama2-chat-7b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["7B", "Foundational Model"], "tags": ["7B", "Foundational Model"],
"size": 4080000000 "size": 4080000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama3-8b-instruct/model.json → extensions/inference-cortex-extension/resources/models/llama3-8b-instruct/model.json
View File

@ -31,5 +31,5 @@
"tags": ["8B"], "tags": ["8B"],
"size": 4920000000 "size": 4920000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama3-hermes-8b/model.json → extensions/inference-cortex-extension/resources/models/llama3-hermes-8b/model.json
View File

@ -34,5 +34,5 @@
], ],
"size": 4920000000 "size": 4920000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama3.1-70b-instruct/model.json → extensions/inference-cortex-extension/resources/models/llama3.1-70b-instruct/model.json
View File

@ -37,5 +37,5 @@
], ],
"size": 42500000000 "size": 42500000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama3.1-8b-instruct/model.json → extensions/inference-cortex-extension/resources/models/llama3.1-8b-instruct/model.json
View File

@ -37,5 +37,5 @@
], ],
"size": 4920000000 "size": 4920000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama3.2-1b-instruct/model.json → extensions/inference-cortex-extension/resources/models/llama3.2-1b-instruct/model.json
View File

@ -31,5 +31,5 @@
"tags": ["1B", "Featured"], "tags": ["1B", "Featured"],
"size": 1320000000 "size": 1320000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llama3.2-3b-instruct/model.json → extensions/inference-cortex-extension/resources/models/llama3.2-3b-instruct/model.json
View File

@ -31,5 +31,5 @@
"tags": ["3B", "Featured"], "tags": ["3B", "Featured"],
"size": 3420000000 "size": 3420000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llamacorn-1.1b/model.json → extensions/inference-cortex-extension/resources/models/llamacorn-1.1b/model.json
View File

@ -34,5 +34,5 @@
], ],
"size": 1170000000 "size": 1170000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llava-13b/model.json → extensions/inference-cortex-extension/resources/models/llava-13b/model.json
View File

@ -32,5 +32,5 @@
"tags": ["Vision"], "tags": ["Vision"],
"size": 7870000000 "size": 7870000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/llava-7b/model.json → extensions/inference-cortex-extension/resources/models/llava-7b/model.json
View File

@ -32,5 +32,5 @@
"tags": ["Vision"], "tags": ["Vision"],
"size": 4370000000 "size": 4370000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/mistral-ins-7b-q4/model.json → extensions/inference-cortex-extension/resources/models/mistral-ins-7b-q4/model.json
View File

@ -32,5 +32,5 @@
"size": 4370000000, "size": 4370000000,
"cover": "https://raw.githubusercontent.com/janhq/jan/dev/models/mistral-ins-7b-q4/cover.png" "cover": "https://raw.githubusercontent.com/janhq/jan/dev/models/mistral-ins-7b-q4/cover.png"
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/mixtral-8x7b-instruct/model.json → extensions/inference-cortex-extension/resources/models/mixtral-8x7b-instruct/model.json
View File

@ -30,5 +30,5 @@
"tags": ["70B", "Foundational Model"], "tags": ["70B", "Foundational Model"],
"size": 26440000000 "size": 26440000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/noromaid-7b/model.json → extensions/inference-cortex-extension/resources/models/noromaid-7b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 4370000000 "size": 4370000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/openchat-3.5-7b/model.json → extensions/inference-cortex-extension/resources/models/openchat-3.5-7b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["Recommended", "7B", "Finetuned"], "tags": ["Recommended", "7B", "Finetuned"],
"size": 4370000000 "size": 4370000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/phi3-3.8b/model.json → extensions/inference-cortex-extension/resources/models/phi3-3.8b/model.json
View File

@ -34,5 +34,5 @@
], ],
"size": 2320000000 "size": 2320000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/phi3-medium/model.json → extensions/inference-cortex-extension/resources/models/phi3-medium/model.json
View File

@ -34,5 +34,5 @@
], ],
"size": 8366000000 "size": 8366000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/phind-34b/model.json → extensions/inference-cortex-extension/resources/models/phind-34b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["34B", "Finetuned"], "tags": ["34B", "Finetuned"],
"size": 20220000000 "size": 20220000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen-7b/model.json → extensions/inference-cortex-extension/resources/models/qwen-7b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 4770000000 "size": 4770000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen2-7b/model.json → extensions/inference-cortex-extension/resources/models/qwen2-7b/model.json
View File

@ -31,6 +31,6 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 4680000000 "size": 4680000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen2.5-14b-instruct/model.json → extensions/inference-cortex-extension/resources/models/qwen2.5-14b-instruct/model.json
View File

@ -31,6 +31,6 @@
"tags": ["14B", "Featured"], "tags": ["14B", "Featured"],
"size": 8990000000 "size": 8990000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen2.5-32b-instruct/model.json → extensions/inference-cortex-extension/resources/models/qwen2.5-32b-instruct/model.json
View File

@ -31,6 +31,6 @@
"tags": ["32B"], "tags": ["32B"],
"size": 19900000000 "size": 19900000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen2.5-72b-instruct/model.json → extensions/inference-cortex-extension/resources/models/qwen2.5-72b-instruct/model.json
View File

@ -31,6 +31,6 @@
"tags": ["72B"], "tags": ["72B"],
"size": 47400000000 "size": 47400000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen2.5-7b-instruct/model.json → extensions/inference-cortex-extension/resources/models/qwen2.5-7b-instruct/model.json
View File

@ -31,6 +31,6 @@
"tags": ["7B", "Featured"], "tags": ["7B", "Featured"],
"size": 4680000000 "size": 4680000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/qwen2.5-coder-7b-instruct/model.json → extensions/inference-cortex-extension/resources/models/qwen2.5-coder-7b-instruct/model.json
View File

@ -31,6 +31,6 @@
"tags": ["7B", "Featured"], "tags": ["7B", "Featured"],
"size": 4680000000 "size": 4680000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/stable-zephyr-3b/model.json → extensions/inference-cortex-extension/resources/models/stable-zephyr-3b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["3B", "Finetuned", "Tiny"], "tags": ["3B", "Finetuned", "Tiny"],
"size": 2970000000 "size": 2970000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/stealth-v1.2-7b/model.json → extensions/inference-cortex-extension/resources/models/stealth-v1.2-7b/model.json
View File

@ -30,5 +30,5 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 4370000000 "size": 4370000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/tinyllama-1.1b/model.json → extensions/inference-cortex-extension/resources/models/tinyllama-1.1b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["Tiny", "Foundation Model"], "tags": ["Tiny", "Foundation Model"],
"size": 669000000 "size": 669000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/trinity-v1.2-7b/model.json → extensions/inference-cortex-extension/resources/models/trinity-v1.2-7b/model.json
View File

@ -31,5 +31,5 @@
"size": 4370000000, "size": 4370000000,
"cover": "https://raw.githubusercontent.com/janhq/jan/dev/models/trinity-v1.2-7b/cover.png" "cover": "https://raw.githubusercontent.com/janhq/jan/dev/models/trinity-v1.2-7b/cover.png"
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/vistral-7b/model.json → extensions/inference-cortex-extension/resources/models/vistral-7b/model.json
View File

@ -31,6 +31,6 @@
"tags": ["7B", "Finetuned"], "tags": ["7B", "Finetuned"],
"size": 4410000000 "size": 4410000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/wizardcoder-13b/model.json → extensions/inference-cortex-extension/resources/models/wizardcoder-13b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["Recommended", "13B", "Finetuned"], "tags": ["Recommended", "13B", "Finetuned"],
"size": 7870000000 "size": 7870000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

2
extensions/inference-nitro-extension/resources/models/yi-34b/model.json → extensions/inference-cortex-extension/resources/models/yi-34b/model.json
View File

@ -31,5 +31,5 @@
"tags": ["34B", "Foundational Model"], "tags": ["34B", "Foundational Model"],
"size": 20660000000 "size": 20660000000
}, },
"engine": "nitro" "engine": "llama-cpp"
} }

Some files were not shown because too many files have changed in this diff Show More