Didson check

app.py

@@ -125,8 +125,6 @@ def infer_next(_, progress=gr.Progress()):
 
     #crop_clip(file_path, 65)
 
-    aris_info, frame = pyARIS.DataImport(file_path)
-
     # Do inference
     json_result, json_filepath, zip_filepath, video_filepath, marking_filepath = predict_task(
         file_path, 

backend/aris.py

@@ -265,37 +265,43 @@ def add_metadata_to_result(aris_fp, json_data, beam_width_dir=BEAM_WIDTH_DIR):
 
     metadata = {}
     metadata["FILE_NAME"] = aris_fp
-    ARISdata, frame = pyARIS.DataImport(aris_fp)
-    metadata["FRAME_RATE"] = frame.framerate
+    if (aris_fp.endswith(".aris")):
+        ARISdata, frame = pyARIS.DataImport(aris_fp)
+    else:
+        ARISdata = None
+        frame = None
 
-    # Load in the beam width information
-    beam_width_data, camera_type = pyARIS.load_beam_width_data(frame, beam_width_dir=beam_width_dir)
+    metadata["FRAME_RATE"] = frame.framerate if frame is not None else "-"
 
-    # What is the meter resolution of the smallest sample?
-    min_pixel_size = pyARIS.get_minimum_pixel_meter_size(frame, beam_width_data)
+    if (frame is not None):
+        # Load in the beam width information
+        beam_width_data, camera_type = pyARIS.load_beam_width_data(frame, beam_width_dir=beam_width_dir)
 
-    # What is the meter resolution of the sample length?
-    sample_length = frame.sampleperiod * 0.000001 * frame.soundspeed / 2
+        # What is the meter resolution of the smallest sample?
+        min_pixel_size = pyARIS.get_minimum_pixel_meter_size(frame, beam_width_data)
 
-    # Choose the size of a pixel
-    pixel_meter_size = max(min_pixel_size, sample_length)
+        # What is the meter resolution of the sample length?
+        sample_length = frame.sampleperiod * 0.000001 * frame.soundspeed / 2
 
-    # Determine the image dimensions
-    xdim, ydim, x_meter_start, y_meter_start, x_meter_stop, y_meter_stop = pyARIS.compute_image_bounds(
-        pixel_meter_size, frame, beam_width_data,
-        additional_pixel_padding_x=0,
-        additional_pixel_padding_y=0
-    )
+        # Choose the size of a pixel
+        pixel_meter_size = max(min_pixel_size, sample_length)
 
-    # Compute the mapping from the samples to the image
-    sample_read_rows, sample_read_cols, image_write_rows, image_write_cols = pyARIS.compute_mapping_from_sample_to_image(
-        pixel_meter_size,
-        xdim, ydim, x_meter_start, y_meter_start,
-        frame, beam_width_data
-    )
+        # Determine the image dimensions
+        xdim, ydim, x_meter_start, y_meter_start, x_meter_stop, y_meter_stop = pyARIS.compute_image_bounds(
+            pixel_meter_size, frame, beam_width_data,
+            additional_pixel_padding_x=0,
+            additional_pixel_padding_y=0
+        )
+
+        # Compute the mapping from the samples to the image
+        sample_read_rows, sample_read_cols, image_write_rows, image_write_cols = pyARIS.compute_mapping_from_sample_to_image(
+            pixel_meter_size,
+            xdim, ydim, x_meter_start, y_meter_start,
+            frame, beam_width_data
+        )
 
-    marking_mapping = dict(zip(zip(image_write_rows, image_write_cols),
-                               zip(sample_read_rows, sample_read_cols)))
+        marking_mapping = dict(zip(zip(image_write_rows, image_write_cols),
+                                zip(sample_read_rows, sample_read_cols)))
     
     # Manual marking format rounds 0.5 to 1 instead of 0 in IEEE 754
     def round(number, ndigits=0):
@@ -308,7 +314,7 @@ def add_metadata_to_result(aris_fp, json_data, beam_width_dir=BEAM_WIDTH_DIR):
     metadata["NONDIRECTIONAL_FISH"] = none # TODO
     metadata["TOTAL_FISH"] = metadata["UPSTREAM_FISH"] + metadata["DOWNSTREAM_FISH"] + metadata["NONDIRECTIONAL_FISH"]
 
-    metadata["TOTAL_FRAMES"] = ARISdata.FrameCount
+    metadata["TOTAL_FRAMES"] = ARISdata.FrameCount if ARISdata is not None else "-"
     metadata["EXPECTED_FRAMES"] = -1 # What is this?
     metadata["TOTAL_TIME"] = str(datetime.timedelta(seconds=round(metadata["TOTAL_FRAMES"]/metadata["FRAME_RATE"])))
     metadata["EXPECTED_TIME"] = str(datetime.timedelta(seconds=round(metadata["EXPECTED_FRAMES"]/metadata["FRAME_RATE"])))
@@ -317,11 +323,11 @@ def add_metadata_to_result(aris_fp, json_data, beam_width_dir=BEAM_WIDTH_DIR):
 
     metadata["COUNT_FILE_NAME"] = 'N/A'
     metadata["EDITOR_ID"] = 'N/A'
-    metadata["INTENSITY"] = f'{round(frame.intensity, 1):.1f} dB' # Missing
-    metadata["THRESHOLD"] = f'{round(frame.threshold, 1):.1f} dB' # Missing
-    metadata["WINDOW_START"] = round(frame.windowstart, 2)
-    metadata["WINDOW_END"] = round(frame.windowstart + frame.windowlength, 2)
-    metadata["WATER_TEMP"] = f'{int(round(frame.watertemp))} degC'
+    metadata["INTENSITY"] = f'{round(frame.intensity, 1) if frame is not None else 0:.1f} dB' # Missing
+    metadata["THRESHOLD"] = f'{round(frame.threshold, 1) if frame is not None else 0:.1f} dB' # Missing
+    metadata["WINDOW_START"] = round(frame.windowstart, 2) if frame is not None else 0
+    metadata["WINDOW_END"] = round(frame.windowstart + frame.windowlength, 2) if frame is not None else 0
+    metadata["WATER_TEMP"] = f'{int(round(frame.watertemp)) if frame is not None else 0} degC'
 
     s = f''''''
 
@@ -375,7 +381,10 @@ def add_metadata_to_result(aris_fp, json_data, beam_width_dir=BEAM_WIDTH_DIR):
     metadata["FISH"] = []
     for entry in sorted(entries, key=lambda x: x['fish_id']):
         frame_num = entry['frame_num']
-        frame = pyARIS.FrameRead(ARISdata, frame_num)
+        if ARISdata is not None:
+            frame = pyARIS.FrameRead(ARISdata, frame_num)
+        else:
+            frame = None
 
         y = (entry['bbox'][1]+entry['bbox'][3])/2
         x = (entry['bbox'][0]+entry['bbox'][2])/2
@@ -397,22 +406,22 @@ def add_metadata_to_result(aris_fp, json_data, beam_width_dir=BEAM_WIDTH_DIR):
         fish_entry['NBR_FRAMES'] = entry['end_frame_index'] + 1 - entry['start_frame_index']
         fish_entry['TRAVEL'] = entry['travel_dist']
         fish_entry['DIR'] = upstream_motion_map[entry['direction']]
-        fish_entry['R'] = bin_num * pixel_meter_size + frame.windowstart
+        fish_entry['R'] = bin_num * pixel_meter_size + frame.windowstart if frame is not None else "-"
         fish_entry['THETA'] = beam_width_data['beam_center'][beam_num]
         fish_entry['L'] = entry['length']
         fish_entry['DR'] = -1.0 # What is this?
         fish_entry['LDR'] = -1.0 # What is this?
         fish_entry['ASPECT'] = -1.0 # What is this?
-        TIME, DATE = datetime.datetime.fromtimestamp(frame.sonartimestamp/1000000, pytz.timezone('UTC')).strftime('%H:%M:%S %Y-%m-%d').split()
+        TIME, DATE = datetime.datetime.fromtimestamp(frame.sonartimestamp/1000000, pytz.timezone('UTC')).strftime('%H:%M:%S %Y-%m-%d').split()  if frame is not None else ("-", "-")
         fish_entry['TIME'] = TIME
         fish_entry['DATE'] = DATE
-        fish_entry['LATITUDE'] = frame.latitude or 'N 00 d  0.00000 m'
-        fish_entry['LONGITUDE'] = frame.longitude or 'E 000 d  0.00000 m'
-        fish_entry['PAN'] = frame.sonarpan
+        fish_entry['LATITUDE'] = frame.latitude or 'N 00 d  0.00000 m' if frame is not None else 0
+        fish_entry['LONGITUDE'] = frame.longitude or 'E 000 d  0.00000 m' if frame is not None else 0
+        fish_entry['PAN'] = frame.sonarpan if frame is not None else 0
         if math.isnan(fish_entry['PAN']): fish_entry['PAN'] = "nan"
-        fish_entry['TILT'] = frame.sonartilt
+        fish_entry['TILT'] = frame.sonartilt if frame is not None else 0
         if math.isnan(fish_entry['TILT']): fish_entry['TILT'] = "nan"
-        fish_entry['ROLL'] = frame.roll # May be wrong number but sonarroll was NaN
+        fish_entry['ROLL'] = frame.roll if frame is not None else 0 # May be wrong number but sonarroll was NaN
         fish_entry['SPECIES'] = 'Unknown'
         fish_entry['MOTION'] = 'Running <-->'
         fish_entry['Q'] = -1 #5 # I don't know what this is or where it comes from
@@ -423,10 +432,15 @@ def add_metadata_to_result(aris_fp, json_data, beam_width_dir=BEAM_WIDTH_DIR):
         
     # What are these?
     # Maybe the date and time range for the recording?
-    first_frame = pyARIS.FrameRead(ARISdata, 0)
-    last_frame = pyARIS.FrameRead(ARISdata, metadata["TOTAL_FRAMES"]-1)
-    start_time, start_date = datetime.datetime.fromtimestamp(first_frame.sonartimestamp/1000000, pytz.timezone('UTC')).strftime('%H:%M:%S %Y-%m-%d').split()
-    end_time, end_date = datetime.datetime.fromtimestamp(last_frame.sonartimestamp/1000000, pytz.timezone('UTC')).strftime('%H:%M:%S %Y-%m-%d').split()
+    if ARISdata is not None:
+        first_frame = pyARIS.FrameRead(ARISdata, 0)
+        last_frame = pyARIS.FrameRead(ARISdata, metadata["TOTAL_FRAMES"]-1)
+        start_time, start_date = datetime.datetime.fromtimestamp(first_frame.sonartimestamp/1000000, pytz.timezone('UTC')).strftime('%H:%M:%S %Y-%m-%d').split()
+        end_time, end_date = datetime.datetime.fromtimestamp(last_frame.sonartimestamp/1000000, pytz.timezone('UTC')).strftime('%H:%M:%S %Y-%m-%d').split()
+    else:
+        start_date = 0
+        start_time = 0
+        end_time = 0
     metadata["DATE"] = start_date 
     metadata["START"] = start_time
     metadata["END"] = end_time