Obfuscating "no analysis" errors

IGS · Aug 9, 2024 · e050be8 · e050be8
1 parent 3f36673
commit e050be8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/www/api/resources/multigene_dash_data.py b/www/api/resources/multigene_dash_data.py
@@ -142,14 +142,22 @@ def post(self, dataset_id):
 
         try:
             ana = geardb.get_analysis(analysis, dataset_id, session_id)
-            # Using adata with "backed" mode does not work with volcano plot
-            adata = ana.get_adata(backed=False)
         except Exception as e:
             import traceback
             traceback.print_exc()
             return {
-                'success': -1,
-                'message': str(e),
+                "success": -1,
+                "message": "Could not retrieve analysis."
+            }
+
+        try:
+            adata = ana.get_adata(backed=True)
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            return {
+                "success": -1,
+                "message": "Could not retrieve AnnData object."
             }
 
         adata.obs = order_by_time_point(adata.obs)

diff --git a/www/api/resources/plotly_data.py b/www/api/resources/plotly_data.py
@@ -119,12 +119,20 @@ def post(self, dataset_id):
 
         try:
             ana = geardb.get_analysis(analysis, dataset_id, session_id)
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            return_dict["success"] = -1
+            return_dict["message"] = "Could not retrieve analysis."
+            return return_dict
+
+        try:
             adata = ana.get_adata(backed=True)
         except Exception as e:
             import traceback
             traceback.print_exc()
             return_dict["success"] = -1
-            return_dict["message"] = str(e)
+            return_dict["message"] = "Could not retrieve AnnData."
             return return_dict
 
         if projection_id:

diff --git a/www/api/resources/projectr.py b/www/api/resources/projectr.py
@@ -296,13 +296,23 @@ def projectr_callback(dataset_id, genecart_id, projection_id, session_id, scope,
     # NOTE Currently no analyses are supported yet.
     try:
         ana = geardb.get_analysis(None, dataset_id, session_id)
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return {
+            "success": -1,
+            "message": "Could not retrieve analysis."
+        }
+
+    try:
         # Using adata with "backed" mode does not work with volcano plot
         adata = ana.get_adata(backed=True)
     except Exception as e:
-        print(str(e), file=fh)
+        import traceback
+        traceback.print_exc()
         return {
-            'success': -1
-            , 'message': str(e)
+            "success": -1,
+            "message": "Could not retrieve AnnData object."
         }
 
 

diff --git a/www/api/resources/tsne_data.py b/www/api/resources/tsne_data.py
@@ -211,15 +211,23 @@ def post(self, dataset_id):
 
         try:
             ana = geardb.get_analysis(analysis, dataset_id, session_id)
-            adata = ana.get_adata(backed=True)
         except Exception as e:
             import traceback
             traceback.print_exc()
             return {
                 "success": -1,
-                "message": str(e)
+                "message": "Could not retrieve analysis."
             }
 
+        try:
+            adata = ana.get_adata(backed=True)
+        except Exception as e:
+            import traceback
+            traceback.print_exc()
+            return {
+                "success": -1,
+                "message": "Could not retrieve AnnData object."
+            }
 
         if projection_id:
             try: