Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6da20083 authored by LETORT Sebastien's avatar LETORT Sebastien Committed by CAMPION Sebastien
Browse files

Tls verify

parent 3981fee9
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ except ImportError:
import requests
log = logging.getLogger('allgo')
__version__ = '0.1.7'
__version__ = '0.1.8'
def local_token():
......@@ -24,6 +24,7 @@ def local_token():
with open(filetoken) as f:
return f.read()
class App:
"""
AllGo app submission object
......@@ -43,14 +44,17 @@ class App:
elif local_token():
self.token = local_token()
else:
raise Exception("You must provide a token in parameter or define an environment variable 'ALLGO_TOKEN'")
err_msg = "You must provide a token in parameter"
err_msg += " or define an environment variable 'ALLGO_TOKEN'"
raise Exception(err_msg)
def run(self, files, outputdir='.', params=''):
def run(self, files, outputdir='.', params='', verify_tls=True):
"""
Submit the job
:param files: input files
:param outputdir: by default current directory
:param params: a string parameters see the application documentation
:param verify_tls: [True] the value is pass to the verify arg of requests.post
:return:
"""
headers = {'Authorization': 'Token token={}'.format(self.token)}
......@@ -58,13 +62,15 @@ class App:
"job[webapp_id]": self.name,
"job[param]": params}
ALLGO_URL = os.environ.get('ALLGO_URL', "https://allgo.inria.fr")
r = requests.post('%s/api/v1/jobs/' % ALLGO_URL, headers=headers, files=files, data=data)
url = '%s/api/v1/jobs' % ALLGO_URL
r = requests.post(url, headers=headers, files=files, data=data, verify=verify_tls)
r.raise_for_status()
r = r.json()
jobid = r['id']
results = None
while True:
r = requests.get('{}/api/v1/jobs/{}'.format(ALLGO_URL, jobid), headers=headers)
url = '{}/api/v1/jobs/{}'.format(ALLGO_URL, jobid)
r = requests.get(url, headers=headers, verify=verify_tls)
r.raise_for_status()
results = r.json()
status = results['status']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment