rename all the different calls to the store!

Author: yeus

src/components/taskyon/ApiSelect.vue

@@ -31,16 +31,16 @@
 </template>
 
 <script setup lang="ts">
-import { useTaskyonStore } from 'stores/taskyonState';
 import {
   matElectricalServices,
   matSettings,
 } from '@quasar/extras/material-icons';
+import { useAppStateStore } from 'src/stores/appState';
 
 const model = defineModel<string | null>();
 
 defineProps<{
   moreSettings?: boolean;
 }>();
-const state = useTaskyonStore();
+const state = useAppStateStore();
 </script>

src/components/taskyon/ChatSidebar.vue

@@ -43,7 +43,7 @@
             >
               {{
                 selected
-                  ? `> ${state.currentTask?.name}`
+                  ? `> ${tystate.currentTask?.name}`
                   : nameMap[conversationId] ||
                     `chat.${conversationId.slice(0, 3)}`
               }}
@@ -130,15 +130,17 @@ import {
   mdiForumPlus,
 } from '@quasar/extras/mdi-v6';
 import TaskChainMenu from './TaskChainMenu.vue';
+import { useAppStateStore } from 'src/stores/appState';
 
-const state = useTaskyonStore();
+const state = useAppStateStore();
+const tystate = useTaskyonStore();
 
 const conversationIDs = ref<string[]>([]);
 const nameMap = reactive<Record<string, string>>({});
 
 async function updateName(id: string) {
   if (!(id in nameMap)) {
-    const tm = await state.getTaskManager();
+    const tm = await tystate.getTaskManager();
     const name = (await tm.getTask(id))?.name;
     if (name) {
       nameMap[id] = name;
@@ -161,7 +163,7 @@ watch(
 );
 
 async function loadYamlConversation(files: File[]) {
-  const tm = await state.getTaskManager();
+  const tm = await tystate.getTaskManager();
   let last_loaded_id = undefined;
   for (const file of files) {
     last_loaded_id = await tm.loadYamlConversation(file);

src/components/taskyon/ConversationWidget.vue

@@ -59,7 +59,7 @@ const $q = useQuasar();
 
 const props = defineProps<{
   selectedThread: TaskNode[];
-  currentTask?: TaskNode;
+  currentTask?: TaskNode | undefined;
   taskWorkerWaiting: boolean;
   taskWorkerMessage?: string;
 }>();

src/components/taskyon/CreateNewTask.vue

@@ -62,10 +62,10 @@
           <div class="row">
             <info-dialog
               v-if="
-                currentModel && state.modelLookUp[currentModel]?.description
+                currentModel && tystate.modelLookUp[currentModel]?.description
               "
               size="xs"
-              :info-text="state.modelLookUp[currentModel]?.description"
+              :info-text="tystate.modelLookUp[currentModel]?.description || ''"
             />
             <q-btn flat dense size="sm" no-caps>
               <div class="ellipsis">
@@ -111,7 +111,7 @@
           <q-space></q-space>
           <div v-if="currentModel" class="gt-xs">
             {{
-              `t/c: ${estimatedTokens}/${state.modelLookUp[currentModel]?.context_length}`
+              `t/c: ${estimatedTokens}/${tystate.modelLookUp[currentModel]?.context_length}`
             }}
             <q-tooltip :delay="1000" class="q-gutter-sm">
               <div>
@@ -367,6 +367,7 @@ import { getApiConfig } from 'src/modules/taskyon/taskWorker';
 import { addPrompts } from 'src/modules/taskyon/promptCreation';
 import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs';
 import { useNlpWorker } from 'src/modules/taskyon/webWorkerApi';
+import { useAppStateStore } from 'src/stores/appState';
 
 const CodeEditor = defineAsyncComponent(
   () =>
@@ -392,7 +393,8 @@ function updateContent(value: string | null | undefined) {
   };
 }
 
-const state = useTaskyonStore();
+const state = useAppStateStore();
+const tystate = useTaskyonStore();
 const { expandedTaskCreation } = toRefs(state);
 const { expertMode } = toRefs(state.appConfiguration);
 const { selectedApi } = toRefs(state.llmSettings);
@@ -404,7 +406,7 @@ const fileAttachments = ref<File[]>([]); // holds all attached files as a "taskl
 
 async function getAllTools() {
   const foundTools = await (
-    await state.getTaskManager()
+    await tystate.getTaskManager()
   ).updateToolDefinitions(true);
   return foundTools;
 }
@@ -455,7 +457,7 @@ const handleBotNameUpdate = ({
   if (api) {
     api.selectedModel = newName;
   }
-  state.addModelToHistory(newName);
+  tystate.addModelToHistory(newName);
 };
 
 const selectedTaskType = computed(() => {
@@ -554,7 +556,7 @@ watchDebounced(
     let accumulatedEstimated = 0;
     let messages: ChatCompletionMessageParam[] = [];
     if (state.llmSettings.selectedTaskId) {
-      const tm = await state.getTaskManager();
+      const tm = await tystate.getTaskManager();
       // we only need the last 2 or 3 tasks in order to check for
       const chain = await tm.getTaskIdChain(
         state.llmSettings.selectedTaskId,
@@ -610,7 +612,7 @@ async function addFiles2Taskyon(newFiles: File[]) {
 
   // Collect UUIDs from added files
   const uuids = [];
-  const tm = await state.getTaskManager();
+  const tm = await tystate.getTaskManager();
   for (const [fileIdx, file] of newFiles.entries()) {
     const uuid = await tm.addFile({
       opfs: opfsMapping[fileIdx],
@@ -630,7 +632,7 @@ async function createFileTask(files: File[]) {
   const fileUuids = await addFiles2Taskyon(files);
 
   if (fileUuids.length) {
-    const task: Parameters<typeof state.addTask2Tree>[0] = {
+    const task: Parameters<typeof tystate.addTask2Tree>[0] = {
       role: 'system',
       configuration: currentModel.value
         ? {
@@ -650,12 +652,12 @@ async function createFileTask(files: File[]) {
 async function addNewTask(execute = true) {
   // make sure we reset our execution context interrupt We do this right before adding another
   // task, because we want to make sure that
-  state.taskWorkerController.reset();
+  tystate.taskWorkerController.reset();
   const fileTaskObj = await createFileTask(fileAttachments.value);
   let fileTaskId = undefined;
   if (fileTaskObj) {
     console.log('add files to chat:', fileTaskObj);
-    fileTaskId = await state.addTask2Tree(
+    fileTaskId = await tystate.addTask2Tree(
       fileTaskObj,
       state.llmSettings.selectedTaskId, // parent
       false, // we do not want to execute the file object, we want to use the users prompt...
@@ -668,7 +670,7 @@ async function addNewTask(execute = true) {
   //          otherwise, it won't get executed but simply saved into the tree
   console.log('adding new task, execute?', execute);
   const newTask = { ...currentnewTask.value };
-  const newTaskId = await state.addTask2Tree(
+  const newTaskId = await tystate.addTask2Tree(
     newTask,
     fileTaskId || state.llmSettings.selectedTaskId, //parent
     execute, // execute right away...

src/components/taskyon/CreateTaskButton.vue

@@ -3,17 +3,19 @@
 </template>
 
 <script setup lang="ts">
+import { useAppStateStore } from 'src/stores/appState';
 import { useTaskyonStore } from 'src/stores/taskyonState';
 
-const state = useTaskyonStore();
+const tystate = useTaskyonStore();
+const state = useAppStateStore();
 
 const props = defineProps<{
   markdown?: string;
   scrollToBottom?: boolean;
 }>();
 
 const onAddTasks = async () => {
-  const newTaskId = await state.addMdTasks(props.markdown);
+  const newTaskId = await tystate.addMdTasks(props.markdown);
   state.llmSettings.selectedTaskId = newTaskId;
   state.lockBottomScroll = props.scrollToBottom;
 };

src/components/taskyon/ExpertEnable.vue

@@ -12,6 +12,6 @@
 </template>
 
 <script setup lang="ts">
-import { useTaskyonStore } from 'src/stores/taskyonState';
-const state = useTaskyonStore();
+import { useAppStateStore } from 'src/stores/appState';
+const state = useAppStateStore();
 </script>

src/components/taskyon/GetStarted.vue

@@ -36,12 +36,12 @@
 </template>
 
 <script setup lang="ts">
-import { useTaskyonStore } from 'stores/taskyonState';
 import LLMProviders from './LLMProviders.vue';
 import CreateTaskButton from './CreateTaskButton.vue';
 import { computed } from 'vue';
+import { useAppStateStore } from 'src/stores/appState';
 
-const state = useTaskyonStore();
+const state = useAppStateStore();
 
 const starters = computed(() => {
   return [

src/components/taskyon/LLMProviders.vue

@@ -172,7 +172,6 @@ insert into the settings below."
 </template>
 
 <script setup lang="ts">
-import { useTaskyonStore } from 'stores/taskyonState';
 import OpenRouterPKCE from './OpenRouterPKCE.vue';
 import JsonInput from '../JsonInput.vue';
 import TyMarkdown from '../tyMarkdown.vue';
@@ -181,8 +180,9 @@ import { matEdit } from '@quasar/extras/material-icons';
 import ApiSelect from './ApiSelect.vue';
 import InfoDialog from '../InfoDialog.vue';
 import tykeyobj from 'src/assets/taskyon_free_key.json';
+import { useAppStateStore } from 'src/stores/appState';
 
-const state = useTaskyonStore();
+const state = useAppStateStore();
 
 const expertModeOn = defineModel<boolean>('expertModeOn', { default: false });
 

src/components/taskyon/ModelSelection.vue

@@ -80,6 +80,7 @@ import ApiSelect from './ApiSelect.vue';
 import { mdiKeyLink } from '@quasar/extras/mdi-v6';
 import { levenshteinDistance } from 'src/modules/string_utils';
 import ToggleButton from '../ToggleButton.vue';
+import { useAppStateStore } from 'src/stores/appState';
 
 defineProps({
   botName: {
@@ -103,7 +104,8 @@ const showVisionModels = ref(false);
 
 const emit = defineEmits(['updateBotName']);
 
-const state = useTaskyonStore();
+const tystate = useTaskyonStore();
+const state = useAppStateStore();
 
 const selectModelInput = ref();
 
@@ -112,7 +114,7 @@ const llmModelsSelection = computed(() => {
     // if we have a taskyon key defined only display the models allowed for that key...
     if (state.tyPublicKey?.model && state.tyPublicKey.model.length > 0) {
       if (state.tyPublicKey.model.includes('*')) {
-        return state.llmModels;
+        return tystate.llmModels;
       } else {
         const models = state.tyPublicKey.model;
         return models.map((m) => {
@@ -122,22 +124,22 @@ const llmModelsSelection = computed(() => {
       }
     }
   }
-  return state.llmModels;
+  return tystate.llmModels;
 });
 
 const modelOptions = computed(() => {
   // openai has no pricing information attached, so we sort it in different ways...
   console.log('calculate model options!');
   if (selectedApi.value === 'openai') {
-    const options = [...state.llmModels]
+    const options = [...tystate.llmModels]
       .sort((m1, m2) => m1.id.localeCompare(m2.id))
       .map((m) => ({
         label: `${m.id}`,
         value: m.id,
       }));
     return options;
   } else {
-    let llmModels: typeof state.llmModels = llmModelsSelection.value;
+    let llmModels: typeof tystate.llmModels = llmModelsSelection.value;
     if (showVisionModels.value) {
       llmModels = llmModels.filter(
         (m) => m.architecture?.modality === 'text+image->text',

src/components/taskyon/OpenRouterPKCE.vue

@@ -32,16 +32,18 @@ import { useTaskyonStore } from 'src/stores/taskyonState';
 import { useRoute } from 'vue-router';
 import InfoDialog from 'components/InfoDialog.vue';
 import { matKey } from '@quasar/extras/material-icons';
+import { useAppStateStore } from 'src/stores/appState';
 
-const state = useTaskyonStore();
+const tystate = useTaskyonStore();
+const state = useAppStateStore();
 const route = useRoute();
 
 const callbackUrl = window.location.origin; // This will get the base URL of your application
 
 const authURL = computed(() => {
   console.log('get current URL');
   return `https://openrouter.ai/auth?callback_url=${encodeURIComponent(
-    callbackUrl
+    callbackUrl,
   )}`;
 });
 
@@ -54,7 +56,7 @@ async function checkForApiKey() {
   const code = route.query['code'] as string | undefined;
   if (code) {
     console.log('found code in URL:', code);
-    await state.getOpenRouterPKCEKey(code);
+    await tystate.getOpenRouterPKCEKey(code);
   }
 }