rename server connections to connection view models

src/components/ChatBoxInputRow.tsx

@@ -17,7 +17,7 @@ import Paperclip from '~/icons/Paperclip'
 import ChevronDown from '~/icons/ChevronDown'
 
 import { lightboxStore } from '~/features/lightbox/LightboxStore'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 const ChatBoxInputRow = observer(
   ({
@@ -81,7 +81,7 @@ const ChatBoxInputRow = observer(
       }
     }
 
-    const noModelSelected = !connectionModelStore.selectedModelName
+    const noModelSelected = !connectionStore.selectedModelName
     const inputDisabled =
       incomingMessageStore.isGettingData || noModelSelected || !!lightboxStore.lightboxMessage
 
@@ -106,9 +106,7 @@ const ChatBoxInputRow = observer(
           (noModelSelected && 'tooltip cursor-not-allowed')
         }
         data-tip={
-          connectionModelStore.isAnyServerConnected
-            ? 'No Models Selected'
-            : 'Server is not connected'
+          connectionStore.isAnyServerConnected ? 'No Models Selected' : 'Server is not connected'
         }
       >
         <div
@@ -204,7 +202,7 @@ const ChatBoxInputRow = observer(
               tabIndex={0}
               type="button"
               className="btn btn-active hidden rounded-none rounded-bl-md md:flex"
-              disabled={inputDisabled || connectionModelStore.isImageGenerationMode}
+              disabled={inputDisabled || connectionStore.isImageGenerationMode}
               onClick={() => settingStore.openSettingsModal('personas')}
             >
               {personaStore.selectedPersona?.name || 'No personas selected'}

src/components/ChatBoxPrompt.tsx

@@ -9,7 +9,7 @@ import { personaStore } from '~/core/PersonaStore'
 import AttachmentWrapper from '~/components/AttachmentWrapper'
 import FunTitle from '~/components/FunTitle'
 import ToolTip from '~/components/Tooltip'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 type StepProps = { isCompleted?: boolean; type?: 'primary' | 'secondary'; inCompleteIcon?: string }
 
@@ -31,22 +31,22 @@ const Step = ({
 
 const ChatBoxPrompt = observer(() => {
   const activeConnectionTypes = useMemo(() => {
-    const connectionsTypes = _.chain(connectionModelStore.connections)
+    const connectionsTypes = _.chain(connectionStore.connections)
       .filter('isConnected')
       .map('type')
       .value()
 
     return new Set(connectionsTypes)
-  }, [connectionModelStore.connections])
+  }, [connectionStore.connections])
 
   const anyConnectionHasModels = useMemo(() => {
-    for (const connection of connectionModelStore.connections) {
+    for (const connection of connectionStore.connections) {
       if (!_.isEmpty(connection.models)) {
         return true
       }
     }
     return false
-  }, [connectionModelStore.connections])
+  }, [connectionStore.connections])
   return (
     <div className="hero my-auto">
       <div className="hero-content w-fit text-center">

src/components/EnabledCheckbox.tsx

@@ -3,10 +3,10 @@ import { Control, Controller } from 'react-hook-form'
 import { SnapshotIn } from 'mobx-state-tree'
 
 import { IConnectionDataModel } from '~/core/types'
-import { ServerConnectionTypes } from '~/core/connections/servers'
+import { ConnectionViewModelTypes } from '~/core/connection/viewModels'
 
 type EnabledCheckboxProps = {
-  connection: ServerConnectionTypes
+  connection: ConnectionViewModelTypes
   control: Control<SnapshotIn<IConnectionDataModel>>
 }
 

src/components/HostInput.tsx

@@ -8,11 +8,11 @@ import Question from '~/icons/Question'
 import Refresh from '~/icons/Refresh'
 
 import FormInput from '~/components/form/FormInput'
-import { ServerConnectionTypes } from '~/core/connections/servers'
+import { ConnectionViewModelTypes } from '~/core/connection/viewModels'
 import { IConnectionDataModel } from '~/core/types'
 
 type HostInputProps = {
-  connection: ServerConnectionTypes
+  connection: ConnectionViewModelTypes
   isEnabled: boolean
 }
 

src/components/ModelRefreshButton.tsx

@@ -1,18 +1,18 @@
 import { observer } from 'mobx-react-lite'
 
 import Refresh from '~/icons/Refresh'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 const ModelRefreshButton = observer(
   ({ small = false, shouldShow = false }: { small?: boolean; shouldShow?: boolean }) => {
-    const noServer = !connectionModelStore.isAnyServerConnected
+    const noServer = !connectionStore.isAnyServerConnected
 
     return (
       (shouldShow || noServer) && (
         <button
           className={'btn btn-ghost align-middle ' + (small && 'px-2')}
           type="button"
-          onClick={() => connectionModelStore.refreshModels()}
+          onClick={() => connectionStore.refreshModels()}
           title="Refresh models"
         >
           <Refresh />

src/components/ModelSelector.tsx

@@ -4,10 +4,10 @@ import _ from 'lodash'
 
 import ChevronDown from '~/icons/ChevronDown'
 import { settingStore } from '~/core/SettingStore'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 const ModelSelector = observer(() => {
-  const { selectedModelLabel, isAnyServerConnected, selectedConnection } = connectionModelStore
+  const { selectedModelLabel, isAnyServerConnected, selectedConnection } = connectionStore
   const noServer = !isAnyServerConnected
 
   const label = useMemo(() => {

src/components/Navbar.tsx

@@ -8,7 +8,7 @@ import FunTitle from '~/components/FunTitle'
 import ToolTip from '~/components/Tooltip'
 
 import { settingStore } from '~/core/SettingStore'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 import Warning from '~/icons/Warning'
 import Bars3 from '~/icons/Bars3'
@@ -32,7 +32,7 @@ const KeyboardTooltip = ({ command, children }: PropsWithChildren<{ command: str
 const Navbar = observer(() => {
   const { query } = useKBar()
 
-  const noServer = !connectionModelStore.isAnyServerConnected
+  const noServer = !connectionStore.isAnyServerConnected
 
   const handlePwaUpdate = () => {
     settingStore.getUpdateServiceWorker()?.()

src/components/OmniBar.tsx

@@ -21,7 +21,7 @@ import { chatStore } from '~/core/ChatStore'
 import type { IMessageModel } from '~/core/MessageModel'
 
 import DaisyUiThemeProvider from '~/containers/DaisyUiThemeProvider'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 const isSelected = ({ parent, id }: ActionImpl) => {
   if (parent === 'theme') {
@@ -35,8 +35,8 @@ const isSelected = ({ parent, id }: ActionImpl) => {
   }
 
   if (parent === 'model') {
-    console.log('model: ', id, connectionModelStore.selectedModelName)
-    return id === connectionModelStore.selectedModelName
+    console.log('model: ', id, connectionStore.selectedModelName)
+    return id === connectionStore.selectedModelName
   }
 
   if (parent === 'chat') {
@@ -167,10 +167,10 @@ const useRegisterModelActions = () => {
         keywords: 'refresh',
         priority: Priority.LOW,
         parent: 'refresh_models',
-        perform: connectionModelStore.refreshModels,
+        perform: connectionStore.refreshModels,
       })
 
-      for (const connection of connectionModelStore.connections) {
+      for (const connection of connectionStore.connections) {
         if (!connection.enabled) continue
 
         const typeAndLabel = `${connection.type} ${connection.label}`
@@ -191,7 +191,7 @@ const useRegisterModelActions = () => {
             keywords: `${model.modelName} model ` + typeAndLabel,
             section: connection.label + ' Models',
             parent: 'model',
-            perform: () => connectionModelStore.dataStore.setSelectedModel(model, connection.id),
+            perform: () => connectionStore.dataStore.setSelectedModel(model, connection.id),
           })
         })
       }
@@ -412,7 +412,7 @@ const OmniBar = () => {
       keywords: 'refresh',
       section: 'Actions',
       priority: Priority.LOW,
-      perform: connectionModelStore.refreshModels,
+      perform: connectionStore.refreshModels,
     }),
     createAction({
       name: 'Open settings',

src/core/ChatModel.ts

@@ -9,8 +9,8 @@ import { incomingMessageStore } from '~/core/IncomingMessageStore'
 import base64EncodeImage from '~/utils/base64EncodeImage'
 import CachedStorage from '~/utils/CachedStorage'
 
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
-import BaseApi from '~/core/connections/api/BaseApi'
+import { connectionStore } from '~/core/connection/ConnectionStore'
+import BaseApi from '~/core/connection/api/BaseApi'
 
 export const ChatModel = types
   .model({
@@ -231,8 +231,8 @@ export const ChatModel = types
 
       const incomingMessage = MessageModel.create({
         fromBot: true,
-        botName: connectionModelStore.selectedModelName,
-        modelType: connectionModelStore.selectedConnection?.type,
+        botName: connectionStore.selectedModelName,
+        modelType: connectionStore.selectedConnection?.type,
         uniqId,
         content: '',
       })

src/core/IncomingMessageStore.ts

@@ -5,8 +5,8 @@ import { IMessageModel, MessageModel } from '~/core/MessageModel'
 import { toastStore } from '~/core/ToastStore'
 import { IChatModel } from '~/core/ChatModel'
 
-import BaseApi from '~/core/connections/api/BaseApi'
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
+import BaseApi from '~/core/connection/api/BaseApi'
+import { connectionStore } from '~/core/connection/ConnectionStore'
 
 const IncomingMessageAbortedModel = types.model({
   id: types.identifier,
@@ -79,7 +79,7 @@ export const IncomingMessageStore = types
 
       const messageToEdit = incomingMessage.selectedVariation
 
-      messageToEdit.setModelName(connectionModelStore.selectedModelName!)
+      messageToEdit.setModelName(connectionStore.selectedModelName!)
 
       console.log(prompt)
 
@@ -108,17 +108,17 @@ export const IncomingMessageStore = types
 
       self.messageById.put(messageToEdit)
 
-      const connection = connectionModelStore.selectedConnection
+      const connection = connectionStore.selectedConnection
 
       if (!connection) throw 'Unknown server'
 
-      if (connectionModelStore.isImageGenerationMode) {
+      if (connectionStore.isImageGenerationMode) {
         return this.generateImage(chat, incomingMessage, connection.api)
       }
 
       const api: BaseApi | undefined = connection.api
 
-      messageToEdit.setModelName(connectionModelStore.selectedModelName!)
+      messageToEdit.setModelName(connectionStore.selectedModelName!)
 
       await this.handleIncomingMessage(incomingMessage, async () => {
         for await (const contentChunk of api.generateChat(
@@ -147,7 +147,7 @@ export const IncomingMessageStore = types
           messageToEdit.setError(error)
 
           // make sure the server is still connected
-          connectionModelStore.selectedConnection?.fetchLmModels()
+          connectionStore.selectedConnection?.fetchLmModels()
         }
       } finally {
         if (shouldDeleteMessage) {

src/core/SettingStore.ts

@@ -4,10 +4,10 @@ import _ from 'lodash'
 
 import { type SettingPanelOptionsType } from '~/features/settings/settingsPanels'
 
-import { connectionModelStore } from '~/core/connections/ConnectionModelStore'
-import LmsServerConnection from '~/core/connections/servers/LmsServerConnection'
-import A1111ServerConnection from '~/core/connections/servers/A1111ServerConnection'
-import OllamaServerConnection from '~/core/connections/servers/OllamaServerConnection'
+import { connectionStore } from '~/core/connection/ConnectionStore'
+import LmsConnectionViewModel from '~/core/connection/viewModels/LmsConnectionViewModel'
+import A1111ConnectionViewModel from '~/core/connection/viewModels/A1111ConnectionViewModel'
+import OllamaConnectionViewModel from '~/core/connection/viewModels/OllamaConnectionViewModel'
 
 import { VoiceModel } from '~/core/VoiceModel'
 
@@ -105,7 +105,7 @@ const migrateV2 = (settings: Record<string, unknown>) => {
   console.log('running v2 migration')
 
   if (settings.lmsEnabled) {
-    const lmsSnapshot = _.cloneDeep(LmsServerConnection.getSnapshot())
+    const lmsSnapshot = _.cloneDeep(LmsConnectionViewModel.getSnapshot())
     lmsSnapshot.host = (settings.lmsHost as string) || lmsSnapshot.host
     ;[['temperature', 'lmsTemperature']].forEach(([field, oldField]) => {
       const parameterIndex = _.findIndex(lmsSnapshot.parameters, { field })
@@ -115,11 +115,11 @@ const migrateV2 = (settings: Record<string, unknown>) => {
       }
     })
 
-    connectionModelStore.dataStore.addConnection('LMS', lmsSnapshot)
+    connectionStore.dataStore.addConnection('LMS', lmsSnapshot)
   }
 
   if (settings.a1111Enabled) {
-    const a1111Snapshot = _.cloneDeep(A1111ServerConnection.getSnapshot())
+    const a1111Snapshot = _.cloneDeep(A1111ConnectionViewModel.getSnapshot())
     a1111Snapshot.host = (settings.a1111Host as string) || a1111Snapshot.host
     ;[
       ['width', 'a1111Width'],
@@ -134,12 +134,12 @@ const migrateV2 = (settings: Record<string, unknown>) => {
       }
     })
 
-    connectionModelStore.dataStore.addConnection('A1111', a1111Snapshot)
+    connectionStore.dataStore.addConnection('A1111', a1111Snapshot)
   }
 
   // it was enabled if it was true or undefined
   if (settings.ollamaEnabled !== false) {
-    const ollamaSnapshot = _.cloneDeep(OllamaServerConnection.getSnapshot())
+    const ollamaSnapshot = _.cloneDeep(OllamaConnectionViewModel.getSnapshot())
     ollamaSnapshot.host = (settings.ollamaHost as string) || ollamaSnapshot.host
     ;[
       ['keep_alive', 'ollamaKeepAliveTime'],
@@ -152,7 +152,7 @@ const migrateV2 = (settings: Record<string, unknown>) => {
       }
     })
 
-    connectionModelStore.dataStore.addConnection('Ollama', ollamaSnapshot)
+    connectionStore.dataStore.addConnection('Ollama', ollamaSnapshot)
   }
 
   delete settings.ollamaEnabled