workflow.py 55.4 KB
Newer Older
Jerome Mariette's avatar
Jerome Mariette committed
1
#
Jerome Mariette's avatar
Jerome Mariette committed
2
# Copyright (C) 2015 INRA
Jerome Mariette's avatar
Jerome Mariette committed
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
# 
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
# 
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
#

import inspect
import os
20
import re
Jerome Mariette's avatar
Jerome Mariette committed
21
22
23
24
25
26
27
import sys
import uuid
import pkgutil
import tempfile
import pickle
import time
import threading
Jerome Mariette's avatar
Jerome Mariette committed
28
import types
Jerome Mariette's avatar
Jerome Mariette committed
29
import datetime
30
31
import logging
import traceback
Jerome Mariette's avatar
Jerome Mariette committed
32

33
from configparser import ConfigParser, NoOptionError
Jerome Mariette's avatar
Jerome Mariette committed
34
from inspect import getcallargs
35
from datetime import date as ddate
Jerome Mariette's avatar
Jerome Mariette committed
36

Jerome Mariette's avatar
Jerome Mariette committed
37
import jflow
Jerome Mariette's avatar
Jerome Mariette committed
38
import jflow.utils as utils
39
from jflow.utils import validate_email
40
from pygraph.classes.digraph import digraph
Jerome Mariette's avatar
Jerome Mariette committed
41
from jflow.workflows_manager import WorkflowsManager, JFlowConfigReader
42
from jflow.utils import get_octet_string_representation, get_nb_octet
43
from jflow.parameter import *
44
from cctools.util import time_format
Jerome Mariette's avatar
Jerome Mariette committed
45
46
47
48
49
50
51
52
53
54
55
56

from weaver.script import ABSTRACTIONS
from weaver.script import DATASETS
from weaver.script import FUNCTIONS
from weaver.script import NESTS
from weaver.script import OPTIONS
from weaver.script import STACKS
from weaver.nest import Nest
from weaver.options import Options
from cctools.makeflow import MakeflowLog
from cctools.makeflow.log import Node

Jerome Mariette's avatar
Jerome Mariette committed
57

58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
class MINIWorkflow(object):
    
    def __init__(self, id, name, description, status, start_time, end_time, metadata, 
                 component_nameids, compts_status, errors):
        self.id = id
        self.name = name
        self.description = description
        self.status = status
        self.start_time = start_time
        self.end_time = end_time
        self.metadata = metadata
        self.component_nameids = component_nameids
        self.compts_status = compts_status
        self.errors = errors
        
    def get_components_nameid(self):
        return self.component_nameids

    def get_component_status(self, component_nameid):
        return self.compts_status[component_nameid]
    
    def get_errors(self):
        return self.errors
    
    def get_status(self):
        return self.status
84

85
86
class Workflow(threading.Thread):
    
Jerome Mariette's avatar
Jerome Mariette committed
87
    MAKEFLOW_LOG_FILE_NAME = "Makeflow.makeflowlog"
88
    DUMP_FILE_NAME = ".workflow.dump"
89
    STDERR_FILE_NAME = "wf_stderr.txt"
Jerome Mariette's avatar
Jerome Mariette committed
90
    WORKING = ".working"
91
    OLD_EXTENSION = ".old"
92
    
Jerome Mariette's avatar
Jerome Mariette committed
93
94
95
96
    STATUS_STARTED = "started"
    STATUS_COMPLETED = "completed"
    STATUS_FAILED = "failed"
    STATUS_ABORTED = "aborted"
Jerome Mariette's avatar
Jerome Mariette committed
97
    STATUS_RESETED = "reseted"
98
    
Jerome Mariette's avatar
Jerome Mariette committed
99
100
101
    INPUTFILE_GRAPH_LABEL = "inputfile"
    INPUTFILES_GRAPH_LABEL = "inputfiles"
    INPUTDIRECTORY_GRAPH_LABEL = "inputdirectory"
102
103
    COMPONENT_GRAPH_LABEL = "component"
    
104
    
105
    def __init__(self, args={}, id=None, function= "process"):
Jerome Mariette's avatar
Jerome Mariette committed
106
107
108
109
        # define as a thread
        threading.Thread.__init__(self)
        self.jflow_config_reader = JFlowConfigReader()
        self.manager = WorkflowsManager()
110
        self.components_to_exec = []
111
        self.components = []
Jerome Mariette's avatar
Jerome Mariette committed
112
113
114
115
116
117
        self.makes = {}
        self.globals = {}
        self.options = Options()
        self.status = self.STATUS_STARTED
        self.start_time = None
        self.end_time = None
118
        self.step = None
Frédéric Escudié's avatar
Frédéric Escudié committed
119
        self.stderr = None
Jerome Mariette's avatar
Jerome Mariette committed
120
        self.args = args
121
        self.dynamic_component_present = False
122
123
124
        self.__to_address = None
        self.__subject = None
        self.__message = None
125
        self.function = function
126
        # intruduce --log-verbose to be able to monitor the new version of makeflow >=4.2.2
Jerome Mariette's avatar
Jerome Mariette committed
127
        self.engine_arguments = ' --log-verbose '
128
        self.component_nameids_is_init = False
Jerome Mariette's avatar
Jerome Mariette committed
129
        self.component_nameids = {}
130
        self.reseted_components = []
Jerome Mariette's avatar
Jerome Mariette committed
131
132
        # try to parse engine arguments
        try:
133
134
            type, options, limit_submission = self.jflow_config_reader.get_batch()
            if limit_submission : self.engine_arguments += ' -J ' + str(limit_submission)
Jerome Mariette's avatar
Jerome Mariette committed
135
136
137
            if type: self.engine_arguments += ' -T ' + type
            if options : self.engine_arguments += ' -B "' + options + '"'
        except: self.engine_arguments = None
138

Jerome Mariette's avatar
Jerome Mariette committed
139
        self.id = id
140
141
142
143
144
        self.name = self.get_name()
        self.description = self.get_description()
        
        # define the parameters 
        self.params_order = []
Jerome Mariette's avatar
Jerome Mariette committed
145
146
        if self.function != None:
            self.define_parameters(self.function)
147
        # add the metadata parameter
148
        self.metadata = []
Jerome Mariette's avatar
Jerome Mariette committed
149
        
Jerome Mariette's avatar
Jerome Mariette committed
150
151
152
        if self.id is not None:
            self.directory = self.manager.get_workflow_directory(self.name, self.id)
            if not os.path.isdir(self.directory):
153
                os.makedirs(self.directory, 0o751)
Frédéric Escudié's avatar
Frédéric Escudié committed
154
            if self.stderr is None:
155
                self.stderr = self._set_stderr()
Jerome Mariette's avatar
Jerome Mariette committed
156
            self._serialize()
Jerome Mariette's avatar
Jerome Mariette committed
157
            
158
159
        self.internal_components = self._import_internal_components()
        self.external_components = self._import_external_components()
160
161

            
Jerome Mariette's avatar
Jerome Mariette committed
162
    def add_input_directory(self, name, help, default=None, required=False, flag=None, 
163
164
165
                            group="default", display_name=None, get_files_fn=None, add_to=None):
        new_param = InputDirectory(name, help, flag=flag, default=default, required=required, 
                                   group=group, display_name=display_name, get_files_fn=get_files_fn)
Jerome Mariette's avatar
Jerome Mariette committed
166
167
168
169
170
171
172
173
174
175
176
        new_param.linkTrace_nameid = name
        # if this input should be added to a particular parameter
        if add_to:
            try:
                self.__getattribute__(add_to).add_sub_parameter(new_param)
            except: pass
        # otherwise, add it to the class itself
        else:
            self.params_order.append(name)
            self.__setattr__(name, new_param)
    
177
    def add_input_file(self, name, help, file_format="any", default=None, type="inputfile", 
178
179
180
181
                       required=False, flag=None, group="default", display_name=None, size_limit="0", add_to=None):
        # check if the size provided is correct
        try: int(get_nb_octet(size_limit))
        except: size_limit="0"
182
        new_param = InputFile(name, help, flag=flag, file_format=file_format, default=default, 
183
                              type=type, required=required, group=group, display_name=display_name, size_limit=size_limit)
Frédéric Escudié's avatar
Frédéric Escudié committed
184
        new_param.linkTrace_nameid = name
185
186
187
188
189
190
        # if this input should be added to a particular parameter
        if add_to:
            try:
                self.__getattribute__(add_to).add_sub_parameter(new_param)
            except: pass
        # otherwise, add it to the class itself
191
        else:
192
193
194
195
            self.params_order.append(name)
            self.__setattr__(name, new_param)
            
    def add_input_file_list(self, name, help, file_format="any", default=None, type="inputfile", 
196
197
                            required=False, flag=None, group="default", display_name=None, size_limit="0", add_to=None):
        # check if the size provided is correct
198
        if default == None: default = []
199
200
        try: int(get_nb_octet(size_limit))
        except: size_limit="0"
201
202
203
204
205
206
207
        if default == None:
            inputs = []
        elif issubclass(default.__class__, list):
            inputs = [IOFile(file, file_format, name, None) for file in default]
        else:
            inputs = [IOFile(default, file_format, name, None)]
        new_param = InputFileList(name, help, flag=flag, file_format=file_format, default=inputs, 
208
                                  type=type, required=required, group=group, display_name=display_name, size_limit=size_limit)
Frédéric Escudié's avatar
Frédéric Escudié committed
209
        new_param.linkTrace_nameid = name
210
211
212
        # if this input should be added to a particular parameter
        if add_to:
            try:
Jerome Mariette's avatar
help ok    
Jerome Mariette committed
213
                self.__getattribute__(add_to).add_sub_parameter(new_param)
214
215
216
217
218
            except: pass
        # otherwise, add it to the class itself
        else:
            self.params_order.append(name)
            self.__setattr__(name, new_param)
219
220
            
    def add_multiple_parameter(self, name, help, required=False, flag=None, group="default", display_name=None):
221
        self.params_order.append(name)
222
223
224
225
226
227
        new_param = MultiParameter(name, help, flag=flag, required=required, group=group, display_name=display_name)
        self.__setattr__(name, new_param)

    def add_multiple_parameter_list(self, name, help, required=False, flag=None, group="default", display_name=None):
        self.params_order.append(name)
        new_param = MultiParameterList(name, help, flag=flag, required=required, group=group, display_name=display_name)
228
229
        self.__setattr__(name, new_param)
    
230
    def add_parameter(self, name, help, default=None, type=str, choices=None, 
231
                      required=False, flag=None, group="default", display_name=None, add_to=None):
232
        new_param = ParameterFactory.factory(name, help, flag=flag, default=default, type=type, choices=choices, 
233
234
235
236
237
238
239
                              required=required, group=group, display_name=display_name)
        # if this input should be added to a particular parameter
        if add_to:
            try:
                self.__getattribute__(add_to).add_sub_parameter(new_param)
            except: pass
        # otherwise, add it to the class itself
240
        else:
241
242
243
            self.params_order.append(name)
            self.__setattr__(name, new_param)
    
244
    def add_parameter_list(self, name, help, default=None, type=str, choices=None, 
245
246
247
                           required=False, flag=None, group="default", display_name=None, add_to=None):
        if default == None: default = []
        new_param = ParameterList(name, help, flag=flag, default=default, type=type, choices=choices, 
248
249
250
251
                                  required=required, group=group, display_name=display_name)
        # if this input should be added to a particular parameter
        if add_to:
            try:
Jerome Mariette's avatar
help ok    
Jerome Mariette committed
252
                self.__getattribute__(add_to).add_sub_parameter(new_param)
253
254
255
256
257
258
            except: pass
        # otherwise, add it to the class itself
        else:
            self.params_order.append(name)
            self.__setattr__(name, new_param)
    
Jerome Mariette's avatar
Jerome Mariette committed
259
    def add_exclusion_rule(self, *args2exclude):
Jerome Mariette's avatar
Jerome Mariette committed
260
        # first of all, does this parameter exist
Jerome Mariette's avatar
Jerome Mariette committed
261
262
263
264
265
266
267
268
269
270
271
272
        params2exclude = []
        for arg2exclude in args2exclude:
            try:
                params2exclude.append(self.__getattribute__(arg2exclude))
            except: pass
        # everything is ok, let's go
        if len(params2exclude) == len(args2exclude):
            new_group = "exclude-"+uuid.uuid4().hex[:5]
            for paramsexclude in params2exclude:
                paramsexclude.group = new_group
        # it might be a mutliple param rule
        else:
273
            self._log("Exclusion rule cannot be applied within a MultiParameter or a MultiParameterList", raisee=True)
Jerome Mariette's avatar
Jerome Mariette committed
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
        # save this for MultiParameter internal exclusion rules, works on command line, not supported on gui
#             for attribute_value in self.__dict__.values():
#                 if issubclass(attribute_value.__class__, MultiParameter) or issubclass(attribute_value.__class__, MultiParameterList):
#                     params2exclude = []
#                     for sub_param in attribute_value.sub_parameters:
#                         if sub_param.name in args2exclude:
#                             params2exclude.append(sub_param)
#                     if len(params2exclude) == len(args2exclude):
#                         new_group = "exclude-"+uuid.uuid4().hex[:5]
#                         flags2exclude = []
#                         for paramsexclude in params2exclude:
#                             paramsexclude.group = new_group
#                             flags2exclude.append(paramsexclude.flag)
#                         attribute_value.type.excludes[new_group] = flags2exclude
#                         break
289

Frédéric Escudié's avatar
Frédéric Escudié committed
290
    def _prepare_parameter(self, args, parameter, key="name"):
291
292
        new_param = None
        # Retrieve value
293
        if parameter.__getattribute__(key) in args:
Frédéric Escudié's avatar
Frédéric Escudié committed
294
            value = args[parameter.__getattribute__(key)]
Jerome Mariette's avatar
Jerome Mariette committed
295
        elif parameter.default != None:
296
297
298
299
            value = parameter.default
        else:
            value = None
        # Set new parameter
Frédéric Escudié's avatar
Frédéric Escudié committed
300
301
        if parameter.__class__ in [StrParameter, IntParameter, FloatParameter, BoolParameter, DateParameter]:
            if value == "" and parameter.__class__ in [IntParameter, FloatParameter, BoolParameter, DateParameter] : value = None # from GUI
302
303
304
305
            new_param = ParameterFactory.factory( parameter.name, parameter.help, default=value, type=parameter.type, choices=parameter.choices, 
                                                  required=parameter.required, flag=parameter.flag, group=parameter.group, 
                                                  display_name=parameter.display_name )
        elif parameter.__class__ ==  ParameterList:
306
            if value == "" : value = [] # from GUI
307
308
309
310
            new_param = ParameterList( parameter.name, parameter.help, default=value, type=parameter.type, choices=parameter.choices,
                                       required=parameter.required, flag=parameter.flag, sub_parameters=parameter.sub_parameters,
                                       group=parameter.group, display_name=parameter.display_name )
        elif parameter.__class__ == InputFileList:
311
            if value == "" : value = [] # from GUI
312
            iovalues = []
Ibouniyamine Nabihoudine's avatar
Ibouniyamine Nabihoudine committed
313
            prepared_files = parameter.prepare(value)
314
            for file in prepared_files:
315
316
                iovalues.append(IOFile(file, parameter.file_format, parameter.linkTrace_nameid, None))
            new_param = InputFileList( parameter.name, parameter.help, file_format=parameter.file_format, default=iovalues,
317
318
                                       type=parameter.type, choices=parameter.choices, required=parameter.required, flag=parameter.flag,
                                       group=parameter.group, display_name=parameter.display_name, size_limit=parameter.size_limit )
319
            new_param.linkTrace_nameid = parameter.linkTrace_nameid            
320
        elif parameter.__class__ == InputFile:
321
            if value == "" : value = None # from GUI
Ibouniyamine Nabihoudine's avatar
Ibouniyamine Nabihoudine committed
322
            prepared_file = parameter.prepare(value)
323
            new_param = InputFile( parameter.name, parameter.help, file_format=parameter.file_format, default=prepared_file,
324
325
                                   type=parameter.type, choices=parameter.choices, required=parameter.required, flag=parameter.flag, 
                                   group=parameter.group, display_name=parameter.display_name )
326
            new_param.linkTrace_nameid = parameter.linkTrace_nameid
Jerome Mariette's avatar
Jerome Mariette committed
327
328
        elif parameter.__class__ == InputDirectory:
            if value == "" : value = None # from GUI
Ibouniyamine Nabihoudine's avatar
Ibouniyamine Nabihoudine committed
329
            prepared_directory = parameter.prepare(value)
330
            new_param = InputDirectory( parameter.name, parameter.help, default=prepared_directory, choices=parameter.choices, 
Jerome Mariette's avatar
Jerome Mariette committed
331
                                        required=parameter.required, flag=parameter.flag, group=parameter.group, 
332
                                        display_name=parameter.display_name, get_files_fn=parameter.get_files_fn)
Jerome Mariette's avatar
Jerome Mariette committed
333
            new_param.linkTrace_nameid = parameter.linkTrace_nameid
334
335
336
337
        else:
            raise Exception( "Unknown class '" +  parameter.__class__.__name__ + "' for parameter.")
        return new_param

338
339
340
    def _set_parameters(self, args):
        parameters = self.get_parameters()
        for param in parameters:
341
            new_param = None
342
            if param.__class__ == MultiParameter:
343
                new_param = MultiParameter(param.name, param.help, required=param.required, flag=param.flag, group=param.group, display_name=param.display_name)
344
                new_param.sub_parameters = param.sub_parameters
345
                if param.name in args:
346
347
348
349
350
351
                    sub_args = {}
                    for sarg in args[param.name]:
                        sub_args[sarg[0]] = sarg[1]
                    for sub_param in param.sub_parameters:
                        new_sub_parameter = self._prepare_parameter(sub_args, sub_param, "flag")
                        new_param[new_sub_parameter.name] = new_sub_parameter
352
            elif param.__class__ == MultiParameterList:
353
                new_param = MultiParameterList(param.name, param.help, required=param.required, flag=param.flag, group=param.group, display_name=param.display_name)
354
                new_param.sub_parameters = param.sub_parameters
355
                if param.name in args:
356
357
358
359
360
361
362
363
364
                    for idx, sargs in enumerate(args[param.name]):
                        new_multi_param = MultiParameter(param.name + '_' + str(idx), '', required=False, flag=None, group="default", display_name=None)
                        sub_args = {}
                        for sarg in sargs:
                            sub_args[sarg[0]] = sarg[1]
                        for sub_param in param.sub_parameters:
                            new_sub_param = self._prepare_parameter(sub_args, sub_param, "flag")
                            new_multi_param[new_sub_param.name] = new_sub_param
                        new_param.append(new_multi_param)
365
            else:
366
                new_param = self._prepare_parameter(args, param)
367
            self.__setattr__(param.name, new_param)
Frédéric Escudié's avatar
Frédéric Escudié committed
368

Jerome Mariette's avatar
Jerome Mariette committed
369
    def get_execution_graph(self):
370
        gr = digraph()
371
372
        # build a all_nodes table to store all nodes
        all_nodes = {}
373
        for ioparameter in list(self.__dict__.values()):
374
375
            if issubclass(ioparameter.__class__, InputFile):
                gr.add_node(ioparameter.name)
Jerome Mariette's avatar
Jerome Mariette committed
376
                gr.add_node_attribute(ioparameter.name, self.INPUTFILE_GRAPH_LABEL)
377
                gr.add_node_attribute(ioparameter.name, ioparameter.display_name)
378
                all_nodes[ioparameter.name] = None
379
380
            elif issubclass(ioparameter.__class__, InputFileList):
                gr.add_node(ioparameter.name)
Jerome Mariette's avatar
Jerome Mariette committed
381
382
383
384
385
386
                gr.add_node_attribute(ioparameter.name, self.INPUTFILES_GRAPH_LABEL)
                gr.add_node_attribute(ioparameter.name, ioparameter.display_name)
                all_nodes[ioparameter.name] = None
            elif issubclass(ioparameter.__class__, InputDirectory):
                gr.add_node(ioparameter.name)
                gr.add_node_attribute(ioparameter.name, self.INPUTDIRECTORY_GRAPH_LABEL)
387
                gr.add_node_attribute(ioparameter.name, ioparameter.display_name)
388
                all_nodes[ioparameter.name] = None
Philippe Bardou's avatar
Philippe Bardou committed
389
            elif issubclass(ioparameter.__class__, MultiParameter):
Jerome Mariette's avatar
Jerome Mariette committed
390
391
392
393
394
395
396
397
398
399
                for subparam in ioparameter.sub_parameters:
                    gr.add_node(subparam.name)
                    all_nodes[subparam.name] = None
                    if issubclass(subparam.__class__, InputFile):
                        gr.add_node_attribute(subparam.name, self.INPUTFILE_GRAPH_LABEL)
                    elif issubclass(subparam.__class__, InputFileList):
                        gr.add_node_attribute(subparam.name, self.INPUTFILES_GRAPH_LABEL)
                    elif issubclass(subparam.__class__, InputDirectory):
                        gr.add_node_attribute(subparam.name, self.INPUTDIRECTORY_GRAPH_LABEL)
                    gr.add_node_attribute(subparam.name, subparam.display_name)
Philippe Bardou's avatar
Philippe Bardou committed
400
401
402
403
404
405
406
407
408
            elif issubclass(ioparameter.__class__, MultiParameterList):
                for subparam in ioparameter.sub_parameters:
                    gr.add_node(subparam.name)
                    all_nodes[subparam.name] = None                        
                    if issubclass(subparam.__class__, InputDirectory):
                        gr.add_node_attribute(subparam.name, self.INPUTDIRECTORY_GRAPH_LABEL)
                    else:
                        gr.add_node_attribute(subparam.name, self.INPUTFILES_GRAPH_LABEL)
                    gr.add_node_attribute(subparam.name, subparam.display_name)
409
        for cpt in self.components:
410
411
            gr.add_node(cpt.get_nameid())
            gr.add_node_attribute(cpt.get_nameid(), self.COMPONENT_GRAPH_LABEL)
412
            gr.add_node_attribute(cpt.get_nameid(), cpt.get_nameid())
413
            all_nodes[cpt.get_nameid()] = None
Jerome Mariette's avatar
Jerome Mariette committed
414
        for cpt in self.components:
415
            for ioparameter in list(cpt.__dict__.values()):
Jerome Mariette's avatar
Jerome Mariette committed
416
                if issubclass( ioparameter.__class__, InputFile ) or issubclass( ioparameter.__class__, InputFileList) or issubclass( ioparameter.__class__, InputDirectory):
Frédéric Escudié's avatar
Frédéric Escudié committed
417
418
                    for parent in ioparameter.parent_linkTrace_nameid:
                        try: gr.add_edge((parent, ioparameter.linkTrace_nameid))
Frédéric Escudié's avatar
Frédéric Escudié committed
419
                        except: pass
420
421
422
423
                elif issubclass( ioparameter.__class__, InputObject) or issubclass( ioparameter.__class__, InputObjectList):
                    for parent in ioparameter.parent_linkTrace_nameid:
                        try: gr.add_edge((parent, ioparameter.linkTrace_nameid))
                        except: pass
424
425
        # check if all nodes are connected
        for edge in gr.edges():
426
            if edge[0] in all_nodes:
427
                del all_nodes[edge[0]]
428
            if edge[1] in all_nodes:
429
430
                del all_nodes[edge[1]]
        # then remove all unconnected nodes: to delete inputs not defined by the user
431
        for orphan_node in list(all_nodes.keys()):
432
            gr.del_node(orphan_node)
433
        return gr
Frédéric Escudié's avatar
Frédéric Escudié committed
434

Jerome Mariette's avatar
Jerome Mariette committed
435
436
    def delete(self):
        if self.get_status() in [self.STATUS_COMPLETED, self.STATUS_FAILED, self.STATUS_ABORTED]:
Jerome Mariette's avatar
Jerome Mariette committed
437
            utils.robust_rmtree(self.directory)
Jerome Mariette's avatar
Jerome Mariette committed
438

439
    @staticmethod
440
    def config_parser(arg_lines):
441
442
        for arg in arg_lines:
            yield arg
443
444
445
446
            
    @staticmethod
    def get_status_under_text_format(workflow, detailed=False, display_errors=False, html=False):
        if workflow.start_time: start_time = time.asctime(time.localtime(workflow.start_time))
447
        else: start_time = "-"
448
449
        if workflow.start_time and workflow.end_time: elapsed_time = str(workflow.end_time-workflow.start_time)
        elif workflow.start_time: elapsed_time = str(time.time()-workflow.start_time)
450
        else: elapsed_time = "-"
Jerome Mariette's avatar
Jerome Mariette committed
451
        elapsed_time = "-" if elapsed_time == "-" else str(datetime.timedelta(seconds=int(str(elapsed_time).split(".")[0])))
452
        if workflow.end_time: end_time = time.asctime(time.localtime(workflow.end_time))
453
454
455
        else: end_time = "-"
        if detailed:
            # Global
456
457
            title = "Workflow #" + utils.get_nb_string(workflow.id) + " (" + workflow.name + ") is " + \
                    workflow.get_status() + ", time elapsed: " + str(elapsed_time) + " (from " + start_time + \
458
459
                    " to " + end_time + ")"
            worflow_errors = ""
460
            error = workflow.get_errors()
461
            if error is not None:
Jerome Mariette's avatar
Jerome Mariette committed
462
463
                if html: worflow_errors = "Workflow Error :\n  <span style='color:#ff0000'>" + error["location"] + "\n    " + "\n    ".join(error["msg"]) + "</span>"
                else: worflow_errors = "Workflow Error :\n  \033[91m" + error["location"] + "\n    " + "\n    ".join(error["msg"]) + "\033[0m"
464
465
466
            # By components
            components_errors = ""
            status = "Components Status :\n"
467
468
            for i, component in enumerate(workflow.get_components_nameid()):
                status_info = workflow.get_component_status(component)
469
470
471
472
473
474
475
476
477
478
479
                try: perc_waiting = (status_info["waiting"]*100.0)/status_info["tasks"]
                except: perc_waiting = 0
                try: perc_running = (status_info["running"]*100.0)/status_info["tasks"]
                except: perc_running = 0
                try: perc_failed = (status_info["failed"]*100.0)/status_info["tasks"]
                except: perc_failed = 0
                try: perc_aborted = (status_info["aborted"]*100.0)/status_info["tasks"]
                except: perc_aborted = 0
                try: perc_completed = (status_info["completed"]*100.0)/status_info["tasks"]
                except: perc_completed = 0
                
Jerome Mariette's avatar
Jerome Mariette committed
480
481
482
                if status_info["running"] > 0: 
                    if html: running = "<span style='color:#3b3bff'>running:" + str(status_info["running"]) + "</span>"
                    else: running = "\033[94mrunning:" + str(status_info["running"]) + "\033[0m"
483
                else: running = "running:" + str(status_info["running"])
Jerome Mariette's avatar
Jerome Mariette committed
484
485
486
                if status_info["waiting"] > 0: 
                    if html: waiting = "<span style='color:#ffea00'>waiting:" + str(status_info["waiting"]) + "</span>"
                    else: waiting = "\033[93mwaiting:" + str(status_info["waiting"]) + "\033[0m"
487
                else: waiting = "waiting:" + str(status_info["waiting"])            
Jerome Mariette's avatar
Jerome Mariette committed
488
489
490
                if status_info["failed"] > 0: 
                    if html: failed = "<span style='color:#ff0000'>failed:" + str(status_info["failed"]) + "</span>"
                    else: failed = "\033[91mfailed:" + str(status_info["failed"]) + "\033[0m"
491
                else: failed = "failed:" + str(status_info["failed"])
Jerome Mariette's avatar
Jerome Mariette committed
492
493
494
                if status_info["aborted"] > 0: 
                    if html: aborted = "<span style='color:#ff01ba'>aborted:" + str(status_info["aborted"]) + "</span>"
                    else: aborted = "\033[95maborted:" + str(status_info["aborted"]) + "\033[0m"
495
                else: aborted = "aborted:" + str(status_info["aborted"])
Jerome Mariette's avatar
Jerome Mariette committed
496
497
498
                if status_info["completed"] == status_info["tasks"] and status_info["completed"] > 0: 
                    if html: completed = "<span style='color:#14ac00'>completed:" + str(status_info["completed"]) + "</span>"
                    else: completed = "\033[92mcompleted:" + str(status_info["completed"]) + "\033[0m"
499
500
501
502
503
                else: completed = "completed:" + str(status_info["completed"])
                
                if display_errors and len(status_info["failed_commands"]) > 0:
                    if components_errors == "" :
                        components_errors = "Failed Commands :\n"  
504
                    components_errors += "  - " + component + " :\n    " + "\n    ".join(status_info["failed_commands"]) + "\n"
505
506
507
                status += "  - " + component + ", time elapsed " + time_format(status_info["time"]) + \
                    " (total:" + str(status_info["tasks"]) + ", " + waiting + ", " + running + ", " + failed + \
                    ", " + aborted + ", " + completed + ")"
508
                if i<len(workflow.get_components_nameid())-1: status += "\n"
509
510
511
            # Format str
            pretty_str = title
            pretty_str += ("\n" + worflow_errors) if worflow_errors != "" else ""
512
513
            if len(workflow.get_components_nameid()) > 0:
                pretty_str += ("\n" + status) if status != "" else ""
514
                pretty_str += ("\n" + components_errors[:-1]) if components_errors != "" else ""
Jerome Mariette's avatar
Jerome Mariette committed
515
516
            if html: return pretty_str.replace("\n", "<br />")
            else: return pretty_str
517
        else:
518
519
            pretty_str = utils.get_nb_string(workflow.id) + "\t" + workflow.name + "\t"
            if workflow.get_status() == Workflow.STATUS_STARTED:
Jerome Mariette's avatar
Jerome Mariette committed
520
                pretty_str += "\033[94m"
521
            elif workflow.get_status() == Workflow.STATUS_COMPLETED:
Jerome Mariette's avatar
Jerome Mariette committed
522
                pretty_str += "\033[92m"
523
            elif workflow.get_status() == Workflow.STATUS_FAILED:
Jerome Mariette's avatar
Jerome Mariette committed
524
                pretty_str += "\033[91m"
525
            elif workflow.get_status() == Workflow.STATUS_ABORTED:
Jerome Mariette's avatar
Jerome Mariette committed
526
                pretty_str += "\033[91m"
527
            elif workflow.get_status() == Workflow.STATUS_RESETED:
Jerome Mariette's avatar
Jerome Mariette committed
528
                pretty_str += "\033[3m"
529
            pretty_str += workflow.get_status() + "\033[0m"
Jerome Mariette's avatar
Jerome Mariette committed
530
531
            pretty_str += "\t" + elapsed_time + "\t" + start_time + "\t" + end_time
            return pretty_str
532
    
533
    def get_errors(self):
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
        if os.path.isfile(self.stderr):
            error = {
                "title"     : "",
                "msg"       : list(),
                "traceback" : list()
            }
            line_idx = 0
            FH_stderr = open( self.stderr )
            lines = FH_stderr.readlines()
            while line_idx < len(lines):
                if lines[line_idx].strip().startswith("##"):
                    error["title"]     = lines[line_idx].rstrip()
                    error["msg"]       = list()
                    error["traceback"] = list()
                    # skip all lines before the traceback
                    while not lines[line_idx].startswith("Traceback"):
                        line_idx += 1
                    # skip : "Traceback (most recent call last):"
                    line_idx += 1    
                    while lines[line_idx] != lines[line_idx].lstrip():
                        error["traceback"].append({ 
                                                   "location" : lines[line_idx].strip(),
                                                   "line"     : lines[line_idx].strip()
                        })
                        line_idx += 2
                    # Error message
                    while line_idx < len(lines) and not lines[line_idx].strip().startswith("##"):
                        try:
                            error["msg"].append( lines[line_idx].strip().split(":", 1)[1][1:] )
                        except:
                            error["msg"].append( lines[line_idx].strip() )
                        line_idx += 1
                    line_idx -= 1
                line_idx += 1
            FH_stderr.close()
            last_stack_location = ""
            if len(error["traceback"]) > 0:
                last_stack_location = error["traceback"][-1]["location"].strip()
                self.status = self.STATUS_FAILED
                return { "msg" : error["msg"], "location" : last_stack_location }
            else:
                return None
Frédéric Escudié's avatar
Frédéric Escudié committed
576
577
        else:
            return None
578
                
579
    def get_outputs_per_components(self):
580
581
        outputs_files = {}
        for current_components in self.components:
Philippe Bardou's avatar
Philippe Bardou committed
582
            #status = self.get_component_status(current_components.get_nameid())
583
            outputs_files[current_components.get_nameid()] = current_components.get_output_files()
Philippe Bardou's avatar
Philippe Bardou committed
584
            #outputs_files["0"] = status["completed"]
585
586
        return outputs_files
    
Jerome Mariette's avatar
Jerome Mariette committed
587
588
    def __setstate__(self, state):
        self.__dict__ = state.copy()
589
        self.external_components = self._import_external_components()
Jerome Mariette's avatar
Jerome Mariette committed
590
591
592
593
594
595
596
        threading.Thread.__init__(self, name=self.name)
        
    def __getstate__(self):
        """
        Threading uses Lock Object, do not consider these objects when serializing a workflow
        """
        odict = self.__dict__.copy()
597
        del odict['_started']
598
599
600
601
        if '_tstate_lock' in odict: # python 3.4
            del odict['_tstate_lock']
        else: # python 3.2
            del odict['_block']
602
603
        del odict['_stderr']
        if 'external_components' in odict:
604
            del odict['external_components']
Jerome Mariette's avatar
Jerome Mariette committed
605
606
        return odict
    
607
608
609
610
611
612
613
614
615
616
617
618
619
    def set_to_address(self, to_address):
        self.__to_address = to_address

    def set_subject(self, subject):
        self.__subject = subject

    def set_message(self, message):
        self.__message = message
    
    def _send_email(self):
        
        import smtplib
        from email.mime.text import MIMEText        
620
        smtps, smtpp, froma, fromp, toa, subject, message = self.jflow_config_reader.get_email_options()
621
622
623
624
625
        
        if self.__to_address: toa = self.__to_address
        if self.__subject: subject = self.__subject
        if self.__message: message = self.__message
        
626
        if smtps and smtpp and froma and fromp:
627
628
            if not toa: toa = froma
            if validate_email(froma) and validate_email(toa):
629
630
631
632
633
                try:
                    # Open a plain text file for reading.  For this example, assume that
                    # the text file contains only ASCII characters.
                    # Create a text/plain message
                    if not message:
634
                        message = Workflow.get_status_under_text_format(self, True, True, True)
Jerome Mariette's avatar
Jerome Mariette committed
635
                    msg = MIMEText(message, 'html')
636
637
638
639
640
641
642
643
644
645
                    me = froma
                    you = toa
                    if not subject: subject = "JFlow - Workflow #" + str(self.id) + " is " + self.status
                    msg['Subject'] = subject
                    msg['From'] = me
                    msg['To'] = you
                    # Send the message via our own SMTP server, but don't include the
                    # envelope header.
                    s = smtplib.SMTP(smtps, smtpp)
                    s.ehlo()
Jerome Mariette's avatar
Jerome Mariette committed
646
647
648
649
650
                    # if the SMTP server does not provides TLS or identification
                    try:
                        s.starttls()
                        s.login(me, fromp)
                    except smtplib.SMTPHeloError:
651
                        self._log("The server didn't reply properly to the HELO greeting.", level="debug", traceback=traceback.format_exc(chain=False))
Jerome Mariette's avatar
Jerome Mariette committed
652
                    except smtplib.SMTPAuthenticationError:
653
                        self._log("The server didn't accept the username/password combination.", level="debug", traceback=traceback.format_exc(chain=False))
Jerome Mariette's avatar
Jerome Mariette committed
654
                    except smtplib.SMTPException:
655
                        self._log("No suitable authentication method was found, or the server does not support the STARTTLS extension.", level="debug", traceback=traceback.format_exc(chain=False))
Jerome Mariette's avatar
Jerome Mariette committed
656
                    except RuntimeError:
657
                        self._log("SSL/TLS support is not available to your Python interpreter.", level="debug", traceback=traceback.format_exc(chain=False))
Jerome Mariette's avatar
Jerome Mariette committed
658
                    except:
659
                        self._log("Unhandled error when sending mail.", level="debug", traceback=traceback.format_exc(chain=False))
Jerome Mariette's avatar
Jerome Mariette committed
660
661
662
                    finally:
                        s.sendmail(me, [you], msg.as_string())
                        s.close()
663
                except:
664
                    self._log("Impossible to connect to smtp server '" + smtps + "'", level="debug", traceback=traceback.format_exc(chain=False))
665
    
666
667
668
669
    def get_parameters_per_groups(self):
        name = self.get_name()
        description = self.get_description()
        parameters = self.get_parameters()
670
671
        pgparameters, parameters_order = {}, []
        for param in parameters:
Jerome Mariette's avatar
Jerome Mariette committed
672
            if param.group not in parameters_order: parameters_order.append(param.group)
673
            if param.group in pgparameters:
674
                pgparameters[param.group].append(param)
Jerome Mariette's avatar
Jerome Mariette committed
675
            else:
676
677
                pgparameters[param.group] = [param]
        return [pgparameters, parameters_order]
Jerome Mariette's avatar
Jerome Mariette committed
678
    
679
680
681
    def get_parameters(self):
        params = []
        for param in self.params_order:
682
            for attribute_value in list(self.__dict__.values()):
683
684
685
686
                if (issubclass(attribute_value.__class__, AbstractParameter)) and param == attribute_value.name:
                    params.append(attribute_value)
        return params
    
687
    def get_exec_path(self, software):
688
689
690
691
692
        exec_path = self.jflow_config_reader.get_exec(software)
        if exec_path is None and os.path.isfile(os.path.join(os.path.dirname(inspect.getfile(self.__class__)), "../bin", software)):
            exec_path = os.path.join(os.path.dirname(inspect.getfile(self.__class__)), "../bin", software)
        elif exec_path is None and os.path.isfile(os.path.join(os.path.dirname(inspect.getfile(self.__class__)), "bin", software)):
            exec_path = os.path.join(os.path.dirname(inspect.getfile(self.__class__)), "bin", software)
693
        elif exec_path is None and utils.which(software) == None:
694
            raise Exception("'" + software + "' path connot be retrieved either in the PATH and in the application.properties file!")
695
696
697
        elif exec_path is None and utils.which(software) != None: 
            exec_path = software
        elif exec_path != None and not os.path.isfile(exec_path):
698
            raise Exception("'" + exec_path + "' set for '" + software + "' does not exists, please provide a valid path!")
699
        return exec_path
700
    
Jerome Mariette's avatar
Jerome Mariette committed
701
702
    def add_component(self, component_name, args=[], kwargs={}, component_prefix="default"):
        # first build and check if this component is OK
703
        if component_name in self.internal_components or component_name in self.external_components:
704
            
705
            if component_name in self.internal_components:
Jerome Mariette's avatar
Jerome Mariette committed
706
                my_pckge = __import__(self.internal_components[component_name], globals(), locals(), [component_name])
707
708
709
710
711
712
713
714
715
716
717
718
719
                # build the object and define required field
                cmpt_object = getattr(my_pckge, component_name)()
                cmpt_object.output_directory = self.get_component_output_directory(component_name, component_prefix)
                cmpt_object.prefix = component_prefix
                if kwargs: cmpt_object.define_parameters(**kwargs)
                else: cmpt_object.define_parameters(*args)
            # external components
            else :
                cmpt_object = self.external_components[component_name]()
                cmpt_object.output_directory = self.get_component_output_directory(component_name, component_prefix)
                cmpt_object.prefix = component_prefix
                # can't use positional arguments with external components
                cmpt_object.define_parameters(**kwargs)
720
721
            
            # there is a dynamic component
722
            if cmpt_object.is_dynamic():
723
724
725
726
                self.dynamic_component_present = True
                # if already init, add the component to the list and check if weaver should be executed
                if self.component_nameids_is_init:
                    # add the component
727
                    self.components_to_exec.append(cmpt_object)
728
                    self.components.append(cmpt_object)
729
730
731
732
733
734
735
736
737
                    self._execute_weaver()
                    # update outputs
                    for output in cmpt_object.get_dynamic_outputs():
                        output.update()
                else:
                    if self._component_is_duplicated(cmpt_object):
                        raise ValueError("Component " + cmpt_object.__class__.__name__ + " with prefix " + 
                                            cmpt_object.prefix + " already exist in this pipeline!")
                    self.component_nameids[cmpt_object.get_nameid()] = None
738
                    self.components_to_exec = []
739
                    self.components = []
740
741
742
            else:
                if self.component_nameids_is_init:
                    # add the component
743
                    self.components_to_exec.append(cmpt_object)
744
                    self.components.append(cmpt_object)
745
                elif not self.component_nameids_is_init and not self.dynamic_component_present:
Jerome Mariette's avatar
Jerome Mariette committed
746
747
748
                    if self._component_is_duplicated(cmpt_object):
                        raise ValueError("Component " + cmpt_object.__class__.__name__ + " with prefix " + 
                                            cmpt_object.prefix + " already exist in this pipeline!")
749
                    self.components_to_exec.append(cmpt_object)
750
                    self.components.append(cmpt_object)
751
752
753
754
755
756
                else:
                    if self._component_is_duplicated(cmpt_object):
                        raise ValueError("Component " + cmpt_object.__class__.__name__ + " with prefix " + 
                                            cmpt_object.prefix + " already exist in this pipeline!")
                    self.component_nameids[cmpt_object.get_nameid()] = None

757
758
            return cmpt_object
        else:
759
            raise ImportError(component_name + " component cannot be loaded, available components are: {0}".format(
760
                                           ", ".join(list(self.internal_components.keys()) + list(self.external_components.keys()))))
Jerome Mariette's avatar
Jerome Mariette committed
761
762
763
764
765
766
767
768
    
    def pre_process(self):
        pass
    
    def process(self):
        """ 
        Run the workflow, has to be implemented by subclasses
        """
769
        raise NotImplementedError( "Workflow.process() must be implemented in " + self.__class__.__name__ )
770
771
772

    def get_name(self):
        """ 
773
        Return the workflow name.
774
        """
Jerome Mariette's avatar
Jerome Mariette committed
775
        return self.__class__.__name__.lower()
776
777
778
779
780
    
    def get_description(self):
        """ 
        Return the workflow description, has to be implemented by subclasses
        """
781
        raise NotImplementedError( "Workflow.get_description() must be implemented in " + self.__class__.__name__ )
782
    
783
    def define_parameters(self, function="process"):
784
785
786
        """ 
        Define the workflow parameters, has to be implemented by subclasses
        """
787
        raise NotImplementedError( "Workflow.define_parameters() must be implemented in " + self.__class__.__name__ )
Jerome Mariette's avatar
Jerome Mariette committed
788
789
790
791
792
793
794
795
796
797
798
799
    
    def post_process(self):
        pass
    
    def get_temporary_file(self, suffix=".txt"):
        tempfile_name = os.path.basename(tempfile.NamedTemporaryFile(suffix=suffix).name)
        return os.path.join(self.jflow_config_reader.get_tmp_directory(), tempfile_name)

    def get_component_output_directory(self, component_name, component_prefix):
        return os.path.join(self.directory, component_name + "_" + component_prefix)
    
    def get_components_nameid(self):
800
        return list(self.component_nameids.keys())
Jerome Mariette's avatar
Jerome Mariette committed
801
    
Jerome Mariette's avatar
Jerome Mariette committed
802
803
    def wf_execution_wrapper(self):
        getattr(self, self.function)()
Jerome Mariette's avatar
Jerome Mariette committed
804
    
Jerome Mariette's avatar
Jerome Mariette committed
805
806
807
808
    def run(self):
        """
        Only require for Threading
        """
809
810
811
812
813
814
815
        try:
            # if this is the first time the workflow run
            if self.step == None :
                self.start_time = time.time()
                self.step = 0
                self.status = self.STATUS_STARTED
                self.end_time = None
Jerome Mariette's avatar
Jerome Mariette committed
816
817
                # if some args are provided, let's fill the parameters
                self._set_parameters(self.args)
818
                self._serialize()
819
820
821
822
823
824
825
            # if pre_processing has not been done yet
            if self.step == 0:
                self.pre_process()
                self.step = 1
                self._serialize()
            # if collecting components and running workflow has not been done yet
            if self.step == 1:
826
827
                try:
                    self.reseted_components = []
828
                    self.components = []
Jerome Mariette's avatar
Jerome Mariette committed
829
                    self.status = self.STATUS_STARTED
830
                    self.wf_execution_wrapper()
831
                except SystemExit: 
832
833
834
                    self.status = self.STATUS_FAILED
                    self.end_time = time.time()
                    self._serialize()
835
                    self._send_email()
836
837
838
839
840
841
842
843
844
845
                    raise
                self.component_nameids_is_init = True
                if self.dynamic_component_present:
                    self.step = 2
                else:
                    self._execute_weaver()
                    self.step = 3
                self._serialize() 
            # if the workflow was a dynamic one
            if self.step == 2:
846
847
                try:
                    self.reseted_components = []
848
                    self.components = []
Jerome Mariette's avatar
Jerome Mariette committed
849
                    self.status = self.STATUS_STARTED
850
                    self.wf_execution_wrapper()
851
                except SystemExit: 
852
853
854
                    self.status = self.STATUS_FAILED
                    self.end_time = time.time()
                    self._serialize()
855
                    self._send_email()
856
857
858
                    raise
                if len(self.components_to_exec) > 0:
                    self._execute_weaver()
859
                self.step = 3
860
861
862
863
                self._serialize()
            # if post processing has ne been done yet
            if self.step == 3:
                self.post_process()
864
                if self.status == self.STATUS_STARTED: self.status = self.STATUS_COMPLETED
865
866
                self.end_time = time.time()
                self._serialize()
867
                self._send_email()
868
        except Exception as e:
869
            self._log(str(e), traceback=traceback.format_exc(chain=False))
870
            utils.display_error_message(str(e))
871

Jerome Mariette's avatar
Jerome Mariette committed
872
873
874
875
876
877
878
879
880
881
882
    def _update_status_from_log(self):
        # first update the status from weaver folders
        # TODO update self.end_time
        try:
            working_directory = os.path.join(self.directory, self.WORKING)
            make_states = []
            for wdir in os.listdir(working_directory):
                log_path = os.path.join(working_directory, wdir, self.MAKEFLOW_LOG_FILE_NAME)
                log = MakeflowLog(log_path)
                log.parse()
                make_states.append(log.state)
Jerome Mariette's avatar
Jerome Mariette committed
883
884
885
            if len(self.reseted_components) > 0:
                self.status = self.STATUS_RESETED
            elif self.STATUS_ABORTED in make_states:
Jerome Mariette's avatar
Jerome Mariette committed
886
887
888
889
890
891
892
893
894
895
896
897
                self.status = self.STATUS_ABORTED
            elif self.STATUS_FAILED in make_states:
                self.status = self.STATUS_FAILED
            elif self.status != self.STATUS_COMPLETED:
                self.status = self.STATUS_STARTED
        except: pass
        self._serialize()

    def get_status(self):
        self._update_status_from_log()
        return self.status
    
898
899
900
    def get_resource(self, resource):
        return self.jflow_config_reader.get_resource(resource)
    
Jerome Mariette's avatar
Jerome Mariette committed
901
902
903
904
905
906
907
    def get_component_status(self, component_nameid):
        status = {"time": 0.0,
                  "tasks": 0,
                  "waiting": 0,
                  "running": 0,
                  "failed":0,
                  "aborted": 0,
908
909
                  "completed": 0,
                  "failed_commands": list() }
910
911
912
913
914
915
916
917
        if component_nameid not in self.reseted_components:
            try:
                log = MakeflowLog(self.component_nameids[component_nameid])
                log.parse()
                symbols = set(n.symbol for n in log.nodes if n.symbol)
                if not symbols: return None
                for n in log.nodes:
                    if not n.symbol: continue
Jerome Mariette's avatar
Jerome Mariette committed
918
                    if n.symbol.replace('"', '') == component_nameid:
919
920
921
922
923
924
925
926
927
928
929
930
931
932
                        status["tasks"] += 1
                        status["time"]  += n.elapsed_time
                        if n.state == Node.WAITING:
                            status["waiting"] += 1
                        elif n.state == Node.RUNNING:
                            status["running"] += 1
                        elif n.state == Node.FAILED:
                            status["failed"] += 1
                            status["failed_commands"].append( n.command )
                        elif n.state == Node.ABORTED:
                            status["aborted"] += 1
                        elif n.state == Node.COMPLETED:
                            status["completed"] += 1
            except: pass
Frédéric Escudié's avatar
Frédéric Escudié committed
933