projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6203: Use faster =~ instead of match.
[arvados.git]
/
sdk
/
python
/
arvados
/
__init__.py
diff --git
a/sdk/python/arvados/__init__.py
b/sdk/python/arvados/__init__.py
index 19a7ad84390dcf0b0b35aa6c3ff3e6b9f7a48790..1df64703a9577d7338f60f5dd944b1c72d854064 100644
(file)
--- a/
sdk/python/arvados/__init__.py
+++ b/
sdk/python/arvados/__init__.py
@@
-18,11
+18,11
@@
import fcntl
import time
import threading
import time
import threading
-from
api import *
-from collection import
*
+from
.api import api, http_cache
+from collection import
CollectionReader, CollectionWriter, ResumableCollectionWriter
from keep import *
from stream import *
from keep import *
from stream import *
-from arvfile import
*
+from arvfile import
StreamFileReader
import errors
import util
import errors
import util
@@
-83,11
+83,15
@@
class JobTask(object):
class job_setup:
@staticmethod
class job_setup:
@staticmethod
- def one_task_per_input_file(if_sequence=0, and_end_task=True, input_as_path=False):
+ def one_task_per_input_file(if_sequence=0, and_end_task=True, input_as_path=False
, api_client=None
):
if if_sequence != current_task()['sequence']:
return
if if_sequence != current_task()['sequence']:
return
+
+ if not api_client:
+ api_client = api('v1')
+
job_input = current_job()['script_parameters']['input']
job_input = current_job()['script_parameters']['input']
- cr = CollectionReader(job_input)
+ cr = CollectionReader(job_input
, api_client=api_client
)
cr.normalize()
for s in cr.all_streams():
for f in s.all_files():
cr.normalize()
for s in cr.all_streams():
for f in s.all_files():
@@
-103,9
+107,9
@@
class job_setup:
'input':task_input
}
}
'input':task_input
}
}
- api
('v1')
.job_tasks().create(body=new_task_attrs).execute()
+ api
_client
.job_tasks().create(body=new_task_attrs).execute()
if and_end_task:
if and_end_task:
- api
('v1')
.job_tasks().update(uuid=current_task()['uuid'],
+ api
_client
.job_tasks().update(uuid=current_task()['uuid'],
body={'success':True}
).execute()
exit(0)
body={'success':True}
).execute()
exit(0)