Skip to content

Commit 492e85f

Browse files
committed
Large stacky changes to fix linked libraries
Added linked libraries for each of the workflow inputs / outputs Fixes to umccrise inputs (and outputs) Refactor fastq list row ids, now uses rgid as the fastq list row id (which has the instrument run id and library id) Added project level data functions
1 parent 48b3474 commit 492e85f

File tree

70 files changed

+4849
-2685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+4849
-2685
lines changed

lib/workload/components/dynamodb-icav2-handle-event-change-sfn/step_functions_templates/icav2_get_workflow_status_and_raise_internal_event.asl.json

+2
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
"workflow_name": "${__workflow_type__}",
160160
"workflow_version": "${__workflow_version__}",
161161
"workflow_run_name.$": "$.Item.workflow_run_name.S",
162+
"linked_libraries.$": "$.Item.linked_libraries.S",
162163
"payload_version": "${__service_version__}",
163164
"payload_inputs.$": "States.StringToJson($.Item.ready_event_data_inputs.S)",
164165
"payload_tags.$": "States.StringToJson($.Item.tags.S)",
@@ -216,6 +217,7 @@
216217
"workflowName.$": "$.get_event_data_step.workflow_name",
217218
"workflowVersion.$": "$.get_event_data_step.workflow_version",
218219
"workflowRunName.$": "$.get_event_data_step.workflow_run_name",
220+
"linkedLibraries.$": "$.get_event_data_step.linked_libraries",
219221
"payload": {
220222
"version": "${__service_version__}",
221223
"data.$": "$.set_data_event_outputs"

lib/workload/components/dynamodb-icav2-ready-event-handler-sfn/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class WfmWorkflowStateChangeIcav2ReadyEventHandlerConstruct extends Const
164164
source: [props.triggerLaunchSource],
165165
detailType: [props.detailType],
166166
detail: {
167-
status: ['ready'],
167+
status: ['READY'],
168168
workflowName: [{ 'equals-ignore-case': props.workflowName }],
169169
},
170170
},

lib/workload/components/dynamodb-icav2-ready-event-handler-sfn/step_functions_templates/icav2_launch_workflow_and_raise_internal_event.asl.json

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
"workflow_run_name": {
7777
"S.$": "$.workflow_inputs.workflowRunName"
7878
},
79+
"linked_libraries": {
80+
"S.$": "States.JsonToString($.workflow_inputs.linkedLibraries)"
81+
},
7982
"workflow_version": {
8083
"S.$": "$.workflow_inputs.workflowVersion"
8184
},
@@ -502,6 +505,7 @@
502505
"workflowName": "${__workflow_type__}",
503506
"workflowVersion": "${__workflow_version__}",
504507
"workflowRunName.$": "$.Item.workflow_run_name.S",
508+
"linkedLibraries.$": "States.StringToJson($.Item.linked_libraries.S)",
505509
"payload": {
506510
"version": "${__service_version__}",
507511
"data": {

lib/workload/components/event-workflowdraftrunstatechange-to-workflowrunstatechange-ready/step_functions_templates/workflowrunstatechange_draft_to_ready_step_function_template.asl.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"UpdateExpression": "SET analysis_status = :analysis_status",
132132
"ExpressionAttributeValues": {
133133
":analysis_status": {
134-
"S": "ready"
134+
"S": "READY"
135135
}
136136
}
137137
},
@@ -179,12 +179,12 @@
179179
"Detail": {
180180
"portalRunId.$": "$.input_event_detail.portalRunId",
181181
"timestamp.$": "$$.State.EnteredTime",
182-
"status": "ready",
182+
"status": "READY",
183183
"workflowName.$": "$.input_event_detail.workflowName",
184184
"workflowVersion.$": "$.input_event_detail.workflowVersion",
185185
"workflowRunName.$": "$.input_event_detail.workflowRunName",
186+
"linkedLibraries.$": "$.input_event_detail.linkedLibraries",
186187
"payload": {
187-
"refId": null,
188188
"version": "${__payload_version__}",
189189
"data": {
190190
"inputs.$": "$.get_event_data_output_step.inputs",

lib/workload/components/python-lambda-b64gz-translator/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class LambdaB64GzTranslatorConstruct extends Construct {
1515

1616
// UUID 7 Generator lambda
1717
this.lambdaObj = new PythonFunction(this, 'b64_gzip_translator_obj', {
18-
functionName: `${props.functionNamePrefix}-b64gz-translator`,
18+
functionName: `${props.functionNamePrefix}-b64gz-t`,
1919
entry: path.join(__dirname, 'b64gz_translator_py'),
2020
runtime: lambda.Runtime.PYTHON_3_12,
2121
architecture: lambda.Architecture.ARM_64,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { Construct } from 'constructs';
2+
import * as lambda_python from '@aws-cdk/aws-lambda-python-alpha';
3+
import * as lambda from 'aws-cdk-lib/aws-lambda';
4+
import path from 'path';
5+
import { Duration } from 'aws-cdk-lib';
6+
7+
export class PythonLambdaGetCwlObjectFromS3InputsConstruct extends Construct {
8+
public readonly lambdaObj: lambda_python.PythonFunction;
9+
10+
constructor(scope: Construct, id: string) {
11+
super(scope, id);
12+
13+
this.lambdaObj = new lambda_python.PythonFunction(this, 'get_cwl_object_from_s3_inputs_py', {
14+
runtime: lambda.Runtime.PYTHON_3_12,
15+
architecture: lambda.Architecture.ARM_64,
16+
entry: path.join(__dirname, 'get_cwl_object_from_s3_inputs_py'),
17+
index: 'get_cwl_object_from_s3_inputs.py',
18+
handler: 'handler',
19+
memorySize: 1024,
20+
timeout: Duration.seconds(10),
21+
});
22+
}
23+
}

0 commit comments

Comments
 (0)