X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=4a6cf34228f45b2780da64ffb833fae6916e7cf1;hb=a9693981d3d981362ee0098270f765afb6153724;hp=a1986adf387e11fdc3545662ac6468baad70f9ac;hpb=0be92069d46130aad675fa715184e9c209140ce9;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index a1986ad..4a6cf34 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -13,17 +13,29 @@ 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.utils 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 paginator_context -from qcg.service import update_user_data, submit_job +from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet, JobTemplateForm +from qcg.models import JobTemplate +from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted, cached_resources +from qcg import service +from django.utils import encoding +import string +import random +import os +from qcg import constants +from qcg.utils import chunks, generate_md_inputfile +# for Debugging +from pprint import pprint + def index(request): return render(request, 'qcg/base.html') @@ -59,9 +71,9 @@ def parse_date(string): return datetime.strptime(string.strip(), "%d.%m.%Y").replace(tzinfo=UTC()) -@login_required +@restricted def jobs_list(request): - update_user_data(request.user, request.session['proxy']) + service.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') @@ -72,6 +84,7 @@ def jobs_list(request): keywords = filters.cleaned_data['keywords'] status = filters.cleaned_data['status'] host = filters.cleaned_data['host'] + purged = filters.cleaned_data['purged'] submission = filters.cleaned_data['submission'] finish = filters.cleaned_data['finish'] @@ -103,6 +116,14 @@ def jobs_list(request): for h in host: selected_filters.append((host_dict[h], 'host', h)) + if isinstance(purged, bool): + tasks = tasks.filter(purged=purged) + + if purged: + selected_filters.append((u"Usunięty katalog roboczy", 'purged', '1')) + else: + selected_filters.append((u"Istniejący katalog roboczy", 'purged', '0')) + if submission: start, end = submission.split('-') @@ -139,58 +160,162 @@ def jobs_list(request): return render(request, 'qcg/jobs.html', context) -@login_required +@restricted def job_details(request, job_id): - job = get_object_or_404(request.user.jobs.prefetch_related('tasks'), job_id=job_id) + job = get_object_or_404(request.user.jobs.select_related('owner').prefetch_related('tasks'), job_id=job_id) - return render(request, 'qcg/job.html', {'job': job}) + return render(request, 'qcg/job.html', process_details(request, job)) -@login_required +@restricted def task_details(request, job_id, task_id): - task = get_object_or_404(request.user.tasks.select_related('job').prefetch_related('allocations'), + task = get_object_or_404(request.user.tasks.select_related('job__owner').prefetch_related('allocations'), job__job_id=job_id, task_id=task_id) - return render(request, 'qcg/task.html', {'task': task}) + return render(request, 'qcg/task.html', process_details(request, task.job, task)) -@login_required -def job_new(request): +def process_details(request, job, task=None): + if not job.terminated or not job.purged: + service.update_job(job, request.session['proxy']) + + form_data = to_form_data(job.qcg_description) + env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())] + + form = JobDescriptionForm(initial=form_data) + env_formset = EnvFormSet(initial=env_formset_data) + template_form = JobTemplateForm(initial={'name': (task and task.note) or u'Szablon z {}'.format(job.job_id)}) + + for field in form: + field.field.widget.attrs['disabled'] = 'True' + for env_form in env_formset: + for field in env_form: + field.field.widget.attrs['disabled'] = 'True' + + return {'job': job, 'task': task, 'form': form, 'env_formset': env_formset, 'template_form': template_form} + + +def id_generator(size=6, chars=string.ascii_uppercase + string.digits): + return ''.join(random.choice(chars) for _ in range(size)) + +@restricted +def job_submit(request, template_id=None): + save_template = 'save-template' in request.POST + template = get_object_or_404(request.user.templates, id=template_id) if template_id is not None else None + + if template is not None: + form_data = to_form_data(template.description) + env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())] + else: + form_data, env_formset_data = None, None + hosts, applications, modules = cached_resources(request.session['proxy']) + if request.method == 'POST': - form = JobDescriptionForm(request.POST) - env_formset = EnvFormSet(request.POST) + form = JobDescriptionForm(request.POST, form_data, hosts, applications, modules) + env_formset = EnvFormSet(request.POST, initial=env_formset_data) + template_form = JobTemplateForm(request.POST, prefix='template', instance=template) - if form.is_valid() and env_formset.is_valid(): + if form.is_valid() and env_formset.is_valid() and (not save_template or template_form.is_valid()): params = form.cleaned_data params['env_variables'] = [(env['name'], env['value']) for env in env_formset.cleaned_data if env and not env['DELETE']] - job_id = submit_job(params, request.session['proxy']) + # Generowanie pliku inputowego + md_input=generate_md_inputfile(params) + url=os.path.splitext(params['pdb_file'])[0]+'_MD_genarated.inp' + params['master_file']=url + params['stage_in'].append(params['pdb_file']) + # Upload + ftp = FTPOperation(request.session['proxy']) + ftp.put(url) + for chunk in chunks('\n'.join([str(i) for i in md_input] ), 4096): + ftp.stream.put(chunk) + ftp.stream.put(None) + ftp.wait() + + params['persistent'] = True - messages.success(request, - format_html(' ' - 'Zlecono zadanie {}.', job_id)) + job_desc = to_job_desc(params, request.session['proxy']) - return redirect('jobs') - print repr(form.errors) - print repr(env_formset.errors) + if save_template: + template = template_form.save(commit=False) + + template.owner = request.user + template.description = job_desc.xml_description + template.save() + + return redirect(template) + + #pprint(params) + job = service.submit(job_desc, request.session['proxy']) + + + messages.success(request, + format_html(u' ' + u'Zlecono zadanie {}.', job.job_id)) + + return redirect('jobs') else: - form = JobDescriptionForm() - env_formset = EnvFormSet() + form = JobDescriptionForm(initial=form_data, hosts=hosts, applications=applications, modules=modules) + env_formset = EnvFormSet(initial=env_formset_data) + template_form = JobTemplateForm(prefix='template', instance=template) + + errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) or ( + save_template and template_form.errors) + + return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors, + 'template_form': template_form, 'template': template}) + - errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) +@require_POST +@login_required +def job_cancel(request, job_id): + job = get_object_or_404(request.user.jobs, job_id=job_id) + return obj_run(request, job, service.cancel, u'Zadanie anulowano.') + + +@require_POST +@login_required +def task_cancel(request, job_id, task_id): + task = get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id) + return obj_run(request, task, service.cancel, u'Zadanie anulowano.') - return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors}) + +@require_POST +@login_required +def job_clean(request, job_id): + job = get_object_or_404(request.user.jobs, job_id=job_id) + return obj_run(request, job, service.clean, u'Usunięto katalog roboczy.') +@require_POST @login_required +def task_clean(request, job_id, task_id): + task = get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id) + return obj_run(request, task, service.clean, u'Usunięto katalog roboczy.') + + +def obj_run(request, obj, func, msg): + try: + func(obj, request.session['proxy']) + except PyqcgException as e: + messages.error(request, format_html(u' {}', + e.message)) + else: + messages.success(request, + format_html(u' {}', msg)) + + return redirect(obj) + + +@restricted def gridftp(request): return render(request, 'qcg/gridftp.html', {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()}) -@login_required +@restricted def gridftp_upload(request): form = HostPathForm(request.GET) @@ -207,3 +332,39 @@ def gridftp_upload(request): {'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 ''}) + + +@restricted +def job_templates(request): + return render(request, 'qcg/job_templates.html', {'templates': request.user.templates.all()}) + + +@require_POST +@login_required +def template_delete(request, template_id): + template = get_object_or_404(request.user.templates, id=template_id) + template.delete() + + messages.success(request, format_html(u' ' + u'Usunięto szablon {}.', template.name)) + + return redirect('job_templates') + + +@require_POST +@login_required +def job_save_template(request, job_id): + job = get_object_or_404(request.user.jobs, job_id=job_id) + + template_form = JobTemplateForm(request.POST, + instance=JobTemplate(owner=request.user, description=job.qcg_description)) + + if template_form.is_valid(): + template = template_form.save() + + return redirect(template) + + messages.error(request, format_html(u' {}' + u'Nie udało się zapisać szablonu!', template_form.errors)) + + return redirect(job)