Release/0.4.14 to main

.github/workflows/jan-electron-build.yml

@@ -25,12 +25,11 @@ jobs:
  GITHUB_REF: ${{ github.ref }}
  - name: Create Draft Release
  id: create_release
- uses: actions/create-release@v1
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ uses: softprops/action-gh-release@v2
  with:
  tag_name: ${{ github.ref_name }}
- release_name: "${{ env.VERSION }}"
+ token: ${{ secrets.GITHUB_TOKEN }}
+ name: "${{ env.VERSION }}"
  draft: true
  prerelease: false
 

.github/workflows/jan-openai-api-test.yml

@@ -1,6 +1,13 @@
 name: Test - OpenAI API Pytest collection
 on:
  workflow_dispatch:
+ inputs:
+ endpoints:
+ description: 'comma-separated list (see available at endpoints_mapping.json e.g. GET /users,POST /transform)'
+ required: false
+ default: all
+ type: string
+
  push:
  branches:
  - main
@@ -38,11 +45,11 @@ jobs:
  rm -rf ~/jan
  make clean
 
- - name: install dependencies
+ - name: Install dependencies
  run: |
  npm install -g @stoplight/prism-cli
 
- - name: create python virtual environment and run test
+ - name: Create python virtual environment and run test
  run: |
  python3 -m venv /tmp/jan
  source /tmp/jan/bin/activate
@@ -65,10 +72,14 @@ jobs:
 
  # Append to conftest.py
  cat ../docs/tests/conftest.py >> tests/conftest.py
-
+ cat ../docs/tests/endpoints_mapping.json >> tests/endpoints_mapping.json
+
  # start mock server and run test then stop mock server
- prism mock ../docs/openapi/jan.yaml > prism.log & prism_pid=$! && pytest --reportportal --html=report.html && kill $prism_pid
+ prism mock ../docs/openapi/jan.yaml > prism.log & prism_pid=$! &&
+ pytest --endpoint "$ENDPOINTS" --reportportal --html=report.html && kill $prism_pid
  deactivate
+ env:
+ ENDPOINTS: ${{ github.event.inputs.endpoints }}
 
  - name: Upload Artifact
  uses: actions/upload-artifact@v2
@@ -79,7 +90,7 @@ jobs:
  openai-python/assets
  openai-python/prism.log
 
- - name: clean up
+ - name: Clean up
  if: always()
  run: |
  rm -rf /tmp/jan

README.md

@@ -1,4 +1,4 @@
-# Jan - Bring AI to your Desktop
+# Jan - Turn your computer into an AI computer
 
 ![Jan banner](https:/janhq/jan/assets/89722390/35daac7d-b895-487c-a6ac-6663daaad78e)
 
@@ -19,13 +19,14 @@
  - <a href="https://discord.gg/AsJ8krTT3N">Discord</a>
 </p>
 
-> ⚠️ **Jan is currently in Development**: Expect breaking changes and bugs!
+>[!Warning]
+>**Jan is currently in Development**: Expect breaking changes and bugs!
 
 Jan is an open-source ChatGPT alternative that runs 100% offline on your computer.
 
 **Jan runs on any hardware.** From PCs to multi-GPU clusters, Jan supports universal architectures:
 
-- [x] Nvidia GPUs (fast)
+- [x] NVIDIA GPUs (fast)
 - [x] Apple M-series (fast)
 - [x] Apple Intel
 - [x] Linux Debian
@@ -57,7 +58,7 @@ Jan is an open-source ChatGPT alternative that runs 100% offline on your compute
  <td style="text-align:center">
  <a href='https://app.jan.ai/download/latest/mac-arm64'>
  <img src='https:/janhq/docs/blob/main/static/img/mac.png' style="height:15px; width: 15px" />
- <b>M1/M2</b>
+ <b>M1/M2/M3/M4</b>
  </a>
  </td>
  <td style="text-align:center">
@@ -90,7 +91,7 @@ Jan is an open-source ChatGPT alternative that runs 100% offline on your compute
  <td style="text-align:center">
  <a href='https://app.jan.ai/download/nightly/mac-arm64'>
  <img src='https:/janhq/docs/blob/main/static/img/mac.png' style="height:15px; width: 15px" />
- <b>M1/M2</b>
+ <b>M1/M2/M3/M4</b>
  </a>
  </td>
  <td style="text-align:center">

docs/tests/conftest.py

@@ -1,6 +1,40 @@
+import json
+
+
+def pytest_addoption(parser):
+ parser.addoption(
+ "--endpoint", action="store", default="all", help="my option: endpoints"
+ )
+
+
+def pytest_configure(config):
+ config.addinivalue_line(
+ "markers", "endpoint(endpoint): this mark select the test based on endpoint"
+ )
+
+
+def pytest_runtest_setup(item):
+ getoption = item.config.getoption("--endpoint").split(",")
+ if getoption not in (["all"], [''], [""]):
+ endpoint_names = [mark.args[0] for mark in item.iter_markers(name="endpoint")]
+ if not endpoint_names or not set(getoption).intersection(set(endpoint_names)):
+ pytest.skip("Test skipped because endpoint is {!r}".format(endpoint_names))
+
+
 def pytest_collection_modifyitems(items):
+ # load the JSON file
+ with open("tests/endpoints_mapping.json", "r") as json_file:
+ endpoints_file_mapping = json.load(json_file)
+
+ # create a dictionary to map filenames to endpoints
+ filename_to_endpoint = {}
+ for endpoint, files in endpoints_file_mapping.items():
+ for filename in files:
+ filename_to_endpoint[filename] = endpoint
+
+ # add the markers based on the JSON file
  for item in items:
- # add the name of the file (without extension) as a marker
- filename = item.nodeid.split("::")[0].split("/")[-1].replace(".py", "")
- marker = pytest.mark.file(filename)
- item.add_marker(marker)
+ # map the name of the file to endpoint, else use default value
+ filename = item.fspath.basename
+ marker = filename_to_endpoint.get(filename, filename)
+ item.add_marker(pytest.mark.endpoint(marker, filename=filename))

docs/tests/endpoints_mapping.json

@@ -0,0 +1,75 @@
+{
+ "/embeddings": [
+ "test_embedding.py"
+ ],
+ "/audio/translations": [
+ "test_translations.py"
+ ],
+ "/audio/transcriptions": [
+ "test_transcriptions.py"
+ ],
+ "/moderations": [
+ "test_moderations.py"
+ ],
+ "/images/generations": [
+ "test_images.py"
+ ],
+ "/batches": [
+ "test_batches.py"
+ ],
+ "/vector_stores": [
+ "test_vector_stores.py"
+ ],
+ "/fine_tuning/jobs": [
+ "test_jobs.py",
+ "test_checkpoints.py"
+ ],
+ "/assistants": [
+ "test_assistants.py"
+ ],
+ "/threads/{thread_id}/runs": [
+ "test_runs.py"
+ ],
+ "/threads/{thread_id}/runs/{run_id}/steps": [
+ "test_steps.py"
+ ],
+ "/vector_stores/{vector_store_id}/file_batches": [
+ "test_file_batches.py"
+ ],
+ "/messages": [
+ "test_messages.py"
+ ],
+ "/vector_stores/{vector_store_id}/files": [
+ "test_files.py"
+ ],
+ "/chat/completions": [
+ "test_completions.py"
+ ],
+ "/threads": [
+ "test_threads.py"
+ ],
+ "/audio/speech": [
+ "test_speech.py"
+ ],
+ "/models": [
+ "test_models.py"
+ ],
+ "native_client_sdk_only": [
+ "test_streaming.py"
+ ],
+ "utils": [
+ "test_response.py",
+ "test_client.py",
+ "test_extract_files.py",
+ "test_typing.py",
+ "test_legacy_response.py",
+ "test_module_client.py",
+ "test_old_api.py",
+ "test_proxy.py",
+ "test_qs.py",
+ "test_required_args.py",
+ "test_transform.py",
+ "test_azure.py",
+ "test_deepcopy.py"
+ ]
+}

electron/sign.js

@@ -1,5 +1,28 @@
 const { exec } = require('child_process')
 
+function execCommandWithRetry(command, retries = 3) {
+ return new Promise((resolve, reject) => {
+ const execute = (attempt) => {
+ exec(command, (error, stdout, stderr) => {
+ if (error) {
+ console.error(`Error: ${error}`)
+ if (attempt < retries) {
+ console.log(`Retrying... Attempt ${attempt + 1}`)
+ execute(attempt + 1)
+ } else {
+ return reject(error)
+ }
+ } else {
+ console.log(`stdout: ${stdout}`)
+ console.error(`stderr: ${stderr}`)
+ resolve()
+ }
+ })
+ }
+ execute(0)
+ })
+}
+
 function sign({
  path,
  name,
@@ -13,16 +36,9 @@ function sign({
 }) {
  return new Promise((resolve, reject) => {
  const command = `azuresigntool.exe sign -kvu "${certUrl}" -kvi "${clientId}" -kvt "${tenantId}" -kvs "${clientSecret}" -kvc "${certName}" -tr "${timestampServer}" -v "${path}"`
-
- exec(command, (error, stdout, stderr) => {
- if (error) {
- console.error(`Error: ${error}`)
- return reject(error)
- }
- console.log(`stdout: ${stdout}`)
- console.error(`stderr: ${stderr}`)
- resolve()
- })
+ execCommandWithRetry(command)
+ .then(resolve)
+ .catch(reject)
  })
 }
 
@@ -34,15 +50,20 @@ exports.default = async function (options) {
  const certName = process.env.AZURE_CERT_NAME
  const timestampServer = 'http://timestamp.globalsign.com/tsa/r6advanced1'
 
- await sign({
- path: options.path,
- name: 'jan-win-x64',
- certUrl,
- clientId,
- tenantId,
- clientSecret,
- certName,
- timestampServer,
- version: options.version,
- })
+ try {
+ await sign({
+ path: options.path,
+ name: 'jan-win-x64',
+ certUrl,
+ clientId,
+ tenantId,
+ clientSecret,
+ certName,
+ timestampServer,
+ version: options.version,
+ })
+ } catch (error) {
+ console.error('Failed to sign after 3 attempts:', error)
+ process.exit(1)
+ }
 }

extensions/inference-nitro-extension/bin/version.txt

@@ -1 +1 @@
-0.4.7
+0.4.9

extensions/inference-nitro-extension/package.json

@@ -1,7 +1,7 @@
 {
  "name": "@janhq/inference-cortex-extension",
  "productName": "Cortex Inference Engine",
- "version": "1.0.7",
+ "version": "1.0.10",
  "description": "This extension embeds cortex.cpp, a lightweight inference engine written in C++. See https://nitro.jan.ai.\nAdditional dependencies could be installed to run without Cuda Toolkit installation.",
  "main": "dist/index.js",
  "node": "dist/node/index.cjs.js",

extensions/inference-nitro-extension/resources/models/aya-23-35b/model.json

@@ -0,0 +1,35 @@
+{
+ "sources": [
+ {
+ "filename": "aya-23-35B-Q4_K_M.gguf",
+ "url": "https://huggingface.co/bartowski/aya-23-35B-GGUF/resolve/main/aya-23-35B-Q4_K_M.gguf"
+ }
+ ],
+ "id": "aya-23-35b",
+ "object": "model",
+ "name": "Aya 23 35B Q4",
+ "version": "1.0",
+ "description": "Aya 23 can talk upto 23 languages fluently.",
+ "format": "gguf",
+ "settings": {
+ "ctx_len": 8192,
+ "prompt_template": "<|START_OF_TURN_TOKEN|><|SYSTEM_TOKEN|>{system_prompt}<|END_OF_TURN_TOKEN|><|START_OF_TURN_TOKEN|><|USER_TOKEN|>{prompt}<|END_OF_TURN_TOKEN|><|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>",
+ "llama_model_path": "aya-23-35B-Q4_K_M.gguf",
+ "ngl": 40
+ },
+ "parameters": {
+ "temperature": 0.7,
+ "top_p": 0.95,
+ "stream": true,
+ "max_tokens": 8192,
+ "frequency_penalty": 0,
+ "presence_penalty": 0,
+ "stop": ["<|END_OF_TURN_TOKEN|>"]
+ },
+ "metadata": {
+ "author": "CohereForAI",
+ "tags": ["34B", "Finetuned"],
+ "size": 21556982144
+ },
+ "engine": "nitro"
+}

extensions/inference-nitro-extension/resources/models/aya-23-8b/model.json

@@ -0,0 +1,35 @@
+{
+ "sources": [
+ {
+ "filename": "aya-23-8B-Q4_K_M.gguf",
+ "url": "https://huggingface.co/bartowski/aya-23-8B-GGUF/resolve/main/aya-23-8B-Q4_K_M.gguf"
+ }
+ ],
+ "id": "aya-23-8b",
+ "object": "model",
+ "name": "Aya 23 8B Q4",
+ "version": "1.0",
+ "description": "Aya 23 can talk upto 23 languages fluently.",
+ "format": "gguf",
+ "settings": {
+ "ctx_len": 8192,
+ "prompt_template": "<|START_OF_TURN_TOKEN|><|SYSTEM_TOKEN|>{system_prompt}<|END_OF_TURN_TOKEN|><|START_OF_TURN_TOKEN|><|USER_TOKEN|>{prompt}<|END_OF_TURN_TOKEN|><|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>",
+ "llama_model_path": "aya-23-8B-Q4_K_M.gguf",
+ "ngl": 32
+ },
+ "parameters": {
+ "temperature": 0.7,
+ "top_p": 0.95,
+ "stream": true,
+ "max_tokens": 8192,
+ "frequency_penalty": 0,
+ "presence_penalty": 0,
+ "stop": ["<|END_OF_TURN_TOKEN|>"]
+ },
+ "metadata": {
+ "author": "CohereForAI",
+ "tags": ["7B", "Finetuned","Featured"],
+ "size": 5056982144
+ },
+ "engine": "nitro"
+}