Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always run the computation of the user profile stats #1005

Merged
merged 1 commit into from
Dec 22, 2024
Merged

Always run the computation of the user profile stats #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions emission/pipeline/intake_stage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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)
4 changes: 2 additions & 2 deletions emission/tests/analysisTests/intakeTests/TestUserStat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -118,4 +118,4 @@ def testLastCall(self):
if __name__ == '__main__':
# Configure logging for the test
etc.configLogging()
unittest.main()
unittest.main()
2 changes: 2 additions & 0 deletions emission/tests/netTests/TestPipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Loading