update core dependency

Signed-off-by: James <[email protected]>
janhq · Oct 22, 2023 · 9c16132 · 9c16132
1 parent d8da3a9
commit 9c16132
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 104 deletions.
diff --git a/plugins/data-plugin/index.ts b/plugins/data-plugin/index.ts
@@ -1,5 +1,5 @@
 import {
-  core,
+  invokePluginFunc,
   store,
   RegisterExtensionPoint,
   StoreService,
@@ -22,7 +22,7 @@ function createCollection({
   name: string;
   schema?: { [key: string]: any };
 }): Promise<void> {
-  return core.invokePluginFunc(MODULE_PATH, "createCollection", name, schema);
+  return invokePluginFunc(MODULE_PATH, "createCollection", name, schema);
 }
 
 /**
@@ -33,7 +33,7 @@ function createCollection({
  *
  */
 function deleteCollection(name: string): Promise<void> {
-  return core.invokePluginFunc(MODULE_PATH, "deleteCollection", name);
+  return invokePluginFunc(MODULE_PATH, "deleteCollection", name);
 }
 
 /**
@@ -51,7 +51,7 @@ function insertOne({
   collectionName: string;
   value: any;
 }): Promise<any> {
-  return core.invokePluginFunc(MODULE_PATH, "insertOne", collectionName, value);
+  return invokePluginFunc(MODULE_PATH, "insertOne", collectionName, value);
 }
 
 /**
@@ -72,13 +72,7 @@ function updateOne({
   key: string;
   value: any;
 }): Promise<void> {
-  return core.invokePluginFunc(
-    MODULE_PATH,
-    "updateOne",
-    collectionName,
-    key,
-    value
-  );
+  return invokePluginFunc(MODULE_PATH, "updateOne", collectionName, key, value);
 }
 
 /**
@@ -97,7 +91,7 @@ function updateMany({
   value: any;
   selector?: { [key: string]: any };
 }): Promise<void> {
-  return core.invokePluginFunc(
+  return invokePluginFunc(
     MODULE_PATH,
     "updateMany",
     collectionName,
@@ -121,7 +115,7 @@ function deleteOne({
   collectionName: string;
   key: string;
 }): Promise<void> {
-  return core.invokePluginFunc(MODULE_PATH, "deleteOne", collectionName, key);
+  return invokePluginFunc(MODULE_PATH, "deleteOne", collectionName, key);
 }
 
 /**
@@ -139,12 +133,7 @@ function deleteMany({
   collectionName: string;
   selector?: { [key: string]: any };
 }): Promise<void> {
-  return core.invokePluginFunc(
-    MODULE_PATH,
-    "deleteMany",
-    collectionName,
-    selector
-  );
+  return invokePluginFunc(MODULE_PATH, "deleteMany", collectionName, selector);
 }
 
 /**
@@ -160,7 +149,7 @@ function findOne({
   collectionName: string;
   key: string;
 }): Promise<any> {
-  return core.invokePluginFunc(MODULE_PATH, "findOne", collectionName, key);
+  return invokePluginFunc(MODULE_PATH, "findOne", collectionName, key);
 }
 
 /**
@@ -179,7 +168,7 @@ function findMany({
   selector: { [key: string]: any };
   sort?: [{ [key: string]: any }];
 }): Promise<any> {
-  return core.invokePluginFunc(
+  return invokePluginFunc(
     MODULE_PATH,
     "findMany",
     collectionName,
@@ -195,18 +184,12 @@ function onStart() {
 }
 
 // Register all the above functions and objects with the relevant extension points
+// prettier-ignore
 export function init({ register }: { register: RegisterExtensionPoint }) {
   register(PluginService.OnStart, PLUGIN_NAME, onStart);
-  register(
-    StoreService.CreateCollection,
-    createCollection.name,
-    createCollection
-  );
-  register(
-    StoreService.DeleteCollection,
-    deleteCollection.name,
-    deleteCollection
-  );
+  register(StoreService.CreateCollection, createCollection.name, createCollection);
+  register(StoreService.DeleteCollection, deleteCollection.name, deleteCollection);
+
   register(StoreService.InsertOne, insertOne.name, insertOne);
   register(StoreService.UpdateOne, updateOne.name, updateOne);
   register(StoreService.UpdateMany, updateMany.name, updateMany);
@@ -215,44 +198,24 @@ export function init({ register }: { register: RegisterExtensionPoint }) {
   register(StoreService.FindOne, findOne.name, findOne);
   register(StoreService.FindMany, findMany.name, findMany);
 
-  register(
-    DataService.GetConversations,
-    getConversations.name,
-    getConversations
-  );
-  register(
-    DataService.CreateConversation,
-    createConversation.name,
-    createConversation
-  );
-  register(
-    DataService.UpdateConversation,
-    updateConversation.name,
-    updateConversation
-  );
+  // for conversations management
+  register(DataService.GetConversations, getConversations.name, getConversations);
+  register(DataService.GetConversationById,getConversationById.name,getConversationById);
+  register(DataService.CreateConversation, createConversation.name, createConversation);
+  register(DataService.UpdateConversation, updateConversation.name, updateConversation);
+  register(DataService.DeleteConversation, deleteConversation.name, deleteConversation);
+
+  // for messages management
   register(DataService.UpdateMessage, updateMessage.name, updateMessage);
-  register(
-    DataService.DeleteConversation,
-    deleteConversation.name,
-    deleteConversation
-  );
   register(DataService.CreateMessage, createMessage.name, createMessage);
-  register(
-    DataService.GetConversationMessages,
-    getConversationMessages.name,
-    getConversationMessages
-  );
+  register(DataService.GetConversationMessages, getConversationMessages.name, getConversationMessages);
 
-  register(
-    "getConversationById",
-    getConversationById.name,
-    getConversationById
-  );
-  register("createBot", createBot.name, createBot);
-  register("getBots", getBots.name, getBots);
-  register("getBotById", getBotById.name, getBotById);
-  register("deleteBot", deleteBot.name, deleteBot);
-  register("updateBot", updateBot.name, updateBot);
+  // for bots management
+  register(DataService.CreateBot, createBot.name, createBot);
+  register(DataService.GetBots, getBots.name, getBots);
+  register(DataService.GetBotById, getBotById.name, getBotById);
+  register(DataService.DeleteBot, deleteBot.name, deleteBot);
+  register(DataService.UpdateBot, updateBot.name, updateBot);
 }
 
 function getConversations(): Promise<any> {
@@ -308,7 +271,7 @@ function createBot(bot: any): Promise<void> {
 function getBots(): Promise<any> {
   console.debug("Getting bots");
   return store
-    .findMany("bots", {name: { $gt: null }})
+    .findMany("bots", { name: { $gt: null } })
     .then((bots) => {
       console.debug("Bots retrieved", JSON.stringify(bots, null, 2));
       return Promise.resolve(bots);

diff --git a/plugins/data-plugin/package.json b/plugins/data-plugin/package.json
@@ -40,7 +40,7 @@
     "node_modules"
   ],
   "dependencies": {
-    "@janhq/core": "file:../../core",
+    "@janhq/core": "^0.1.6",
     "pouchdb-find": "^8.0.1",
     "pouchdb-node": "^8.0.1"
   },

diff --git a/plugins/inference-plugin/package.json b/plugins/inference-plugin/package.json
@@ -26,7 +26,7 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@janhq/core": "^0.1.3",
+    "@janhq/core": "^0.1.6",
     "kill-port-process": "^3.2.0",
     "rxjs": "^7.8.1",
     "tcp-port-used": "^1.0.2",

diff --git a/plugins/model-management-plugin/package.json b/plugins/model-management-plugin/package.json
@@ -27,7 +27,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@janhq/core": "^0.1.3",
+    "@janhq/core": "^0.1.6",
     "ts-loader": "^9.5.0"
   }
 }
diff --git a/plugins/monitoring-plugin/package.json b/plugins/monitoring-plugin/package.json
@@ -21,7 +21,7 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@janhq/core": "^0.1.3",
+    "@janhq/core": "^0.1.6",
     "systeminformation": "^5.21.8",
     "ts-loader": "^9.5.0"
   },

diff --git a/plugins/openai-plugin/package.json b/plugins/openai-plugin/package.json
@@ -26,7 +26,7 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@janhq/core": "^0.1.3",
+    "@janhq/core": "^0.1.6",
     "azure-openai": "^0.9.4",
     "kill-port-process": "^3.2.0",
     "tcp-port-used": "^1.0.2",

diff --git a/web/app/_components/CustomBotTemperature/index.tsx b/web/app/_components/CustomBotTemperature/index.tsx
@@ -14,7 +14,7 @@ const CutomBotTemperature: React.FC<Props> = ({ control }) => (
       control={control}
     />
     <div className="text-gray-500 mt-1 text-[0.8em]">
-      Controls the creativity of the bot's responses. Higher values produce more
+      Controls the creativity of the bot&apos;s responses. Higher values produce more
       varied but unpredictable replies, lower values generate more consistent
       responses.
     </div>

diff --git a/web/app/_components/InputToolbar/index.tsx b/web/app/_components/InputToolbar/index.tsx
@@ -1,21 +1,21 @@
 'use client'
 
-import BasicPromptInput from "../BasicPromptInput"
-import BasicPromptAccessories from "../BasicPromptAccessories"
-import { useAtomValue, useSetAtom } from "jotai"
-import { showingAdvancedPromptAtom } from "@/_helpers/atoms/Modal.atom"
-import SecondaryButton from "../SecondaryButton"
-import { Fragment, useEffect, useState } from "react"
-import { PlusIcon } from "@heroicons/react/24/outline"
-import useCreateConversation from "@/_hooks/useCreateConversation"
-import { activeAssistantModelAtom } from "@/_helpers/atoms/Model.atom"
+import BasicPromptInput from '../BasicPromptInput'
+import BasicPromptAccessories from '../BasicPromptAccessories'
+import { useAtomValue, useSetAtom } from 'jotai'
+import { showingAdvancedPromptAtom } from '@/_helpers/atoms/Modal.atom'
+import SecondaryButton from '../SecondaryButton'
+import { Fragment, useEffect, useState } from 'react'
+import { PlusIcon } from '@heroicons/react/24/outline'
+import useCreateConversation from '@/_hooks/useCreateConversation'
+import { activeAssistantModelAtom } from '@/_helpers/atoms/Model.atom'
 import {
   currentConversationAtom,
   currentConvoStateAtom,
-} from "@/_helpers/atoms/Conversation.atom"
-import useGetBots from "@/_hooks/useGetBots"
-import { activeBotAtom } from "@/_helpers/atoms/Bot.atom"
-import { useGetDownloadedModels } from "@/_hooks/useGetDownloadedModels"
+} from '@/_helpers/atoms/Conversation.atom'
+import useGetBots from '@/_hooks/useGetBots'
+import { activeBotAtom } from '@/_helpers/atoms/Bot.atom'
+import { useGetDownloadedModels } from '@/_hooks/useGetDownloadedModels'
 
 const InputToolbar: React.FC = () => {
   const showingAdvancedPrompt = useAtomValue(showingAdvancedPromptAtom)
@@ -27,26 +27,22 @@ const InputToolbar: React.FC = () => {
   const setActiveBot = useSetAtom(activeBotAtom)
   const { getBotById } = useGetBots()
   const [inputState, setInputState] = useState<
-    "available" | "disabled" | "loading"
+    'available' | 'disabled' | 'loading'
   >()
   const [error, setError] = useState<string | undefined>()
   const { downloadedModels } = useGetDownloadedModels()
 
-  if (showingAdvancedPrompt) {
-    return <div />
-  }
-
   useEffect(() => {
     const getReplyState = async () => {
-      setInputState("loading")
+      setInputState('loading')
       if (currentConvo && currentConvo.botId && currentConvo.botId.length > 0) {
         // if botId is set, check if bot is available
         const bot = await getBotById(currentConvo.botId)
-        console.debug("Found bot", JSON.stringify(bot, null, 2))
+        console.debug('Found bot', JSON.stringify(bot, null, 2))
         if (bot) {
           setActiveBot(bot)
         }
-        setInputState(bot ? "available" : "disabled")
+        setInputState(bot ? 'available' : 'disabled')
         setError(
           bot
             ? undefined
@@ -57,7 +53,7 @@ const InputToolbar: React.FC = () => {
           (model) => model._id === activeModel?._id
         )
 
-        setInputState(model ? "available" : "disabled")
+        setInputState(model ? 'available' : 'disabled')
         setError(
           model
             ? undefined
@@ -74,15 +70,19 @@ const InputToolbar: React.FC = () => {
     }
   }
 
-  if (inputState === "loading") {
+  if (showingAdvancedPrompt) {
+    return <div />
+  }
+
+  if (inputState === 'loading') {
     return <div>Loading..</div>
   }
 
-  if (inputState === "disabled") {
+  if (inputState === 'disabled') {
     // text italic
 
     return (
-      <p className="mx-auto my-5 text-center text-ellipsis line-clamp-2 italic text-gray-600 text-sm">
+      <p className="mx-auto my-5 line-clamp-2 text-ellipsis text-center text-sm italic text-gray-600">
         {error}
       </p>
     )

diff --git a/web/app/_hooks/useCreateBot.ts b/web/app/_hooks/useCreateBot.ts
@@ -1,10 +1,11 @@
 import { Bot } from "@/_models/Bot";
 import { executeSerial } from "../../../electron/core/plugin-manager/execution/extension-manager";
+import { DataService } from "@janhq/core";
 
 export default function useCreateBot() {
   const createBot = async (bot: Bot) => {
     try {
-      await executeSerial("createBot", bot);
+      await executeSerial(DataService.CreateBot, bot);
     } catch (err) {
       alert(err);
       console.error(err);

diff --git a/web/app/_hooks/useDeleteBot.ts b/web/app/_hooks/useDeleteBot.ts
@@ -2,14 +2,15 @@ import { useSetAtom } from "jotai";
 import { executeSerial } from "../../../electron/core/plugin-manager/execution/extension-manager";
 import { activeBotAtom } from "@/_helpers/atoms/Bot.atom";
 import { rightSideBarExpandStateAtom } from "@/_helpers/atoms/LeftSideBarExpand.atom";
+import { DataService } from "@janhq/core";
 
 export default function useDeleteBot() {
   const setActiveBot = useSetAtom(activeBotAtom);
   const setRightPanelVisibility = useSetAtom(rightSideBarExpandStateAtom);
 
   const deleteBot = async (botId: string): Promise<"success" | "failed"> => {
     try {
-      await executeSerial("deleteBot", botId);
+      await executeSerial(DataService.DeleteBot, botId);
       setRightPanelVisibility(false);
       setActiveBot(undefined);
       return "success";

diff --git a/web/app/_hooks/useGetBots.ts b/web/app/_hooks/useGetBots.ts
@@ -1,10 +1,11 @@
 import { Bot } from "@/_models/Bot";
 import { executeSerial } from "../../../electron/core/plugin-manager/execution/extension-manager";
+import { DataService } from "@janhq/core";
 
 export default function useGetBots() {
   const getAllBots = async (): Promise<Bot[]> => {
     try {
-      const bots = await executeSerial("getBots");
+      const bots = await executeSerial(DataService.GetBots);
       return bots;
     } catch (err) {
       alert(`Failed to get bots: ${err}`);
@@ -15,7 +16,7 @@ export default function useGetBots() {
 
   const getBotById = async (botId: string): Promise<Bot | undefined> => {
     try {
-      const bot: Bot = await executeSerial("getBotById", botId);
+      const bot: Bot = await executeSerial(DataService.GetBotById, botId);
       return bot;
     } catch (err) {
       alert(`Failed to get bot ${botId}: ${err}`);