[Job Launcher] Implemented image polygons job type (#2845)

* Implemented image polygons job type

* Removed console.log

Author: 0xVoronov

packages/apps/job-launcher/client/src/components/Jobs/Create/CvatJobRequestForm.tsx

@@ -239,6 +239,9 @@ export const CvatJobRequestForm = () => {
                     onBlur={handleBlur}
                   >
                     <MenuItem value={CvatJobType.IMAGE_POINTS}>Points</MenuItem>
+                    <MenuItem value={CvatJobType.IMAGE_POLYGONS}>
+                      Polygons
+                    </MenuItem>
                     <MenuItem value={CvatJobType.IMAGE_BOXES}>
                       Bounding Boxes
                     </MenuItem>

packages/apps/job-launcher/client/src/types/index.ts

@@ -77,6 +77,7 @@ export enum JobType {
 
 export enum CvatJobType {
   IMAGE_POINTS = 'image_points',
+  IMAGE_POLYGONS = 'image_polygons',
   IMAGE_BOXES = 'image_boxes',
   IMAGE_BOXES_FROM_POINTS = 'image_boxes_from_points',
   IMAGE_SKELETONS_FROM_BOXES = 'image_skeletons_from_boxes',

packages/apps/job-launcher/server/src/common/constants/index.ts

@@ -33,6 +33,7 @@ export const SENDGRID_API_KEY_DISABLED = 'sendgrid-disabled';
 export const HEADER_SIGNATURE_KEY = 'human-signature';
 
 export const CVAT_JOB_TYPES = [
+  JobRequestType.IMAGE_POLYGONS,
   JobRequestType.IMAGE_BOXES,
   JobRequestType.IMAGE_POINTS,
   JobRequestType.IMAGE_BOXES_FROM_POINTS,

packages/apps/job-launcher/server/src/common/enums/job.ts

@@ -27,6 +27,7 @@ export enum JobSortField {
 
 export enum JobRequestType {
   IMAGE_POINTS = 'image_points',
+  IMAGE_POLYGONS = 'image_polygons',
   IMAGE_BOXES = 'image_boxes',
   IMAGE_BOXES_FROM_POINTS = 'image_boxes_from_points',
   IMAGE_SKELETONS_FROM_BOXES = 'image_skeletons_from_boxes',

packages/apps/job-launcher/server/src/common/utils/index.ts

@@ -121,6 +121,8 @@ export const mapJobType = (requestType: JobRequestType): string => {
   switch (requestType) {
     case JobRequestType.IMAGE_POINTS:
       return 'Points';
+    case JobRequestType.IMAGE_POLYGONS:
+      return 'Polygons';
     case JobRequestType.IMAGE_BOXES:
       return 'Bounding Boxes';
     case JobRequestType.IMAGE_BOXES_FROM_POINTS:

packages/apps/job-launcher/server/src/common/utils/storage.ts

@@ -12,7 +12,8 @@ export function generateBucketUrl(
   jobType: JobRequestType,
 ): URL {
   if (
-    (jobType === JobRequestType.IMAGE_BOXES ||
+    (jobType === JobRequestType.IMAGE_POLYGONS ||
+      jobType === JobRequestType.IMAGE_BOXES ||
       jobType === JobRequestType.IMAGE_POINTS ||
       jobType === JobRequestType.IMAGE_BOXES_FROM_POINTS ||
       jobType === JobRequestType.IMAGE_SKELETONS_FROM_BOXES) &&

packages/apps/job-launcher/server/src/database/migrations/1732612497937-addJobTypeToJobsRequestTypeEnum.ts

@@ -0,0 +1,56 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddJobTypeToJobsRequestTypeEnum1732612497937
+  implements MigrationInterface
+{
+  name = 'AddJobTypeToJobsRequestTypeEnum1732612497937';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            ALTER TYPE "hmt"."jobs_request_type_enum"
+            RENAME TO "jobs_request_type_enum_old"
+        `);
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."jobs_request_type_enum" AS ENUM(
+                'image_points',
+                'image_polygons',
+                'image_boxes',
+                'image_boxes_from_points',
+                'image_skeletons_from_boxes',
+                'hcaptcha',
+                'fortune'
+            )
+        `);
+    await queryRunner.query(`
+            ALTER TABLE "hmt"."jobs"
+            ALTER COLUMN "request_type" TYPE "hmt"."jobs_request_type_enum" USING "request_type"::"text"::"hmt"."jobs_request_type_enum"
+        `);
+    await queryRunner.query(`
+            DROP TYPE "hmt"."jobs_request_type_enum_old"
+        `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            CREATE TYPE "hmt"."jobs_request_type_enum_old" AS ENUM(
+                'image_points',
+                'image_boxes',
+                'image_boxes_from_points',
+                'image_skeletons_from_boxes',
+                'hcaptcha',
+                'fortune'
+            )
+        `);
+    await queryRunner.query(`
+            ALTER TABLE "hmt"."jobs"
+            ALTER COLUMN "request_type" TYPE "hmt"."jobs_request_type_enum_old" USING "request_type"::"text"::"hmt"."jobs_request_type_enum_old"
+        `);
+    await queryRunner.query(`
+            DROP TYPE "hmt"."jobs_request_type_enum"
+        `);
+    await queryRunner.query(`
+            ALTER TYPE "hmt"."jobs_request_type_enum_old"
+            RENAME TO "jobs_request_type_enum"
+        `);
+  }
+}

packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts

@@ -674,6 +674,53 @@ describe('JobService', () => {
       });
     });
 
+    it('should create a valid CVAT manifest for image polygons job type', async () => {
+      const jobBounty = '100';
+      jest
+        .spyOn(jobService, 'calculateJobBounty')
+        .mockResolvedValueOnce(jobBounty);
+
+      const dto: JobCvatDto = {
+        data: MOCK_CVAT_DATA_DATASET,
+        labels: MOCK_CVAT_LABELS,
+        requesterDescription: MOCK_REQUESTER_DESCRIPTION,
+        userGuide: MOCK_FILE_URL,
+        minQuality: 0.8,
+        groundTruth: MOCK_STORAGE_DATA,
+        type: JobRequestType.IMAGE_POLYGONS,
+        fundAmount: 10,
+        currency: JobCurrency.HMT,
+      };
+
+      const requestType = JobRequestType.IMAGE_POLYGONS;
+      const tokenFundAmount = 100;
+
+      const result = await jobService.createCvatManifest(
+        dto,
+        requestType,
+        tokenFundAmount,
+      );
+
+      expect(result).toEqual({
+        data: {
+          data_url: MOCK_BUCKET_FILE,
+        },
+        annotation: {
+          labels: MOCK_CVAT_LABELS,
+          description: MOCK_REQUESTER_DESCRIPTION,
+          user_guide: MOCK_FILE_URL,
+          type: requestType,
+          job_size: 1,
+        },
+        validation: {
+          min_quality: 0.8,
+          val_size: 2,
+          gt_url: MOCK_BUCKET_FILE,
+        },
+        job_bounty: jobBounty,
+      });
+    });
+
     it('should create a valid CVAT manifest for image boxes from points job type', async () => {
       const jobBounty = '50.0';
 

packages/apps/job-launcher/server/src/modules/job/job.service.ts

@@ -462,6 +462,14 @@ export class JobService {
         fundAmount,
       }),
     },
+    [JobRequestType.IMAGE_POLYGONS]: {
+      calculateFundAmount: async (dto: JobCvatDto) => dto.fundAmount,
+      createManifest: (
+        dto: JobCvatDto,
+        requestType: JobRequestType,
+        fundAmount: number,
+      ) => this.createCvatManifest(dto, requestType, fundAmount),
+    },
     [JobRequestType.IMAGE_BOXES]: {
       calculateFundAmount: async (dto: JobCvatDto) => dto.fundAmount,
       createManifest: (
@@ -503,6 +511,9 @@ export class JobService {
     [JobRequestType.FORTUNE]: {
       getTrustedHandlers: () => [],
     },
+    [JobRequestType.IMAGE_POLYGONS]: {
+      getTrustedHandlers: () => [],
+    },
     [JobRequestType.IMAGE_BOXES]: {
       getTrustedHandlers: () => [],
     },
@@ -526,6 +537,39 @@ export class JobService {
       getElementsCount: async () => 0,
       generateUrls: () => ({ dataUrl: new URL(''), gtUrl: new URL('') }),
     },
+    [JobRequestType.IMAGE_POLYGONS]: {
+      getElementsCount: async (urls: GenerateUrls) => {
+        const gt = (await this.storageService.downloadJsonLikeData(
+          `${urls.gtUrl.protocol}//${urls.gtUrl.host}${urls.gtUrl.pathname}`,
+        )) as any;
+        if (!gt || !gt.images || gt.images.length === 0)
+          throw new ControlledError(
+            ErrorJob.GroundThuthValidationFailed,
+            HttpStatus.BAD_REQUEST,
+          );
+
+        const data = await listObjectsInBucket(urls.dataUrl);
+        if (!data || data.length === 0 || !data[0])
+          throw new ControlledError(
+            ErrorJob.DatasetValidationFailed,
+            HttpStatus.BAD_REQUEST,
+          );
+
+        await this.checkImageConsistency(gt.images, data);
+
+        return data.length - gt.images.length;
+      },
+      generateUrls: (
+        data: CvatDataDto,
+        groundTruth: StorageDataDto,
+      ): GenerateUrls => {
+        const requestType = JobRequestType.IMAGE_POLYGONS;
+        return {
+          dataUrl: generateBucketUrl(data.dataset, requestType),
+          gtUrl: generateBucketUrl(groundTruth, requestType),
+        };
+      },
+    },
     [JobRequestType.IMAGE_BOXES]: {
       getElementsCount: async (urls: GenerateUrls) => {
         const gt = (await this.storageService.downloadJsonLikeData(
@@ -656,6 +700,16 @@ export class JobService {
         return { exchangeOracle, recordingOracle, reputationOracle };
       },
     },
+    [JobRequestType.IMAGE_POLYGONS]: {
+      getOracleAddresses: (): OracleAddresses => {
+        const exchangeOracle = this.web3ConfigService.cvatExchangeOracleAddress;
+        const recordingOracle =
+          this.web3ConfigService.cvatRecordingOracleAddress;
+        const reputationOracle = this.web3ConfigService.reputationOracleAddress;
+
+        return { exchangeOracle, recordingOracle, reputationOracle };
+      },
+    },
     [JobRequestType.IMAGE_BOXES]: {
       getOracleAddresses: (): OracleAddresses => {
         const exchangeOracle = this.web3ConfigService.cvatExchangeOracleAddress;