opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Making changes based on PR comments

Browse Source
This commit is contained in:
Kyle Ellrott
2015-04-28 13:03:03 -07:00
parent d1b939136b
commit 21a4927d4b
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/__init__.py
+33 -30
View File
@@ -551,16 +551,16 @@ class Job( object, HasJobMetrics, Dictifiable ):
input_dict = {}
for i in self.input_datasets:
if i.dataset is not None:
i_d = {"id" : i.dataset.id, "src" : "hda"}
if i.dataset.dataset.uuid is not None:
i_d['uuid'] = str(i.dataset.dataset.uuid)
input_dict[i.name] = i_d
input_dict[i.name] = {
"id" : i.dataset.id, "src" : "hda",
"uuid" : str(i.dataset.dataset.uuid) if i.dataset.dataset.uuid is not None else None
}
for i in self.input_library_datasets:
if i.dataset is not None:
i_d = {"id" : i.dataset.id, "src" : "ldda"}
if i.dataset.dataset.uuid is not None:
i_d['uuid'] = str(i.dataset.dataset.uuid)
input_dict[i.name] = i_d
input_dict[i.name] = {
"id" : i.dataset.id, "src" : "ldda",
"uuid": str(i.dataset.dataset.uuid) if i.dataset.dataset.uuid is not None else None
}
for k in input_dict:
if k in param_dict:
del param_dict[k]
@@ -569,16 +569,16 @@ class Job( object, HasJobMetrics, Dictifiable ):
output_dict = {}
for i in self.output_datasets:
if i.dataset is not None:
i_d = {"id" : i.dataset.id, "src" : "hda"}
if i.dataset.dataset.uuid is not None:
i_d['uuid'] = str(i.dataset.dataset.uuid)
output_dict[i.name] = i_d
output_dict[i.name] = {
"id" : i.dataset.id, "src" : "hda",
"uuid" : str(i.dataset.dataset.uuid) if i.dataset.dataset.uuid is not None else None
}
for i in self.output_library_datasets:
if i.dataset is not None:
i_d = {"id" : i.dataset.id, "src" : "ldda"}
if i.dataset.dataset.uuid is not None:
i_d['uuid'] = str(i.dataset.dataset.uuid)
output_dict[i.name] = i_d
output_dict[i.name] = {
"id" : i.dataset.id, "src" : "ldda",
"uuid" : str(i.dataset.dataset.uuid) if i.dataset.dataset.uuid is not None else None
}
rval['outputs'] = output_dict
return rval
@@ -3268,12 +3268,15 @@ class WorkflowInvocation( object, Dictifiable ):
# is relatively intutitive.
return map( lambda wi: wi.id, query.all() )
def to_dict( self, view='collection', value_mapper=None ):
def to_dict( self, view='collection', value_mapper=None, step_details=False ):
rval = super( WorkflowInvocation, self ).to_dict( view=view, value_mapper=value_mapper )
if view == 'element':
steps = []
for step in self.steps:
v = step.to_dict(view='element')
if step_details:
v = step.to_dict(view='element')
else:
v = step.to_dict(view='collection')
steps.append( v )
rval['steps'] = steps
@@ -3286,10 +3289,10 @@ class WorkflowInvocation( object, Dictifiable ):
src = "hda" if output_step_type == 'data_input' else 'hdca'
for job_input in step.job.input_datasets:
if job_input.name == step_input.input_name:
in_d = { "id": job_input.dataset_id, "src": src }
if job_input.dataset.dataset.uuid is not None:
in_d['uuid'] = str(job_input.dataset.dataset.uuid)
inputs[str(step_input.output_step.order_index)] = in_d
inputs[str(step_input.output_step.order_index)] = {
"id": job_input.dataset_id, "src": src,
"uuid" : str(job_input.dataset.dataset.uuid) if job_input.dataset.dataset.uuid is not None else None
}
rval['inputs'] = inputs
return rval
@@ -3335,16 +3338,16 @@ class WorkflowInvocationStep( object, Dictifiable ):
output_dict = {}
for i in self.job.output_datasets:
if i.dataset is not None:
j = {"id" : i.dataset.id, "src" : "hda"}
if i.dataset.dataset.uuid is not None:
j['uuid'] = str(i.dataset.dataset.uuid)
output_dict[i.name] = j
output_dict[i.name] = {
"id" : i.dataset.id, "src" : "hda",
"uuid" : str(i.dataset.dataset.uuid) if i.dataset.dataset.uuid is not None else None
}
for i in self.job.output_library_datasets:
if i.dataset is not None:
j = {"id" : i.dataset.id, "src" : "ldda"}
if i.dataset.dataset.uuid is not None:
j['uuid'] = str(i.dataset.dataset.uuid)
output_dict[i.name] = j
output_dict[i.name] = {
"id" : i.dataset.id, "src" : "ldda",
"uuid" : str(i.dataset.dataset.uuid) if i.dataset.dataset.uuid is not None else None
}
rval['outputs'] = output_dict
return rval
lib/galaxy/webapps/galaxy/api/workflows.py
+5 -5
View File
@@ -213,7 +213,7 @@ class WorkflowsAPIController(BaseAPIController, UsesStoredWorkflowMixin, UsesAnn
# Newer version of this API just returns the invocation as a dict, to
# facilitate migration - produce the newer style response and blend in
# the older information.
invocation_response = self.__encode_invocation( trans, invocation )
invocation_response = self.__encode_invocation( trans, invocation, step_details=kwd.get('step_details', False) )
invocation_response.update( rval )
return invocation_response
@@ -463,7 +463,7 @@ class WorkflowsAPIController(BaseAPIController, UsesStoredWorkflowMixin, UsesAnn
results = self.workflow_manager.build_invocations_query( trans, stored_workflow.id )
out = []
for r in results:
out.append( self.__encode_invocation( trans, r ) )
out.append( self.__encode_invocation( trans, r, view="collection" ) )
return out
@expose_api
@@ -483,7 +483,7 @@ class WorkflowsAPIController(BaseAPIController, UsesStoredWorkflowMixin, UsesAnn
decoded_workflow_invocation_id = self.decode_id( invocation_id )
workflow_invocation = self.workflow_manager.get_invocation( trans, decoded_workflow_invocation_id )
if workflow_invocation:
return self.__encode_invocation( trans, workflow_invocation )
return self.__encode_invocation( trans, workflow_invocation, step_details=kwd.get('step_details', False) )
return None
@expose_api
@@ -596,9 +596,9 @@ class WorkflowsAPIController(BaseAPIController, UsesStoredWorkflowMixin, UsesAnn
raise exceptions.ObjectNotFound( "No such workflow found." )
return stored_workflow
def __encode_invocation( self, trans, invocation, view="element" ):
def __encode_invocation( self, trans, invocation, view="element", step_details=False ):
return self.encode_all_ids(
trans,
invocation.to_dict( view ),
invocation.to_dict( view, step_details=step_details ),
True
)