diff --git a/packages/apps/job-launcher/client/src/components/Jobs/Create/AudinoJobRequestForm.tsx b/packages/apps/job-launcher/client/src/components/Jobs/Create/AudinoJobRequestForm.tsx index f726f6357a..df5705cff3 100644 --- a/packages/apps/job-launcher/client/src/components/Jobs/Create/AudinoJobRequestForm.tsx +++ b/packages/apps/job-launcher/client/src/components/Jobs/Create/AudinoJobRequestForm.tsx @@ -88,7 +88,6 @@ export const AudinoJobRequestForm = () => { gtPath, userGuide, accuracyTarget, - audioDuration, segmentDuration, }: ReturnType) => { updateJobRequest({ @@ -116,7 +115,6 @@ export const AudinoJobRequestForm = () => { }, userGuide, accuracyTarget, - audioDuration, segmentDuration, }, }); @@ -599,36 +597,6 @@ export const AudinoJobRequestForm = () => { - - - - setFieldValue('audioDuration', e.target.value) - } - onBlur={handleBlur} - placeholder="Audio duration" - label="Audio duration (seconds)" - error={ - touched.audioDuration && Boolean(errors.audioDuration) - } - helperText={errors.audioDuration} - InputProps={{ - endAdornment: ( - - - - - - ), - }} - /> - - { - return schema.max( - audioDuration * 1000, - 'Segment duration should not exceed audio duration', - ); - }), + .max(3600000, 'Segment duration must be less than or equal to 3600000'), // one hour in ms }); diff --git a/packages/apps/job-launcher/client/src/services/job.ts b/packages/apps/job-launcher/client/src/services/job.ts index 44025fa127..39e9ced548 100644 --- a/packages/apps/job-launcher/client/src/services/job.ts +++ b/packages/apps/job-launcher/client/src/services/job.ts @@ -88,7 +88,6 @@ export const createAudinoJob = async ( userGuide: data.userGuide, type: data.type, qualifications: data.qualifications, - audioDuration: Number(data.audioDuration), segmentDuration: Number(data.segmentDuration), }; diff --git a/packages/apps/job-launcher/client/src/types/index.ts b/packages/apps/job-launcher/client/src/types/index.ts index f8ba948d89..58f1c01343 100644 --- a/packages/apps/job-launcher/client/src/types/index.ts +++ b/packages/apps/job-launcher/client/src/types/index.ts @@ -73,7 +73,6 @@ export type CreateAudinoJobRequest = { groundTruth: AudinoDataSource; userGuide: string; type: AudinoJobType; - audioDuration: number; segmentDuration: number; }; @@ -284,7 +283,6 @@ export type AudinoRequest = { groundTruth: AudinoDataSource; userGuide: string; accuracyTarget: number; - audioDuration: number; segmentDuration: number; }; diff --git a/packages/apps/job-launcher/server/src/modules/job/job.dto.ts b/packages/apps/job-launcher/server/src/modules/job/job.dto.ts index d46f9db8ae..4533cbb615 100644 --- a/packages/apps/job-launcher/server/src/modules/job/job.dto.ts +++ b/packages/apps/job-launcher/server/src/modules/job/job.dto.ts @@ -247,11 +247,6 @@ export class JobAudinoDto extends JobDto { @IsEnumCaseInsensitive(AudinoJobType) public type: AudinoJobType; - @ApiProperty({ name: 'audio_duration' }) - @IsNumber() - @IsPositive() - public audioDuration: number; - @ApiProperty({ name: 'segment_duration' }) @IsNumber() @IsPositive() diff --git a/packages/apps/job-launcher/server/src/modules/manifest/fixtures.ts b/packages/apps/job-launcher/server/src/modules/manifest/fixtures.ts index 8ff0012edf..524b950191 100644 --- a/packages/apps/job-launcher/server/src/modules/manifest/fixtures.ts +++ b/packages/apps/job-launcher/server/src/modules/manifest/fixtures.ts @@ -97,8 +97,7 @@ export function createJobAudinoDto( path: faker.system.filePath(), }, labels: [{ name: faker.lorem.word() }], - audioDuration: faker.number.int({ min: 100, max: 1000 }), - segmentDuration: faker.number.int({ min: 10, max: 100 }), + segmentDuration: faker.number.int({ min: 10, max: 3600000 }), requesterDescription: faker.lorem.sentence(), userGuide: faker.internet.url(), qualifications: [faker.lorem.word()], diff --git a/packages/apps/job-launcher/server/src/modules/manifest/manifest.dto.ts b/packages/apps/job-launcher/server/src/modules/manifest/manifest.dto.ts index c4ab89f9a1..096d21fcc0 100644 --- a/packages/apps/job-launcher/server/src/modules/manifest/manifest.dto.ts +++ b/packages/apps/job-launcher/server/src/modules/manifest/manifest.dto.ts @@ -198,9 +198,6 @@ export class AudinoManifestDto { @ValidateNested() @Type(() => AudinoValidation) public validation: AudinoValidation; - - @IsString() - public job_bounty: string; } export class RestrictedAudience { diff --git a/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.spec.ts b/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.spec.ts index 970468cedf..619a12ae74 100644 --- a/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.spec.ts +++ b/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.spec.ts @@ -8,7 +8,6 @@ import { faker } from '@faker-js/faker'; import { createMock } from '@golevelup/ts-jest'; import { Encryption } from '@human-protocol/sdk'; import { Test } from '@nestjs/testing'; -import { ethers } from 'ethers'; import { AuthConfigService } from '../../common/config/auth-config.service'; import { CvatConfigService } from '../../common/config/cvat-config.service'; import { PGPConfigService } from '../../common/config/pgp-config.service'; @@ -314,13 +313,6 @@ describe('ManifestService', () => { mockTokenFundDecimals, ); - const totalSegments = Math.ceil( - (mockDto.audioDuration * 1000) / mockDto.segmentDuration, - ); - const jobBounty = - ethers.parseUnits(mockTokenFundAmount.toString(), 'ether') / - BigInt(totalSegments); - expect(result).toEqual({ annotation: { description: mockDto.requesterDescription, @@ -334,7 +326,6 @@ describe('ManifestService', () => { data_url: generateBucketUrl(mockDto.data.dataset, mockRequestType) .href, }, - job_bounty: ethers.formatEther(jobBounty), validation: { gt_url: generateBucketUrl(mockDto.groundTruth, mockRequestType) .href, diff --git a/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.ts b/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.ts index 3e7e9176d1..61836dde66 100644 --- a/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.ts +++ b/packages/apps/job-launcher/server/src/modules/manifest/manifest.service.ts @@ -118,11 +118,7 @@ export class ManifestService { ); case AudinoJobType.AUDIO_TRANSCRIPTION: - return this.createAudinoManifest( - dto as JobAudinoDto, - requestType, - fundAmount, - ); + return this.createAudinoManifest(dto as JobAudinoDto, requestType); default: throw new ValidationError(ErrorJob.InvalidRequestType); @@ -330,16 +326,7 @@ export class ManifestService { private async createAudinoManifest( dto: JobAudinoDto, requestType: AudinoJobType, - tokenFundAmount: number, - ): Promise { - const totalSegments = Math.ceil( - (dto.audioDuration * 1000) / dto.segmentDuration, - ); - - const jobBounty = - ethers.parseUnits(tokenFundAmount.toString(), 'ether') / - BigInt(totalSegments); - + ): Promise { return { annotation: { description: dto.requesterDescription, @@ -352,7 +339,6 @@ export class ManifestService { data: { data_url: generateBucketUrl(dto.data.dataset, requestType).href, }, - job_bounty: ethers.formatEther(jobBounty), validation: { gt_url: generateBucketUrl(dto.groundTruth, requestType).href, min_quality: dto.minQuality,