Fixed run window issue

coderdj · coderdj · commit 75b7425bba6c · 2016-12-05T18:02:35.000+01:00
diff --git a/api/api/resources.py b/api/api/resources.py
@@ -345,7 +345,7 @@ class Meta:
         allowed_methods = ['get', 'post', 'put']
         authorization = Authorization()
         authentication = ApiKeyAuthentication()
-        throttle = CacheThrottle(throttle_at=50, timeframe=60)
+        throttle = CacheThrottle(throttle_at=500, timeframe=60)
         
     def _db(self):
         try:
@@ -370,6 +370,8 @@ def get_object_list(self, request):
 
         query = {}
         
+        if "query" in request.GET:
+            query = request.GET['query']
         if "number" in request.GET:
             query['number'] = int(request.GET['number'])
         if "detector" in request.GET:
@@ -379,6 +381,7 @@ def get_object_list(self, request):
         if "_id" in request.GET:
             query['_id'] = request.GET['_id']
             
+            
         cursor = self._db()[settings.RUNS_DB_COLLECTION].find(query).sort("_id", -1)
 
         ret = []
@@ -530,3 +533,210 @@ def obj_delete(self, bundle, **kwargs):
 
     def rollback(self, bundles):
         pass
+
+
+
+# Run
+class QualityResource(Resource):
+    number = fields.IntegerField(attribute="number")
+    _id = fields.CharField(attribute="_id")
+    detector = fields.CharField(attribute="detector")
+    name = fields.CharField(attribute="name")
+    doc = fields.DictField(attribute="doc")
+    class Meta:
+        resource_name = 'quality'
+        object_class = rundoc
+        allowed_methods = ['get', 'post', 'put']
+        authorization = Authorization()
+        authentication = ApiKeyAuthentication()
+        throttle = CacheThrottle(throttle_at=500, timeframe=60)
+
+    def _db(self):
+        try:
+            return (pymongo.MongoClient(settings.RUNS_DB_ADDR)
+                                [settings.RUNS_DB_NAME])
+        except:
+            return None
+            
+    def detail_uri_kwargs(self, bundle_or_obj):
+        kwargs = {}
+        if isinstance(bundle_or_obj, Bundle):
+                kwargs['pk'] = bundle_or_obj.obj._id
+        else:
+            kwargs['pk'] = bundle_or_obj._id
+            return kwargs
+
+    def get_object_list(self, request):
+        # This will return a stripped down version of the run doc 
+        # It includes _id, name, number (if applicable), and detector  
+        self.throttle_check(request)
+        self.log_throttled_access(request)
+
+        query = {}
+
+        if "query" in request.GET:
+            query = request.GET['query']
+        if "number" in request.GET:
+            query['number'] = int(request.GET['number'])
+        if "detector" in request.GET:
+            query['detector'] = request.GET['detector']
+        if "name" in request.GET:
+            query['name'] = request.GET['name']
+        if "_id" in request.GET:
+            query['_id'] = request.GET['_id']
+
+
+        cursor = self._db()[settings.RUNS_DB_COLLECTION].find(query).sort("_id", -1)
+
+        ret = []
+        for doc in cursor:
+            if 'number' in doc:
+                thedoc = {"number": doc['number'] }
+            else:
+                thedoc = {"number": -1}
+            thedoc['name'] = doc['name']
+            thedoc['_id'] = doc['_id']
+            thedoc['detector'] = doc['detector']
+            thedoc['doc'] = doc
+            ret.append(rundoc(initial=thedoc))
+
+        return ret
+
+
+    def obj_get_list(self, bundle, **kwargs):
+        return self.get_object_list(bundle.request)
+
+
+    def obj_get(self, bundle, **kwargs):
+        self.throttle_check(bundle.request)
+        self.log_throttled_access(bundle.request)
+        req = {}
+        if 'pk' in kwargs:
+            req['_id'] = kwargs['pk']
+            return self._create_obj(req)
+            return rundoc(initial={"error": "For now we only support searching for a run by number"})
+
+    def _create_obj(self, req):
+
+        doc = self._db()[settings.RUNS_DB_COLLECTION].find_one(
+            {"_id":
+             ObjectId(req['_id'])})
+        if doc is None:
+            return
+
+        ret = {}
+        if 'number' in doc:
+            ret['number'] = doc['number']
+        else:
+            ret['number'] = -1
+        ret['detector'] = doc['detector']
+        ret['_id'] = doc['_id']
+        ret['name'] = doc['name']
+        ret['doc'] = doc
+        ret_obj = rundoc(initial=ret)
+
+        return ret_obj
+
+    def obj_create(self, bundle, **kwargs):
+        return self.obj_update(bundle, kwargs)
+
+
+
+    def obj_update(self, bundle, **kwargs):
+        self.throttle_check(bundle.request)
+        self.log_throttled_access(bundle.request)
+        searchDict = {}
+        ret = {}
+
+        reader = codecs.getreader("utf-8")
+        request = (json.load(reader(bundle.request)))
+        logger.error(request)
+        if 'pk' in kwargs:
+            searchDict['_id'] = ObjectId(kwargs['pk'])
+        elif 'number' in request:
+            searchDict['number'] = int(request['number'])
+        elif 'name' in request and 'detector' in request:
+            searchDict['name'] = request['name']
+            searchDict['detector'] = request['detector']
+
+        # We REQUIRE the following format
+        # {
+        #     "qname": a unique name for this check
+        #     "version": the version info for this check 
+        #     "checks": [] a list of string/bool pairs i.e. {"deadtime": true}
+        #     "extracted": a dictionary of any format of size < 100kB
+        # }
+
+        
+        updateDict = {}
+        if ( 'qname' not in request or 'checks' not in request 
+             or 'version' not in request):
+            doc = self._default(
+            "ERROR",
+                        "Bad request. Require status, host, location, and type"
+                    )
+            bundle.obj = rundoc(initial=doc)
+            bundle = self.full_hydrate(bundle)
+            return bundle.obj
+
+        updateDict['qname'] = request['qname']
+        updateDict['checks'] = request['checks']
+        updateDict['version'] = request['version']
+
+        if 'extracted' in request:
+            if sys.getsizeof(request['extracted']) > 50000:
+                doc = self._default(
+                    "ERROR",
+                        "Bad request. Quality dictionary must be less than 50kB."
+                )
+                bundle.obj = rundoc(initial=doc)
+                bundle = self.full_hydrate(bundle)
+                return bundle.obj
+            else:
+                updateDict['extracted'] = request['extracted']
+
+        # Enforce string/bool types for checks array
+        for key, value in updateDict['checks']:
+            extre = "test"
+            if type(key) != type(extre) or type(value) != type(True):
+
+        elif request['status'] == 'processed':
+            if 'pax_version' not in request:
+                return {"number": doc['number'],
+                        "ERROR": "pax_version must be provided for processed data"}
+            updateDict['pax_version'] = request['pax_version']
+
+            # Status needed for new entry                                                                    
+            updateDict['status'] = request['status']
+            updateDict['creation_time'] = datetime.datetime.utcnow(),
+
+            # Now add a new entry                                                                            
+        res = self._db()[settings.RUNS_DB_COLLECTION].update_one(
+                searchDict,
+                {"$push": {"data": updateDict}})
+        doc = self._default(
+            "Success",
+            "Document updated",
+            res
+            )
+        bundle.obj = rundoc(initial=doc)
+        bundle = self.full_hydrate(bundle)
+
+        return rundoc(initial=doc)
+
+    def _default(self, message, longer, return_value):
+        doc = {
+            "number": -1,
+                "_id": -1,
+            "detector": "ret",
+                "name": message,
+            "doc": {
+                "message": longer,
+                        "success": message,
+                        "ret": return_value
+                        }
+            }
+        return doc
+
+    def obj_delete_list(self, bundle, **kwargs):
+        pass
diff --git a/runs/templates/runs/runs_new.html b/runs/templates/runs/runs_new.html
@@ -110,7 +110,7 @@
   </div>
 </div>
   <div class="col-sm-6 col-sm-offset-6 col-xs-12" id="detail_window" 
-       style="display:none;z-index:100;position:fixed;top:40px;right:0px;height:150%;overflow-y:hidden;padding:0;background-color:white;border-left:1px;border-color:#666;border-style:solid;border-top:0;border-right:0;">
+       style="display:none;z-index:100;position:fixed;top:40px;right:0px;height:150%;overflow-y:hidden;padding:0;background-color:white;border-left:1px;border-color:#666;border-style:solid;border-top:0;border-right:0;overflow-y:auto">
     <div id="loading_run"
          style="z-index:10;width:100%;height:100%;position:absolute;top:0;left:0;display:none;background-color:white;">
       <div class="sk-cube-grid">
@@ -128,7 +128,7 @@
 
 
     <div class="emobox" id="tab_content" 
-	 style="padding:10px;margin:0px;overflow-y:hidden;overflow-x:hidden;border-bottom:0px;">
+	 style="padding:10px;margin:0px;overflow-x:hidden;border-bottom:0px;">
       <div style="height:100%;">
 	<div id="run_detail_top">
 	</div>
@@ -144,15 +144,15 @@ <h4 style="margin-bottom:2px">Tags</h4>
 	
 	<!-- Tab panes -->
 	<div class="tab-content">
-	  <div role="tabpanel" class="tab-pane active" id="locations_tab" style="height:60vh;overflow-y:scroll;">
+	  <div role="tabpanel" class="tab-pane active" id="locations_tab">
             <div id="detail_locations">No storage sites registered for this run.</div>
 	  </div>
-	  <div role="tabpanel" class="tab-pane" id="comments_tab" style="height:60vh;overflow-y:scroll;">
+	  <div role="tabpanel" class="tab-pane" id="comments_tab">
 	    <h4 style="margin-bottom:2px">Comments</h4>
             <hr style="margin-top:0px;margin-bottom:4px;">
             <div id="detail_comments"></div>
 	  </div>
-	  <div role="tabpanel" class="tab-pane" id="json" style="height:60vh;overflow-y:scroll;">...</div>
+	  <div role="tabpanel" class="tab-pane" id="json">...</div>
 	</div>
 	
       </div>
@@ -215,10 +215,17 @@ <h4 class="modal-title">Help</h4>
 
 <script>
 
+function resize(){
+   var height = window.innerHeight;
+   document.getElementById("detail_window").style.height = height-40+"px";
+}
+$(window).resize(function(){resize();});
 $(function(){
    document.whoami="{{ request.user.username }}";
    MakeRunsTable("runstable", "/runs/runs_stream", "template", "counterdiv");
+   resize();
 
+window.onresize=function(){ resize() };
 });
 
 function ShowTransferErrors(){
diff --git a/slow_control/templates/slow_control/slow_control.html b/slow_control/templates/slow_control/slow_control.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+B{% extends "base.html" %}
 {% load staticfiles %}
 {% block head %}
 <script src="{% static "js/jquery-resize.min.js" %}" type="text/javascript"></script>
@@ -448,7 +448,7 @@ <h4 class="modal-title"><strong>Help!</strong></h4>
             };
 
 
-$("#content").resize(function()
+$(window).resize(function()
                 {
   if($('#chart_div').highcharts() != null)
  $('#chart_div').highcharts().setSize($("#chart_div").width(), 200, false);
