Itinerum commit e-mission#2, no testing, saving changes thus far

Author: jruzekowicz

emission/core/wrapper/confirmedtrip.py

@@ -19,7 +19,6 @@ class Confirmedtrip(ecwt.Trip):
 # the user input will have all `manual/*` entries
 # let's make that be somewhat flexible instead of hardcoding into the data model
                   "user_input": ecwb.WrapperBase.Access.WORM
-                  "itinerum_boolean": ecwb.WrapperBase.Access.WORM
                   })
 
     def _populateDependencies(self):

emission/core/wrapper/entry.py

@@ -129,9 +129,8 @@ def _getData2Wrapper():
             ### ** END: prediction objects
             ### ** BEGIN: confirmed objects which combine inferred and user input values
             "analysis/confirmed_trip": "confirmedtrip",
-            "analysis/confirmed_section": "confirmedsection",
+            "analysis/confirmed_section": "confirmedsection"
             ### ** END: confirmed objects which combine inferred and user input values
-            "itinerum": "itinerum_boolean"
             }
 
   @staticmethod

emission/core/wrapper/itinerum_boolean.py

@@ -24,7 +24,7 @@ class PipelineStages(enum.Enum):
     USER_MODEL = 7
     RECOMMENDATION = 8
     OUTPUT_GEN = 9
-    ITINERUM_BOOLEAN = 15
+    EXPORT_DATA = 15
 
 class PipelineState(ecwb.WrapperBase):
     props = {"pipeline_stage": ecwb.WrapperBase.Access.RW,  # the value of the stage from the enum above

emission/core/wrapper/pipelinestate.py

@@ -33,7 +33,7 @@
 import emission.net.ext_service.habitica.executor as autocheck
 
 import emission.storage.decorations.stats_queries as esds
-import emission.itinerum.itinerum_boolean as eii
+import emission.exportdata.export_data as eeded
 
 def run_intake_pipeline(process_number, uuid_list):
     """
@@ -173,10 +173,10 @@ def run_intake_pipeline_for_user(uuid):
 
         esds.store_pipeline_time(uuid, ecwp.PipelineStages.OUTPUT_GEN.name,
                                  time.time(), ogt.elapsed)
-        with ect.Timer() as ibt:
-            logging.info("*" * 10 + "UUID %s: setting itinerum boolean to false" % uuid + "*" * 10)
-            print(str(arrow.now()) + "*" * 10 + "UUID %s: setting itinerum boolean to false" % uuid + "*" * 10)
-            eii.set_itinerum_boolean(uuid)
+        with ect.Timer() as edt:
+            logging.info("*" * 10 + "UUID %s: exporting data" % uuid + "*" * 10)
+            print(str(arrow.now()) + "*" * 10 + "UUID %s: exporting data" % uuid + "*" * 10)
+            eeded.set_export_data(uuid)
 
-            esds.store_pipeline_time(uuid, ecwp.PipelineStages.ITINERUM_BOOLEAN.name,
-                                 time.time(), ibt.elapsed)
+            esds.store_pipeline_time(uuid, ecwp.PipelineStages.EXPORT_DATA.name,
+                                 time.time(), edt.elapsed)

emission/itinerum/__init__.py

@@ -185,20 +185,20 @@ def mark_mode_inference_done(user_id, last_section_done):
 def mark_mode_inference_failed(user_id):    
     mark_stage_failed(user_id, ps.PipelineStages.MODE_INFERENCE)
 
-def get_time_range_for_itinerum_boolean(user_id):
-    tq = get_time_range_for_stage(user_id, ps.PipelineStages.ITINERUM_BOOLEAN)
+def get_time_range_for_export_data(user_id):
+    tq = get_time_range_for_stage(user_id, ps.PipelineStages.EXPORT_DATA)
     tq.timeType = "data.end_ts"
     return tq
 
-def mark_label_inference_done(user_id, last_trip_done):
+def mark_export_data_done(user_id, last_trip_done):
     if last_trip_done is None:
-        mark_stage_done(user_id, ps.PipelineStages.ITINERUM_BOOLEAN, None)
+        mark_stage_done(user_id, ps.PipelineStages.EXPORT_DATA, None)
     else:
-        mark_stage_done(user_id, ps.PipelineStages.ITINERUM_BOOLEAN,
+        mark_stage_done(user_id, ps.PipelineStages.EXPORT_DATA,
                         last_trip_done.data.end_ts + END_FUZZ_AVOID_LTE)
 
-def mark_itinerum_boolean_failed(user_id):    
-    mark_stage_failed(user_id, ps.PipelineStages.ITINERUM_BOOLEAN)
+def mark_export_data_failed(user_id):    
+    mark_stage_failed(user_id, ps.PipelineStages.EXPORT_DATA)
 
 def get_time_range_for_output_gen(user_id):
     return get_time_range_for_stage(user_id, ps.PipelineStages.OUTPUT_GEN)

emission/itinerum/itinerum_boolean.py

@@ -83,8 +83,7 @@ def __init__(self, user_id):
                 "inference/prediction": self.analysis_timeseries_db,
                 "analysis/inferred_section": self.analysis_timeseries_db,
                 "analysis/confirmed_trip": self.analysis_timeseries_db,
-                "analysis/confirmed_section": self.analysis_timeseries_db,
-                "itinerum": self.analysis_timeseries_db
+                "analysis/confirmed_section": self.analysis_timeseries_db
             }