Merge develop to resolve conflicts

2026-01-29 19:45:29 -06:00
parent 1bd21b33d7 181fb6ce2a
commit 540344d108
31 changed files with 1330 additions and 146 deletions
--- a/apps/api/src/app.module.ts
+++ b/apps/api/src/app.module.ts
@@ -15,7 +15,7 @@ import { LayoutsModule } from "./layouts/layouts.module";
 import { KnowledgeModule } from "./knowledge/knowledge.module";
 import { UsersModule } from "./users/users.module";
 import { WebSocketModule } from "./websocket/websocket.module";
-import { OllamaModule } from "./ollama/ollama.module";
+import { LlmModule } from "./llm/llm.module";
 import { BrainModule } from "./brain/brain.module";

@Module({
@@ -34,7 +34,7 @@ import { BrainModule } from "./brain/brain.module";
    KnowledgeModule,
    UsersModule,
    WebSocketModule,
-    OllamaModule,
+    LlmModule,
    BrainModule,
  ],
  controllers: [AppController],