X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=91c052310196ffad5ba027cf25c6145d533eb9ee;hb=7e5bf1ffbcf2dd1d728102f531520258958602d2;hp=f498f950ebf78fc6e38ca49778aece940436d658;hpb=2bb5dce1848b7e66179cb0fd10b763620ee6cd3c;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index f498f95..91c0523 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -23,10 +23,19 @@ from filex.ftp import FTPOperation, FTPError from filex.views import make_url 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 -from qcg.service import update_user_data, update_job, cancel, clean +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') @@ -62,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') @@ -151,28 +160,45 @@ 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) - - update_job(job, request.session['proxy']) + job = get_object_or_404(request.user.jobs.select_related('owner').prefetch_related('tasks'), job_id=job_id) - template_form = JobTemplateForm(initial={'name': job.note or u'Szablon z {}'.format(job.job_id)}) + return render(request, 'qcg/job.html', process_details(request, job)) - return render(request, 'qcg/job.html', {'job': job, 'template_form': template_form}) - -@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) - update_job(task.job, request.session['proxy']) + return render(request, 'qcg/task.html', process_details(request, task.job, task)) - return render(request, 'qcg/task.html', {'task': task}) +def process_details(request, job, task=None): + if not job.terminated or not job.purged: + service.update_job(job, request.session['proxy']) -@login_required + 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 @@ -182,9 +208,10 @@ def job_submit(request, template_id=None): 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, initial=form_data) + 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) @@ -193,8 +220,24 @@ def job_submit(request, template_id=None): params['env_variables'] = [(env['name'], env['value']) for env in env_formset.cleaned_data if env and not env['DELETE']] + # 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 + job_desc = to_job_desc(params, request.session['proxy']) + if save_template: template = template_form.save(commit=False) @@ -204,15 +247,16 @@ def job_submit(request, template_id=None): return redirect(template) - job = job_desc.submit() + job = service.submit(job_desc, request.session['proxy']) + messages.success(request, - format_html(' ' + format_html(u' ' u'Zlecono zadanie {}.', job.job_id)) - + return redirect('jobs') else: - form = JobDescriptionForm(initial=form_data) + 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) @@ -226,60 +270,51 @@ def job_submit(request, template_id=None): @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)) + 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): - 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(' {}', - e.message)) - else: - messages.success(request, format_html(' ' - 'Zadanie anulowano.')) - - return redirect(obj) + 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.') @require_POST @login_required def job_clean(request, job_id): - return obj_clean(request, get_object_or_404(request.user.jobs, job_id=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): - return obj_clean(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_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_clean(request, obj): +def obj_run(request, obj, func, msg): try: - clean(obj, request.session['proxy']) + func(obj, request.session['proxy']) except PyqcgException as e: - messages.error(request, format_html(' {}', + messages.error(request, format_html(u' {}', e.message)) else: - messages.success(request, format_html(' ' - 'Usunięto katalog roboczy.')) + messages.success(request, + format_html(u' {}', msg)) return redirect(obj) -@login_required +@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) @@ -298,7 +333,7 @@ def gridftp_upload(request): 'sep': '/' if form.cleaned_data['path'].startswith('~') else ''}) -@login_required +@restricted def job_templates(request): return render(request, 'qcg/job_templates.html', {'templates': request.user.templates.all()}) @@ -309,7 +344,7 @@ def template_delete(request, template_id): template = get_object_or_404(request.user.templates, id=template_id) template.delete() - messages.success(request, format_html(' ' + messages.success(request, format_html(u' ' u'Usunięto szablon {}.', template.name)) return redirect('job_templates') @@ -328,7 +363,7 @@ def job_save_template(request, job_id): return redirect(template) - messages.error(request, format_html(' {}' - 'Nie udało się zapisać szablonu!', template_form.errors)) + messages.error(request, format_html(u' {}' + u'Nie udało się zapisać szablonu!', template_form.errors)) return redirect(job)