Merge pull request #2061 from pupil-labs/pye3d-raw-export-support

Make model_id optional for pupil 3d raw data export

Author: papr

pupil_src/shared_modules/raw_data_exporter.py

@@ -296,7 +296,6 @@ def dict_export(
         try:
             diameter_3d = raw_value["diameter_3d"]
             model_confidence = raw_value["model_confidence"]
-            model_id = raw_value["model_id"]
             sphere_center = raw_value["sphere"]["center"]
             sphere_radius = raw_value["sphere"]["radius"]
             circle_3d_center = raw_value["circle_3d"]["center"]
@@ -310,7 +309,6 @@ def dict_export(
         except KeyError:
             diameter_3d = None
             model_confidence = None
-            model_id = None
             sphere_center = [None, None, None]
             sphere_radius = None
             circle_3d_center = [None, None, None]
@@ -322,6 +320,9 @@ def dict_export(
             projected_sphere_axis = [None, None]
             projected_sphere_angle = None
 
+        # pye3d no longer includes this field. Keeping for backwards-compatibility.
+        model_id = raw_value.get("model_id", None)
+
         return {
             # 2d data
             "pupil_timestamp": pupil_timestamp,