From 97cd0224f1ba5fb1ceb83b7398abff4423fbe99c Mon Sep 17 00:00:00 2001 From: Ashley Date: Tue, 14 Jan 2025 20:54:26 +0700 Subject: [PATCH 1/5] Updated parameters descriptions --- electron/package.json | 2 +- electron/package.tmp | 0 extensions/yarn.lock | 29 ++-- .../Thread/ThreadRightPanel/Tools/index.tsx | 25 +-- web/utils/predefinedComponent.ts | 30 ++-- yarn.lock | 145 +----------------- 6 files changed, 39 insertions(+), 192 deletions(-) create mode 100644 electron/package.tmp diff --git a/electron/package.json b/electron/package.json index 329f2b4c4..8ac5a90d7 100644 --- a/electron/package.json +++ b/electron/package.json @@ -144,4 +144,4 @@ "hoistingLimits": "workspaces" }, "packageManager": "yarn@4.5.3" -} \ No newline at end of file +} diff --git a/electron/package.tmp b/electron/package.tmp new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/yarn.lock b/extensions/yarn.lock index d7ef3c4cb..46720a888 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -509,71 +509,71 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fmonitoring-extension%40workspace%3Amonitoring-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Fmonitoring-extension%40workspace%3Amonitoring-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Fmonitoring-extension%40workspace%3Amonitoring-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Ftensorrt-llm-extension%40workspace%3Atensorrt-llm-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e8dac7&locator=%40janhq%2Ftensorrt-llm-extension%40workspace%3Atensorrt-llm-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=b3efad&locator=%40janhq%2Ftensorrt-llm-extension%40workspace%3Atensorrt-llm-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" - checksum: 10c0/394734b0cc26f051a9ad138f8ae642d066acff07de26ab7c4b944d190c030cb422ac044da6352461589e13a480425200cbd8e5a549cf0181cd5c9af4b1d7eb2c + checksum: 10c0/a617e70c606d6f463fbd82488704a02f75290323c07fcf0242641732efa5e9d067062595f27cefade0ac79b47796ac34ef57ac439e82a5a4888b30e37d019994 languageName: node linkType: hard @@ -588,6 +588,7 @@ __metadata: p-queue: "npm:^8.0.1" rimraf: "npm:^3.0.2" rolldown: "npm:^1.0.0-beta.1" + run-script-os: "npm:^1.1.6" ts-loader: "npm:^9.5.0" typescript: "npm:^5.3.3" languageName: unknown diff --git a/web/screens/Thread/ThreadRightPanel/Tools/index.tsx b/web/screens/Thread/ThreadRightPanel/Tools/index.tsx index 925eebe77..04cd6607f 100644 --- a/web/screens/Thread/ThreadRightPanel/Tools/index.tsx +++ b/web/screens/Thread/ThreadRightPanel/Tools/index.tsx @@ -115,10 +115,7 @@ const Tools = () => { className="ml-2 flex-shrink-0 text-[hsl(var(--text-secondary))]" /> } - content="Retrieval helps the assistant use information from - files you send to it. Once you share a file, the - assistant automatically fetches the relevant content - based on your request." + content="Allows assistant to pull information from your uploaded files to provide context-aware responses." />
@@ -147,13 +144,7 @@ const Tools = () => { className="ml-2 flex-shrink-0 text-[hsl(var(--text-secondary))]" /> } - content="Embedding model is crucial for understanding and - processing the input text effectively by - converting text to numerical representations. - Align the model choice with your task, evaluate - its performance, and consider factors like - resource availability. Experiment to find the best - fit for your specific use case." + content="Converts text into numbers for AI processing." />
@@ -174,11 +165,7 @@ const Tools = () => { className="ml-2 flex-shrink-0 text-[hsl(var(--text-secondary))]" /> } - content="Vector Database is crucial for efficient storage - and retrieval of embeddings. Consider your - specific task, available resources, and language - requirements. Experiment to find the best fit for - your specific use case." + content="Stores and searches text data efficiently. Pick settings that balance speed and accuracy for your data size." />
@@ -202,11 +189,7 @@ const Tools = () => { className="ml-2 flex-shrink-0 text-[hsl(var(--text-secondary))]" /> } - content="Time-Weighted Retriever looks at how similar - they are and how new they are. It compares - documents based on their meaning like usual, but - also considers when they were added to give - newer ones more importance." + content="Prioritizes newer documents while searching but still considers older ones. Newer content gets higher importance when finding relevant information." />
= { prompt_template: { key: 'prompt_template', title: 'Prompt template', - description: `A predefined text or framework that guides the AI model's response generation. It includes placeholders or instructions for the model to fill in or expand upon.`, + description: `A structured format that guides how the model should respond.`, controllerType: 'input', controllerProps: { placeholder: 'Prompt template', @@ -16,7 +16,7 @@ export const presetConfiguration: Record = { stop: { key: 'stop', title: 'Stop', - description: `Defines specific tokens or phrases that signal the model to stop producing further output, allowing you to control the length and coherence of the output.`, + description: `Defines tokens or phrases that will end the model's response.`, controllerType: 'tag', controllerProps: { placeholder: 'Enter stop words', @@ -28,7 +28,7 @@ export const presetConfiguration: Record = { ctx_len: { key: 'ctx_len', title: 'Context Length', - description: `Sets the maximum input the model can use to generate a response, it varies with the model used. Higher length is better for tasks needing extensive context, like summarizing long documents. Lower length can improve response time and reduce computing needs for simple queries.`, + description: `Controls how much text the model can consider at once. Longer context allows the model to handle more input but uses more memory and runs slower.`, controllerType: 'slider', controllerProps: { min: 128, @@ -42,7 +42,7 @@ export const presetConfiguration: Record = { max_tokens: { key: 'max_tokens', title: 'Max Tokens', - description: `Sets the upper limit on the number of tokens the model can generate in a single output. A higher limit benefits detailed and complex responses, while a lower limit helps maintain conciseness.`, + description: `Controls response length. Higher values allow longer, more detailed responses.`, controllerType: 'slider', controllerProps: { min: 100, @@ -56,7 +56,7 @@ export const presetConfiguration: Record = { ngl: { key: 'ngl', title: 'Number of GPU layers (ngl)', - description: 'The number of layers to load onto the GPU for acceleration.', + description: 'Controls how many layers of the model run on GPU. More layers means faster processing, but requires more GPU memory.', controllerType: 'slider', controllerProps: { min: 1, @@ -81,7 +81,7 @@ export const presetConfiguration: Record = { stream: { key: 'stream', title: 'Stream', - description: `Enables real-time data processing, which is useful for applications needing immediate responses, like live interactions. It accelerates predictions by processing data as it becomes available.`, + description: `Enables real-time response streaming.`, controllerType: 'checkbox', controllerProps: { value: false, @@ -92,7 +92,7 @@ export const presetConfiguration: Record = { temperature: { key: 'temperature', title: 'Temperature', - description: `Influences the randomness of the model's output. A higher value leads to more random and diverse responses, while a lower value produces more predictable outputs.`, + description: `Controls response randomness. Higher values produce more creative, varied responses. `, controllerType: 'slider', controllerProps: { min: 0, @@ -106,7 +106,7 @@ export const presetConfiguration: Record = { frequency_penalty: { key: 'frequency_penalty', title: 'Frequency Penalty', - description: `Modifies the likelihood of the model repeating the same words or phrases within a single output. Increasing it can help avoid repetition, which is useful for scenarios where you want more varied language, like creative writing or content generation.`, + description: `Reduces word repetition. Higher values encourage more varied language. Useful for creative writing and content generation.`, controllerType: 'slider', controllerProps: { min: 0, @@ -120,7 +120,7 @@ export const presetConfiguration: Record = { presence_penalty: { key: 'presence_penalty', title: 'Presence Penalty', - description: `Reduces the likelihood of repeating tokens, promoting novelty in the output. Use a higher value for tasks requiring diverse ideas.`, + description: `Encourages the model to explore new topics. Higher values help prevent the model from fixating on already-discussed subjects.`, controllerType: 'slider', controllerProps: { min: 0, @@ -134,7 +134,7 @@ export const presetConfiguration: Record = { top_p: { key: 'top_p', title: 'Top P', - description: `Set probability threshold for more relevant outputs. A lower value (e.g., 0.9) may be more suitable for focused, task-oriented applications, while a higher value (e.g., 0.95 or 0.97) may be better for more open-ended, creative tasks.`, + description: `Set probability threshold for more relevant outputs. Higher values allow more diverse word choices.`, controllerType: 'slider', controllerProps: { min: 0, @@ -149,7 +149,7 @@ export const presetConfiguration: Record = { key: 'cpu_threads', title: 'CPU Threads', description: - 'Determines CPU inference threads, limited by hardware and OS. (Maximum determined by system)', + 'Controls how many CPU cores are used for processing. Higher values can speed up model loading but use more system resources.', controllerType: 'slider', controllerProps: { min: 0, @@ -164,7 +164,7 @@ export const presetConfiguration: Record = { chunk_size: { key: 'chunk_size', title: 'Chunk Size', - description: 'Maximum number of tokens in a chunk', + description: 'Sets the maximum number of tokens per data chunk. Increase size for processing large blocks of text efficiently, or decrease it to optimize memory usage.', controllerType: 'slider', controllerProps: { min: 128, @@ -178,7 +178,7 @@ export const presetConfiguration: Record = { chunk_overlap: { key: 'chunk_overlap', title: 'Chunk Overlap', - description: 'Number of tokens overlapping between two adjacent chunks', + description: 'How many words overlap between text segments. More overlap helps maintain meaning across splits.', controllerType: 'slider', controllerProps: { min: 32, @@ -192,7 +192,7 @@ export const presetConfiguration: Record = { top_k: { key: 'top_k', title: 'Top K', - description: 'Number of top-ranked documents to retrieve', + description: 'Number of most relevant documents to retrieve. Higher values return more results.', controllerType: 'slider', controllerProps: { min: 1, @@ -207,7 +207,7 @@ export const presetConfiguration: Record = { key: 'retrieval_template', title: 'Retrieval Template', description: - 'The template to use for retrieval. The following variables are available: {CONTEXT}, {QUESTION}', + 'Format for how the AI uses context to answer questions.', controllerType: 'input', controllerProps: { placeholder: 'Retrieval Template', diff --git a/yarn.lock b/yarn.lock index 035400a11..c425d7e90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -43,19 +43,6 @@ __metadata: languageName: node linkType: hard -"@asamuzakjp/css-color@npm:^2.8.2": - version: 2.8.2 - resolution: "@asamuzakjp/css-color@npm:2.8.2" - dependencies: - "@csstools/css-calc": "npm:^2.1.1" - "@csstools/css-color-parser": "npm:^3.0.7" - "@csstools/css-parser-algorithms": "npm:^3.0.4" - "@csstools/css-tokenizer": "npm:^3.0.3" - lru-cache: "npm:^11.0.2" - checksum: 10c0/352b91ca7741876e459cd3cb350a969e842da1e532577157d38365a6da89b7d6e6944249489366ee61b8a225ede1b521e7ab305b70ad4c688b01404061eecca8 - languageName: node - linkType: hard - "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0, @babel/code-frame@npm:^7.26.2": version: 7.26.2 resolution: "@babel/code-frame@npm:7.26.2" @@ -434,52 +421,6 @@ __metadata: languageName: node linkType: hard -"@csstools/color-helpers@npm:^5.0.1": - version: 5.0.1 - resolution: "@csstools/color-helpers@npm:5.0.1" - checksum: 10c0/77fa3b7236eaa3f36dea24708ac0d5e53168903624ac5aed54615752a0730cd20773fda50e742ce868012eca8c000cc39688e05869e79f34714230ab6968d1e6 - languageName: node - linkType: hard - -"@csstools/css-calc@npm:^2.1.1": - version: 2.1.1 - resolution: "@csstools/css-calc@npm:2.1.1" - peerDependencies: - "@csstools/css-parser-algorithms": ^3.0.4 - "@csstools/css-tokenizer": ^3.0.3 - checksum: 10c0/857c8dac40eb6ba8810408dad141bbcad060b28bce69dfd3bcf095a060fcaa23d5c4dbf52be88fcb57e12ce32c666e855dc68de1d8020851f6b432e3f9b29950 - languageName: node - linkType: hard - -"@csstools/css-color-parser@npm:^3.0.7": - version: 3.0.7 - resolution: "@csstools/css-color-parser@npm:3.0.7" - dependencies: - "@csstools/color-helpers": "npm:^5.0.1" - "@csstools/css-calc": "npm:^2.1.1" - peerDependencies: - "@csstools/css-parser-algorithms": ^3.0.4 - "@csstools/css-tokenizer": ^3.0.3 - checksum: 10c0/b81780e6c50f0b0605776bd39bbd6203780231a561601853a9835cc70788560e7a281d0fbfe47ebe8affcb07dd64b0b1dcd4b67552520cfbe0e5088df158f12c - languageName: node - linkType: hard - -"@csstools/css-parser-algorithms@npm:^3.0.4": - version: 3.0.4 - resolution: "@csstools/css-parser-algorithms@npm:3.0.4" - peerDependencies: - "@csstools/css-tokenizer": ^3.0.3 - checksum: 10c0/d411f07765e14eede17bccc6bd4f90ff303694df09aabfede3fd104b2dfacfd4fe3697cd25ddad14684c850328f3f9420ebfa9f78380892492974db24ae47dbd - languageName: node - linkType: hard - -"@csstools/css-tokenizer@npm:^3.0.3": - version: 3.0.3 - resolution: "@csstools/css-tokenizer@npm:3.0.3" - checksum: 10c0/c31bf410e1244b942e71798e37c54639d040cb59e0121b21712b40015fced2b0fb1ffe588434c5f8923c9cd0017cfc1c1c8f3921abc94c96edf471aac2eba5e5 - languageName: node - linkType: hard - "@develar/schema-utils@npm:~2.6.5": version: 2.6.5 resolution: "@develar/schema-utils@npm:2.6.5" @@ -5674,7 +5615,7 @@ __metadata: languageName: node linkType: hard -"bindings@npm:1.5.0, bindings@npm:^1.2.1, bindings@npm:^1.5.0": +"bindings@npm:1.5.0, bindings@npm:^1.5.0": version: 1.5.0 resolution: "bindings@npm:1.5.0" dependencies: @@ -6577,17 +6518,6 @@ __metadata: languageName: node linkType: hard -"contextify@npm:0.1.x": - version: 0.1.15 - resolution: "contextify@npm:0.1.15" - dependencies: - bindings: "npm:^1.2.1" - nan: "npm:^2.1.0" - node-gyp: "npm:latest" - checksum: 10c0/818ce9ff0867050e50ba18fea112d12932f30ee1c0350000a9a28fb2df3efc97c7922ea891b03c83244d8132c462e472f18b8d824d95dafde43520c2395bb781 - languageName: node - linkType: hard - "convert-source-map@npm:^2.0.0": version: 2.0.0 resolution: "convert-source-map@npm:2.0.0" @@ -6863,13 +6793,6 @@ __metadata: languageName: node linkType: hard -"cssom@npm:0.2.x": - version: 0.2.5 - resolution: "cssom@npm:0.2.5" - checksum: 10c0/d8fae52a1b2cc37fdcc7ab81ff2294ba239959a690bec764446a4f6219de443b5bf82b5fa2249f7b3ead74e5b521cc7a4808790e5c518eaa2b199bc895443fd3 - languageName: node - linkType: hard - "cssom@npm:^0.5.0": version: 0.5.0 resolution: "cssom@npm:0.5.0" @@ -6884,16 +6807,6 @@ __metadata: languageName: node linkType: hard -"cssstyle@npm:>=0.2.3": - version: 4.2.1 - resolution: "cssstyle@npm:4.2.1" - dependencies: - "@asamuzakjp/css-color": "npm:^2.8.2" - rrweb-cssom: "npm:^0.8.0" - checksum: 10c0/02ba8c47c0caaab57acadacb3eb6c0f5f009000f55d61f6563670e07d389b26edefeed497e6c1847fcd2e6bbe0b6974c2d4291f97fa0c6ec6add13a7fa926d84 - languageName: node - linkType: hard - "cssstyle@npm:^2.3.0": version: 2.3.0 resolution: "cssstyle@npm:2.3.0" @@ -9858,13 +9771,6 @@ __metadata: languageName: node linkType: hard -"htmlparser@npm:1.x": - version: 1.7.7 - resolution: "htmlparser@npm:1.7.7" - checksum: 10c0/b4ef1d2031f1370f274f646f824da10c8d946e671001d92878a4db77332abe84541667728063bb374a2742659b9549fd7d2e7ecdf71605ff016ef18b328becf5 - languageName: node - linkType: hard - "http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" @@ -11053,7 +10959,6 @@ __metadata: eslint: "npm:8.57.0" eslint-plugin-react: "npm:^7.34.0" fs-extra: "npm:^11.2.0" - jq: "npm:^1.7.2" node-fetch: "npm:2" pacote: "npm:^21.0.0" request: "npm:^2.88.2" @@ -11609,18 +11514,6 @@ __metadata: languageName: node linkType: hard -"jq@npm:^1.7.2": - version: 1.7.2 - resolution: "jq@npm:1.7.2" - dependencies: - jsdom: "npm:0.2.x" - xmlhttprequest: "npm:1.3.x" - bin: - jq: ./bin/jq - checksum: 10c0/ac23f36e3455435f7da90fe3dc4134cbbd5c04b52bdb04591efedb236aff7e0384c08f27849d44e3123357f6e8f1afca60b63c3af1663cbdc04b4a0ae0c11e3b - languageName: node - linkType: hard - "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" @@ -11665,22 +11558,6 @@ __metadata: languageName: node linkType: hard -"jsdom@npm:0.2.x": - version: 0.2.19 - resolution: "jsdom@npm:0.2.19" - dependencies: - contextify: "npm:0.1.x" - cssom: "npm:0.2.x" - cssstyle: "npm:>=0.2.3" - htmlparser: "npm:1.x" - request: "npm:2.x" - dependenciesMeta: - contextify: - optional: true - checksum: 10c0/7a0aaff6b4d4ae96e1e3489667926782117cfcbee0f7aaefafcc7b04a4e00a1588b2f03db50978612cbb47441fe31bedf28179cdd4c5e144a8cc5a7218a2f0e6 - languageName: node - linkType: hard - "jsdom@npm:^20.0.0": version: 20.0.3 resolution: "jsdom@npm:20.0.3" @@ -12255,7 +12132,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^11.0.0, lru-cache@npm:^11.0.2": +"lru-cache@npm:^11.0.0": version: 11.0.2 resolution: "lru-cache@npm:11.0.2" checksum: 10c0/c993b8e06ead0b24b969c1dbb5b301716aed66e320e9014a80012f5febe280b438f28ff50046b2c55ff404e889351ccb332ff91f8dd175a21f5eae80e3fb155f @@ -13282,7 +13159,7 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.1.0, nan@npm:^2.12.1": +"nan@npm:^2.12.1": version: 2.22.0 resolution: "nan@npm:2.22.0" dependencies: @@ -15969,7 +15846,7 @@ __metadata: languageName: node linkType: hard -"request@npm:2.x, request@npm:^2.88.2": +"request@npm:^2.88.2": version: 2.88.2 resolution: "request@npm:2.88.2" dependencies: @@ -16438,13 +16315,6 @@ __metadata: languageName: node linkType: hard -"rrweb-cssom@npm:^0.8.0": - version: 0.8.0 - resolution: "rrweb-cssom@npm:0.8.0" - checksum: 10c0/56f2bfd56733adb92c0b56e274c43f864b8dd48784d6fe946ef5ff8d438234015e59ad837fc2ad54714b6421384141c1add4eb569e72054e350d1f8a50b8ac7b - languageName: node - linkType: hard - "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -19148,13 +19018,6 @@ __metadata: languageName: node linkType: hard -"xmlhttprequest@npm:1.3.x": - version: 1.3.0 - resolution: "xmlhttprequest@npm:1.3.0" - checksum: 10c0/42d59ee0b20099bd3b618c12d99e1fb6efb9e2945d8dee779f015665a74ee0907a0e936b1f66dc4b89653c3d49bd02246195e4cc74601338babc17d9a43e8673 - languageName: node - linkType: hard - "xtend@npm:^4.0.0": version: 4.0.2 resolution: "xtend@npm:4.0.2" From 1174772958200d16a9a0f3c599cf833019f3ffbc Mon Sep 17 00:00:00 2001 From: Ashley Date: Tue, 14 Jan 2025 22:13:10 +0700 Subject: [PATCH 2/5] Updated some copies in Settings --- docs/src/pages/docs/extensions.mdx | 12 ++++++------ electron/package.json | 2 +- electron/package.tmp | 0 extensions/assistant-extension/package.json | 2 +- extensions/conversational-extension/package.json | 2 +- .../engine-management-extension/package.json | 2 +- extensions/model-extension/package.json | 2 +- extensions/monitoring-extension/package.json | 2 +- .../Advanced/FactoryReset/ModalConfirmReset.tsx | 2 +- .../Settings/Advanced/FactoryReset/index.tsx | 2 +- web/screens/Settings/Advanced/index.tsx | 7 +++---- web/screens/Settings/Appearance/index.tsx | 4 ++-- web/screens/Settings/Engines/LocalEngineItem.tsx | 2 +- .../Settings/Engines/LocalEngineSettings.tsx | 2 +- web/screens/Settings/Engines/RemoteEngineItem.tsx | 2 +- web/screens/Settings/Privacy/index.tsx | 2 +- .../Thread/ThreadRightPanel/Tools/index.tsx | 4 ++-- web/utils/predefinedComponent.ts | 15 +++++++++------ 18 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 electron/package.tmp diff --git a/docs/src/pages/docs/extensions.mdx b/docs/src/pages/docs/extensions.mdx index e248556cf..8e7c23243 100644 --- a/docs/src/pages/docs/extensions.mdx +++ b/docs/src/pages/docs/extensions.mdx @@ -42,10 +42,10 @@ The current Jan Desktop Client has some default extensions built on this framewo ## List of Core Extensions | Extension Name | Version | Description | |---------------------|----------|-----------------------------------------------------------------------------| -| Jan Assistant | v1.0.1 | This extension enables assistants, including Jan, a default assistant that can call all downloaded models | -| Conversational | v1.0.0 | This extension enables conversations and state persistence via your filesystem | +| Jan Assistant | v1.0.1 | Powers the default AI assistant that works with all your installed models. | +| Conversational | v1.0.0 | Enables conversations and state persistence via your filesystem. | | Model Management | v1.0.33 | Model Management Extension provides model exploration and seamless downloads | -| System Monitoring | v1.0.10 | This extension provides system health and OS level data | +| System Monitoring | v1.0.10 | Provides system health and OS level data. | ## Configure an Extension Settings @@ -83,7 +83,7 @@ To configure an extension settings: "productName": "Conversational", "version": "1.0.0", "main": "dist/index.js", - "description": "This extension enables conversations and state persistence via your filesystem", + "description": "Enables conversations and state persistence via your filesystem.", "url": "extension://@janhq/conversational-extension/dist/index.js" }, "@janhq/inference-anthropic-extension": { @@ -248,7 +248,7 @@ To configure an extension settings: "productName": "System Monitoring", "version": "1.0.10", "main": "dist/index.js", - "description": "This extension provides system health and OS level data", + "description": "Provides system health and OS level data.", "url": "extension://@janhq/monitoring-extension/dist/index.js" }, "@janhq/assistant-extension": { @@ -263,7 +263,7 @@ To configure an extension settings: "productName": "Jan Assistant", "version": "1.0.1", "main": "dist/index.js", - "description": "This extension enables assistants, including Jan, a default assistant that can call all downloaded models", + "description": "Powers the default AI assistant that works with all your installed models.", "url": "extension://@janhq/assistant-extension/dist/index.js" }, "@janhq/tensorrt-llm-extension": { diff --git a/electron/package.json b/electron/package.json index 8ac5a90d7..53e0a2255 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "jan", - "version": "0.1.1736316956", + "version": "0.1.1736864554", "main": "./build/main.js", "author": "Jan ", "license": "MIT", diff --git a/electron/package.tmp b/electron/package.tmp deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/assistant-extension/package.json b/extensions/assistant-extension/package.json index d65b789b1..08ccb3b3d 100644 --- a/extensions/assistant-extension/package.json +++ b/extensions/assistant-extension/package.json @@ -2,7 +2,7 @@ "name": "@janhq/assistant-extension", "productName": "Jan Assistant", "version": "1.0.2", - "description": "This extension enables assistants, including Jan, a default assistant that can call all downloaded models", + "description": "Powers the default AI assistant that works with all your installed models.", "main": "dist/index.js", "node": "dist/node/index.js", "author": "Jan ", diff --git a/extensions/conversational-extension/package.json b/extensions/conversational-extension/package.json index dd2283eb0..a5224b99b 100644 --- a/extensions/conversational-extension/package.json +++ b/extensions/conversational-extension/package.json @@ -2,7 +2,7 @@ "name": "@janhq/conversational-extension", "productName": "Conversational", "version": "1.0.0", - "description": "This extension enables conversations and state persistence via your filesystem", + "description": "Enables conversations and state persistence via your filesystem.", "main": "dist/index.js", "author": "Jan ", "license": "MIT", diff --git a/extensions/engine-management-extension/package.json b/extensions/engine-management-extension/package.json index 5ffe2d42a..96f962ffd 100644 --- a/extensions/engine-management-extension/package.json +++ b/extensions/engine-management-extension/package.json @@ -2,7 +2,7 @@ "name": "@janhq/engine-management-extension", "productName": "Engine Management", "version": "1.0.0", - "description": "Extension for managing engines and their configurations", + "description": "Manages AI engines and their configurations.", "main": "dist/index.js", "node": "dist/node/index.cjs.js", "author": "Jan ", diff --git a/extensions/model-extension/package.json b/extensions/model-extension/package.json index 02e9174fa..abd0e28a0 100644 --- a/extensions/model-extension/package.json +++ b/extensions/model-extension/package.json @@ -2,7 +2,7 @@ "name": "@janhq/model-extension", "productName": "Model Management", "version": "1.0.35", - "description": "This extension manages model lists, model details, and model configurations", + "description": "Handles model lists, their details, and settings.", "main": "dist/index.js", "author": "Jan ", "license": "AGPL-3.0", diff --git a/extensions/monitoring-extension/package.json b/extensions/monitoring-extension/package.json index 105e886b6..2f827b41b 100644 --- a/extensions/monitoring-extension/package.json +++ b/extensions/monitoring-extension/package.json @@ -2,7 +2,7 @@ "name": "@janhq/monitoring-extension", "productName": "System Monitoring", "version": "1.0.10", - "description": "This extension provides system health and OS level data", + "description": "Provides system health and OS level data.", "main": "dist/index.js", "node": "dist/node/index.cjs.js", "author": "Jan ", diff --git a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx index 08ac35f04..20749a60f 100644 --- a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx +++ b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx @@ -30,7 +30,7 @@ const ModalConfirmReset = () => { content={

- Restore app to initial state, erasing all models and chat history. + Restore appplication to its initial state, erasing all models and chat history. This action is irreversible and recommended only if the application is corrupted.

diff --git a/web/screens/Settings/Advanced/FactoryReset/index.tsx b/web/screens/Settings/Advanced/FactoryReset/index.tsx index 10e8cbc20..3f85be34d 100644 --- a/web/screens/Settings/Advanced/FactoryReset/index.tsx +++ b/web/screens/Settings/Advanced/FactoryReset/index.tsx @@ -17,7 +17,7 @@ const FactoryReset = () => {

- Restore app to initial state, erasing all models and chat history. + Restore appplication to its initial state, erasing all models and chat history. This action is irreversible and recommended only if the application is corrupted.

diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx index 3dbb56a86..9723f87e2 100644 --- a/web/screens/Settings/Advanced/index.tsx +++ b/web/screens/Settings/Advanced/index.tsx @@ -232,7 +232,7 @@ const Advanced = () => {
Experimental Mode

- Enable new features that may be unstable. + New features that are still unstable and could affect app performance. Enable with caution.

{
HTTPS Proxy

- Specify the HTTPS proxy or leave blank (proxy auto-configuration - and SOCKS not supported). + Optional proxy server for internet connections. Only HTTPS proxies supported.

@@ -501,7 +500,7 @@ const Advanced = () => {
Jan Quick Ask

- Enable Quick Ask to be triggered via the default hotkey{' '} + Enable Quick Ask to be triggered via the default hotkey {' '}. {isMac ? '⌘' : 'Ctrl'} + J {' '} diff --git a/web/screens/Settings/Appearance/index.tsx b/web/screens/Settings/Appearance/index.tsx index a13656052..d7008552e 100644 --- a/web/screens/Settings/Appearance/index.tsx +++ b/web/screens/Settings/Appearance/index.tsx @@ -119,7 +119,7 @@ export default function AppearanceOptions() {

Choose the width of the chat area to customize your conversation - view + view.

@@ -184,7 +184,7 @@ export default function AppearanceOptions() {
Spell Check

- Turn on to enable spell check + Turn on to enable spell check.

diff --git a/web/screens/Settings/Engines/LocalEngineItem.tsx b/web/screens/Settings/Engines/LocalEngineItem.tsx index f284ca8a3..2efb177a3 100644 --- a/web/screens/Settings/Engines/LocalEngineItem.tsx +++ b/web/screens/Settings/Engines/LocalEngineItem.tsx @@ -19,7 +19,7 @@ const LocalEngineItems = ({ engine }: { engine: InferenceEngine }) => { const manualDescription = (engine: string) => { switch (engine) { case InferenceEngine.cortex_llamacpp: - return 'Fast, efficient local inference engine that runs GGUF models directly on your device' + return 'Fast, efficient local inference engine that runs GGUF models directly on your device.' default: break diff --git a/web/screens/Settings/Engines/LocalEngineSettings.tsx b/web/screens/Settings/Engines/LocalEngineSettings.tsx index 41ca622da..cac731a85 100644 --- a/web/screens/Settings/Engines/LocalEngineSettings.tsx +++ b/web/screens/Settings/Engines/LocalEngineSettings.tsx @@ -215,7 +215,7 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => {

Choose the default variant that best suited for your - hardware. See more information here. + hardware. See [our guides](https://jan.ai/docs/local-engines/llama-cpp).

diff --git a/web/screens/Settings/Engines/RemoteEngineItem.tsx b/web/screens/Settings/Engines/RemoteEngineItem.tsx index 9e54e1872..4538be1fe 100644 --- a/web/screens/Settings/Engines/RemoteEngineItem.tsx +++ b/web/screens/Settings/Engines/RemoteEngineItem.tsx @@ -50,7 +50,7 @@ const RemoteEngineItems = ({

Access models from {getTitleByEngine(engine as InferenceEngine)}{' '} - via their API + via their API.

diff --git a/web/screens/Settings/Privacy/index.tsx b/web/screens/Settings/Privacy/index.tsx index 3034d8b2f..f591c9cdd 100644 --- a/web/screens/Settings/Privacy/index.tsx +++ b/web/screens/Settings/Privacy/index.tsx @@ -103,7 +103,7 @@ const Privacy = () => {
Logs

- Open App Logs and Cortex Logs + Open App Logs and Cortex Logs.

diff --git a/web/screens/Thread/ThreadRightPanel/Tools/index.tsx b/web/screens/Thread/ThreadRightPanel/Tools/index.tsx index 04cd6607f..1648564ea 100644 --- a/web/screens/Thread/ThreadRightPanel/Tools/index.tsx +++ b/web/screens/Thread/ThreadRightPanel/Tools/index.tsx @@ -180,7 +180,7 @@ const Tools = () => { id="use-time-weighted-retriever" className="inline-block font-medium" > - Time-Weighted Retrieval? + Time-Weighted Retrieval { className="ml-2 flex-shrink-0 text-[hsl(var(--text-secondary))]" /> } - content="Prioritizes newer documents while searching but still considers older ones. Newer content gets higher importance when finding relevant information." + content="Prioritizes newer documents while searching but still considers older ones." />
= { ngl: { key: 'ngl', title: 'Number of GPU layers (ngl)', - description: 'Controls how many layers of the model run on GPU. More layers means faster processing, but requires more GPU memory.', + description: + 'Controls how many layers of the model run on GPU. More layers means faster processing, but requires more GPU memory.', controllerType: 'slider', controllerProps: { min: 1, @@ -164,7 +165,8 @@ export const presetConfiguration: Record = { chunk_size: { key: 'chunk_size', title: 'Chunk Size', - description: 'Sets the maximum number of tokens per data chunk. Increase size for processing large blocks of text efficiently, or decrease it to optimize memory usage.', + description: + 'Sets the maximum number of tokens per data chunk. Increase size for processing large blocks of text efficiently, or decrease it to optimize memory usage.', controllerType: 'slider', controllerProps: { min: 128, @@ -178,7 +180,8 @@ export const presetConfiguration: Record = { chunk_overlap: { key: 'chunk_overlap', title: 'Chunk Overlap', - description: 'How many words overlap between text segments. More overlap helps maintain meaning across splits.', + description: + 'How many words overlap between text segments. More overlap helps maintain meaning across splits.', controllerType: 'slider', controllerProps: { min: 32, @@ -192,7 +195,8 @@ export const presetConfiguration: Record = { top_k: { key: 'top_k', title: 'Top K', - description: 'Number of most relevant documents to retrieve. Higher values return more results.', + description: + 'Number of most relevant documents to retrieve. Higher values return more results.', controllerType: 'slider', controllerProps: { min: 1, @@ -206,8 +210,7 @@ export const presetConfiguration: Record = { retrieval_template: { key: 'retrieval_template', title: 'Retrieval Template', - description: - 'Format for how the AI uses context to answer questions.', + description: 'Format for how the AI uses context to answer questions.', controllerType: 'input', controllerProps: { placeholder: 'Retrieval Template', From 99536b7dacb66c57546fca4f7d4005dfbb3b6a97 Mon Sep 17 00:00:00 2001 From: Ashley Date: Tue, 14 Jan 2025 22:43:05 +0700 Subject: [PATCH 3/5] Resolved conflicts --- docs/src/pages/docs/extensions.mdx | 267 ----------------------------- 1 file changed, 267 deletions(-) diff --git a/docs/src/pages/docs/extensions.mdx b/docs/src/pages/docs/extensions.mdx index 6fcfb7411..aa612a940 100644 --- a/docs/src/pages/docs/extensions.mdx +++ b/docs/src/pages/docs/extensions.mdx @@ -27,273 +27,6 @@ Extensions are modular components that add functionality to Jan. Each extension Extensions can be managed through **Settings** () > **Extensions**: -<<<<<<< HEAD -## List of Core Extensions -| Extension Name | Version | Description | -|---------------------|----------|-----------------------------------------------------------------------------| -| Jan Assistant | v1.0.1 | Powers the default AI assistant that works with all your installed models. | -| Conversational | v1.0.0 | Enables conversations and state persistence via your filesystem. | -| Model Management | v1.0.33 | Model Management Extension provides model exploration and seamless downloads | -| System Monitoring | v1.0.10 | Provides system health and OS level data. | - - -## Configure an Extension Settings - -To configure an extension settings: - -1. Navigate to the `~/jan/data/extensions`. -2. Open the `extensions.json` file -3. Edit the file with options including: - -| Option | Description | -| ---------------- | ----------------------------------- | -| `_active` | Enable/disable the extension. | -| `listeners` | Default listener setting. | -| `origin` | Extension file path. | -| `installOptions` | Version and metadata configuration. | -| `name` | Extension name. | -| `productName` | Extension display name. | -| `version` | Extension version. | -| `main` | Main file path. | -| `description` | Extension description. | -| `url` | Extension URL. | - -```json title="~/jan/data/extensions/extensions.json" -{ - "@janhq/conversational-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-conversational-extension-1.0.0.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/conversational-extension", - "productName": "Conversational", - "version": "1.0.0", - "main": "dist/index.js", - "description": "Enables conversations and state persistence via your filesystem.", - "url": "extension://@janhq/conversational-extension/dist/index.js" - }, - "@janhq/inference-anthropic-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-anthropic-extension-1.0.2.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-anthropic-extension", - "productName": "Anthropic Inference Engine", - "version": "1.0.2", - "main": "dist/index.js", - "description": "This extension enables Anthropic chat completion API calls", - "url": "extension://@janhq/inference-anthropic-extension/dist/index.js" - }, - "@janhq/inference-triton-trt-llm-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-triton-trt-llm-extension-1.0.0.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-triton-trt-llm-extension", - "productName": "Triton-TRT-LLM Inference Engine", - "version": "1.0.0", - "main": "dist/index.js", - "description": "This extension enables Nvidia's TensorRT-LLM as an inference engine option", - "url": "extension://@janhq/inference-triton-trt-llm-extension/dist/index.js" - }, - "@janhq/inference-mistral-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-mistral-extension-1.0.1.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-mistral-extension", - "productName": "MistralAI Inference Engine", - "version": "1.0.1", - "main": "dist/index.js", - "description": "This extension enables Mistral chat completion API calls", - "url": "extension://@janhq/inference-mistral-extension/dist/index.js" - }, - "@janhq/inference-martian-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-martian-extension-1.0.1.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-martian-extension", - "productName": "Martian Inference Engine", - "version": "1.0.1", - "main": "dist/index.js", - "description": "This extension enables Martian chat completion API calls", - "url": "extension://@janhq/inference-martian-extension/dist/index.js" - }, - "@janhq/inference-openrouter-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-openrouter-extension-1.0.0.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-openrouter-extension", - "productName": "OpenRouter Inference Engine", - "version": "1.0.0", - "main": "dist/index.js", - "description": "This extension enables Open Router chat completion API calls", - "url": "extension://@janhq/inference-openrouter-extension/dist/index.js" - }, - "@janhq/inference-nvidia-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-nvidia-extension-1.0.1.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-nvidia-extension", - "productName": "NVIDIA NIM Inference Engine", - "version": "1.0.1", - "main": "dist/index.js", - "description": "This extension enables NVIDIA chat completion API calls", - "url": "extension://@janhq/inference-nvidia-extension/dist/index.js" - }, - "@janhq/inference-groq-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-groq-extension-1.0.1.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-groq-extension", - "productName": "Groq Inference Engine", - "version": "1.0.1", - "main": "dist/index.js", - "description": "This extension enables fast Groq chat completion API calls", - "url": "extension://@janhq/inference-groq-extension/dist/index.js" - }, - "@janhq/inference-openai-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-openai-extension-1.0.2.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-openai-extension", - "productName": "OpenAI Inference Engine", - "version": "1.0.2", - "main": "dist/index.js", - "description": "This extension enables OpenAI chat completion API calls", - "url": "extension://@janhq/inference-openai-extension/dist/index.js" - }, - "@janhq/inference-cohere-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-cohere-extension-1.0.0.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-cohere-extension", - "productName": "Cohere Inference Engine", - "version": "1.0.0", - "main": "dist/index.js", - "description": "This extension enables Cohere chat completion API calls", - "url": "extension://@janhq/inference-cohere-extension/dist/index.js" - }, - "@janhq/model-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-model-extension-1.0.33.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/model-extension", - "productName": "Model Management", - "version": "1.0.33", - "main": "dist/index.js", - "description": "Model Management Extension provides model exploration and seamless downloads", - "url": "extension://@janhq/model-extension/dist/index.js" - }, - "@janhq/monitoring-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-monitoring-extension-1.0.10.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/monitoring-extension", - "productName": "System Monitoring", - "version": "1.0.10", - "main": "dist/index.js", - "description": "Provides system health and OS level data.", - "url": "extension://@janhq/monitoring-extension/dist/index.js" - }, - "@janhq/assistant-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-assistant-extension-1.0.1.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/assistant-extension", - "productName": "Jan Assistant", - "version": "1.0.1", - "main": "dist/index.js", - "description": "Powers the default AI assistant that works with all your installed models.", - "url": "extension://@janhq/assistant-extension/dist/index.js" - }, - "@janhq/tensorrt-llm-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-tensorrt-llm-extension-0.0.3.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/tensorrt-llm-extension", - "productName": "TensorRT-LLM Inference Engine", - "version": "0.0.3", - "main": "dist/index.js", - "description": "This extension enables Nvidia's TensorRT-LLM for the fastest GPU acceleration. See the [setup guide](https://jan.ai/guides/providers/tensorrt-llm/) for next steps.", - "url": "extension://@janhq/tensorrt-llm-extension/dist/index.js" - }, - "@janhq/inference-cortex-extension": { - "_active": true, - "listeners": {}, - "origin": "C:\\Users\\ACER\\AppData\\Local\\Programs\\jan\\resources\\app.asar.unpacked\\pre-install\\janhq-inference-cortex-extension-1.0.15.tgz", - "installOptions": { - "version": false, - "fullMetadata": true - }, - "name": "@janhq/inference-cortex-extension", - "productName": "Cortex Inference Engine", - "version": "1.0.15", - "main": "dist/index.js", - "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.", - "url": "extension://@janhq/inference-cortex-extension/dist/index.js" - } -} -``` - -## Specific Extension Settings -Jan offers an Extensions settings menu for configuring extensions that have registered their settings within the application. Here, you can directly integrate Remote Inference Engines with Jan without inserting the URL and API Key directly in the `JSON` file. Additionally, you can turn the Logging extensions available on or off in Jan. To access the Extension settings, follow the steps below: -1. Navigate to the main dashboard. -2. Click the **gear icon (⚙️)** on the bottom left of your screen. -======= ->>>>>>> e5b6901b57c5b7edcd5895316f84d742a2772202
![Remove Model](./_assets/extensions-01.png)
From 6b44bde9c993b2c4128d65e1fc4fa8e1dd68f3d7 Mon Sep 17 00:00:00 2001 From: Ashley Date: Tue, 14 Jan 2025 22:51:39 +0700 Subject: [PATCH 4/5] Resolved conflicts --- .../Settings/Advanced/FactoryReset/ModalConfirmReset.tsx | 6 +++--- web/screens/Settings/Advanced/FactoryReset/index.tsx | 6 +++--- web/screens/Settings/Advanced/index.tsx | 8 +++++--- web/screens/Settings/Engines/LocalEngineSettings.tsx | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx index 20749a60f..c59163735 100644 --- a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx +++ b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx @@ -30,9 +30,9 @@ const ModalConfirmReset = () => { content={

- Restore appplication to its initial state, erasing all models and chat history. - This action is irreversible and recommended only if the application - is corrupted. + Restore appplication to its initial state, erasing all models and + chat history. This action is irreversible and recommended only if + the application is corrupted.

diff --git a/web/screens/Settings/Advanced/FactoryReset/index.tsx b/web/screens/Settings/Advanced/FactoryReset/index.tsx index 3f85be34d..f688e0a61 100644 --- a/web/screens/Settings/Advanced/FactoryReset/index.tsx +++ b/web/screens/Settings/Advanced/FactoryReset/index.tsx @@ -17,9 +17,9 @@ const FactoryReset = () => {

- Restore appplication to its initial state, erasing all models and chat history. - This action is irreversible and recommended only if the application is - corrupted. + Restore appplication to its initial state, erasing all models and chat + history. This action is irreversible and recommended only if the + application is corrupted.

- New features that are still unstable and could affect app performance. Enable with caution. + New features that are still unstable and could affect app + performance. Enable with caution.

{
HTTPS Proxy

- Optional proxy server for internet connections. Only HTTPS proxies supported. + Optional proxy server for internet connections. Only HTTPS proxies + supported.

@@ -500,7 +502,7 @@ const Advanced = () => {
Jan Quick Ask

- Enable Quick Ask to be triggered via the default hotkey {' '}. + Enable Quick Ask to be triggered via the default hotkey . {isMac ? '⌘' : 'Ctrl'} + J {' '} diff --git a/web/screens/Settings/Engines/LocalEngineSettings.tsx b/web/screens/Settings/Engines/LocalEngineSettings.tsx index cac731a85..c9522a743 100644 --- a/web/screens/Settings/Engines/LocalEngineSettings.tsx +++ b/web/screens/Settings/Engines/LocalEngineSettings.tsx @@ -215,7 +215,8 @@ const LocalEngineSettings = ({ engine }: { engine: InferenceEngine }) => {

Choose the default variant that best suited for your - hardware. See [our guides](https://jan.ai/docs/local-engines/llama-cpp). + hardware. See [our + guides](https://jan.ai/docs/local-engines/llama-cpp).

From a7a497a38664d68a6431e16e0e223171fb49ceae Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 15 Jan 2025 10:09:24 +0700 Subject: [PATCH 5/5] test: fix failed test cases --- web/utils/predefinedComponent.test.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/utils/predefinedComponent.test.ts b/web/utils/predefinedComponent.test.ts index 42b391d73..fe5a700d3 100644 --- a/web/utils/predefinedComponent.test.ts +++ b/web/utils/predefinedComponent.test.ts @@ -1,12 +1,11 @@ - -import { presetConfiguration } from './predefinedComponent'; +import { presetConfiguration } from './predefinedComponent' it('should have correct configuration for prompt_template', () => { - const config = presetConfiguration['prompt_template']; + const config = presetConfiguration['prompt_template'] expect(config).toEqual({ key: 'prompt_template', title: 'Prompt template', - description: `A predefined text or framework that guides the AI model's response generation. It includes placeholders or instructions for the model to fill in or expand upon.`, + description: `A structured format that guides how the model should respond.`, controllerType: 'input', controllerProps: { placeholder: 'Prompt template', @@ -14,5 +13,5 @@ it('should have correct configuration for prompt_template', () => { }, requireModelReload: true, configType: 'setting', - }); -}); + }) +})