X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=qcg%2Fviews.py;h=dae0ad460f7cec5342de2c1bb8ba6155e9a6ff0c;hb=fea3e566aeda6c20b89b645136279313a1a22867;hp=5e8f0a001b9760cf8e84718d876941238779937e;hpb=bb22ef5ff00541b1e6c248b780bad42d591d2382;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index 5e8f0a0..dae0ad4 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -23,9 +23,16 @@ 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.service import update_user_data, update_job, cancel, clean, submit + +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 @@ -64,7 +71,7 @@ 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']) @@ -153,16 +160,16 @@ 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', 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', process_details(request, task.job, task)) @@ -187,18 +194,11 @@ def process_details(request, job, task=None): return {'job': job, 'task': task, 'form': form, 'env_formset': env_formset, 'template_form': template_form} -def generate_mremd_inputfile(params, mremd_input): - mremd_input = list() - opis=params['note'] - mremd_input.append(opis[:73]) - mremd_input.append('SEED=-3059743 PDBREF MD EXTCONF RESCALE_MODE=2') - - - - - return mremd_input -@login_required +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 @@ -208,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) @@ -219,17 +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']] - # tu wygenerować plik inputowy i go uploadować? - mremd_input=list() - print generate_mremd_inputfile(params,mremd_input) + # 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 - # Debugging parametrów - pprint(params) job_desc = to_job_desc(params, request.session['proxy']) + if save_template: template = template_form.save(commit=False) @@ -239,17 +247,16 @@ def job_submit(request, template_id=None): return redirect(template) - # wyłączenie wysyłania zadania - ''' - job = job_desc.submit() + job = 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) @@ -263,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, 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, task, 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, 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, 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(' {}', e.message)) else: - messages.success(request, format_html(' ' - 'Usunięto katalog roboczy.')) + messages.success(request, + format_html(' {}', 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) @@ -335,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()}) @@ -346,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') @@ -365,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)