@oneuptime/common 7.0.3010 → 7.0.3022

package/Server/Infrastructure/Postgres/SchemaMigrations/1725291476867-MigrationName.ts

@@ -0,0 +1,51 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725291476867 implements MigrationInterface {
+  public name = "MigrationName1725291476867";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "CopilotActionTypePriority" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP, "version" integer NOT NULL, "projectId" uuid NOT NULL, "codeRepositoryId" uuid NOT NULL, "createdByUserId" uuid, "deletedByUserId" uuid, "actionType" character varying(100) NOT NULL, "priority" integer NOT NULL DEFAULT '1', CONSTRAINT "PK_e87af58e75ac25610e48807703e" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_d8e9d95bc4e4094b84d812950f" ON "CopilotActionTypePriority" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_a4c64c718646aebbfe469d6c95" ON "CopilotActionTypePriority" ("codeRepositoryId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" ADD CONSTRAINT "FK_d8e9d95bc4e4094b84d812950f2" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" ADD CONSTRAINT "FK_a4c64c718646aebbfe469d6c950" FOREIGN KEY ("codeRepositoryId") REFERENCES "CopilotCodeRepository"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" ADD CONSTRAINT "FK_039fd3af73a2c910eee5ed67669" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" ADD CONSTRAINT "FK_01864ec4b8b5f343e484a09128a" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" DROP CONSTRAINT "FK_01864ec4b8b5f343e484a09128a"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" DROP CONSTRAINT "FK_039fd3af73a2c910eee5ed67669"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" DROP CONSTRAINT "FK_a4c64c718646aebbfe469d6c950"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotActionTypePriority" DROP CONSTRAINT "FK_d8e9d95bc4e4094b84d812950f2"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_a4c64c718646aebbfe469d6c95"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_d8e9d95bc4e4094b84d812950f"`,
+    );
+    await queryRunner.query(`DROP TABLE "CopilotActionTypePriority"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1725357719072-MigrationName.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725357719072 implements MigrationInterface {
+  public name = "MigrationName1725357719072";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" ADD "copilotActionProp" jsonb`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" ADD "statusMessage" text`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" DROP COLUMN "statusMessage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" DROP COLUMN "copilotActionProp"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1725360199561-MigrationName.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725360199561 implements MigrationInterface {
+  public name = "MigrationName1725360199561";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "CopilotAction" ADD "logs" text`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "CopilotAction" DROP COLUMN "logs"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1725379949648-MigrationName.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725379949648 implements MigrationInterface {
+  public name = "MigrationName1725379949648";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" ADD "isPriority" boolean NOT NULL DEFAULT false`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" DROP COLUMN "isPriority"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -44,6 +44,10 @@ import { MigrationName1724078044172 } from "./1724078044172-MigrationName";
 import { MigrationName1724610006927 } from "./1724610006927-MigrationName";
 import { MigrationName1724613666632 } from "./1724613666632-MigrationName";
 import { MigrationName1724659071843 } from "./1724659071843-MigrationName";
+import { MigrationName1725291476867 } from "./1725291476867-MigrationName";
+import { MigrationName1725357719072 } from "./1725357719072-MigrationName";
+import { MigrationName1725360199561 } from "./1725360199561-MigrationName";
+import { MigrationName1725379949648 } from "./1725379949648-MigrationName";
 
 export default [
   InitialMigration,
@@ -92,4 +96,8 @@ export default [
   MigrationName1724610006927,
   MigrationName1724613666632,
   MigrationName1724659071843,
+  MigrationName1725291476867,
+  MigrationName1725357719072,
+  MigrationName1725360199561,
+  MigrationName1725379949648,
 ];

package/Server/Services/CopilotActionTypePriorityService.ts

@@ -0,0 +1,66 @@
+import CopilotActionType from "../../Types/Copilot/CopilotActionType";
+import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
+import CreateBy from "../Types/Database/CreateBy";
+import { OnCreate } from "../Types/Database/Hooks";
+import DatabaseService from "./DatabaseService";
+import Model from "Common/Models/DatabaseModels/CopilotActionTypePriority";
+
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+  }
+
+  protected override async onBeforeCreate(
+    createBy: CreateBy<Model>,
+  ): Promise<OnCreate<Model>> {
+    // check if the action exits witht he same name exists in the same repo.
+
+    const actionType: CopilotActionType | undefined = createBy.data.actionType;
+    const codeRepositoryId: ObjectID | undefined =
+      createBy.data.codeRepositoryId;
+
+    if (!actionType) {
+      throw new BadDataException("ActionType is required");
+    }
+
+    if (!codeRepositoryId) {
+      throw new BadDataException("CodeRepositoryId is required");
+    }
+
+    const existingItem: Model | null = await this.findOneBy({
+      query: {
+        actionType,
+        codeRepositoryId,
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (existingItem) {
+      throw new BadDataException(
+        "Action Type already exists for this repository.",
+      );
+    }
+
+    // check if the priority is in between 1 and 5.
+
+    const priority: number | undefined = createBy.data.priority;
+
+    if (!priority) {
+      throw new BadDataException("Priority is required");
+    }
+
+    if (priority < 1 || priority > 5) {
+      throw new BadDataException("Priority must be between 1 and 5");
+    }
+
+    return {
+      createBy: createBy,
+      carryForward: null,
+    };
+  }
+}
+
+export default new Service();

package/Server/Services/CopilotCodeRepositoryService.ts

@@ -3,6 +3,12 @@ import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import ObjectID from "../../Types/ObjectID";
 import Model from "Common/Models/DatabaseModels/CopilotCodeRepository";
+import {
+  CopilotActionTypeData,
+  CopilotActionTypeUtil,
+} from "../../Types/Copilot/CopilotActionType";
+import CopilotActionTypePriority from "../../Models/DatabaseModels/CopilotActionTypePriority";
+import CopilotActionTypePriorityService from "./CopilotActionTypePriorityService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -19,6 +25,36 @@ export class Service extends DatabaseService<Model> {
       createBy: createBy,
     };
   }
+
+  protected override async onCreateSuccess(
+    _onCreate: OnCreate<Model>,
+    createdItem: Model,
+  ): Promise<Model> {
+    // add all the actions.
+
+    const repo: Model = createdItem;
+
+    const defaultCopilotActionTypes: Array<CopilotActionTypeData> =
+      CopilotActionTypeUtil.getAllCopilotActionTypes();
+
+    for (const defaultAction of defaultCopilotActionTypes) {
+      const copilotActionTypePriority: CopilotActionTypePriority =
+        new CopilotActionTypePriority();
+      copilotActionTypePriority.projectId = repo.projectId!;
+      copilotActionTypePriority.actionType = defaultAction.type;
+      copilotActionTypePriority.priority = defaultAction.defaultPriority;
+      copilotActionTypePriority.codeRepositoryId = repo.id!;
+
+      await CopilotActionTypePriorityService.create({
+        data: copilotActionTypePriority,
+        props: {
+          isRoot: true,
+        },
+      });
+    }
+
+    return createdItem;
+  }
 }
 
 export default new Service();

package/Server/Services/Index.ts

@@ -132,6 +132,7 @@ import ServiceCatalogDependencyService from "./ServiceCatalogDependencyService";
 import TelemetryAttributeService from "./TelemetryAttributeService";
 import TelemetryExceptionService from "./TelemetryExceptionService";
 import ExceptionInstanceService from "./ExceptionInstanceService";
+import CopilotActionTypePriorityService from "./CopilotActionTypePriorityService";
 
 const services: Array<BaseService> = [
   AcmeCertificateService,
@@ -273,6 +274,7 @@ const services: Array<BaseService> = [
   CopilotActionService,
   ServiceCopilotCodeRepositoryService,
   CopilotPullRequestService,
+  CopilotActionTypePriorityService,
 
   TelemetryExceptionService,
 ];

package/Server/Services/ServiceCatalogService.ts

@@ -1,7 +1,7 @@
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import ArrayUtil from "../../Types/ArrayUtil";
+import ArrayUtil from "../../Utils/Array";
 import { BrightColors } from "../../Types/BrandColors";
 import Model from "Common/Models/DatabaseModels/ServiceCatalog";
 

package/Server/Services/TelemetryServiceService.ts

@@ -1,7 +1,7 @@
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import ArrayUtil from "../../Types/ArrayUtil";
+import ArrayUtil from "../../Utils/Array";
 import { BrightColors } from "../../Types/BrandColors";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";

package/Server/Types/Database/Permissions/AccessControlPermission.ts

@@ -6,7 +6,7 @@ import AccessControlModel from "Common/Models/DatabaseModels/DatabaseBaseModel/A
 import BaseModel, {
   DatabaseBaseModelType,
 } from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import ArrayUtil from "Common/Types/ArrayUtil";
+import ArrayUtil from "Common/Utils/Array";
 import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import DatabaseCommonInteractionPropsUtil, {

package/Server/Types/Workflow/Components/Email.ts

@@ -5,6 +5,7 @@ import ComponentMetadata, { Port } from "Common/Types/Workflow/Component";
 import ComponentID from "Common/Types/Workflow/ComponentID";
 import Components from "Common/Types/Workflow/Components/Email";
 import nodemailer, { Transporter } from "nodemailer";
+import SMTPTransport from "nodemailer/lib/smtp-transport";
 
 export default class Email extends ComponentCode {
   public constructor() {
@@ -48,53 +49,49 @@ export default class Email extends ComponentCode {
     }
 
     if (!args["to"]) {
-      throw options.onError(new BadDataException("to not found"));
+      throw options.onError(new BadDataException("To Email not found"));
     }
 
     if (args["to"] && typeof args["to"] !== "string") {
-      throw options.onError(new BadDataException("to is not type of string"));
+      throw options.onError(
+        new BadDataException("To Email is not type of string"),
+      );
     }
 
     if (!args["from"]) {
-      throw options.onError(new BadDataException("from not found"));
+      throw options.onError(new BadDataException("From Email not found"));
     }
 
     if (args["from"] && typeof args["from"] !== "string") {
-      throw options.onError(new BadDataException("from is not type of string"));
-    }
-
-    if (!args["smtp-username"]) {
-      throw options.onError(new BadDataException("email not found"));
+      throw options.onError(
+        new BadDataException("From Email is not type of string"),
+      );
     }
 
     if (args["smtp-username"] && typeof args["smtp-username"] !== "string") {
       throw options.onError(
-        new BadDataException("smtp-username is not type of string"),
+        new BadDataException("SMTP Username is not type of string"),
       );
     }
 
-    if (!args["smtp-password"]) {
-      throw options.onError(new BadDataException("email not found"));
-    }
-
     if (args["smtp-password"] && typeof args["smtp-password"] !== "string") {
       throw options.onError(
-        new BadDataException("smtp-username is not type of string"),
+        new BadDataException("SMTP Password is not type of string"),
       );
     }
 
     if (!args["smtp-host"]) {
-      throw options.onError(new BadDataException("email not found"));
+      throw options.onError(new BadDataException("SMTP Host not found"));
     }
 
     if (args["smtp-host"] && typeof args["smtp-host"] !== "string") {
       throw options.onError(
-        new BadDataException("smtp-host is not type of string"),
+        new BadDataException("SMTP Host is not type of string"),
       );
     }
 
     if (!args["smtp-port"]) {
-      throw options.onError(new BadDataException("email not found"));
+      throw options.onError(new BadDataException("SMTP Port not found"));
     }
 
     if (args["smtp-port"] && typeof args["smtp-port"] === "string") {
@@ -103,20 +100,30 @@ export default class Email extends ComponentCode {
 
     if (args["smtp-port"] && typeof args["smtp-port"] !== "number") {
       throw options.onError(
-        new BadDataException("smtp-host is not type of number"),
+        new BadDataException("SMTP Port is not type of number"),
       );
     }
 
     try {
-      const mailer: Transporter = nodemailer.createTransport({
+      const username: string | undefined =
+        args["smtp-username"]?.toString() || undefined;
+      const password: string | undefined =
+        args["smtp-password"]?.toString() || undefined;
+
+      const smtpTransport: SMTPTransport.Options = {
         host: args["smtp-host"]?.toString(),
         port: args["smtp-port"] as number,
         secure: Boolean(args["secure"]),
-        auth: {
-          user: args["smtp-username"] as string,
-          pass: args["smtp-password"] as string,
-        },
-      });
+      };
+
+      if (username && password) {
+        smtpTransport.auth = {
+          user: username,
+          pass: password,
+        };
+      }
+
+      const mailer: Transporter = nodemailer.createTransport(smtpTransport);
 
       await mailer.sendMail({
         from: args["from"].toString(),
@@ -135,7 +142,7 @@ export default class Email extends ComponentCode {
       options.log(err as Error);
       return Promise.resolve({
         returnValues: {},
-        executePort: successPort,
+        executePort: errorPort,
       });
     }
   }

package/Server/Utils/CodeRepository/CodeRepository.ts

@@ -3,9 +3,18 @@ import LocalFile from "../LocalFile";
 import logger from "../Logger";
 import CodeRepositoryFile from "./CodeRepositoryFile";
 import Dictionary from "Common/Types/Dictionary";
-import ServiceLanguageUtil from "Common/Utils/TechStack";
 
 export default class CodeRepositoryUtil {
+  public static getCurrentCommitHash(data: {
+    repoPath: string;
+  }): Promise<string> {
+    const command: string = `cd ${data.repoPath} && git rev-parse HEAD`;
+
+    logger.debug("Executing command: " + command);
+
+    return Execute.executeCommand(command);
+  }
+
   public static async addAllChangedFilesToGit(data: {
     repoPath: string;
   }): Promise<void> {
@@ -367,24 +376,12 @@ export default class CodeRepositoryUtil {
         }
       }
 
-      const gitCommitHash: string = await this.getGitCommitHashForFile({
-        filePath,
-        repoPath,
-      });
-
-      const fileExtension: string = fileName.split(".").pop() || "";
       files[filePath] = {
-        filePath: LocalFile.sanitizeFilePath(`${directoryPath}/${fileName}`),
-        gitCommitHash,
-        fileExtension,
-        fileName,
         fileContent: await this.getFileContent({
           filePath: LocalFile.sanitizeFilePath(`${directoryPath}/${fileName}`),
           repoPath,
         }),
-        fileLanguage: ServiceLanguageUtil.getLanguageByFileExtension({
-          fileExtension,
-        }),
+        filePath: filePath,
       };
     }
 

package/Server/Utils/CodeRepository/CodeRepositoryFile.ts

@@ -1,10 +1,4 @@
-import TechStack from "Common/Types/ServiceCatalog/TechStack";
-
 export default interface CodeRepositoryFile {
-  filePath: string;
-  gitCommitHash: string;
-  fileExtension: string;
-  fileName: string;
   fileContent: string;
-  fileLanguage: TechStack;
+  filePath: string;
 }

package/Tests/Types/ArrayUtil.test.ts

@@ -1,4 +1,4 @@
-import ArrayUtil from "../../Types/ArrayUtil";
+import ArrayUtil from "../../Utils/Array";
 
 describe("ArrayUtil.isEqual", () => {
   const equalArrays: Array<[Array<any>, Array<any>]> = [

package/Types/Copilot/CopilotActionProps/DirectoryActionProp.ts

@@ -0,0 +1,3 @@
+export default interface DirectoryActionProp {
+  directoryPath: string;
+}

package/Types/Copilot/CopilotActionProps/ExceptionActionProp.ts

@@ -0,0 +1,4 @@
+export default interface ExceptionActionProp {
+  fingerprint: string;
+  message: string;
+}

package/Types/Copilot/CopilotActionProps/FileActionProp.ts

@@ -0,0 +1,7 @@
+export default interface FileActionProp {
+  filePath: string;
+
+  // if startLineNumber and endLineNumber are not provided, the whole file will be considered
+  startLineNumber?: number | undefined;
+  endLineNumber?: number | undefined;
+}

package/Types/Copilot/CopilotActionProps/FunctionActionProp.ts

@@ -0,0 +1,5 @@
+export default interface FunctionActionProp {
+  filePath: string;
+  className?: string | undefined; // some languages are not class based.
+  functionName: string;
+}

package/Types/Copilot/CopilotActionProps/Index.ts

@@ -0,0 +1,96 @@
+import DirectoryActionProp from "./DirectoryActionProp";
+import FileActionProp from "./FileActionProp";
+import ExceptionActionProp from "./ExceptionActionProp";
+import SpanActionProp from "./SpanActionProp";
+import FunctionActionProp from "./FunctionActionProp";
+import CopilotActionType from "../CopilotActionType";
+
+type CopilotActionProp =
+  | DirectoryActionProp
+  | FileActionProp
+  | ExceptionActionProp
+  | SpanActionProp
+  | FunctionActionProp;
+
+export enum CopilotActionPropType {
+  Directory = "Directory",
+  File = "File",
+  Exception = "Exception",
+  Span = "Span",
+  Metric = "Metric",
+  Function = "Function",
+}
+
+export class CopilotActionPropUtil {
+  public static getCopilotActionPropByActionType(
+    actionType: CopilotActionType,
+  ): CopilotActionPropType {
+    if (actionType === CopilotActionType.FIX_EXCEPTIONS) {
+      return CopilotActionPropType.Exception;
+    }
+
+    if (actionType === CopilotActionType.FIX_PERFORMANCE_ISSUES) {
+      return CopilotActionPropType.Span;
+    }
+
+    if (actionType === CopilotActionType.FIX_BUGS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.IMPROVE_LOGS) {
+      return CopilotActionPropType.File;
+    }
+
+    if (actionType === CopilotActionType.IMPROVE_SPANS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.IMPROVE_METRICS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.ADD_LOGS) {
+      return CopilotActionPropType.File;
+    }
+
+    if (actionType === CopilotActionType.ADD_SPANS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.ADD_METRICS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.REFACTOR_CODE) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.WRITE_UNIT_TESTS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.IMPROVE_UNIT_TESTS) {
+      return CopilotActionPropType.Function;
+    }
+
+    if (actionType === CopilotActionType.IMPROVE_COMMENTS) {
+      return CopilotActionPropType.File;
+    }
+
+    if (actionType === CopilotActionType.ADD_COMMENTS) {
+      return CopilotActionPropType.File;
+    }
+
+    if (actionType === CopilotActionType.ADD_README) {
+      return CopilotActionPropType.Directory;
+    }
+
+    if (actionType === CopilotActionType.IMPROVE_README) {
+      return CopilotActionPropType.File;
+    }
+
+    return CopilotActionPropType.File;
+  }
+}
+
+export default CopilotActionProp;

package/Types/Copilot/CopilotActionProps/SpanActionProp.ts

@@ -0,0 +1,4 @@
+export default interface SpanActionProp {
+  traceId: string;
+  spanId?: string;
+}