test before accessing anootations

Author: sreeder

odmtools/controller/olvDataTable.py

@@ -54,12 +54,12 @@ def init(self, memDB):
     def __merge_dataframe_with_annotations(self):
         data_list = self.dataframe.values.tolist()
         data = data_list
-
-        for key, value in self.annotations_grouped.iteritems():
-            for i in range(0, len(data_list)):
-                if key in data[i]:
-                    data[i].append(value)
-                    break
+        if self.annotations_grouped:
+            for key, value in self.annotations_grouped.iteritems():
+                for i in range(0, len(data_list)):
+                    if key in data[i]:
+                        data[i].append(value)
+                        break
 
         return data
 
@@ -68,18 +68,21 @@ def __group_annotations(self):
         Ideally, this method should only be called once. Use self.grouped_annotations after calling this method
         :return:
         """
-        anno_list = self.annotations.values.tolist()
-
-        anno = {}
-        for i in range(0, len(anno_list)):
-            value_id = anno_list[i][1]
-            annotation_code = anno_list[i][-1]
-            if value_id in anno:
-                anno[value_id].append(annotation_code)
-            else:
-                anno[value_id] = [annotation_code]
-
-        return anno
+        if (self.annotations):
+            anno_list = self.annotations.values.tolist()
+
+            anno = {}
+            for i in range(0, len(anno_list)):
+                value_id = anno_list[i][1]
+                annotation_code = anno_list[i][-1]
+                if value_id in anno:
+                    anno[value_id].append(annotation_code)
+                else:
+                    anno[value_id] = [annotation_code]
+
+            return anno
+        else:
+            return None
 
     def EnableSorting(self):
         self.Bind(wx.EVT_LIST_COL_CLICK, self.on_column_selected)

odmtools/odmdata/memory_database.py

@@ -47,6 +47,7 @@ def __init__(self, taskserver=None):
     def reset_edit(self):
         sm = ServiceManager()
         self.mem_service = sm.get_series_service(conn_string="sqlite:///:memory:")
+        self.annotation_list = pd.DataFrame()
         setSchema(self.mem_service._session_factory.engine)
 
     def set_series_service(self, service):

odmtools/odmservices/edit_service.py

@@ -512,58 +512,71 @@ def save(self,  result=None):
             # upsert values
             self.memDB.series_service.upsert_values(values)
             # save new annotations
-            self.add_annotations(self.memDB.annotation_list)
+            if len(self.memDB.annotation_list >0):
+                self.add_annotations(self.memDB.annotation_list)
+            return result
         except Exception as e:
             logger.error("Exception encountered while saving: {}".format(e))
-        return result
+        return None
 
     def save_existing(self, result):
         result = self.save(result)
         return result
 
     def save_appending(self, result, overwrite=True):
-        values = self.memDB.getDataValuesDF()
-
-        # get value count
-        vc = result.ValueCount
-        # set in df
-        values["resultid"] = result.ResultID
-
-        # count = overlap calc
-        count = self.overlapcalc(result, values, overwrite)
-        # set value count = res.vc+valuecount-count
-        valuecount = result.ValueCount + vc - count
-        # update result
-        self.updateResult(result, valuecount)
-        # insert values
-        self.memDB.series_service.upsert_values(values)
-        # save new annotations
-        self.add_annotations(self.memDB.annotation_list)
-
-        return result
-
-    def save_as(self, variable, method, proc_level, action, action_by):
-        #save as new series
-        values = self.memDB.getDataValuesDF()
-        # get all annotations for series
-        annolist= self.memDB.series_service.get_annotations_by_result(str(values["resultid"][0]))
-        annolist['valueid']=None
+        try:
 
-        # create series
-        result = self.getResult(variable, method, proc_level, action, action_by)
+            values = self.memDB.getDataValuesDF()
 
-        # set in df
-        values["resultid"] = result.ResultID
-        # insert values
-        self.memDB.series_service.insert_values(values)
+            # get value count
+            vc = result.ValueCount
+            # set in df
+            values["resultid"] = result.ResultID
 
-        # save all annotations
-        frames = [self.memDB.annotation_list, annolist]
-        annolist = pd.concat(frames)
-        self.add_annotations(annolist)
+            # count = overlap calc
+            count = self.overlapcalc(result, values, overwrite)
+            # set value count = res.vc+valuecount-count
+            valuecount = result.ValueCount + vc - count
+            # update result
+            self.updateResult(result, valuecount)
+            # insert values
+            self.memDB.series_service.upsert_values(values)
+            # save new annotations
+            if len(self.memDB.annotation_list >0):
+                self.add_annotations(self.memDB.annotation_list)
+            return result
+        except Exception as e:
+            logger.error("Exception encountered while performing a save as: {}".format(e))
+        return None
 
+    def save_as(self, variable, method, proc_level, action, action_by):
 
-        return result
+        try:
+            #save as new series
+            values = self.memDB.getDataValuesDF()
+            # get all annotations for series
+            annolist= self.memDB.series_service.get_annotations_by_result(str(values["resultid"][0]))
+            annolist['valueid']=None
+
+            # create series
+            result = self.getResult(variable, method, proc_level, action, action_by)
+
+            # set in df
+            values["resultid"] = result.ResultID
+            # insert values
+            self.memDB.series_service.insert_values(values)
+
+            #combine all of the annotations new annotations with the existing
+            frames = [self.memDB.annotation_list, annolist]
+            annolist = pd.concat(frames)
+            # save all annotations
+            if len(annolist >0):
+                self.add_annotations(annolist)
+
+            return result
+        except Exception as e:
+            logger.error("Exception encountered while performing a save as: {}".format(e))
+        return None
 
     def getResult(self, var, meth, proc, action, action_by):
         values = self.memDB.getDataValuesDF()
@@ -602,17 +615,19 @@ def getResult(self, var, meth, proc, action, action_by):
                 newaction.MethodID = action.MethodID
                 newaction.ActionTypeCV = "Derivation"
 
-                print newaction
+                print "creating an action"
                 newaction = self.memDB.series_service.create.createAction(newaction)  # it times out. find out why
                 print newaction
 
 
                 # create Actionby done
+                print "creating an actionby"
                 action_by.ActionID = newaction.ActionID
                 action_by= self.memDB.series_service.create.createActionby(action_by)
                 print action_by
 
 
+                print "creating a feature_action"
                 # create FeatureAction (using current sampling feature id)
                 sampling_feature = result.FeatureActionObj.SamplingFeatureObj
                 self.memDB.series_service.read._session.expunge(result.FeatureActionObj.SamplingFeatureObj)
@@ -625,6 +640,7 @@ def getResult(self, var, meth, proc, action, action_by):
                 feature_action = self.memDB.series_service.create.createFeatureAction(feature_action)
                 print feature_action
 
+                print "creating a result"
                 # create TimeSeriesResult - this should also contain all of the stuff for the Result
                 time, offset = self.get_current_time_and_utcoffset()
 
@@ -674,9 +690,9 @@ def overlapcalc(self, result, values,  overwrite):
         #is there any overlap
         dbend = result.FeatureActionObj.ActionObj.EndDateTime
         dfstart = datetime.datetime.strptime(str(np.min(values["valuedatetime"])), form)
-        overlap = dbend>= dfstart
+        overlap = dbend >= dfstart
         #number of overlapping values
-        overlapdf = values[(values["valuedatetime"]<= dfstart) & (values["valuedatetime"]>= dbend)]
+        overlapdf = values[(values["valuedatetime"] <= dfstart) & (values["valuedatetime"] >= dbend)]
         count =len(overlapdf)
         #if not overwrite. remove any overlapping values from df
         if overlap:
@@ -710,6 +726,7 @@ def add_annotations(self, annolist):
         mynewdf= newdf[["valueid_y","annotationid"]]
         mynewdf.columns = ["ValueID", "AnnotationID"]
 
+
         # save df to db
         self.memDB.series_service.add_annotations(mynewdf)
 

odmtools/odmservices/series_service.py

@@ -611,8 +611,9 @@ def get_current_time_and_utcoffset(self):
 
 
 
-    def insert_annotations(self, annotations):
-        annotations.to_sql(name="timeseriesresultvalueannotations", if_exists='append', con=self._session_factory.engine, index=False)
+    # def insert_annotations(self, annotations):
+    #     setSchema(self._session_factory.engine)
+    #     annotations.to_sql(name="timeseriesresultvalueannotations", if_exists='append', con=self._session_factory.engine, index=False)
 
 
     def _get_df_query(self, values):
@@ -787,6 +788,7 @@ def create_annotation(self, code, text, link=None):
         return self.create_annotation_by_anno(annotation)
 
     def add_annotations(self, anno_list):
+        setSchema(self._session_factory.engine)
         try:
             #tablename = TimeSeriesResultValueAnnotations.__tablename__
             #print ("I am TS saving name the table name", tablename)
@@ -872,6 +874,7 @@ def get_all_annotations(self):
 
     def get_annotations_by_result(self, resultid):
         resultid = int(resultid)
+        setSchema(self._session_factory.engine)
 
         q = self.read._session.query(TimeSeriesResultValueAnnotations.AnnotationID, TimeSeriesResultValueAnnotations.ValueID,
                                     TimeSeriesResultValues.ResultID, TimeSeriesResultValues.ValueDateTime, Annotations.AnnotationCode)\