opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge for populate model

Browse Source
This commit is contained in:
guerler
2017-05-24 12:59:30 -04:00
parent d7a0fdfaa7
commit 6f5e76eecc
1 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/__init__.py
+13 -48
View File
@@ -1799,48 +1799,6 @@ class Tool( object, Dictifiable ):
# create parameter object
params = galaxy.util.Params( kwd, sanitize=False )
# populates model from state
def populate_model( inputs, state_inputs, group_inputs, other_values=None ):
other_values = ExpressionContext( state_inputs, other_values )
for input_index, input in enumerate( inputs.values() ):
tool_dict = None
group_state = state_inputs.get( input.name, {} )
if input.type == 'repeat':
tool_dict = input.to_dict( request_context )
group_cache = tool_dict[ 'cache' ] = {}
for i in range( len( group_state ) ):
group_cache[ i ] = []
populate_model( input.inputs, group_state[ i ], group_cache[ i ], other_values )
elif input.type == 'conditional':
tool_dict = input.to_dict( request_context )
if 'test_param' in tool_dict:
test_param = tool_dict[ 'test_param' ]
test_param[ 'value' ] = input.test_param.value_to_basic( group_state.get( test_param[ 'name' ], input.test_param.get_initial_value( request_context, other_values ) ), self.app )
test_param[ 'text_value' ] = input.test_param.value_to_display_text( test_param[ 'value' ] )
for i in range( len( tool_dict['cases'] ) ):
current_state = {}
if i == group_state.get( '__current_case__' ):
current_state = group_state
populate_model( input.cases[ i ].inputs, current_state, tool_dict[ 'cases' ][ i ][ 'inputs' ], other_values )
elif input.type == 'section':
tool_dict = input.to_dict( request_context )
populate_model( input.inputs, group_state, tool_dict[ 'inputs' ], other_values )
else:
try:
initial_value = input.get_initial_value( request_context, other_values )
tool_dict = input.to_dict( request_context, other_values=other_values )
tool_dict[ 'value' ] = input.value_to_basic( state_inputs.get( input.name, initial_value ), self.app, use_security=True )
tool_dict[ 'default_value' ] = input.value_to_basic( initial_value, self.app, use_security=True )
tool_dict[ 'text_value' ] = input.value_to_display_text( tool_dict[ 'value' ] )
except Exception as e:
tool_dict = input.to_dict( request_context )
log.exception('tools::to_json() - Skipping parameter expansion \'%s\': %s.' % ( input.name, e ) )
pass
if input_index >= len( group_inputs ):
group_inputs.append( tool_dict )
else:
group_inputs[ input_index ] = tool_dict
# expand incoming parameters (parameters might trigger multiple tool executions,
# here we select the first execution only in order to resolve dynamic parameters)
expanded_incomings, _ = expand_meta_parameters( trans, self, params.__dict__ )
@@ -1858,7 +1816,7 @@ class Tool( object, Dictifiable ):
# create tool model
tool_model = self.to_dict( request_context )
tool_model[ 'inputs' ] = {}
tool_model[ 'inputs' ] = []
self.populate_model( request_context, self.inputs, state_inputs, tool_model[ 'inputs' ] )
# create tool help
@@ -1897,17 +1855,19 @@ class Tool( object, Dictifiable ):
})
return tool_model
# populates model from state
def populate_model( self, request_context, inputs, state_inputs, group_inputs, other_values=None ):
"""
Populates the tool model consumed by the client form builder.
"""
other_values = ExpressionContext( state_inputs, other_values )
for input_index, input in enumerate( inputs.itervalues() ):
for input_index, input in enumerate( inputs.values() ):
tool_dict = None
group_state = state_inputs.get( input.name, {} )
if input.type == 'repeat':
tool_dict = input.to_dict( request_context )
group_cache = tool_dict[ 'cache' ] = {}
for i in range( len( group_state ) ):
group_cache[ i ] = {}
group_cache[ i ] = []
self.populate_model( request_context, input.inputs, group_state[ i ], group_cache[ i ], other_values )
elif input.type == 'conditional':
tool_dict = input.to_dict( request_context )
@@ -1925,14 +1885,19 @@ class Tool( object, Dictifiable ):
self.populate_model( request_context, input.inputs, group_state, tool_dict[ 'inputs' ], other_values )
else:
try:
initial_value = input.get_initial_value( request_context, other_values )
tool_dict = input.to_dict( request_context, other_values=other_values )
tool_dict[ 'value' ] = input.value_to_basic( state_inputs.get( input.name, input.get_initial_value( request_context, other_values ) ), self.app, use_security=True )
tool_dict[ 'value' ] = input.value_to_basic( state_inputs.get( input.name, initial_value ), self.app, use_security=True )
tool_dict[ 'default_value' ] = input.value_to_basic( initial_value, self.app, use_security=True )
tool_dict[ 'text_value' ] = input.value_to_display_text( tool_dict[ 'value' ] )
except Exception as e:
tool_dict = input.to_dict( request_context )
log.exception('tools::to_json() - Skipping parameter expansion \'%s\': %s.' % ( input.name, e ) )
pass
group_inputs[ input_index ] = tool_dict
if input_index >= len( group_inputs ):
group_inputs.append( tool_dict )
else:
group_inputs[ input_index ] = tool_dict
def _get_job_remap( self, job):
if job: