Mercurial > repos > fubar > brokenandnotdeletablebyowneroradmin

annotate rgToolFactory.py @ 13:7725e4ab27e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adding tests - problem to find the script - needs a fixed string somewhere. Updated readme
author ross lazarus ross.lazarus@gmail.com
date Sun, 03 Jun 2012 22:25:46 +1000
parents d12728e33c3d
children 8594478e8d2c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
1 # rgToolFactory.py
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
2 # derived from
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
3 # rgBaseScriptWrapper.py
10
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
4 # but designed to run arbitrary user supplied code
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
5 # extremely dangerous!!
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
6 # trusted users only - private site only
10
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
7 # a list in the xml is searched for users permitted to run this tool.
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
8 # DO NOT install on a public or important site - local instance only
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
9 # generated tools are fine as they just run normally and their user cannot do anything unusually insecure
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
10 #
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
11 # copyright ross lazarus (ross.lazarus@gmail.com) May 2012
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
12 #
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
13 # all rights reserved
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
14 # Licensed under the LGPL for your pleasure
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
15 # Derived from rgDGE.py in May 2012
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
16 # generalized to run required interpreter
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
17 # to make your own tools based on a given script and interpreter such as perl or python
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
18 # clone this and the corresponding xml wrapper
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
19 # replace the parameters/inputs/outputs and the configfile contents with your script
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
20 # Use the $foo syntax to place your parameter values inside the script to assign them - at run time, the script will be used as a template
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
21 # and returned as part of the output to the user - with the right values for all the parameters.
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
22 # Note that this assumes you want all the outputs arranged as a single Html file output
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
23 # after this generic script runner runs your script with the specified interpreter,
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
24 # it will collect all output files into the specified output_html, making thumbnails for all the pdfs it finds and making links for all the other files.
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
25
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
26 import sys
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
27 import shutil
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
28 import subprocess
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
29 import os
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
30 import time
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
31 import tempfile
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
32 import optparse
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
33 import tarfile
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
34 import re
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
35 import shutil
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
36
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
37 progname = os.path.split(sys.argv[0])[1]
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
38 myversion = 'V000.1 May 2012'
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
39 verbose = False
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
40 debug = False
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
41
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
42
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
43 def timenow():
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
44 """return current time as a string
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
45 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
46 return time.strftime('%d/%m/%Y %H:%M:%S', time.localtime(time.time()))
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
47 # characters that are allowed but need to be escaped
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
48
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
49 class ScriptRunner:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
50 """class is a wrapper for an arbitrary script
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
51 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
52
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
53 def __init__(self,opts=None):
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
54 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
55 run the script
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
56
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
57 """
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
58 if opts.output_dir: # simplify for the tool tarball
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
59 os.chdir(opts.output_dir)
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
60 self.thumbformat = 'jpg'
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
61 self.opts = opts
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
62 self.toolname = re.sub('[^a-zA-Z0-9_]+', '', opts.tool_name)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
63 self.toolid = self.toolname
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
64 s = open(self.opts.script_path,'r').read()
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
65 self.script = s
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
66 self.myname = sys.argv[0] # get our name because we write ourselves out as a tool later
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
67 self.pyfile = self.myname # crude but efficient - the cruft won't hurt much
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
68 self.xmlfile = '%s.xml' % self.toolname
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
69 self.sfile = '%s.%s' % (self.toolname,opts.interpreter)
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
70 if opts.output_dir: # may not want these complexities
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
71 self.tlog = os.path.join(opts.output_dir,"%s_runner.log" % self.toolname)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
72 artifactpath = os.path.join(opts.output_dir,'%s_run.script' % self.toolname)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
73 artifact = open(artifactpath,'w')
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
74 artifact.write(self.script)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
75 artifact.write('\n')
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
76 artifact.close()
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
77 if opts.make_Tool: # need this code and the user script for the tarball
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
78 localscript = open(self.sfile,'w')
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
79 localscript.write(self.script)
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
80 localscript.close()
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
81 shutil.copyfile(self.myname,'%s.py' % self.toolname) # for tool and for user
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
82 self.cl = []
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
83 self.html = []
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
84 a = self.cl.append
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
85 a(opts.interpreter)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
86 a('-') # use stdin
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
87 a(opts.input_tab)
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
88 a(opts.output_tab)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
89 self.outFormats = 'tabular' # TODO make this an option at tool generation time
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
90 self.inputFormats = 'tabular' # TODO make this an option at tool generation time
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
91
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
92
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
93 def makeXML(self):
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
94 """
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
95 Create a Galaxy xml tool wrapper for the new script as a string to write out
13
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
96 fixme - use templating or something less fugly than this.
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
97 Here's an example of what we produce
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
98
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
99 <tool id="reverse" name="reverse" version="0.01">
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
100 <description>a tabular file</description>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
101 <command interpreter="python">
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
102 reverse.py --script_path "$runMe" --interpreter "python"
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
103 --tool_name "reverse" --input_tab "$input1" --output_tab "$tab_file"
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
104 </command>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
105 <inputs>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
106 <param name="input1" type="data" format="tabular" label="Select a suitable input file from your history"/><param name="job_name" type="text" label="Supply a name for the outputs to remind you what they contain" value="reverse"/>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
107
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
108 </inputs>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
109 <outputs>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
110 <data format="tabular" name="tab_file" label="${job_name}"/>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
111
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
112 </outputs>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
113 <help>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
114
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
115 **What it Does**
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
116
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
117 Reverse the columns in a tabular file
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
118
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
119 </help>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
120 <configfiles>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
121 <configfile name="runMe">
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
122
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
123 # reverse order of columns in a tabular file
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
124 import sys
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
125 inp = sys.argv[1]
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
126 outp = sys.argv[2]
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
127 i = open(inp,'r')
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
128 o = open(outp,'w')
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
129 for row in i:
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
130 rs = row.rstrip().split('\t')
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
131 rs.reverse()
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
132 o.write('\t'.join(rs))
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
133 o.write('\n')
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
134 i.close()
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
135 o.close()
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
136
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
137
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
138 </configfile>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
139 </configfiles>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
140 </tool>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
141
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
142 """
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
143 newXML="""<tool id="%(toolid)s" name="%(toolname)s" version="0.01">
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
144 %(tooldesc)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
145 %(command)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
146 <inputs>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
147 %(inputs)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
148 </inputs>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
149 <outputs>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
150 %(outputs)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
151 </outputs>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
152 <help>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
153 %(help)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
154 </help>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
155 <configfiles>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
156 <configfile name="runMe">
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
157 %(script)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
158 </configfile>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
159 </configfiles>
13
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
160 %(tooltests)s
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
161 </tool>""" # needs a dict with toolname, toolid, interpreter, scriptname, command, inputs as a multi line string ready to write, outputs ditto, help ditto
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
162
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
163 newCommand="""<command interpreter="python">
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
164 %(toolname)s.py --script_path "$runMe" --interpreter "%(interpreter)s"
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
165 --tool_name "%(toolname)s" %(command_inputs)s %(command_outputs)s
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
166 </command>""" # may NOT be an input or htmlout
13
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
167 tooltests = """<tests><test>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
168 <param name="input1" value="%s" ftype="%s"/>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
169 <param name="job_name" value="test1"/>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
170 <param name="runMe" value="$runMe"/>
7725e4ab27e1 Adding tests - problem to find the script - needs a fixed string somewhere.
ross lazarus ross.lazarus@gmail.com
parents: 12
diff changeset
171 </test><tests>"""
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
172 xdict = {}
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
173 xdict['script'] = self.script # configfile is least painful way to embed script to avoid external dependencies
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
174 if self.opts.help_text:
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
175 xdict['help'] = open(self.opts.help_text,'r').read()
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
176 else:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
177 xdict['help'] = 'Please ask the tool author for help as none was supplied at tool generation'
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
178 if self.opts.tool_desc:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
179 xdict['tooldesc'] = '<description>%s</description>' % self.opts.tool_desc
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
180 else:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
181 xdict['tooldesc'] = ''
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
182 xdict['command_outputs'] = ''
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
183 xdict['outputs'] = ''
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
184 if self.opts.input_tab <> 'None':
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
185 xdict['command_inputs'] = '--input_tab "$input1"'
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
186 xdict['inputs'] = '<param name="input1" type="data" format="%s" label="Select a suitable input file from your history"/>' % self.inputFormats
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
187 else:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
188 xdict['command_inputs'] = '' # assume no input - eg a random data generator
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
189 xdict['inputs'] = ''
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
190 xdict['inputs'] += '<param name="job_name" type="text" label="Supply a name for the outputs to remind you what they contain" value="%s"/>\n' % self.toolname
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
191 xdict['toolname'] = self.toolname
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
192 xdict['toolid'] = self.toolid
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
193 xdict['interpreter'] = self.opts.interpreter
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
194 xdict['scriptname'] = self.sfile
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
195 if self.opts.make_HTML:
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
196 xdict['command_outputs'] += '--output_dir "$html_file.files_path" --output_html "$html_file" --make_HTML "yes"'
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
197 xdict['outputs'] += '<data format="html" name="html_file" label="${job_name}.html"/>\n'
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
198 if self.opts.output_tab <> 'None':
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
199 xdict['command_outputs'] += '--output_tab "$tab_file"'
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
200 xdict['outputs'] += '<data format="%s" name="tab_file" label="${job_name}"/>\n' % self.outFormats
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
201 xdict['command'] = newCommand % xdict
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
202 xmls = newXML % xdict
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
203 xf = open(self.xmlfile,'w')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
204 xf.write(xmls)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
205 xf.write('\n')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
206 xf.close()
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
207 # ready for the tarball
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
208
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
209
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
210 def makeTooltar(self):
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
211 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
212 a tool is a gz tarball with eg
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
213 /toolname/tool.xml /toolname/tool.py /toolname/test-data/test1_in.foo ...
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
214 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
215 retval = self.run()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
216 if retval:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
217 print >> sys.stderr,'## Run failed. Cannot build yet. Please fix and retry'
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
218 sys.exit(1)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
219 self.makeXML()
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
220 tdir = self.toolname
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
221 os.mkdir(tdir)
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
222 if self.opts.input_tab <> 'None': # we may have test data?
10
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
223 testdir = os.path.join(tdir,'test-data')
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
224 os.mkdir(testdir) # make tests directory
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
225 shutil.copyfile(self.opts.input_tab,os.path.join(testdir,'test1_in.tab'))
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
226 if self.opts.output_tab <> 'None':
10
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
227 shutil.copyfile(self.opts.output_tab,os.path.join(testdir,'test1_out.tab'))
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
228 if self.opts.make_HTML:
71f2ac0eee95 Updated tarball with some test material - still need code generated...
ross lazarus ross.lazarus@gmail.com
parents: 9
diff changeset
229 shutil.copyfile(self.opts.output_html,os.path.join(testdir,'test1_out.html'))
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
230 if self.opts.output_dir:
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
231 shutil.copyfile(self.tlog,os.path.join(testdir,'test1_out.log'))
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
232 shutil.copyfile(self.xmlfile,os.path.join(tdir,self.xmlfile))
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
233 shutil.copyfile(self.pyfile,os.path.join(tdir,'%s.py' % self.toolname))
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
234 shutil.copyfile(self.sfile,os.path.join(tdir,self.sfile))
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
235 tarpath = "%s.gz" % self.toolname
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
236 tar = tarfile.open(tarpath, "w:gz")
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
237 tar.add(tdir,arcname=self.toolname)
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
238 tar.close()
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
239 shutil.copy(tarpath,self.opts.new_tool)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
240 shutil.rmtree(tdir)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
241 ## TODO: replace with optional direct upload to local toolshed?
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
242 return retval
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
243
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
244 def compressPDF(self,inpdf=None,thumbformat='png'):
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
245 """need absolute path to pdf
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
246 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
247 assert os.path.isfile(inpdf), "## Input %s supplied to %s compressPDF not found" % (inpdf,self.myName)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
248 hf,hlog = tempfile.mkstemp(suffix="%s.log" % self.toolname)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
249 sto = open(hlog,'w')
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
250 outpdf = '%s_compressed' % inpdf
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
251 cl = ["gs", "-sDEVICE=pdfwrite", "-dNOPAUSE", "-dBATCH", "-sOutputFile=%s" % outpdf,inpdf]
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
252 x = subprocess.Popen(cl,stdout=sto,stderr=sto,cwd=self.opts.output_dir)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
253 retval1 = x.wait()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
254 if retval1 == 0:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
255 os.unlink(inpdf)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
256 shutil.move(outpdf,inpdf)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
257 outpng = '%s.%s' % (os.path.splitext(inpdf)[0],thumbformat)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
258 cl2 = ['convert', inpdf, outpng]
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
259 x = subprocess.Popen(cl2,stdout=sto,stderr=sto,cwd=self.opts.output_dir)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
260 retval2 = x.wait()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
261 sto.close()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
262 retval = retval1 or retval2
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
263 return retval
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
264
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
265
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
266 def getfSize(self,fpath,outpath):
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
267 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
268 format a nice file size string
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
269 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
270 size = ''
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
271 fp = os.path.join(outpath,fpath)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
272 if os.path.isfile(fp):
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
273 n = float(os.path.getsize(fp))
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
274 if n > 2**20:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
275 size = ' (%1.1f MB)' % (n/2**20)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
276 elif n > 2**10:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
277 size = ' (%1.1f KB)' % (n/2**10)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
278 elif n > 0:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
279 size = ' (%d B)' % (int(n))
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
280 return size
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
281
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
282 def makeHtml(self):
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
283 """ Create an HTML file content to list all the artefacts found in the output_dir
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
284 """
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
285
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
286 galhtmlprefix = """<?xml version="1.0" encoding="utf-8" ?>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
287 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
288 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
289 <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
290 <meta name="generator" content="Galaxy %s tool output - see http://g2.trac.bx.psu.edu/" />
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
291 <title></title>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
292 <link rel="stylesheet" href="/static/style/base.css" type="text/css" />
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
293 </head>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
294 <body>
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
295 <div class="document">
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
296 """
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
297 galhtmlattr = """<hr/><b><a href="http://rgenetics.org">Galaxy Tool Factory Script Wrapper</a> tool output %s run at %s</b><br/>"""
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
298 galhtmlpostfix = """</div></body></html>\n"""
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
299
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
300 flist = os.listdir(self.opts.output_dir)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
301 flist = [x for x in flist if x <> 'Rplots.pdf']
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
302 flist.sort()
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
303 html = [galhtmlprefix % progname,]
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
304 html.append('<h2>Galaxy %s outputs run at %s</h2><br/>\n' % (self.toolname,timenow()))
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
305 fhtml = []
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
306 if len(flist) > 0:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
307 html.append('<table cellpadding="3" cellspacing="3">\n')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
308 for fname in flist:
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
309 dname,e = os.path.splitext(fname)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
310 sfsize = self.getfSize(fname,self.opts.output_dir)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
311 if e.lower() == '.pdf' : # compress and make a thumbnail
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
312 thumb = '%s.%s' % (dname,self.thumbformat)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
313 pdff = os.path.join(self.opts.output_dir,fname)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
314 retval = self.compressPDF(inpdf=pdff,thumbformat=self.thumbformat)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
315 if retval == 0:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
316 s= '<tr><td><a href="%s"><img src="%s" title="Click to download a PDF of %s" hspace="10" width="600"></a></td></tr>\n' % (fname,thumb,fname)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
317 html.append(s)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
318 fhtml.append('<li><a href="%s">%s %s</a></li>' % (fname,fname,sfsize))
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
319 else:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
320 fhtml.append('<li><a href="%s">%s %s</a></li>' % (fname,fname,sfsize))
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
321 html.append('</table>\n')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
322 if len(fhtml) > 0:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
323 fhtml.insert(0,'<ul>')
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
324 fhtml.append('</ul><br/>')
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
325 html += fhtml # add all non-pdf files to the end of the display
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
326 else:
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
327 html.append('<h2>### Error - %s returned no files - please confirm that parameters are sane</h1>' % self.opts.interpreter)
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
328 html.append('<h3>%s log follows below</h3><hr/><pre><br/>\n' % self.opts.interpreter)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
329 rlog = open(self.tlog,'r').readlines()
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
330 html += rlog
9
e09c76551bed Can run without input or output or either..
ross lazarus ross.lazarus@gmail.com
parents: 8
diff changeset
331 html.append('<br/>%s CL = %s<br/>\n' % (self.toolname,' '.join(sys.argv)))
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
332 html.append('</pre>\n')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
333 html.append(galhtmlattr % (progname,timenow()))
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
334 html.append(galhtmlpostfix)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
335 htmlf = file(self.opts.output_html,'w')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
336 htmlf.write('\n'.join(html))
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
337 htmlf.write('\n')
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
338 htmlf.close()
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
339 self.html = html
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
340
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
341
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
342 def run(self):
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
343 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
344 """
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
345 if self.opts.output_dir:
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
346 sto = open(self.tlog,'w')
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
347 p = subprocess.Popen(' '.join(self.cl),shell=True,stdout=sto,stderr=sto,stdin=subprocess.PIPE,cwd=self.opts.output_dir)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
348 else:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
349 p = subprocess.Popen(' '.join(self.cl),shell=True,stdin=subprocess.PIPE)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
350 p.stdin.write(self.script)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
351 p.stdin.close()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
352 retval = p.wait()
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
353 if self.opts.output_dir:
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
354 sto.close()
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
355 if self.opts.make_HTML:
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
356 self.makeHtml()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
357 return retval
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
358
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
359
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
360 def main():
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
361 u = """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
362 This is a Galaxy wrapper. It expects to be called by a special purpose tool.xml as:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
363 <command interpreter="python">rgBaseScriptWrapper.py --script_path "$scriptPath" --tool_name "foo" --interpreter "Rscript"
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
364 </command>
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
365 """
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
366 op = optparse.OptionParser()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
367 a = op.add_option
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
368 a('--script_path',default=None)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
369 a('--tool_name',default=None)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
370 a('--interpreter',default=None)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
371 a('--output_dir',default=None)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
372 a('--output_html',default=None)
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
373 a('--input_tab',default="None")
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
374 a('--output_tab',default="None")
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
375 a('--user_email',default=None)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
376 a('--bad_user',default=None)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
377 a('--make_Tool',default=None)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
378 a('--make_HTML',default=None)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
379 a('--help_text',default=None)
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
380 a('--tool_desc',default=None)
12
d12728e33c3d Changed to deliver a gz file - requires a new datatypes_conf.xml entry:
ross lazarus ross.lazarus@gmail.com
parents: 10
diff changeset
381 a('--new_tool',default=None)
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
382 opts, args = op.parse_args()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
383 assert not opts.bad_user,'%s is NOT authorized to use this tool. Please ask your friendly admin' % opts.bad_user
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
384 assert opts.tool_name,'## Tool Factory expects a tool name - eg --tool_name=DESeq'
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
385 assert opts.interpreter,'## Tool Factory wrapper expects an interpreter - eg --interpreter=Rscript'
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
386 assert os.path.isfile(opts.script_path),'## Tool Factory wrapper expects a script path - eg --script_path=foo.R'
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
387 if opts.output_dir:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
388 try:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
389 os.makedirs(opts.output_dir)
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
390 except:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
391 pass
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
392 r = ScriptRunner(opts)
8
220885b2d7ee End to end test works. Add tests next
ross lazarus ross.lazarus@gmail.com
parents: 7
diff changeset
393 if opts.make_Tool:
7
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
394 retcode = r.makeTooltar()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
395 else:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
396 retcode = r.run()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
397 if retcode:
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
398 sys.exit(retcode) # indicate failure to job runner
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
399
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
400
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
401 if __name__ == "__main__":
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
402 main()
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
403
7221619caefa Updated name and added crude gzip generator for toolshed
ross lazarus ross.lazarus@gmail.com
parents:
diff changeset
404