Skip to content

Commit

Permalink
Typo, missed storing dynamic fields in job, and addressing those corr…
Browse files Browse the repository at this point in the history
…ectly when running job
  • Loading branch information
glormph committed Apr 2, 2024
1 parent b0af8db commit b33e04a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/backend/analysis/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def process(self, **kwargs):
# For non-pooled labelcheck, cannot be ''
infile['channel'] = fn.rawfile.datasetrawfile.quantfilechannel.channel.channel.name
# Dynamic fields
infile.update(kwargs['filefields'][fn.pk])
infile.update(kwargs['filefields'].get(str(fn.pk), {}))
infiles.append(infile)
# FIXME bigrun not hardcode, probably need to remove when new infra
shortname = models.UserWorkflow.WFTypeChoices(analysis.nextflowsearch.workflow.wftype).name
Expand Down
4 changes: 3 additions & 1 deletion src/backend/analysis/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,9 @@ def parse_isoquant(quants):
for fieldname, value in sample.items():
am.AnalysisFileValue.objects.update_or_create(defaults={'value': value},
field=fieldname, analysis=analysis, sfile_id=sfid)
data_args['filesamples'].update({sfid: sample for sfid, sample in req['fnfields'].items()})
# __sample etc is stored in special dicts, filefields is for dynamic only
if not fieldname.startswith('__'):
data_args['filefields'][sfid][fieldname] = value

# Store params
passedparams_exdelete = {**req['params']['flags'], **req['params']['inputparams'], **req['params']['multicheck']}
Expand Down

0 comments on commit b33e04a

Please sign in to comment.