fixing stats.html call

Author: antgonza

qiita_db/meta_util.py

@@ -34,6 +34,7 @@
 from urllib import quote
 from StringIO import StringIO
 from future.utils import viewitems
+from datetime import datetime
 
 from qiita_core.qiita_settings import qiita_config
 import qiita_db as qdb
@@ -245,10 +246,12 @@ def sizeof_fmt(value, position):
     img = '<img src = "%s"/>' % (
         'data:image/png;base64,' + quote(b64encode(plot.buf)))
 
+    time = datetime.now().strftime('%m-%d-%y %H:%M:%S')
+
     portal = qiita_config.portal
     keys = [
         'number_studies', 'number_of_samples', 'num_users', 'lat_longs',
-        'num_studies_ebi', 'num_samples_ebi', 'img']
+        'num_studies_ebi', 'num_samples_ebi', 'img', 'time']
     for k in keys:
         redis_key = '%s:stats:%s' % (portal, k)
 
@@ -266,6 +269,8 @@ def sizeof_fmt(value, position):
             r_client.set(redis_key, num_samples_ebi)
         elif k == 'img':
             r_client.set(redis_key, img)
+        elif k == 'time':
+            r_client.set(redis_key, time)
         # storing tuples
         elif k == 'lat_longs':
             r_client.set(redis_key, lat_longs)

qiita_db/test/test_meta_util.py

@@ -211,9 +211,9 @@ def test_update_redis_stats(self):
             elif k == 'num_samples_ebi':
                 data = r_client.get(redis_key)
                 self.assertEqual(data, '54')
-            elif k == 'img':
-                # not testing image!
-                data = r_client.get(redis_key)
+            elif k in ['img', 'time']:
+                # not testing image or time!
+                pass
             # storing tuples and single values
             elif k == 'lat_longs':
                 data = r_client.get(redis_key)

qiita_pet/handlers/stats.py

@@ -7,63 +7,56 @@
 
 from qiita_core.util import execute_as_transaction
 from qiita_core.qiita_settings import qiita_config
-from qiita_db.util import get_count
 from qiita_db.study import Study
-from qiita_db.meta_util import get_lat_longs
 from .base_handlers import BaseHandler
 
 
 class StatsHandler(BaseHandler):
     @execute_as_transaction
     def _get_stats(self, callback):
-        # check if the key exists in redis
-        redis_lats_key = '%s:stats:sample_lats' % qiita_config.portal
-        redis_longs_key = '%s:stats:sample_longs' % qiita_config.portal
-        lats = r_client.lrange(redis_lats_key, 0, -1)
-        longs = r_client.lrange(redis_longs_key, 0, -1)
-        if not (lats and longs):
-            # if we don't have them, then fetch from disk and add to the
-            # redis server with a 24-hour expiration
-            lat_longs = get_lat_longs()
-            lats = [float(x[0]) for x in lat_longs]
-            longs = [float(x[1]) for x in lat_longs]
-            with r_client.pipeline() as pipe:
-                for latitude, longitude in lat_longs:
-                    # storing as a simple data structure, hopefully this
-                    # doesn't burn us later
-                    pipe.rpush(redis_lats_key, latitude)
-                    pipe.rpush(redis_longs_key, longitude)
+        # initializing values
+        number_studies, number_of_samples, num_users, time = '', '', '', ''
+        lat_longs, num_studies_ebi, num_samples_ebi, img = '', '', '', ''
 
-                # set the key to expire in 24 hours, so that we limit the
-                # number of times we have to go to the database to a reasonable
-                # amount
-                r_client.expire(redis_lats_key, 86400)
-                r_client.expire(redis_longs_key, 86400)
+        # checking values from redis
+        portal = qiita_config.portal
+        keys = [
+            'number_studies', 'number_of_samples', 'num_users', 'lat_longs',
+            'num_studies_ebi', 'num_samples_ebi', 'img', 'time']
 
-                pipe.execute()
-        else:
-            # If we do have them, put the redis results into the same structure
-            # that would come back from the database
-            longs = [float(x) for x in longs]
-            lats = [float(x) for x in lats]
-            lat_longs = zip(lats, longs)
-
-        # Get the number of studies
-        num_studies = get_count('qiita.study')
-
-        # Get the number of samples
-        num_samples = len(lats)
-
-        # Get the number of users
-        num_users = get_count('qiita.qiita_user')
+        for k in keys:
+            redis_key = '%s:stats:%s' % (portal, k)
+            # retrieving dicts
+            if k == 'number_studies':
+                number_studies = r_client.hgetall(redis_key)
+            elif k == 'number_of_samples':
+                number_of_samples = r_client.hgetall(redis_key)
+            # single values
+            elif k == 'num_users':
+                num_users = r_client.get(redis_key)
+            elif k == 'num_studies_ebi':
+                num_studies_ebi = r_client.get(redis_key)
+            elif k == 'num_samples_ebi':
+                num_samples_ebi = r_client.get(redis_key)
+            elif k == 'img':
+                # not testing image!
+                img = r_client.get(redis_key)
+            elif k == 'time':
+                # not testing image!
+                time = r_client.get(redis_key)
+            # storing tuples and single values
+            elif k == 'lat_longs':
+                lat_longs = eval(r_client.get(redis_key))
 
-        callback([num_studies, num_samples, num_users, lat_longs])
+        callback([number_studies, number_of_samples, num_users, lat_longs,
+                  num_studies_ebi, num_samples_ebi, img, time])
 
     @coroutine
     @execute_as_transaction
     def get(self):
-        num_studies, num_samples, num_users, lat_longs = \
-            yield Task(self._get_stats)
+        number_studies, number_of_samples, num_users, lat_longs, \
+            num_studies_ebi, num_samples_ebi, img, time \
+            = yield Task(self._get_stats)
 
         # Pull a random public study from the database
         public_studies = Study.get_by_status('public')
@@ -79,8 +72,10 @@ def get(self):
             random_study_id = study.id
 
         self.render('stats.html',
-                    num_studies=num_studies, num_samples=num_samples,
-                    num_users=num_users, lat_longs=lat_longs,
+                    number_studies=number_studies,
+                    number_of_samples=number_of_samples, num_users=num_users,
+                    lat_longs=lat_longs, num_studies_ebi=num_studies_ebi,
+                    num_samples_ebi=num_samples_ebi, img=img, time=time,
                     random_study_info=random_study_info,
                     random_study_title=random_study_title,
                     random_study_id=random_study_id)

qiita_pet/templates/stats.html

@@ -54,17 +54,31 @@
   <table width="100%">
   <thead>
     <tr>
-      <th>Number of studies</th>
-      <th>Number of samples</th>
-      <th>Number of users</th>
+      <th>Studies</th>
+      <th>Samples</th>
+      <th>Users</th>
     </tr>
   </thead>
     <tr>
-      <td>{{ num_studies }}</td>
-      <td>{{ num_samples }}</td>
+      <td>
+        {% for k in number_studies %}
+          <i>{{k}}</i>: {{number_studies[k]}}
+        {% end %}
+        <br/>
+        <i>Submitted to EBI</i>: {{ num_studies_ebi }}
+      </td>
+      <td>
+        {% for k in number_of_samples %}
+          <i>{{k}}</i>: {{number_of_samples[k]}}
+        {% end %}
+        <br/>
+        <i>Submitted to EBI</i>: {{ num_samples_ebi }}
+      </td>
       <td>{{ num_users }}</td>
     </tr>
   </table>
+  <br/>
+  <small>Generated on: {{time}}</small>
 </div>
 <div id="map-canvas"></div>