Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 41 additions & 19 deletions mglib/mglib.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import base64
import json
import string
import time
import random
import hashlib
import subprocess
Expand Down Expand Up @@ -176,6 +177,7 @@ def async_rest_api(url, auth=None, data=None, debug=False, delay=60):

# POST file to MG-RAST or Shock
def post_file(url, keyname, filename, data={}, auth=None, debug=False):

if debug:
print("post_file", url)
data[keyname] = (filename, open(filename, 'rb'))
Expand All @@ -187,27 +189,47 @@ def post_file(url, keyname, filename, data={}, auth=None, debug=False):
print("data:\t"+repr(data))
print("header:\t"+repr(header))
print("url:\t"+url)
try:
res = requests.post(url, data=datagen, headers=header, stream=True)
except HTTPError as error:

success = False
sleep = 60
maxt = 3
counter = 0
obj = None

# try maxt times
while not success and counter < maxt :
try:
eobj = json.loads(error.read())
if 'ERROR' in eobj:
sys.stderr.write("ERROR (%s): %s\n" %(error.code, eobj['ERROR']))
elif 'error' in eobj:
sys.stderr.write("ERROR (%s): %s\n" %(error.code, eobj['error'][0]))
except:
res = requests.post(url, data=datagen, headers=header, stream=True)
except HTTPError as error:
try:
eobj = json.loads(error.read())
if 'ERROR' in eobj:
sys.stderr.write("ERROR (%s): %s\n" %(error.code, eobj['ERROR']))
elif 'error' in eobj:
sys.stderr.write("ERROR (%s): %s\n" %(error.code, eobj['error'][0]))
except:
sys.stderr.write("ERROR (%s): %s\n" %(error.code, error.read()))
finally:
# sys.exit(1)
return None
except OSError as error:
sys.stderr.write("ERROR with post_file\n")
sys.stderr.write("ERROR (%s): %s\n" %(error.code, error.read()))
finally:
sys.exit(1)
if not res:
sys.stderr.write("ERROR: no results returned\n")
sys.exit(1)
obj = json.loads(res.content.decode("utf8"))
if debug:
print(json.dumps(obj))
if obj is None:
sys.stderr.write("ERROR: return structure not valid json format\n")
if not res:
sys.stderr.write("ERROR: no results returned for %s\n"% (filename))
# sys.exit(1)
else:
obj = json.loads(res.content.decode("utf8"))
if debug:
print(json.dumps(obj))
if obj is None:
sys.stderr.write("ERROR: return structure not valid json format\n")
else:
success = True
# increase counter
if not success :
counter += 1
time.sleep(counter * sleep)
return(obj)

# safe handling of stdout for piping
Expand Down
2 changes: 1 addition & 1 deletion scripts/mg-display-statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def main(args):
token = get_auth_token(opts)

# build call url
url = opts.url+'/metagenome/'+opts.id+'?verbosity=stats'
url = opts.url+'/metagenome/'+opts.id+'?verbosity=stats&public=1'

# retrieve / output data
result = obj_from_url(url, auth=token)
Expand Down
6 changes: 5 additions & 1 deletion scripts/mg-project.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"""

synch_pause = 900
valid_actions = ["get-info", "get-metadata", "update-metadata", "make-public", "submit-ebi", "status-ebi"]
valid_actions = ["get-info", "get-metadata", "update-metadata", "make-public", "submit-ebi", "status-ebi" , "move-metagenomes"]


def main(args):
Expand Down Expand Up @@ -116,6 +116,10 @@ def main(args):
elif action == "status-ebi":
data = obj_from_url(opts.url+'/submission/'+pid, auth=token)
print(json.dumps(data, sort_keys=True, indent=4))
elif action == "move-metagenoes":
next ;
data = obj_from_url(opts.url+'/submission/'+pid, auth=token)
print(json.dumps(data, sort_keys=True, indent=4))

return 0

Expand Down
Loading