submitting jobs: handling user defined script

[qcg-portal.git] / qcg / service.py

diff --git a/qcg/service.py b/qcg/service.py
index 44cb42e..972592f 100644 (file)
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -10,7 +10,10 @@ from pyqcg.description import JobDescription
 from pyqcg.service import Registry
 from pyqcg.utils import Credential, TimePeriod, JobStatus, TaskStatus
 
+from filex.ftp import FTPOperation
+from qcg.constants import QCG_DATA_URL
 from qcg.models import User, Job, Task, Allocation, NodeInfo
+from qcg.utils import random_id, chunks
 
 
 logger = logging.getLogger(__name__)
@@ -150,20 +153,27 @@ def submit_job(params, proxy):
         desc.set_application(*params['application'])
         desc.stage_in += [params['master_file']]
         desc.arguments.insert(0, os.path.basename(params['master_file']))
+    if params['script']:
+        ftp = FTPOperation(proxy)
+
+        ftp.mkdir(QCG_DATA_URL, parents=True)
+        url = os.path.join(QCG_DATA_URL, 'script.{}.sh'.format(random_id()))
+        ftp.put(url)
+
+        for chunk in chunks(params['script'], 4096):
+            ftp.stream.put(chunk)
+        ftp.stream.put(None)
+
+        ftp.wait()
+        desc.executable = url
     if params['nodes']:
         desc.set_nodes(*params['nodes'])
     if params['reservation']:
         desc.set_reservation(params['reservation'])
     if params['watch_output']:
         desc.set_watch_output(params['watch_output'], params['watch_output_pattern'])
-    # TODO script
     # TODO monitoring
 
-    # for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'):
-    #     print prop, type(getattr(desc, prop)), repr(getattr(desc, prop))
-
-    # print desc.xml_description
-
     job = desc.submit()
 
     return job.job_id