more app model refactors, more cleanups

Author: gallayl

service/src/AppModelManager.ts

@@ -50,7 +50,7 @@ export class AppModelManager {
     )
   }
 
-  public updateAppModelState(appModelId: string, state: AppModel['state']) {
+  private updateAppModelState(appModelId: string, state: AppModel['state']) {
     const appModel = this.appModels.get(appModelId)
     if (!appModel) {
       const error = new Error(`App model with id ${appModelId} is not registered`)
@@ -64,11 +64,11 @@ export class AppModelManager {
       })
       throw error
     }
-    const oldStateType = appModel.state.type
+    const oldState = appModel.state
     appModel.state = state
     void this.logger.information({
-      message: `App model state for ${appModel.manifest.name} updated from "${oldStateType}" to "${state.type}"`,
-      data: { appModel, state },
+      message: `App model state for ${appModel.manifest.name} updated from "${oldState.type}" to "${state.type}"`,
+      data: { appModel, oldState, state },
     })
   }
 }

service/src/ai/ai-app-model.ts

@@ -0,0 +1,20 @@
+import { Injectable, type Injector } from '@furystack/inject'
+import type { AppState } from 'common'
+import type { InternalAppModel } from '../AppModelManager.js'
+import { AiManifest } from './ai-manifest.js'
+import { setupAiRestApi } from './setup-ai-rest-api.js'
+import { setupAi } from './setup-ai.js'
+
+@Injectable({ lifetime: 'singleton' })
+export class AiAppModel implements InternalAppModel {
+  manifest = AiManifest
+  state: AppState = {
+    type: 'initializing',
+  }
+
+  declare private injector: Injector
+
+  public async setup() {
+    await Promise.all([setupAi(this.injector), setupAiRestApi(this.injector)])
+  }
+}

service/src/ai/ai-manifest.ts

@@ -0,0 +1,11 @@
+import type { AppModelManifest } from 'common'
+
+export const AiManifest: AppModelManifest = {
+  id: '@pi-rat/ai',
+  name: 'AI',
+  description: 'AI capabilities with Ollama',
+  apiRedirects: {},
+  integrations: {},
+  requiredPermissions: {},
+  version: '0.1.0',
+}

service/src/ai/ollama-client-service.ts

@@ -74,7 +74,6 @@ export class OllamaClientService {
   }
 
   public async init(injector: Injector) {
-    await this.logger.verbose({ message: '🤖   Initializing Ollama Service' })
     const config = await this.getOllamaConfig(injector)
     if (!config) {
       this.config = undefined

service/src/ai/setup-ai-store.ts

@@ -32,7 +32,6 @@ class AiChatMessageModel extends Model<AiChatMessage, AiChatMessage> implements
 
 export const setupAiStore = async (injector: Injector) => {
   const logger = getLogger(injector).withScope('AI Store Setup')
-  await logger.verbose({ message: '🤖   Initializing AI Store' })
 
   const dbOptions = getDefaultDbSettings('ai.sqlite', logger)
 

service/src/ai/setup-ai.ts

@@ -10,7 +10,6 @@ import { setupAiStore } from './setup-ai-store.js'
 
 export const setupAi = async (injector: Injector) => {
   const logger = getLogger(injector).withScope('AI Setup')
-  await logger.verbose({ message: '🤖   Initializing AI Services' })
   const clientService = injector.getInstance(OllamaClientService)
 
   const storeManager = getStoreManager(injector)

service/src/dashboards/setup-dashboards.ts

@@ -67,7 +67,6 @@ export const setupDashboards = async (injector: Injector) => {
       )
     },
   })
-  await logger.verbose({ message: 'Setting up repository...' })
   getRepository(injector).createDataSet(Dashboard, 'id', {
     authorizeAdd: withRole('admin'),
     authorizeGet: withRole('admin'),

service/src/drives/drives-manifest.ts

@@ -1,8 +1,8 @@
 import type { AppModelManifest } from 'common'
 
 export const DrivesManifest: AppModelManifest = {
-  id: 'Drives',
-  name: '@pi-rat/drives',
+  name: 'Drives',
+  id: '@pi-rat/drives',
   description: 'Provides access to file system drives.',
   version: '0.0.1',
   apiRedirects: {},

service/src/drives/setup-drives.ts

@@ -62,7 +62,6 @@ export const setupDrives = async (injector: Injector) => {
     },
   })
 
-  await logger.verbose({ message: 'Setting up repository...' })
   getRepository(injector).createDataSet(Drive, 'letter', {
     authorizeGet: withRole('admin'),
     authorizeUpdate: async (args) => {
@@ -106,6 +105,5 @@ export const setupDrives = async (injector: Injector) => {
     },
   })
 
-  await logger.verbose({ message: '💾  Setting up FileWatchers...' })
   await useFileWatchers(injector)
 }

service/src/identity/setup-identity-store.ts

@@ -125,7 +125,6 @@ export const setupIdentity = async (injector: Injector) => {
     },
   })
 
-  await logger.verbose({ message: 'Setting up repository...' })
   getRepository(injector).createDataSet(User, 'username', {
     authorizeAdd: withRole('admin'),
     authorizeGet: withRole('admin'),