From 4087b94d97738a8c6ff5e605c9b57124cf87c3ec Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 16 Sep 2024 14:53:34 +0700
Subject: [PATCH 1/5] fix: correct prompt template for Phi3 Medium model

---
 extensions/inference-nitro-extension/package.json             | 2 +-
 .../resources/models/phi3-medium/model.json                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/inference-nitro-extension/package.json b/extensions/inference-nitro-extension/package.json
index 425e4b49c..ac3ed180a 100644
--- a/extensions/inference-nitro-extension/package.json
+++ b/extensions/inference-nitro-extension/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@janhq/inference-cortex-extension",
   "productName": "Cortex Inference Engine",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "This extension embeds cortex.cpp, a lightweight inference engine written in C++. See https://jan.ai.\nAdditional dependencies could be installed to run without Cuda Toolkit installation.",
   "main": "dist/index.js",
   "node": "dist/node/index.cjs.js",
diff --git a/extensions/inference-nitro-extension/resources/models/phi3-medium/model.json b/extensions/inference-nitro-extension/resources/models/phi3-medium/model.json
index 50944b9fe..7331b2fd8 100644
--- a/extensions/inference-nitro-extension/resources/models/phi3-medium/model.json
+++ b/extensions/inference-nitro-extension/resources/models/phi3-medium/model.json
@@ -8,12 +8,12 @@
     "id": "phi3-medium",
     "object": "model",
     "name": "Phi-3 Medium Instruct Q4",
-    "version": "1.3",
+    "version": "1.4",
     "description": "Phi-3 Medium is Microsoft's latest SOTA model.",
     "format": "gguf",
     "settings": {
       "ctx_len": 128000,
-      "prompt_template": "<|user|> {prompt}<|end|><|assistant|><|end|>",
+      "prompt_template": "<|user|> {prompt}<|end|><|assistant|>",
       "llama_model_path": "Phi-3-medium-128k-instruct-Q4_K_M.gguf",
       "ngl": 33
     },

From 3949515c8a68dee16e2209b513bcf239d2b5343a Mon Sep 17 00:00:00 2001
From: 0xSage <n@pragmatic.vc>
Date: Wed, 18 Sep 2024 17:02:41 +0800
Subject: [PATCH 2/5] chore: copy nits

---
 .../BottomPanel/SystemMonitor/TableActiveModel/index.tsx       | 2 +-
 web/screens/LocalServer/LocalServerLeftPanel/index.tsx         | 2 +-
 web/screens/Settings/Advanced/FactoryReset/index.tsx           | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/containers/Layout/BottomPanel/SystemMonitor/TableActiveModel/index.tsx b/web/containers/Layout/BottomPanel/SystemMonitor/TableActiveModel/index.tsx
index c9d86e5e8..e68f843a9 100644
--- a/web/containers/Layout/BottomPanel/SystemMonitor/TableActiveModel/index.tsx
+++ b/web/containers/Layout/BottomPanel/SystemMonitor/TableActiveModel/index.tsx
@@ -79,7 +79,7 @@ const TableActiveModel = () => {
           ) : (
             <tbody>
               <tr className="text-[hsla(var(--text-secondary))]">
-                <td className="p-4">No on-device model running</td>
+                <td className="p-4">No models are loaded into memory</td>
               </tr>
             </tbody>
           )}
diff --git a/web/screens/LocalServer/LocalServerLeftPanel/index.tsx b/web/screens/LocalServer/LocalServerLeftPanel/index.tsx
index f66945929..16aa75af5 100644
--- a/web/screens/LocalServer/LocalServerLeftPanel/index.tsx
+++ b/web/screens/LocalServer/LocalServerLeftPanel/index.tsx
@@ -130,7 +130,7 @@ const LocalServerLeftPanel = () => {
             {serverEnabled && (
               <Button variant="soft" asChild>
                 <a href={`http://localhost:${port}`} target="_blank">
-                  API Reference <ExternalLinkIcon size={20} className="ml-2" />
+                  API Playground <ExternalLinkIcon size={20} className="ml-2" />
                 </a>
               </Button>
             )}
diff --git a/web/screens/Settings/Advanced/FactoryReset/index.tsx b/web/screens/Settings/Advanced/FactoryReset/index.tsx
index 3bbce39ef..181b0bd4b 100644
--- a/web/screens/Settings/Advanced/FactoryReset/index.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/index.tsx
@@ -17,8 +17,7 @@ const FactoryReset = () => {
           </h6>
         </div>
         <p className="whitespace-pre-wrap font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-          Reset the application to its initial state, deleting all your usage
-          data, including conversation history. This action is irreversible and
+          Restore app to initial state, erasing all models and chat history. This action is irreversible and
           recommended only if the application is in a corrupted state.
         </p>
       </div>

From 062af9bcda43256b6cc14d6c5dd0cbd927a43c7b Mon Sep 17 00:00:00 2001
From: 0xSage <n@pragmatic.vc>
Date: Wed, 18 Sep 2024 17:42:35 +0800
Subject: [PATCH 3/5] nits

---
 .../Settings/Advanced/FactoryReset/ModalConfirmReset.tsx     | 5 ++---
 web/screens/Settings/Advanced/FactoryReset/index.tsx         | 4 ++--
 web/screens/Settings/CancelModelImportModal/index.tsx        | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
index 8173574a9..268192627 100644
--- a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
@@ -30,9 +30,8 @@ const ModalConfirmReset = () => {
       content={
         <div>
           <p className="text-[hsla(var(--text-secondary))]">
-            It will reset the application to its original state, deleting all
-            your usage data, including model customizations and conversation
-            history. This action is irreversible.
+            Restore app to initial state, erasing all models and chat history. This
+            action is irreversible and recommended only if the application is corrupted.
           </p>
 
           <div className="my-4">
diff --git a/web/screens/Settings/Advanced/FactoryReset/index.tsx b/web/screens/Settings/Advanced/FactoryReset/index.tsx
index e79bfe54c..fb789e5b3 100644
--- a/web/screens/Settings/Advanced/FactoryReset/index.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/index.tsx
@@ -17,8 +17,8 @@ const FactoryReset = () => {
           </h6>
         </div>
         <p className="whitespace-pre-wrap font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-          Restore app to initial state, erasing all models and chat history. This action is irreversible and
-          recommended only if the application is in a corrupted state.
+          Restore app to initial state, erasing all models and chat history. This
+          action is irreversible and recommended only if the application is corrupted.
         </p>
       </div>
       <Button
diff --git a/web/screens/Settings/CancelModelImportModal/index.tsx b/web/screens/Settings/CancelModelImportModal/index.tsx
index 49f099633..ae54fa20b 100644
--- a/web/screens/Settings/CancelModelImportModal/index.tsx
+++ b/web/screens/Settings/CancelModelImportModal/index.tsx
@@ -28,8 +28,7 @@ const CancelModelImportModal = () => {
         <div>
           <p className="text-[hsla(var(--text-secondary))]">
             The model import process is not complete. Are you sure you want to
-            cancel all ongoing model imports? This action is irreversible and
-            the progress will be lost.
+            cancel?
           </p>
           <div className="mt-4 flex justify-end gap-x-2">
             <ModalClose asChild onClick={onContinueClick}>

From cfe657faf55ef12100a8fbfd078bb5cca616853f Mon Sep 17 00:00:00 2001
From: 0xSage <n@pragmatic.vc>
Date: Wed, 18 Sep 2024 17:46:53 +0800
Subject: [PATCH 4/5] fix: linter

---
 .../Settings/Advanced/FactoryReset/ModalConfirmReset.tsx     | 5 +++--
 web/screens/Settings/Advanced/FactoryReset/index.tsx         | 5 +++--
 web/screens/Settings/CoreExtensions/ExtensionItem.tsx        | 4 ++--
 .../Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx     | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
index 268192627..08ac35f04 100644
--- a/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/ModalConfirmReset.tsx
@@ -30,8 +30,9 @@ const ModalConfirmReset = () => {
       content={
         <div>
           <p className="text-[hsla(var(--text-secondary))]">
-            Restore app to initial state, erasing all models and chat history. This
-            action is irreversible and recommended only if the application is corrupted.
+            Restore app to initial state, erasing all models and chat history.
+            This action is irreversible and recommended only if the application
+            is corrupted.
           </p>
 
           <div className="my-4">
diff --git a/web/screens/Settings/Advanced/FactoryReset/index.tsx b/web/screens/Settings/Advanced/FactoryReset/index.tsx
index fb789e5b3..10e8cbc20 100644
--- a/web/screens/Settings/Advanced/FactoryReset/index.tsx
+++ b/web/screens/Settings/Advanced/FactoryReset/index.tsx
@@ -17,8 +17,9 @@ const FactoryReset = () => {
           </h6>
         </div>
         <p className="whitespace-pre-wrap font-medium leading-relaxed text-[hsla(var(--text-secondary))]">
-          Restore app to initial state, erasing all models and chat history. This
-          action is irreversible and recommended only if the application is corrupted.
+          Restore app to initial state, erasing all models and chat history.
+          This action is irreversible and recommended only if the application is
+          corrupted.
         </p>
       </div>
       <Button
diff --git a/web/screens/Settings/CoreExtensions/ExtensionItem.tsx b/web/screens/Settings/CoreExtensions/ExtensionItem.tsx
index 497b8ac4a..ec72f5f43 100644
--- a/web/screens/Settings/CoreExtensions/ExtensionItem.tsx
+++ b/web/screens/Settings/CoreExtensions/ExtensionItem.tsx
@@ -32,8 +32,8 @@ const ExtensionItem: React.FC<Props> = ({ item }) => {
   )
 
   const progress = isInstalling
-    ? (installingExtensions.find((e) => e.extensionId === item.name)
-        ?.percentage ?? -1)
+    ? installingExtensions.find((e) => e.extensionId === item.name)
+        ?.percentage ?? -1
     : -1
 
   useEffect(() => {
diff --git a/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx b/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx
index abbe6db43..d7d52a093 100644
--- a/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx
@@ -178,7 +178,7 @@ const SimpleTextMessage: React.FC<ThreadMessage> = (props) => {
         >
           {isUser
             ? props.role
-            : (activeThread?.assistants[0].assistant_name ?? props.role)}
+            : activeThread?.assistants[0].assistant_name ?? props.role}
         </div>
         <p className="text-xs font-medium text-gray-400">
           {displayDate(props.created)}

From 8fe376340a4de0c9c1c998bdce32350ff6b3f23c Mon Sep 17 00:00:00 2001
From: Faisal Amir <urmauur@gmail.com>
Date: Thu, 19 Sep 2024 10:06:27 +0700
Subject: [PATCH 5/5] chore: fix linter issue CI

---
 web/screens/Settings/CoreExtensions/ExtensionItem.tsx         | 4 ++--
 .../Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/screens/Settings/CoreExtensions/ExtensionItem.tsx b/web/screens/Settings/CoreExtensions/ExtensionItem.tsx
index ec72f5f43..497b8ac4a 100644
--- a/web/screens/Settings/CoreExtensions/ExtensionItem.tsx
+++ b/web/screens/Settings/CoreExtensions/ExtensionItem.tsx
@@ -32,8 +32,8 @@ const ExtensionItem: React.FC<Props> = ({ item }) => {
   )
 
   const progress = isInstalling
-    ? installingExtensions.find((e) => e.extensionId === item.name)
-        ?.percentage ?? -1
+    ? (installingExtensions.find((e) => e.extensionId === item.name)
+        ?.percentage ?? -1)
     : -1
 
   useEffect(() => {
diff --git a/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx b/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx
index d7d52a093..abbe6db43 100644
--- a/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/SimpleTextMessage/index.tsx
@@ -178,7 +178,7 @@ const SimpleTextMessage: React.FC<ThreadMessage> = (props) => {
         >
           {isUser
             ? props.role
-            : activeThread?.assistants[0].assistant_name ?? props.role}
+            : (activeThread?.assistants[0].assistant_name ?? props.role)}
         </div>
         <p className="text-xs font-medium text-gray-400">
           {displayDate(props.created)}