annotate toolfactory/rgToolFactory2.py @ 79:2d0272e730d1 draft

Uploaded
author fubar
date Tue, 17 Nov 2020 06:21:07 +0000
parents 89aca6c67405
children f423a77bc669
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
1
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
2 # rgToolFactory.py
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
3 # see https://github.com/fubar2/toolfactory
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
4 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
5 # copyright ross lazarus (ross stop lazarus at gmail stop com) May 2012
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
6 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
7 # all rights reserved
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
8 # Licensed under the LGPL
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
9 # suggestions for improvement and bug fixes welcome at
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
10 # https://github.com/fubar2/toolfactory
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
11 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
12 # July 2020: BCC was fun and I feel like rip van winkle after 5 years.
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
13 # Decided to
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
14 # 1. Fix the toolfactory so it works - done for simplest case
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
15 # 2. Fix planemo so the toolfactory function works
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
16 # 3. Rewrite bits using galaxyxml functions where that makes sense - done
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
17 #
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
18 # removed all the old complications including making the new tool use this same script
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
19 # galaxyxml now generates the tool xml https://github.com/hexylena/galaxyxml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
20 # No support for automatic HTML file creation from arbitrary outputs
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
21 # essential problem is to create two command lines - one for the tool xml and a different
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
22 # one to run the executable with the supplied test data and settings
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
23 # Be simpler to write the tool, then run it with planemo and soak up the test outputs.
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
24
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
25
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
26 import argparse
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
27 import datetime
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
28 import json
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
29 import logging
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
30 import os
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
31 import re
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
32 import shutil
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
33 import subprocess
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
34 import sys
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
35 import tarfile
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
36 import tempfile
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
37 import time
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
38
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
39
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
40 from bioblend import toolshed
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
41
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
42 import galaxyxml.tool as gxt
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
43 import galaxyxml.tool.parameters as gxtp
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
44
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
45 import lxml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
46
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
47 import yaml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
49 myversion = "V2.1 July 2020"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
50 verbose = True
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
51 debug = True
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
52 toolFactoryURL = "https://github.com/fubar2/toolfactory"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
53 ourdelim = "~~~"
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
54 ALOT = 10000000 # srsly. command or test overrides use read() so just in case
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
55 STDIOXML = """<stdio>
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
56 <exit_code range="100:" level="debug" description="shite happens" />
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
57 </stdio>"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
58
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
59 # --input_files="$input_files~~~$CL~~~$input_formats~~~$input_label
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
60 # ~~~$input_help"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
61 IPATHPOS = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
62 ICLPOS = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
63 IFMTPOS = 2
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
64 ILABPOS = 3
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
65 IHELPOS = 4
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
66 IOCLPOS = 5
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
67
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
68 # --output_files "$otab.history_name~~~$otab.history_format~~~$otab.CL~~~otab.history_test
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
69 ONAMEPOS = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
70 OFMTPOS = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
71 OCLPOS = 2
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
72 OTESTPOS = 3
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
73 OOCLPOS = 4
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
74
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
75
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
76 # --additional_parameters="$i.param_name~~~$i.param_value~~~
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
77 # $i.param_label~~~$i.param_help~~~$i.param_type~~~$i.CL~~~i$.param_CLoverride"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
78 ANAMEPOS = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
79 AVALPOS = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
80 ALABPOS = 2
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
81 AHELPPOS = 3
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
82 ATYPEPOS = 4
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
83 ACLPOS = 5
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
84 AOVERPOS = 6
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
85 AOCLPOS = 7
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
86
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
87
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
88 foo = len(lxml.__version__)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
89 # fug you, flake8. Say my name!
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
90 FAKEEXE = "~~~REMOVE~~~ME~~~"
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
91 # need this until a PR/version bump to fix galaxyxml prepending the exe even
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
92 # with override.
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
93
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
94
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
95 def timenow():
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
96 """return current time as a string"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
97 return time.strftime("%d/%m/%Y %H:%M:%S", time.localtime(time.time()))
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
98
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
99
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
100 def quote_non_numeric(s):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
101 """return a prequoted string for non-numerics
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
102 useful for perl and Rscript parameter passing?
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
103 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
104 try:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
105 _ = float(s)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
106 return s
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
107 except ValueError:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
108 return '"%s"' % s
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
109
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
110
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
111 html_escape_table = {"&": "&amp;", ">": "&gt;", "<": "&lt;", "$": r"\$"}
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
112
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
113
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
114 def html_escape(text):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
115 """Produce entities within text."""
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
116 return "".join(html_escape_table.get(c, c) for c in text)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
117
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
118
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
119 def html_unescape(text):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
120 """Revert entities within text. Multiple character targets so use replace"""
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
121 t = text.replace("&amp;", "&")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
122 t = t.replace("&gt;", ">")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
123 t = t.replace("&lt;", "<")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
124 t = t.replace("\\$", "$")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
125 return t
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
126
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
127
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
128 def parse_citations(citations_text):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
129 """"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
130 citations = [c for c in citations_text.split("**ENTRY**") if c.strip()]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
131 citation_tuples = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
132 for citation in citations:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
133 if citation.startswith("doi"):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
134 citation_tuples.append(("doi", citation[len("doi") :].strip()))
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
135 else:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
136 citation_tuples.append(("bibtex", citation[len("bibtex") :].strip()))
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
137 return citation_tuples
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
138
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
139
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
140 class ScriptRunner:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
141 """Wrapper for an arbitrary script
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
142 uses galaxyxml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
143
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
144 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
145
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
146 def __init__(self, args=None):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
147 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
148 prepare command line cl for running the tool here
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
149 and prepare elements needed for galaxyxml tool generation
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
150 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
151 self.infiles = [x.split(ourdelim) for x in args.input_files]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
152 self.outfiles = [x.split(ourdelim) for x in args.output_files]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
153 self.addpar = [x.split(ourdelim) for x in args.additional_parameters]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
154 self.args = args
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
155 self.cleanuppar()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
156 self.lastclredirect = None
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
157 self.lastxclredirect = None
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
158 self.cl = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
159 self.xmlcl = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
160 self.is_positional = self.args.parampass == "positional"
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
161 if self.args.sysexe:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
162 self.executeme = self.args.sysexe
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
163 else:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
164 if self.args.packages:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
165 self.executeme = self.args.packages.split(",")[0].split(":")[0]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
166 else:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
167 self.executeme = None
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
168 aCL = self.cl.append
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
169 aXCL = self.xmlcl.append
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
170 assert args.parampass in [
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
171 "0",
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
172 "argparse",
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
173 "positional",
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
174 ], 'args.parampass must be "0","positional" or "argparse"'
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
175 self.tool_name = re.sub("[^a-zA-Z0-9_]+", "", args.tool_name)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
176 self.tool_id = self.tool_name
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
177 self.newtool = gxt.Tool(
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
178 self.args.tool_name,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
179 self.tool_id,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
180 self.args.tool_version,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
181 self.args.tool_desc,
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
182 FAKEEXE,
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
183 )
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
184 self.newtarpath = "toolfactory_%s.tgz" % self.tool_name
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
185 self.tooloutdir = "tfout"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
186 self.repdir = "TF_run_report_tempdir"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
187 self.testdir = os.path.join(self.tooloutdir, "test-data")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
188 if not os.path.exists(self.tooloutdir):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
189 os.mkdir(self.tooloutdir)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
190 if not os.path.exists(self.testdir):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
191 os.mkdir(self.testdir) # make tests directory
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
192 if not os.path.exists(self.repdir):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
193 os.mkdir(self.repdir)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
194 self.tinputs = gxtp.Inputs()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
195 self.toutputs = gxtp.Outputs()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
196 self.testparam = []
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
197 if self.args.script_path:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
198 self.prepScript()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
199 if self.args.command_override:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
200 scos = open(self.args.command_override, "r").readlines()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
201 self.command_override = [x.rstrip() for x in scos]
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
202 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
203 self.command_override = None
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
204 if self.args.test_override:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
205 stos = open(self.args.test_override, "r").readlines()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
206 self.test_override = [x.rstrip() for x in stos]
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
207 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
208 self.test_override = None
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
209 if self.args.cl_prefix: # DIY CL start
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
210 clp = self.args.cl_prefix.split(" ")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
211 for c in clp:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
212 aCL(c)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
213 aXCL(c)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
214 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
215 if self.args.script_path:
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
216 aCL(self.executeme)
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
217 aCL(self.sfile)
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
218 aXCL(self.executeme)
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
219 aXCL("$runme")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
220 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
221 aCL(self.executeme) # this little CL will just run
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
222 aXCL(self.executeme)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
223 self.elog = os.path.join(self.repdir, "%s_error_log.txt" % self.tool_name)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
224 self.tlog = os.path.join(self.repdir, "%s_runner_log.txt" % self.tool_name)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
225
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
226 if self.args.parampass == "0":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
227 self.clsimple()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
228 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
229 clsuffix = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
230 xclsuffix = []
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
231 for i, p in enumerate(self.infiles):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
232 if p[IOCLPOS] == "STDIN":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
233 appendme = [
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
234 p[IOCLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
235 p[ICLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
236 p[IPATHPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
237 "< %s" % p[IPATHPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
238 ]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
239 xappendme = [
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
240 p[IOCLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
241 p[ICLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
242 p[IPATHPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
243 "< $%s" % p[ICLPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
244 ]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
245 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
246 appendme = [p[IOCLPOS], p[ICLPOS], p[IPATHPOS], ""]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
247 xappendme = [p[IOCLPOS], p[ICLPOS], "$%s" % p[ICLPOS], ""]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
248 clsuffix.append(appendme)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
249 xclsuffix.append(xappendme)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
250 for i, p in enumerate(self.outfiles):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
251 if p[OOCLPOS] == "STDOUT":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
252 self.lastclredirect = [">", p[ONAMEPOS]]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
253 self.lastxclredirect = [">", "$%s" % p[OCLPOS]]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
254 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
255 clsuffix.append([p[OOCLPOS], p[OCLPOS], p[ONAMEPOS], ""])
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
256 xclsuffix.append([p[OOCLPOS], p[OCLPOS], "$%s" % p[ONAMEPOS], ""])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
257 for p in self.addpar:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
258 clsuffix.append([p[AOCLPOS], p[ACLPOS], p[AVALPOS], p[AOVERPOS]])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
259 xclsuffix.append(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
260 [p[AOCLPOS], p[ACLPOS], '"$%s"' % p[ANAMEPOS], p[AOVERPOS]]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
261 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
262 clsuffix.sort()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
263 xclsuffix.sort()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
264 self.xclsuffix = xclsuffix
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
265 self.clsuffix = clsuffix
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
266 if self.args.parampass == "positional":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
267 self.clpositional()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
268 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
269 self.clargparse()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
270
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
271 def prepScript(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
272 rx = open(self.args.script_path, "r").readlines()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
273 rx = [x.rstrip() for x in rx]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
274 rxcheck = [x.strip() for x in rx if x.strip() > ""]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
275 assert len(rxcheck) > 0, "Supplied script is empty. Cannot run"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
276 self.script = "\n".join(rx)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
277 fhandle, self.sfile = tempfile.mkstemp(
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
278 prefix=self.tool_name, suffix="_%s" % (self.executeme)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
279 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
280 tscript = open(self.sfile, "w")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
281 tscript.write(self.script)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
282 tscript.close()
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
283 self.indentedScript = " %s" % "\n".join([" %s" % html_escape(x) for x in rx])
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
284 self.escapedScript = "%s" % "\n".join([" %s" % html_escape(x) for x in rx])
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
285 art = "%s.%s" % (self.tool_name, self.executeme)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
286 artifact = open(art, "wb")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
287 artifact.write(bytes(self.script, "utf8"))
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
288 artifact.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
289
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
290 def cleanuppar(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
291 """ positional parameters are complicated by their numeric ordinal"""
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
292 for i, p in enumerate(self.infiles):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
293 if self.args.parampass == "positional":
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
294 assert p[
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
295 ICLPOS
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
296 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
297 p[ICLPOS],
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
298 p[ILABPOS],
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
299 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
300 p.append(p[ICLPOS])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
301 if p[ICLPOS].isdigit() or self.args.parampass == "0":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
302 scl = "input%d" % (i + 1)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
303 p[ICLPOS] = scl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
304 self.infiles[i] = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
305 for i, p in enumerate(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
306 self.outfiles
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
307 ): # trying to automagically gather using extensions
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
308 if self.args.parampass == "positional" and p[OCLPOS] != "STDOUT":
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
309 assert p[
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
310 OCLPOS
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
311 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
312 p[OCLPOS],
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
313 p[ONAMEPOS],
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
314 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
315 p.append(p[OCLPOS])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
316 if p[OCLPOS].isdigit() or p[OCLPOS] == "STDOUT":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
317 scl = p[ONAMEPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
318 p[OCLPOS] = scl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
319 self.outfiles[i] = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
320 for i, p in enumerate(self.addpar):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
321 if self.args.parampass == "positional":
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
322 assert p[
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
323 ACLPOS
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
324 ].isdigit(), "Positional parameters must be ordinal integers - got %s for %s" % (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
325 p[ACLPOS],
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
326 p[ANAMEPOS],
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
327 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
328 p.append(p[ACLPOS])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
329 if p[ACLPOS].isdigit():
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
330 scl = "input%s" % p[ACLPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
331 p[ACLPOS] = scl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
332 self.addpar[i] = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
333
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
334 def clsimple(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
335 """no parameters - uses < and > for i/o"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
336 aCL = self.cl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
337 aXCL = self.xmlcl.append
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
338
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
339 if len(self.infiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
340 aCL("<")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
341 aCL(self.infiles[0][IPATHPOS])
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
342 aXCL("<")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
343 aXCL("$%s" % self.infiles[0][ICLPOS])
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
344 if len(self.outfiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
345 aCL(">")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
346 aCL(self.outfiles[0][OCLPOS])
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
347 aXCL(">")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
348 aXCL("$%s" % self.outfiles[0][ONAMEPOS])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
349
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
350 def clpositional(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
351 # inputs in order then params
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
352 aCL = self.cl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
353 for (o_v, k, v, koverride) in self.clsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
354 if " " in v:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
355 aCL("%s" % v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
356 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
357 aCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
358 aXCL = self.xmlcl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
359 for (o_v, k, v, koverride) in self.xclsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
360 aXCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
361 if self.lastxclredirect:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
362 aXCL(self.lastxclredirect[0])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
363 aXCL(self.lastxclredirect[1])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
364
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
365 def clargparse(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
366 """argparse style"""
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
367 aCL = self.cl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
368 aXCL = self.xmlcl.append
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
369 # inputs then params in argparse named form
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
370 for (o_v, k, v, koverride) in self.xclsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
371 if koverride > "":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
372 k = koverride
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
373 elif len(k.strip()) == 1:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
374 k = "-%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
375 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
376 k = "--%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
377 aXCL(k)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
378 aXCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
379 for (o_v, k, v, koverride) in self.clsuffix:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
380 if koverride > "":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
381 k = koverride
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
382 elif len(k.strip()) == 1:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
383 k = "-%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
384 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
385 k = "--%s" % k
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
386 aCL(k)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
387 aCL(v)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
388
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
389 def getNdash(self, newname):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
390 if self.is_positional:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
391 ndash = 0
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
392 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
393 ndash = 2
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
394 if len(newname) < 2:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
395 ndash = 1
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
396 return ndash
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
397
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
398 def doXMLparam(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
399 """flake8 made me do this..."""
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
400 for p in self.outfiles:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
401 newname, newfmt, newcl, test, oldcl = p
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
402 ndash = self.getNdash(newcl)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
403 aparm = gxtp.OutputData(newcl, format=newfmt, num_dashes=ndash)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
404 aparm.positional = self.is_positional
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
405 if self.is_positional:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
406 if oldcl == "STDOUT":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
407 aparm.positional = 9999999
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
408 aparm.command_line_override = "> $%s" % newcl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
409 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
410 aparm.positional = int(oldcl)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
411 aparm.command_line_override = "$%s" % newcl
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
412 self.toutputs.append(aparm)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
413 usetest = None
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
414 ld = None
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
415 if test > "":
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
416 if test.startswith("diff"):
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
417 usetest = "diff"
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
418 if test.split(":")[1].isdigit:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
419 ld = int(test.split(":")[1])
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
420 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
421 usetest = test
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
422 tp = gxtp.TestOutput(
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
423 name=newcl,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
424 value="%s_sample" % newcl,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
425 format=newfmt,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
426 compare=usetest,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
427 lines_diff=ld,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
428 delta=None,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
429 )
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
430 self.testparam.append(tp)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
431 for p in self.infiles:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
432 newname = p[ICLPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
433 newfmt = p[IFMTPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
434 ndash = self.getNdash(newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
435 if not len(p[ILABPOS]) > 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
436 alab = p[ICLPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
437 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
438 alab = p[ILABPOS]
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
439 aninput = gxtp.DataParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
440 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
441 optional=False,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
442 label=alab,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
443 help=p[IHELPOS],
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
444 format=newfmt,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
445 multiple=False,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
446 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
447 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
448 aninput.positional = self.is_positional
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
449 self.tinputs.append(aninput)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
450 tparm = gxtp.TestParam(name=newname, value="%s_sample" % newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
451 self.testparam.append(tparm)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
452 for p in self.addpar:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
453 newname, newval, newlabel, newhelp, newtype, newcl, override, oldcl = p
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
454 if not len(newlabel) > 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
455 newlabel = newname
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
456 ndash = self.getNdash(newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
457 if newtype == "text":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
458 aparm = gxtp.TextParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
459 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
460 label=newlabel,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
461 help=newhelp,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
462 value=newval,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
463 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
464 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
465 elif newtype == "integer":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
466 aparm = gxtp.IntegerParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
467 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
468 label=newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
469 help=newhelp,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
470 value=newval,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
471 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
472 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
473 elif newtype == "float":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
474 aparm = gxtp.FloatParam(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
475 newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
476 label=newname,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
477 help=newhelp,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
478 value=newval,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
479 num_dashes=ndash,
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
480 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
481 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
482 raise ValueError(
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
483 'Unrecognised parameter type "%s" for\
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
484 additional parameter %s in makeXML'
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
485 % (newtype, newname)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
486 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
487 aparm.positional = self.is_positional
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
488 if self.is_positional:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
489 aparm.positional = int(oldcl)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
490 self.tinputs.append(aparm)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
491 tparm = gxtp.TestParam(newname, value=newval)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
492 self.testparam.append(tparm)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
493
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
494 def doNoXMLparam(self):
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
495 """filter style package - stdin to stdout"""
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
496 if len(self.infiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
497 alab = self.infiles[0][ILABPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
498 if len(alab) == 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
499 alab = self.infiles[0][ICLPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
500 max1s = (
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
501 "Maximum one input if parampass is 0 but multiple input files supplied - %s"
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
502 % str(self.infiles)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
503 )
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
504 assert len(self.infiles) == 1, max1s
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
505 newname = self.infiles[0][ICLPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
506 aninput = gxtp.DataParam(
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
507 newname,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
508 optional=False,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
509 label=alab,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
510 help=self.infiles[0][IHELPOS],
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
511 format=self.infiles[0][IFMTPOS],
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
512 multiple=False,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
513 num_dashes=0,
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
514 )
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
515 aninput.command_line_override = "< $%s" % newname
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
516 aninput.positional = self.is_positional
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
517 self.tinputs.append(aninput)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
518 tp = gxtp.TestParam(name=newname, value="%s_sample" % newname)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
519 self.testparam.append(tp)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
520 if len(self.outfiles) > 0:
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
521 newname = self.outfiles[0][OCLPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
522 newfmt = self.outfiles[0][OFMTPOS]
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
523 anout = gxtp.OutputData(newname, format=newfmt, num_dashes=0)
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
524 anout.command_line_override = "> $%s" % newname
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
525 anout.positional = self.is_positional
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
526 self.toutputs.append(anout)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
527 tp = gxtp.TestOutput(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
528 name=newname, value="%s_sample" % newname, format=newfmt
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
529 )
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
530 self.testparam.append(tp)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
531
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
532 def makeXML(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
533 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
534 Create a Galaxy xml tool wrapper for the new script
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
535 Uses galaxyhtml
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
536 Hmmm. How to get the command line into correct order...
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
537 """
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
538 if self.command_override:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
539 self.newtool.command_override = self.command_override # config file
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
540 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
541 self.newtool.command_override = self.xmlcl
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
542 if self.args.help_text:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
543 helptext = open(self.args.help_text, "r").readlines()
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
544 safertext = [html_escape(x) for x in helptext]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
545 if False and self.args.script_path:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
546 scrp = self.script.split("\n")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
547 scrpt = [" %s" % x for x in scrp] # try to stop templating
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
548 scrpt.insert(0, "```\n")
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
549 if len(scrpt) > 300:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
550 safertext = (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
551 safertext + scrpt[:100] + \
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
552 [">500 lines - stuff deleted", "......"] + scrpt[-100:]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
553 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
554 else:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
555 safertext = safertext + scrpt
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
556 safertext.append("\n```")
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
557 self.newtool.help = "\n".join([x for x in safertext])
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
558 else:
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
559 self.newtool.help = (
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
560 "Please ask the tool author (%s) for help \
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
561 as none was supplied at tool generation\n"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
562 % (self.args.user_email)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
563 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
564 self.newtool.version_command = None # do not want
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
565 requirements = gxtp.Requirements()
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
566 if self.args.packages:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
567 for d in self.args.packages.split(","):
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
568 if ":" in d:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
569 packg, ver = d.split(":")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
570 else:
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
571 packg = d
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
572 ver = ""
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
573 requirements.append(
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
574 gxtp.Requirement("package", packg.strip(), ver.strip())
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
575 )
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
576 self.newtool.requirements = requirements
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
577 if self.args.parampass == "0":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
578 self.doNoXMLparam()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
579 else:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
580 self.doXMLparam()
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
581 self.newtool.outputs = self.toutputs
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
582 self.newtool.inputs = self.tinputs
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
583 if self.args.script_path:
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
584 configfiles = gxtp.Configfiles()
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
585 configfiles.append(gxtp.Configfile(name="runme", text=self.script))
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
586 self.newtool.configfiles = configfiles
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
587 tests = gxtp.Tests()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
588 test_a = gxtp.Test()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
589 for tp in self.testparam:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
590 test_a.append(tp)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
591 tests.append(test_a)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
592 self.newtool.tests = tests
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
593 self.newtool.add_comment(
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
594 "Created by %s at %s using the Galaxy Tool Factory."
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
595 % (self.args.user_email, timenow())
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
596 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
597 self.newtool.add_comment("Source in git at: %s" % (toolFactoryURL))
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
598 self.newtool.add_comment(
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
599 "Cite: Creating re-usable tools from scripts doi: \
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
600 10.1093/bioinformatics/bts573"
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
601 )
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
602 exml0 = self.newtool.export()
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
603 exml = exml0.replace(FAKEEXE, "") # temporary work around until PR accepted
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
604 if (
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
605 self.test_override
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
606 ): # cannot do this inside galaxyxml as it expects lxml objects for tests
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
607 part1 = exml.split("<tests>")[0]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
608 part2 = exml.split("</tests>")[1]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
609 fixed = "%s\n%s\n%s" % (part1, self.test_override, part2)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
610 exml = fixed
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
611 exml = exml.replace('range="1:"', 'range="1000:"')
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
612 xf = open("%s.xml" % self.tool_name, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
613 xf.write(exml)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
614 xf.write("\n")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
615 xf.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
616 # ready for the tarball
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
617
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
618 def run(self):
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
619 """
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
620 generate test outputs by running a command line
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
621 won't work if command or test override in play - planemo is the
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
622 easiest way to generate test outputs for that case so is
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
623 automagically selected
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
624 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
625 scl = " ".join(self.cl)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
626 err = None
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
627 if self.args.parampass != "0":
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
628 if os.path.exists(self.elog):
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
629 ste = open(self.elog, "a")
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
630 else:
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
631 ste = open(self.elog, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
632 if self.lastclredirect:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
633 sto = open(self.lastclredirect[1], "wb") # is name of an output file
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
634 else:
56
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
635 if os.path.exists(self.tlog):
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
636 sto = open(self.tlog, "a")
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
637 else:
68fbdbe35f08 Uploaded
fubar
parents: 51
diff changeset
638 sto = open(self.tlog, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
639 sto.write(
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
640 "## Executing Toolfactory generated command line = %s\n" % scl
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
641 )
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
642 sto.flush()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
643 p = subprocess.run(self.cl, shell=False, stdout=sto, stderr=ste)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
644 sto.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
645 ste.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
646 retval = p.returncode
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
647 else: # work around special case - stdin and write to stdout
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
648 if len(self.infiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
649 sti = open(self.infiles[0][IPATHPOS], "rb")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
650 else:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
651 sti = sys.stdin
62
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
652 if len(self.outfiles) > 0:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
653 sto = open(self.outfiles[0][ONAMEPOS], "wb")
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
654 else:
881bd8c81ac9 Uploaded
fubar
parents: 57
diff changeset
655 sto = sys.stdout
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
656 p = subprocess.run(self.cl, shell=False, stdout=sto, stdin=sti)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
657 sto.write("## Executing Toolfactory generated command line = %s\n" % scl)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
658 retval = p.returncode
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
659 sto.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
660 sti.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
661 if os.path.isfile(self.tlog) and os.stat(self.tlog).st_size == 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
662 os.unlink(self.tlog)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
663 if os.path.isfile(self.elog) and os.stat(self.elog).st_size == 0:
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
664 os.unlink(self.elog)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
665 if retval != 0 and err: # problem
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
666 sys.stderr.write(err)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
667 logging.debug("run done")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
668 return retval
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
669
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
670 def shedLoad(self):
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
671 """
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
672 {'deleted': False,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
673 'description': 'Tools for manipulating data',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
674 'id': '175812cd7caaf439',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
675 'model_class': 'Category',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
676 'name': 'Text Manipulation',
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
677 'url': '/api/categories/175812cd7caaf439'}]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
678
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
679
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
680 """
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
681 if os.path.exists(self.tlog):
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
682 sto = open(self.tlog, "a")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
683 else:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
684 sto = open(self.tlog, "w")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
685
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
686 ts = toolshed.ToolShedInstance(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
687 url=self.args.toolshed_url, key=self.args.toolshed_api_key, verify=False
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
688 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
689 repos = ts.repositories.get_repositories()
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
690 rnames = [x.get("name", "?") for x in repos]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
691 rids = [x.get("id", "?") for x in repos]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
692 sto.write(f"############names={rnames} rids={rids}")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
693 cat = "ToolFactory generated tools"
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
694 if self.args.tool_name not in rnames:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
695 tscat = ts.categories.get_categories()
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
696 cnames = [x.get("name", "?") for x in tscat]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
697 cids = [x.get("id", "?") for x in tscat]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
698 catID = None
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
699 if cat in cnames:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
700 ci = cnames.index(cat)
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
701 catID = cids[ci]
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
702 res = ts.repositories.create_repository(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
703 name=self.args.tool_name,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
704 synopsis="Synopsis:%s" % self.args.tool_desc,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
705 description=self.args.tool_desc,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
706 type="unrestricted",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
707 remote_repository_url=self.args.toolshed_url,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
708 homepage_url=None,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
709 category_ids=catID,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
710 )
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
711 tid = res.get("id", None)
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
712 sto.write(f"##########create res={res}")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
713 else:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
714 i = rnames.index(self.args.tool_name)
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
715 tid = rids[i]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
716 res = ts.repositories.update_repository(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
717 id=tid, tar_ball_path=self.newtarpath, commit_message=None
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
718 )
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
719 sto.write(f"#####update res={res}")
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
720 sto.close()
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
721
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
722 def eph_galaxy_load(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
723 """load the new tool from the local toolshed after planemo uploads it"""
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
724 if os.path.exists(self.tlog):
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
725 tout = open(self.tlog, "a")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
726 else:
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
727 tout = open(self.tlog, "w")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
728 cll = [
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
729 "shed-tools",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
730 "install",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
731 "-g",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
732 self.args.galaxy_url,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
733 "--latest",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
734 "-a",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
735 self.args.galaxy_api_key,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
736 "--name",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
737 self.args.tool_name,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
738 "--owner",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
739 "fubar",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
740 "--toolshed",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
741 self.args.toolshed_url,
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
742 "--section_label",
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
743 "ToolFactory",
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
744 ]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
745 tout.write("running\n%s\n" % " ".join(cll))
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
746 p = subprocess.run(cll, shell=False, stderr=tout, stdout=tout)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
747 tout.write(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
748 "installed %s - got retcode %d\n" % (self.args.tool_name, p.returncode)
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
749 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
750 tout.close()
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
751 return p.returncode
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
752
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
753 def planemo_shedload(self):
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
754 """
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
755 planemo shed_create --shed_target testtoolshed
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
756 planemo shed_init --name=<name>
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
757 --owner=<shed_username>
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
758 --description=<short description>
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
759 [--remote_repository_url=<URL to .shed.yml on github>]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
760 [--homepage_url=<Homepage for tool.>]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
761 [--long_description=<long description>]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
762 [--category=<category name>]*
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
763
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
764
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
765 planemo shed_update --check_diff --shed_target testtoolshed
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
766 """
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
767 if os.path.exists(self.tlog):
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
768 tout = open(self.tlog, "a")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
769 else:
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
770 tout = open(self.tlog, "w")
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
771 ts = toolshed.ToolShedInstance(
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
772 url=self.args.toolshed_url, key=self.args.toolshed_api_key, verify=False
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
773 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
774 repos = ts.repositories.get_repositories()
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
775 rnames = [x.get("name", "?") for x in repos]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
776 rids = [x.get("id", "?") for x in repos]
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
777 tout.write(f"############names={rnames} rids={rids}")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
778 #cat = "ToolFactory generated tools"
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
779 if self.args.tool_name not in rnames:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
780 cll = [
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
781 "planemo",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
782 "shed_create",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
783 "--shed_target",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
784 "local",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
785 "--owner",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
786 "fubar",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
787 "--name",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
788 self.args.tool_name,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
789 "--shed_key",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
790 self.args.toolshed_api_key,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
791 ]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
792 try:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
793 p = subprocess.run(
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
794 cll, shell=False, cwd=self.tooloutdir, stdout=tout, stderr=tout
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
795 )
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
796 except:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
797 pass
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
798 if p.returncode != 0:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
799 tout.write("Repository %s exists" % self.args.tool_name)
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
800 else:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
801 tout.write("initiated %s" % self.args.tool_name)
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
802 cll = [
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
803 "planemo",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
804 "shed_upload",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
805 "--shed_target",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
806 "local",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
807 "--owner",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
808 "fubar",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
809 "--name",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
810 self.args.tool_name,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
811 "--shed_key",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
812 self.args.toolshed_api_key,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
813 "--tar",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
814 self.newtarpath,
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
815 ]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
816 p = subprocess.run(cll, shell=False, stdout=tout, stderr=tout)
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
817 tout.write("Ran %s got %d" % (" ".join(cll), p.returncode))
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
818 tout.close()
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
819 return p.returncode
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
820
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
821 def eph_test(self, genoutputs=True):
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
822 """problem getting jobid - ephemeris upload is the job before the one we want - but depends on how many inputs
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
823 """
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
824 if os.path.exists(self.tlog):
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
825 tout = open(self.tlog, "a")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
826 else:
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
827 tout = open(self.tlog, "w")
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
828 cll = [
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
829 "shed-tools",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
830 "test",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
831 "-g",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
832 self.args.galaxy_url,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
833 "-a",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
834 self.args.galaxy_api_key,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
835 "--name",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
836 self.args.tool_name,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
837 "--owner",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
838 "fubar",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
839 ]
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
840 if genoutputs:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
841 dummy, tfile = tempfile.mkstemp()
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
842 p = subprocess.run(
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
843 cll, shell=False, stderr=dummy, stdout=dummy
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
844 )
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
845
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
846 with open('tool_test_output.json','rb') as f:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
847 s = json.loads(f.read())
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
848 print('read %s' % s)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
849 cl = s['tests'][0]['data']['job']['command_line'].split()
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
850 n = cl.index('--script_path')
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
851 jobdir = cl[n+1]
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
852 jobdir = jobdir.replace('"','')
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
853 jobdir = jobdir.split('/configs')[0]
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
854 print('jobdir=%s' % jobdir)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
855
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
856 #"/home/ross/galthrow/database/jobs_directory/000/649/configs/tmptfxu51gs\"
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
857 src = os.path.join(jobdir,'working',self.newtarpath)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
858 if os.path.exists(src):
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
859 dest = os.path.join(self.testdir, self.newtarpath)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
860 shutil.copyfile(src, dest)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
861 else:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
862 tout.write('No toolshed archive found after first ephemeris test - not a good sign')
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
863 ephouts = os.path.join(jobdir,'working','tfout','test-data')
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
864 with os.scandir(ephouts) as outs:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
865 for entry in outs:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
866 if not entry.is_file():
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
867 continue
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
868 dest = os.path.join(self.tooloutdir, entry.name)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
869 src = os.path.join(ephouts, entry.name)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
870 shutil.copyfile(src, dest)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
871 else:
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
872 p = subprocess.run(
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
873 cll, shell=False, stderr=tout, stdout=tout)
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
874 tout.write("eph_test Ran %s got %d" % (" ".join(cll), p.returncode))
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
875 tout.close()
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
876 return p.returncode
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
877
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
878 def planemo_test(self, genoutputs=True):
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
879 """planemo is a requirement so is available for testing
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
880 and for generating test outputs if command or test overrides are supplied
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
881 test outputs are sent to repdir for display
67
2cb06a59d84b Uploaded
fubar
parents: 66
diff changeset
882 planemo test --engine docker_galaxy --database_type docker_postgres --galaxy_root /galaxy-central pyrevpos/pyrevpos.xml
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
883 """
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
884 xreal = "%s.xml" % self.tool_name
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
885 tool_test_path = os.path.join(self.repdir,f"{self.tool_name}_planemo_test_report.html")
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
886 if os.path.exists(self.tlog):
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
887 tout = open(self.tlog, "a")
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
888 else:
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
889 tout = open(self.tlog, "w")
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
890 if genoutputs:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
891 dummy, tfile = tempfile.mkstemp()
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
892 cll = [
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
893 "planemo",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
894 "test",
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
895 "--test_output_xunit",os.path.join(self.repdir,f"{self.tool_name}_xunit.xml")
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
896 "--test_data", os.path.abspath(self.testdir),
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
897 "--test_output", os.path.abspath(tool_test_path),
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
898 "--galaxy_root",
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
899 self.args.galaxy_root,
74
3d4324df911b Uploaded
fubar
parents: 72
diff changeset
900 "--update_test_data",
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
901 os.path.abspath(xreal),
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
902 ]
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
903 p = subprocess.run(
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
904 cll,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
905 shell=False,
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
906 cwd=self.tooloutdir,
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
907 stderr=tout,
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
908 stdout=tout,
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
909 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
910 else:
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
911 cll = [
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
912 "planemo",
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
913 "test",
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
914 "--test_data", self.testdir,
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
915 "--test_output", tool_test_path,
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
916 "--galaxy_root",
74
3d4324df911b Uploaded
fubar
parents: 72
diff changeset
917 self.args.galaxy_root,
78
89aca6c67405 Uploaded
fubar
parents: 76
diff changeset
918 os.path.abspath(xreal),
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
919 ]
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
920 p = subprocess.run(
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
921 cll, shell=False, cwd=self.tooloutdir, stderr=tout, stdout=tout
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
922 )
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
923 tout.close()
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
924 return p.returncode
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
925
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
926 def writeShedyml(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
927 """for planemo"""
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
928 yuser = self.args.user_email.split("@")[0]
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
929 yfname = os.path.join(self.tooloutdir, ".shed.yml")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
930 yamlf = open(yfname, "w")
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
931 odict = {
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
932 "name": self.tool_name,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
933 "owner": yuser,
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
934 "type": "unrestricted",
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
935 "description": self.args.tool_desc,
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
936 "synopsis": self.args.tool_desc,
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
937 "category": "TF Generated Tools",
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
938 }
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
939 yaml.dump(odict, yamlf, allow_unicode=True)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
940 yamlf.close()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
941
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
942 def makeTool(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
943 """write xmls and input samples into place"""
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
944 self.makeXML()
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
945 if self.args.script_path:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
946 stname = os.path.join(self.tooloutdir, "%s" % (self.sfile))
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
947 if not os.path.exists(stname):
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
948 shutil.copyfile(self.sfile, stname)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
949 xreal = "%s.xml" % self.tool_name
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
950 xout = os.path.join(self.tooloutdir, xreal)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
951 shutil.copyfile(xreal, xout)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
952 for p in self.infiles:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
953 pth = p[IPATHPOS]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
954 dest = os.path.join(self.testdir, "%s_sample" % p[ICLPOS])
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
955 shutil.copyfile(pth, dest)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
956 dest = os.path.join(self.repdir, "%s.%s" % (p[ICLPOS], p[IFMTPOS]))
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
957 shutil.copyfile(pth, dest)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
958
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
959 def makeToolTar(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
960 """move outputs into test-data and prepare the tarball"""
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
961 excludeme = "tool_test_output"
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
962
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
963 def exclude_function(tarinfo):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
964 filename = tarinfo.name
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
965 return (
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
966 None
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
967 if filename.startswith(excludeme) or \
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
968 os.path.splitext(filename)[1].startswith(excludeme)
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
969 else tarinfo
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
970 )
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
971
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
972 for p in self.outfiles:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
973 src = p[ONAMEPOS]
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
974 if os.path.isfile(src):
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
975 dest = os.path.join(self.testdir, "%s_sample" % src)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
976 shutil.copyfile(src, dest)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
977 dest = os.path.join(self.repdir, "%s.%s" % (src, p[OFMTPOS]))
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
978 shutil.copyfile(src, dest)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
979 else:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
980 print(
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
981 "### problem - output file %s not found in tooloutdir %s"
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
982 % (src, self.tooloutdir)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
983 )
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
984 tf = tarfile.open(self.newtarpath, "w:gz")
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
985 tf.add(name=self.tooloutdir, arcname=self.tool_name, filter=exclude_function)
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
986 tf.close()
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
987 shutil.copyfile(self.newtarpath, self.args.new_tool)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
988
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
989 def moveRunOutputs(self):
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
990 """need to move planemo or run outputs into toolfactory collection"""
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
991 with os.scandir(self.tooloutdir) as outs:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
992 for entry in outs:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
993 if not entry.is_file() or entry.name.startswith("."):
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
994 continue
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
995 if "." in entry.name:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
996 nayme, ext = os.path.splitext(entry.name)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
997 else:
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
998 ext = ".txt"
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
999 ofn = "%s%s" % (entry.name.replace(".", "_"), ext)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1000 dest = os.path.join(self.repdir, ofn)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1001 src = os.path.join(self.tooloutdir, entry.name)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1002 shutil.copyfile(src, dest)
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1003
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1004
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1005
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1006 def main():
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1007 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1008 This is a Galaxy wrapper. It expects to be called by a special purpose tool.xml as:
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1009 <command interpreter="python">rgBaseScriptWrapper.py --script_path "$scriptPath"
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1010 --tool_name "foo" --interpreter "Rscript"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1011 </command>
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1012 """
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1013 parser = argparse.ArgumentParser()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1014 a = parser.add_argument
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1015 a("--script_path", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1016 a("--history_test", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1017 a("--cl_prefix", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1018 a("--sysexe", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1019 a("--packages", default=None)
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1020 a("--tool_name", default="newtool")
72
a8764cda9dbf Uploaded
fubar
parents: 69
diff changeset
1021 a("--tool_dir", default=None)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1022 a("--input_files", default=[], action="append")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1023 a("--output_files", default=[], action="append")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1024 a("--user_email", default="Unknown")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1025 a("--bad_user", default=None)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1026 a("--make_Tool", default="runonly")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1027 a("--help_text", default=None)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1028 a("--tool_desc", default=None)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1029 a("--tool_version", default=None)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1030 a("--citations", default=None)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1031 a("--command_override", default=None)
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1032 a("--test_override", default=None)
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1033 a("--additional_parameters", action="append", default=[])
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1034 a("--edit_additional_parameters", action="store_true", default=False)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1035 a("--parampass", default="positional")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1036 a("--tfout", default="./tfout")
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1037 a("--new_tool", default="new_tool")
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1038 a("--galaxy_url", default="http://localhost:8080")
75
25dd9364a32a Uploaded
fubar
parents: 74
diff changeset
1039 a(
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1040 "--toolshed_url", default="http://localhost:9009")
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1041 # make sure this is identical to tool_sheds_conf.xml localhost != 127.0.0.1 so validation fails
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
1042 a("--toolshed_api_key", default="fakekey")
50
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1043 a("--galaxy_api_key", default="fakekey")
bf432f4486c7 Uploaded
fubar
parents: 49
diff changeset
1044 a("--galaxy_root", default="/galaxy-central")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1045 args = parser.parse_args()
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1046 assert not args.bad_user, (
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1047 'UNAUTHORISED: %s is NOT authorized to use this tool until Galaxy admin adds %s to "admin_users" in the Galaxy configuration file'
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1048 % (args.bad_user, args.bad_user)
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1049 )
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1050 assert args.tool_name, "## Tool Factory expects a tool name - eg --tool_name=DESeq"
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1051 assert (
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1052 args.sysexe or args.packages
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1053 ), "## Tool Factory wrapper expects an interpreter or an executable package"
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1054 args.input_files = [x.replace('"', "").replace("'", "") for x in args.input_files]
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1055 # remove quotes we need to deal with spaces in CL params
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1056 for i, x in enumerate(args.additional_parameters):
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1057 args.additional_parameters[i] = args.additional_parameters[i].replace('"', "")
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1058 r = ScriptRunner(args)
49
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1059 r.writeShedyml()
35a912ce0c83 Can now make the bwa example from planemo :)
fubar
parents: 48
diff changeset
1060 r.makeTool()
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1061 if args.make_Tool == "generate":
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1062 retcode = r.run()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1063 r.moveRunOutputs()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1064 r.makeToolTar()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1065 else:
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1066 retcode = r.planemo_test(genoutputs=True) # this fails :( - see PR
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1067 r.moveRunOutputs()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1068 r.makeToolTar()
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1069 retcode = r.planemo_test(genoutputs=False)
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1070 r.moveRunOutputs()
76
46db8143adb7 Uploaded
fubar
parents: 75
diff changeset
1071 print(f"second planemo_test returned {retcode}")
66
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1072 if args.make_Tool == "gentestinstall":
bc1977b1f7b5 Uploaded
fubar
parents: 65
diff changeset
1073 r.eph_galaxy_load()
63
b3254219d4fb Uploaded
fubar
parents: 62
diff changeset
1074
48
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1075
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1076 if __name__ == "__main__":
5a7a5b06bce0 Uploaded
fubar
parents:
diff changeset
1077 main()