X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Futils.py;h=57cf23aa683cc60f73f4b4c0d1508b6462e1b334;hb=586209a600ac5767a48c57cae1f566c0d6aaf48a;hp=44de96fa640c2cf25289093c7c6c88a2f9a72681;hpb=93d6b9d3273e1f35c0147ae9a58ac142eceb75cb;p=qcg-portal.git

diff --git a/qcg/utils.py b/qcg/utils.py
index 44de96f..57cf23a 100644
--- a/qcg/utils.py
+++ b/qcg/utils.py
@@ -7,19 +7,23 @@ import string
 import random
 
 from django.contrib.auth.decorators import login_required
+from django.core.cache import caches
 from django.core.paginator import Paginator
 from django.utils.formats import date_format
 from django.utils.timezone import localtime
 from django.views.decorators.cache import cache_control
 from pyqcg import QCG
-from pyqcg.utils import Credential
 from pyqcg.description import JobDescription
 
 from filex.ftp import FTPOperation
 from qcg import constants
 
+
 from django.utils import encoding
 
+resources_cache = caches['resources']
+
+
 def get_attributes(obj, attrs):
     return {name: getattr(obj, name) for name in attrs if getattr(obj, name) is not None}
 
@@ -103,7 +107,7 @@ def generate_md_inputfile(params):
 
 def to_job_desc(params, proxy):
     QCG.start()
-    desc = JobDescription(Credential(proxy))
+    desc = JobDescription()
 
     direct_map = ('env_variables', 'executable', 'arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs',
                   'wall_time', 'memory', 'memory_per_slot', 'modules', 'input', 'stage_in', 'native', 'notify',
@@ -151,7 +155,7 @@ def to_form_data(xml):
     desc.xml_description = xml
 
     direct_map = ('env_variables', 'executable', 'arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs',
-                  'wall_time', 'memory', 'memory_per_slot', 'modules', 'input', 'stage_in', 'native', 'persistent')
+                  'wall_time', 'modules', 'input', 'stage_in', 'native', 'persistent')
 
     params = {}
     for name in direct_map:
@@ -189,9 +193,34 @@ def to_form_data(xml):
         else:
             params['postprocess_type'] = JobDescriptionForm.Process.CMD
             params['postprocess_cmd'] = desc.postprocess
+    if desc.memory:
+        params['memory'] = int(desc.memory)
+    if desc.memory_per_slot:
+        params['memory_per_slot'] = int(desc.memory_per_slot)
 
     return params
 
 
 def restricted(view):
     return wraps(view)(cache_control(no_cache=True, must_revalidate=True, no_store=True)(login_required(view)))
+
+
+def cached_resources(proxy):
+    hosts = resources_cache.get('hosts')
+    if hosts is None:
+        # prevent circular import errors
+        from qcg.service import fetch_resources
+
+        hosts, _, applications, modules = map(make_choices, fetch_resources(proxy))
+        resources_cache.set('hosts', hosts)
+        resources_cache.set('applications', applications)
+        resources_cache.set('modules', modules)
+    else:
+        applications = resources_cache.get('applications')
+        modules = resources_cache.get('modules')
+
+    return hosts, applications, modules
+
+
+def make_choices(iterable):
+    return ((None, ''),) + tuple((item, item) for item in sorted(iterable))