Minor rearrangements in the project structure

preeesha · preeesha · commit 304aee1e3f14 · 2024-08-18T12:38:20.000+05:30
diff --git a/ai-assistant/src/commands/AskCodeCommand.ts b/ai-assistant/src/commands/AskCodeCommand.ts
@@ -8,11 +8,11 @@ import {
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
 
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { PromptFactory } from "../core/prompt.factory";
 import { Query } from "../core/query";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class AskCodeCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/AskDocsCommand.ts b/ai-assistant/src/commands/AskDocsCommand.ts
@@ -8,9 +8,9 @@ import {
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
 
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class AskDocsCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/DiagramCommand.ts b/ai-assistant/src/commands/DiagramCommand.ts
@@ -8,12 +8,12 @@ import {
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
 
-import { Neo4j } from "../core/db/neo4j";
+import { Neo4j } from "../core/services/db/neo4j";
 // import { renderDiagramToBase64URI } from "../core/diagram";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { PromptFactory } from "../core/prompt.factory";
 import { Query } from "../core/query";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class DiagramCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/DocumentCommand.ts b/ai-assistant/src/commands/DocumentCommand.ts
@@ -7,11 +7,11 @@ import {
     ISlashCommand,
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { PromptFactory } from "../core/prompt.factory";
 import { Query } from "../core/query";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class DocumentCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/ImportanceCommand.ts b/ai-assistant/src/commands/ImportanceCommand.ts
@@ -7,11 +7,11 @@ import {
     ISlashCommand,
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
-import { DBNode } from "../core/db/db";
-import { IDB } from "../core/db/db.types";
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
 import { Query } from "../core/query";
+import { DBNode } from "../core/services/db/db";
+import { IDB } from "../core/services/db/db.types";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class ImportanceCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/TestLLM.ts b/ai-assistant/src/commands/TestLLM.ts
@@ -8,8 +8,8 @@ import {
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
 
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { Prompt } from "../core/prompt";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class TestCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/TranslateCommand.ts b/ai-assistant/src/commands/TranslateCommand.ts
@@ -7,11 +7,11 @@ import {
     ISlashCommand,
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { PromptFactory } from "../core/prompt.factory";
 import { Query } from "../core/query";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class TranslateCommand implements ISlashCommand {
diff --git a/ai-assistant/src/commands/WhyUsedCommand.ts b/ai-assistant/src/commands/WhyUsedCommand.ts
@@ -8,12 +8,12 @@ import {
     SlashCommandContext,
 } from "@rocket.chat/apps-engine/definition/slashcommands";
 import { writeFileSync } from "fs";
-import { Neo4j } from "../core/db/neo4j";
+import { Neo4j } from "../core/services/db/neo4j";
 // import { renderDiagramToBase64URI } from "../core/diagram";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { PromptFactory } from "../core/prompt.factory";
 import { Query } from "../core/query";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
 export class WhyUsedCommand implements ISlashCommand {
diff --git a/ai-assistant/src/core/query.ts b/ai-assistant/src/core/query.ts
@@ -1,8 +1,8 @@
-import { DBNode } from "./db/db";
-import { IDB } from "./db/db.types";
-import { IEmbeddingModel } from "./embeddings/embeddings.types";
-import { ILLMModel } from "./llm/llm.types";
 import { PromptFactory } from "./prompt.factory";
+import { DBNode } from "./services/db/db";
+import { IDB } from "./services/db/db.types";
+import { IEmbeddingModel } from "./services/embeddings/embeddings.types";
+import { ILLMModel } from "./services/llm/llm.types";
 
 export namespace Query {
     export async function getDBNodesFromVectorQuery(
diff --git a/ai-assistant/src/core/services/db/db.ts b/ai-assistant/src/core/services/db/db.ts
diff --git a/ai-assistant/src/core/services/db/db.types.ts b/ai-assistant/src/core/services/db/db.types.ts
diff --git a/ai-assistant/src/core/services/db/neo4j.ts b/ai-assistant/src/core/services/db/neo4j.ts
diff --git a/ai-assistant/src/core/services/embeddings/embeddings.types.ts b/ai-assistant/src/core/services/embeddings/embeddings.types.ts
diff --git a/ai-assistant/src/core/services/embeddings/minilml6.ts b/ai-assistant/src/core/services/embeddings/minilml6.ts
@@ -1,5 +1,5 @@
 import { IHttp } from "@rocket.chat/apps-engine/definition/accessors";
-import { HF_TOKEN } from "../../credentials";
+import { HF_TOKEN } from "../../../credentials";
 import { IEmbeddingModel } from "./embeddings.types";
 
 export class MiniLML6 implements IEmbeddingModel {
diff --git a/ai-assistant/src/core/services/llm/llama3_70B.ts b/ai-assistant/src/core/services/llm/llama3_70B.ts
@@ -1,7 +1,7 @@
 import { IHttp } from "@rocket.chat/apps-engine/definition/accessors";
 
-import { HF_TOKEN } from "../../credentials";
-import { Prompt } from "../prompt";
+import { HF_TOKEN } from "../../../credentials";
+import { Prompt } from "../../prompt";
 import { ILLMModel } from "./llm.types";
 
 export class Llama3_70B implements ILLMModel {
diff --git a/ai-assistant/src/core/services/llm/llm.types.ts b/ai-assistant/src/core/services/llm/llm.types.ts
@@ -1,4 +1,4 @@
-import { Prompt } from "../prompt";
+import { Prompt } from "../../prompt";
 
 export interface ILLMModel {
     ask(prompt: Prompt): Promise<string | null>;
diff --git a/ai-assistant/src/core/services/llm/mistral_7b.ts b/ai-assistant/src/core/services/llm/mistral_7b.ts
@@ -1,6 +1,6 @@
 import { IHttp } from "@rocket.chat/apps-engine/definition/accessors";
 
-import { Prompt } from "../prompt";
+import { Prompt } from "../../prompt";
 import { ILLMModel } from "./llm.types";
 
 export class Mistral_7B implements ILLMModel {
diff --git a/ai-assistant/src/endpoints/establishRelations.ts b/ai-assistant/src/endpoints/establishRelations.ts
@@ -10,9 +10,13 @@ import {
     IApiRequest,
     IApiResponse,
 } from "@rocket.chat/apps-engine/definition/api";
-import { IDB } from "../core/db/db.types";
-import { Neo4j } from "../core/db/neo4j";
-import { EstablishRelationsEndpointRelations, EstablishRelationsEndpointRequestBody, EstablishRelationsEndpointResponseBody } from "./establishRelations.types";
+import { IDB } from "../core/services/db/db.types";
+import { Neo4j } from "../core/services/db/neo4j";
+import {
+    EstablishRelationsEndpointRelations,
+    EstablishRelationsEndpointRequestBody,
+    EstablishRelationsEndpointResponseBody,
+} from "./establishRelations.types";
 
 namespace Helpers {
     async function establishRelation(
@@ -33,7 +37,10 @@ namespace Helpers {
         }
     }
 
-    export async function establishRelations(db: IDB, relations: EstablishRelationsEndpointRelations[]) {
+    export async function establishRelations(
+        db: IDB,
+        relations: EstablishRelationsEndpointRelations[]
+    ) {
         const jobs: Promise<any>[] = [];
         for (const relation of relations) {
             const job = establishRelation(
@@ -53,7 +60,10 @@ export class EstablishRelationsEndpoint extends ApiEndpoint {
 
     makeBodies(
         content: any
-    ): [EstablishRelationsEndpointRequestBody, EstablishRelationsEndpointResponseBody] {
+    ): [
+        EstablishRelationsEndpointRequestBody,
+        EstablishRelationsEndpointResponseBody
+    ] {
         const requestBody = content as EstablishRelationsEndpointRequestBody;
         const responseBody: EstablishRelationsEndpointResponseBody = {
             status: 200,
diff --git a/ai-assistant/src/endpoints/establishRelations.types.ts b/ai-assistant/src/endpoints/establishRelations.types.ts
@@ -1,10 +1,10 @@
-import { DBNodeRelationType } from "../core/db/db";
+import { DBNodeRelationType } from "../core/services/db/db";
 
 export type EstablishRelationsEndpointRelations = {
     source: string;
     target: string;
     relation: DBNodeRelationType;
-}
+};
 
 export type EstablishRelationsEndpointRequestBody = {
     relations: EstablishRelationsEndpointRelations[];
diff --git a/ai-assistant/src/endpoints/ingest.ts b/ai-assistant/src/endpoints/ingest.ts
@@ -10,10 +10,10 @@ import {
     IApiRequest,
     IApiResponse,
 } from "@rocket.chat/apps-engine/definition/api";
-import { DBNode } from "../core/db/db";
-import { IDB } from "../core/db/db.types";
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
+import { DBNode } from "../core/services/db/db";
+import { IDB } from "../core/services/db/db.types";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
 import {
     IngestEndpointRequestBody,
     IngestEndpointResponseBody,
diff --git a/ai-assistant/src/endpoints/ingest.types.ts b/ai-assistant/src/endpoints/ingest.types.ts
@@ -1,4 +1,4 @@
-import { DBNode } from "../core/db/db";
+import { DBNode } from "../core/services/db/db";
 
 export type IngestEndpointRequestBody = {
     batchID: string;
diff --git a/ai-assistant/src/endpoints/purgeDB.ts b/ai-assistant/src/endpoints/purgeDB.ts
@@ -10,8 +10,8 @@ import {
     IApiRequest,
     IApiResponse,
 } from "@rocket.chat/apps-engine/definition/api";
-import { IDB } from "../core/db/db.types";
-import { Neo4j } from "../core/db/neo4j";
+import { IDB } from "../core/services/db/db.types";
+import { Neo4j } from "../core/services/db/neo4j";
 
 export class PurgeDBEndpoint extends ApiEndpoint {
     public path = "purgeDB";
diff --git a/ai-assistant/src/modals/findSimilarModal.ts b/ai-assistant/src/modals/findSimilarModal.ts
@@ -10,10 +10,10 @@ import {
     UIKitSurfaceType,
 } from "@rocket.chat/apps-engine/definition/uikit";
 import { IUser } from "@rocket.chat/apps-engine/definition/users";
-import { DBNode } from "../core/db/db";
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
 import { Query } from "../core/query";
+import { DBNode } from "../core/services/db/db";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
 import { getButton, getInputBox } from "../utils/blockBuilders";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
diff --git a/ai-assistant/src/modals/improveModal.ts b/ai-assistant/src/modals/improveModal.ts
@@ -10,11 +10,11 @@ import {
     UIKitSurfaceType,
 } from "@rocket.chat/apps-engine/definition/uikit";
 import { IUser } from "@rocket.chat/apps-engine/definition/users";
-import { Neo4j } from "../core/db/neo4j";
-import { MiniLML6 } from "../core/embeddings/minilml6";
-import { Llama3_70B } from "../core/llm/llama3_70B";
 import { PromptFactory } from "../core/prompt.factory";
 import { Query } from "../core/query";
+import { Neo4j } from "../core/services/db/neo4j";
+import { MiniLML6 } from "../core/services/embeddings/minilml6";
+import { Llama3_70B } from "../core/services/llm/llama3_70B";
 import { getButton, getInputBox } from "../utils/blockBuilders";
 import { handleCommandResponse } from "../utils/handleCommandResponse";
 
diff --git a/ai-assistant/tsconfig.json b/ai-assistant/tsconfig.json
@@ -11,5 +11,5 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true
     },
-    "include": ["**/*.ts", "src/core/db/db.types.ts"]
+    "include": ["**/*.ts", "src/core/services/db/db.types.ts"]
 }
