Minor changes

Author: Gossty

qiita_db/meta_util.py

@@ -555,9 +555,8 @@ def generate_plugin_releases():
         f(redis_key, v)
 
 
-def get_software_commands():
-    # TODO change active=False to True. In test, the data is active=False.
-    software_list = [s for s in qdb.software.Software.iter(active=False)]
+def get_software_commands(active):
+    software_list = [s for s in qdb.software.Software.iter(active=active)]
     software_commands = dict()
     for software in software_list:
         sname = software.name
@@ -572,21 +571,27 @@ def get_software_commands():
     return software_commands
 
 
-def update_resource_allocation_redis():
+def update_resource_allocation_redis(active=True):
+    """Updates redis with plots and information about current software.
+
+    Parameters
+    ----------
+    active: boolean, optional
+        Defaults to True. Should only be False when testing.
+
+    """
     time = datetime.now().strftime('%m-%d-%y')
-    scommands = get_software_commands()
+    scommands = get_software_commands(active)
     redis_key = 'resources:commands'
     r_client.set(redis_key, str(scommands))
 
     for sname, versions in scommands.items():
         for version, commands in versions.items():
             for cname in commands:
 
-                print("Generating plot for:", sname, version, cname)
                 col_name = "samples * columns"
                 df = _retrieve_resource_data(cname, sname, version, columns)
                 if len(df) == 0:
-                    print("No available data for", sname, version, cname)
                     continue
 
                 fig, axs = resource_allocation_plot(df, cname, sname, col_name)
@@ -641,7 +646,6 @@ def update_resource_allocation_redis():
                     ("title_mem", titles[0], r_client.set),
                     ("title_time", titles[1], r_client.set)
                 ]
-                print(time, titles[0], titles[1])
 
                 for k, v, f in values:
                     redis_key = 'resources$#%s$#%s$#%s$#%s:%s' % (

qiita_db/test/test_meta_util.py

@@ -13,7 +13,6 @@
 from os.path import exists, join
 
 import pandas as pd
-from datetime import datetime
 
 from qiita_core.qiita_settings import qiita_config, r_client
 from qiita_core.util import qiita_test_checker
@@ -525,28 +524,21 @@ def test_update_resource_allocation_redis(self):
         sname = "QIIMEq2"
         col_name = "samples * columns"
         version = "1.9.1"
-        qdb.meta_util.update_resource_allocation_redis()
-        # since time is month, day, year, it should be equal unless test is ran
-        # at midnight.
-        time = datetime.now().strftime('%m-%d-%y')
+        qdb.meta_util.update_resource_allocation_redis(False)
         title_mem_str = 'resources$#%s$#%s$#%s$#%s:%s' % (
             cname, sname, version, col_name, 'title_mem')
         title_mem = str(r_client.get(title_mem_str))
         self.assertTrue(
-            "model_chosen: "
+            "model: "
             "k * log(x) + "
             "b * log(x)^2 + "
-            "a * log(x)^2.5" in title_mem
+            "a * log(x)^3" in title_mem
         )
 
         title_time_str = 'resources$#%s$#%s$#%s$#%s:%s' % (
                         cname, sname, version, col_name, 'title_time')
         title_time = str(r_client.get(title_time_str))
-        self.assertTrue("model_chosen: a + b + log(x) * k" in title_time)
-        time_create_str = 'resources$#%s$#%s$#%s$#%s:%s' % (
-            cname, sname, version, col_name, 'time')
-        time_create = str(r_client.get(time_create_str))
-        self.assertTrue(time in time_create)
+        self.assertTrue("model: a + b + log(x) * k" in title_time)
 
 
 if __name__ == '__main__':

qiita_db/util.py

@@ -2527,7 +2527,7 @@ def _resource_allocation_plot_helper(
 
     ax.set_title(
                  f'k||a||b: {k}||{a}||{b}\n'
-                 f'model_chosen: {get_model_name(best_model)}\n'
+                 f'model: {get_model_name(best_model)}\n'
                  f'real: {mini} || {maxi}\n'
                  f'calculated: {cmin} || {cmax}\n'
                  f'failures: {failures}')

qiita_pet/templates/sitebase.html

@@ -384,7 +384,6 @@
                       <li><a href="{% raw qiita_config.portal_dir %}/admin/approval/">View Studies awaiting approval</a></li>
                       <li><a href="{% raw qiita_config.portal_dir %}/admin/portals/studies/">Edit study portal connections</a></li>
                       <li><a href="{% raw qiita_config.portal_dir %}/admin/purge_users/">Purge non-validated users</a></li>
-                      <li><a href="{% raw qiita_config.portal_dir %}/admin/resources/">View Resource Allocation Plots</a></li>
                     {% end %}
                     <li><a href="{% raw qiita_config.portal_dir %}/admin/sample_validation/">Sample Validation</a></li>
                     <li><a href="{% raw qiita_config.portal_dir %}/admin/processing_jobs/">Processing Jobs</a></li>