X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=89ddfa40168b19c904fa532b840b06c97867d1b7;hb=0b053edee9793cef21c62b3ccb379eb304a22ccd;hp=53491cc724fad93ffe3e53e587d8c135aba24ae0;hpb=1547dbc536b4848a93ce0a39493c0c69b853c576;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 53491cc..89ddfa4 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -1,22 +1,29 @@
 # coding=utf-8
 from datetime import datetime, timedelta
+
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import SuspiciousOperation
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, QueryDict
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import render, get_object_or_404, redirect
+from django.utils.html import format_html
 from django.utils.http import urlencode
 from django.utils.timezone import UTC
+from django.views.decorators.http import require_POST
 from django_openid_auth.views import make_consumer
 from openid.extensions import ax
-from pyqcg import QCG
-from pyqcg.description import JobDescription
-from pyqcg.utils import Credential
+from pyqcg.utils.qcg_types import PyqcgException
 
+from filex.forms import HostPathNameForm, RenameForm, ArchiveForm, HostPathForm
+from filex.ftp import FTPOperation, FTPError
+from filex.views import make_url
 from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
-from qcg.utils import update_user_data, paginator_context
+from qcg.utils import paginator_context
+from qcg.service import update_user_data, submit_job, update_job, cancel
 
 
 def index(request):
@@ -56,8 +63,7 @@ def parse_date(string):
 
 @login_required
 def jobs_list(request):
-    # QCG.start()
-    # update_user_data(request.user, request.session['proxy'])
+    update_user_data(request.user, request.session['proxy'])
 
     tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
         .select_related('job').prefetch_related('allocations__nodes')
@@ -139,6 +145,8 @@ def jobs_list(request):
 def job_details(request, job_id):
     job = get_object_or_404(request.user.jobs.prefetch_related('tasks'), job_id=job_id)
 
+    update_job(job, request.session['proxy'])
+
     return render(request, 'qcg/job.html', {'job': job})
 
 
@@ -147,45 +155,29 @@ def task_details(request, job_id, task_id):
     task = get_object_or_404(request.user.tasks.select_related('job').prefetch_related('allocations'),
                              job__job_id=job_id, task_id=task_id)
 
+    update_job(task.job, request.session['proxy'])
+
     return render(request, 'qcg/task.html', {'task': task})
 
 
 @login_required
-def job_new(request):
+def job_submit(request):
     if request.method == 'POST':
-        QCG.start()
-
         form = JobDescriptionForm(request.POST)
         env_formset = EnvFormSet(request.POST)
 
         if form.is_valid() and env_formset.is_valid():
-            print form.cleaned_data
-
-            desc = JobDescription(Credential(request.session['proxy']))
-
-            direct_map = ('arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs', 'wall_time', 'memory',
-                          'memory_per_slot', 'modules', 'native', 'notify', 'preprocess', 'postprocess', 'persistent')
+            params = form.cleaned_data
+            params['env_variables'] = [(env['name'], env['value'])
+                                       for env in env_formset.cleaned_data if env and not env['DELETE']]
 
-            for name in direct_map:
-                if form.cleaned_data[name]:
-                    setattr(desc, name, form.cleaned_data[name])
+            job_id = submit_job(params, request.session['proxy'])
 
-            desc.set_application(*form.cleaned_data['application'])
-            desc.set_nodes(*form.cleaned_data['nodes'])
-            desc.set_reservation(form.cleaned_data['reservation'])
-            desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern'])
-            desc.env_variables += [(env['name'], env['value']) for env in env_formset.cleaned_data if not env['DELETE']]
-            # TODO script
-            # TODO executable
-            # TODO input
-            # TODO stage_in
-            # TODO stage_out
-            # TODO monitoring
+            messages.success(request,
+                             format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                         'Zlecono zadanie <em>{}</em>.', job_id))
 
-            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
+            return redirect('jobs')
 
         print repr(form.errors)
         print repr(env_formset.errors)
@@ -195,4 +187,54 @@ def job_new(request):
 
     errors = form.errors or (env_formset.is_bound and not env_formset.is_valid)
 
-    return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors})
+    return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors})
+
+
+@require_POST
+@login_required
+def job_cancel(request, job_id):
+    return obj_cancel(request, get_object_or_404(request.user.jobs, job_id=job_id))
+
+
+@require_POST
+@login_required
+def task_cancel(request, job_id, task_id):
+    return obj_cancel(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id))
+
+
+def obj_cancel(request, obj):
+    try:
+        cancel(obj, request.session['proxy'])
+    except PyqcgException as e:
+        messages.error(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}',
+                                            e.message))
+    else:
+        messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                              'Zadanie anulowano.'))
+
+    return redirect(obj)
+
+
+@login_required
+def gridftp(request):
+    return render(request, 'qcg/gridftp.html',
+                  {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()})
+
+
+@login_required
+def gridftp_upload(request):
+    form = HostPathForm(request.GET)
+
+    if not form.is_valid():
+        raise SuspiciousOperation('Invalid parameters for `gridftp_upload`!')
+
+    error = None
+    try:
+        FTPOperation(request.session['proxy']).info(make_url(form.cleaned_data, 'path'))
+    except FTPError as e:
+        error = e.message
+
+    return render(request, 'qcg/gridftp_upload.html',
+                  {'error': error, 'url': reverse('filex:upload') + '?' + urlencode(form.cleaned_data),
+                   'host': form.cleaned_data['host'], 'path': form.cleaned_data['path'],
+                   'sep': '/' if form.cleaned_data['path'].startswith('~') else ''})