Deployment concurrency limits/configurable collision strategy

src/components/DeploymentForm.vue

@@ -35,6 +35,10 @@
       <p-number-input v-model="concurrencyLimit" :state="concurrencyLimitState" placeholder="Unlimited" />
     </p-label>
 
+    <p-label label="Concurrency Limit Collision Strategy (Optional)" description="Configure behavior for runs once the concurrency limit is reached.">
+      <p-select v-model="concurrencyLimitCollisionStrategy" :options="deploymentCollisionStrategies" empty-message="ENQUEUE" />
+    </p-label>
+
     <p-divider />
 
     <template v-if="schemaHasParameters">
@@ -84,7 +88,7 @@
   import { JobVariableOverridesInput, WorkPoolCombobox, WorkPoolQueueCombobox } from '@/components'
   import ToastParameterValidationError from '@/components/ToastParameterValidationError.vue'
   import { localization } from '@/localization'
-  import { Deployment, DeploymentUpdateV2 } from '@/models'
+  import { Deployment, deploymentCollisionStrategies, DeploymentUpdateV2 } from '@/models'
   import { DeploymentCreate } from '@/models/DeploymentCreate'
   import { SchemaInputV2 } from '@/schemas'
   import { useSchemaValidation } from '@/schemas/compositions/useSchemaValidation'
@@ -104,6 +108,7 @@
   const workPoolName = ref(props.deployment.workPoolName)
   const workQueueName = ref(props.deployment.workQueueName)
   const concurrencyLimit = ref(props.deployment.concurrencyLimit)
+  const concurrencyLimitCollisionStrategy = ref(props.deployment.concurrencyOptions?.collisionStrategy)
   const parameters = ref(props.deployment.parameters)
   const tags = ref(props.deployment.tags)
   const jobVariables = ref(stringify(props.deployment.jobVariables))
@@ -186,6 +191,7 @@
         infrastructureDocumentId: props.deployment.infrastructureDocumentId,
         pullSteps: props.deployment.pullSteps,
         concurrencyLimit: concurrencyLimit.value,
+        concurrencyOptions: concurrencyLimitCollisionStrategy.value ? { collisionStrategy: concurrencyLimitCollisionStrategy.value } : null,
       }
       emit('submit', deploymentCreate)
     } else {
@@ -198,11 +204,10 @@
         enforceParameterSchema: enforceParameterSchema.value,
         jobVariables: JSON.parse(jobVariables.value),
         concurrencyLimit: concurrencyLimit.value,
+        concurrencyOptions: concurrencyLimitCollisionStrategy.value ? { collisionStrategy: concurrencyLimitCollisionStrategy.value } : null,
       }
       emit('submit', deploymentUpdate)
     }
-
-
   }
 
   const cancel = (): void => {

src/maps/deployment.ts

@@ -1,8 +1,9 @@
 import { sortStringArray } from '@prefecthq/prefect-design'
 import { DeploymentFlowRunCreate, DeploymentFlowRunRequest, DeploymentUpdateRequest, DeploymentUpdateV2 } from '@/models'
+import { DeploymentApiConcurrencyOptions } from '@/models/api/DeploymentApiConcurrencyOptions'
 import { DeploymentCreateRequest } from '@/models/api/DeploymentCreateRequest'
 import { DeploymentResponse } from '@/models/api/DeploymentResponse'
-import { Deployment } from '@/models/Deployment'
+import { Deployment, DeploymentConcurrencyOptions } from '@/models/Deployment'
 import { DeploymentCreate } from '@/models/DeploymentCreate'
 import { createObjectLevelCan } from '@/models/ObjectLevelCan'
 import { schemaV2Mapper } from '@/schemas'
@@ -37,10 +38,17 @@ export const mapDeploymentResponseToDeployment: MapFunction<DeploymentResponse,
     can: createObjectLevelCan(),
     status: this.map('ServerDeploymentStatus', source.status, 'DeploymentStatus'),
     disabled: source.disabled ?? false,
-    concurrencyLimit: source.concurrency_limit ?? source.global_concurrency_limit?.limit ?? null,
+    globalConcurrencyLimit: this.map('ConcurrencyV2LimitResponse', source.global_concurrency_limit, 'ConcurrencyV2Limit'),
+    concurrencyOptions: source.concurrency_options == null ? null : mapDeploymentApiConcurrencyOptionsToDeploymentConcurrencyOptions(source.concurrency_options),
   })
 }
 
+function mapDeploymentApiConcurrencyOptionsToDeploymentConcurrencyOptions(source: DeploymentApiConcurrencyOptions): DeploymentConcurrencyOptions {
+  return {
+    collisionStrategy: source.collision_strategy,
+  }
+}
+
 export const mapDeploymentUpdateV2ToDeploymentUpdateRequest: MapFunction<DeploymentUpdateV2, DeploymentUpdateRequest> = function(source) {
   return {
     description: source.description,
@@ -52,6 +60,7 @@ export const mapDeploymentUpdateV2ToDeploymentUpdateRequest: MapFunction<Deploym
     job_variables: source.jobVariables,
     enforce_parameter_schema: source.enforceParameterSchema,
     concurrency_limit: source.concurrencyLimit,
+    concurrency_options: source.concurrencyOptions == null ? null : mapDeploymentConcurrencyOptionsToDeploymentApiConcurrencyOptions(source.concurrencyOptions),
   }
 }
 
@@ -93,5 +102,12 @@ export const mapDeploymentCreateToDeploymentCreateRequest: MapFunction<Deploymen
     version: source.version,
     paused: source.paused,
     concurrency_limit: source.concurrencyLimit,
+    concurrency_options: source.concurrencyOptions == null ? null : mapDeploymentConcurrencyOptionsToDeploymentApiConcurrencyOptions(source.concurrencyOptions),
+  }
+}
+
+function mapDeploymentConcurrencyOptionsToDeploymentApiConcurrencyOptions(source: DeploymentConcurrencyOptions): DeploymentApiConcurrencyOptions {
+  return {
+    collision_strategy: source.collisionStrategy,
   }
 }

src/mocks/deployment.ts

@@ -41,6 +41,8 @@ export const randomDeployment: MockFunction<Deployment, [Partial<Deployment>?]>
     status: this.create('deploymentStatus'),
     disabled: disabled,
     concurrencyLimit: null,
+    globalConcurrencyLimit: null,
+    concurrencyOptions: null,
     ...overrides,
   }
 }

src/models/Deployment.ts

@@ -1,8 +1,17 @@
+import { ConcurrencyV2Limit } from '@/models/ConcurrencyV2Limit'
 import { CreatedOrUpdatedBy } from '@/models/CreatedOrUpdatedBy'
 import { DeploymentSchedule } from '@/models/DeploymentSchedule'
 import { DeploymentStatus } from '@/models/DeploymentStatus'
 import { ObjectLevelCan } from '@/models/ObjectLevelCan'
 import { SchemaV2, SchemaValuesV2 } from '@/schemas'
+import { createTuple } from '@/utilities'
+
+export const { values: deploymentCollisionStrategies, isValue: isDeploymentCollisionStrategy } = createTuple(['ENQUEUE', 'CANCEL_NEW'])
+export type DeploymentCollisionStrategy = typeof deploymentCollisionStrategies[number]
+
+export type DeploymentConcurrencyOptions = {
+  collisionStrategy: DeploymentCollisionStrategy,
+}
 
 export interface IDeployment {
   id: string,
@@ -32,7 +41,8 @@ export interface IDeployment {
   can: ObjectLevelCan<'deployment'>,
   status: DeploymentStatus,
   disabled: boolean,
-  concurrencyLimit: number | null,
+  globalConcurrencyLimit: ConcurrencyV2Limit | null,
+  concurrencyOptions: DeploymentConcurrencyOptions | null,
 }
 
 export class Deployment implements IDeployment {
@@ -64,7 +74,8 @@ export class Deployment implements IDeployment {
   public can: ObjectLevelCan<'deployment'>
   public status: DeploymentStatus
   public disabled: boolean
-  public concurrencyLimit: number | null
+  public globalConcurrencyLimit: ConcurrencyV2Limit | null
+  public concurrencyOptions: DeploymentConcurrencyOptions | null
 
   public constructor(deployment: IDeployment) {
     this.id = deployment.id
@@ -94,7 +105,12 @@ export class Deployment implements IDeployment {
     this.can = deployment.can
     this.status = deployment.status
     this.disabled = deployment.disabled
-    this.concurrencyLimit = deployment.concurrencyLimit
+    this.globalConcurrencyLimit = deployment.globalConcurrencyLimit
+    this.concurrencyOptions = deployment.concurrencyOptions
+  }
+
+  public get concurrencyLimit(): number | null {
+    return this.globalConcurrencyLimit?.limit ?? null
   }
 
   public get deprecated(): boolean {

src/models/DeploymentCreate.ts

@@ -1,3 +1,4 @@
+import { DeploymentConcurrencyOptions } from '@/models/Deployment'
 import { DeploymentSchedule } from '@/models/DeploymentSchedule'
 import { SchemaValuesV2 } from '@/schemas'
 
@@ -22,4 +23,5 @@ export type DeploymentCreate = {
   enforceParameterSchema: boolean,
   pullSteps: unknown,
   concurrencyLimit: number | null,
+  concurrencyOptions: DeploymentConcurrencyOptions | null,
 }

src/models/DeploymentUpdate.ts

@@ -1,3 +1,4 @@
+import { DeploymentConcurrencyOptions } from '@/models/Deployment'
 import { SchemaValuesV2 } from '@/schemas'
 
 type Base = {
@@ -9,6 +10,7 @@ type Base = {
   jobVariables?: Record<string, unknown> | null,
   enforceParameterSchema?: boolean,
   concurrencyLimit?: number | null,
+  concurrencyOptions?: DeploymentConcurrencyOptions | null,
 }
 
 type WithoutParameters = Base & {

src/models/api/DeploymentApiConcurrencyOptions.ts

@@ -0,0 +1,3 @@
+export type DeploymentApiConcurrencyOptions = {
+  collision_strategy: 'ENQUEUE' | 'CANCEL_NEW',
+}

src/models/api/DeploymentCreateRequest.ts

@@ -1,3 +1,4 @@
+import { DeploymentApiConcurrencyOptions } from '@/models/api/DeploymentApiConcurrencyOptions'
 import { SchemaValues } from '@/schemas/types/schemaValues'
 
 export type DeploymentCreateRequest = {
@@ -21,4 +22,5 @@ export type DeploymentCreateRequest = {
   version: string | null,
   paused: boolean,
   concurrency_limit: number | null,
+  concurrency_options: DeploymentApiConcurrencyOptions | null,
 }

src/models/api/DeploymentResponse.ts

@@ -1,5 +1,6 @@
 import { ConcurrencyV2Response } from '@/models/api/ConcurrencyV2Response'
 import { CreatedOrUpdatedByResponse } from '@/models/api/CreatedOrUpdatedByResponse'
+import { DeploymentApiConcurrencyOptions } from '@/models/api/DeploymentApiConcurrencyOptions'
 import { DeploymentScheduleResponse } from '@/models/api/DeploymentScheduleResponse'
 import { ScheduleResponse } from '@/models/api/ScheduleResponse'
 import { ServerDeploymentStatus } from '@/models/DeploymentStatus'
@@ -36,6 +37,8 @@ export type DeploymentResponse = {
   pull_steps: unknown,
   status: ServerDeploymentStatus,
   disabled?: boolean,
+  /** @deprecated Prefer `global_concurrency_limit */
   concurrency_limit: number | null,
   global_concurrency_limit: ConcurrencyV2Response | null,
+  concurrency_options: DeploymentApiConcurrencyOptions | null,
 }

src/models/api/DeploymentUpdateRequest.ts

@@ -1,4 +1,5 @@
 import { ScheduleResponse } from '@/models'
+import { DeploymentApiConcurrencyOptions } from '@/models/api/DeploymentApiConcurrencyOptions'
 import { SchemaValues } from '@/types/schemas'
 
 export type DeploymentUpdateRequest = Partial<{
@@ -16,4 +17,5 @@ export type DeploymentUpdateRequest = Partial<{
   job_variables: Record<string, unknown> | null,
   enforce_parameter_schema: boolean,
   concurrency_limit: number | null,
+  concurrency_options: DeploymentApiConcurrencyOptions | null,
 }>