Merge pull request #1005 from shankari/run_user_stats_profile_always

Always run the computation of the user profile stats
e-mission · Dec 22, 2024 · abcc3fc · abcc3fc
2 parents fee1bef + 9d1f414
commit abcc3fc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/emission/pipeline/intake_stage.py b/emission/pipeline/intake_stage.py
@@ -76,6 +76,12 @@ def run_intake_pipeline(process_number, uuid_list, skip_if_no_new_data=False):
 
         try:
             run_intake_pipeline_for_user(uuid, skip_if_no_new_data)
+            with ect.Timer() as gsr:
+                logging.info("*" * 10 + "UUID %s: storing user stats " % uuid + "*" * 10)
+                print(str(arrow.now()) + "*" * 10 + "UUID %s: storing user stats " % uuid + "*" * 10)
+                eaurs.get_and_store_user_stats(uuid, "analysis/composite_trip")
+            esds.store_pipeline_time(uuid, 'STORE_USER_STATS',
+                                time.time(), gsr.elapsed)
         except Exception as e:
             esds.store_pipeline_error(uuid, "WHOLE_PIPELINE", time.time(), None)
             logging.exception("Found error %s while processing pipeline "
@@ -200,10 +206,3 @@ def run_intake_pipeline_for_user(uuid, skip_if_no_new_data):
         esds.store_pipeline_time(uuid, ecwp.PipelineStages.CREATE_COMPOSITE_OBJECTS.name,
                                  time.time(), crt.elapsed)
 
-        with ect.Timer() as gsr:
-            logging.info("*" * 10 + "UUID %s: storing user stats " % uuid + "*" * 10)
-            print(str(arrow.now()) + "*" * 10 + "UUID %s: storing user stats " % uuid + "*" * 10)
-            eaurs.get_and_store_user_stats(uuid, "analysis/composite_trip")
-
-        esds.store_pipeline_time(uuid, 'STORE_USER_STATS',
-                                time.time(), gsr.elapsed)
diff --git a/emission/tests/analysisTests/intakeTests/TestUserStat.py b/emission/tests/analysisTests/intakeTests/TestUserStat.py
@@ -44,7 +44,7 @@ def setUp(self):
             edb.get_profile_db().insert_one({"user_id": self.testUUID})
 
         #etc.runIntakePipeline(self.testUUID)
-        epi.run_intake_pipeline_for_user(self.testUUID, skip_if_no_new_data = False)
+        etc.runIntakePipeline(self.testUUID)
         logging.debug("UUID = %s" % (self.testUUID))
 
     def tearDown(self):
@@ -118,4 +118,4 @@ def testLastCall(self):
 if __name__ == '__main__':
     # Configure logging for the test
     etc.configLogging()
-    unittest.main()
+    unittest.main()
diff --git a/emission/tests/netTests/TestPipeline.py b/emission/tests/netTests/TestPipeline.py
@@ -7,6 +7,7 @@
 import emission.core.wrapper.localdate as ecwl
 import emission.tests.common as etc
 import emission.pipeline.intake_stage as epi
+import emission.analysis.result.user_stat as eaurs
 
 from emission.net.api import pipeline
 
@@ -38,6 +39,7 @@ def testNoAnalysisResults(self):
     def testAnalysisResults(self):
         self.assertEqual(pipeline.get_range(self.testUUID), (None, None))
         epi.run_intake_pipeline_for_user(self.testUUID, skip_if_no_new_data = False)
+        eaurs.get_and_store_user_stats(self.testUUID, "analysis/composite_trip")
         pr = pipeline.get_range(self.testUUID)
         self.assertAlmostEqual(pr[0], 1440688739.672)
         self.assertAlmostEqual(pr[1], 1440729142.709)