Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions bats_ai/core/management/commands/load_public_dataset.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from csv import DictReader
from datetime import date
import hashlib
import logging
import os
Expand Down Expand Up @@ -34,11 +35,11 @@ def _create_filename(s3_key: str) -> str:
return f'{h}{suffix}'


def _get_metadata(filename: str) -> dict[str, Any]:
def _get_metadata(filename: str, line: dict[str, str]) -> dict[str, Any]:
metadata = {}
guano_metadata = extract_guano_metadata(filename, check_filename=False)
if guano_metadata.get('nabat_activation_start_time'):
dt = metadata['nabat_activation_start_time']
dt = guano_metadata['nabat_activation_start_time']
metadata['recorded_date'] = dt.date()
metadata['recorded_time'] = dt.time()
if guano_metadata.get('nabat_latitude') and guano_metadata.get('nabat_longitude'):
Expand All @@ -59,6 +60,21 @@ def _get_metadata(filename: str) -> dict[str, Any]:
metadata['site_name'] = guano_metadata.get('nabat_site_name')
metadata['unusual_occurrences'] = guano_metadata.get('nabat_unusual_occurrences')

if metadata.get('grts_cell_id', None) is None and line.get('grts_cell_id', None) is not None:
metadata['grts_cell_id'] = line['grts_cell_id']

if (
metadata.get('recorded_date', None) is None
and line.get('recording_night', None) is not None
):
# Expect this column to contain a string in YYYY-MM-DD format
recording_night_parts = line['recording_night'].split('-')
if len(recording_night_parts) == 3:
year = int(recording_night_parts[0])
month = int(recording_night_parts[1])
day = int(recording_night_parts[2])
metadata['recorded_date'] = date(year=year, month=month, day=day)

return metadata


Expand Down Expand Up @@ -116,7 +132,7 @@ def _ingest_files_from_manifest(
logger.info(f' Downloading to temporary file {filename}...')
s3_client.download_file(bucket, s3_key, filename)
logger.info(f' Creating recording for {s3_key}')
metadata = _get_metadata(filename)
metadata = _get_metadata(filename, line)
with open(filename, 'rb') as f:
recording = Recording.objects.create(
name=s3_key,
Expand Down
21 changes: 17 additions & 4 deletions client/src/views/Recordings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,18 @@ export default defineComponent({
}
};

function getItemLocation(item: Recording) {
if (configuration.value.mark_annotations_completed_enabled) {
return undefined;
} else if (item.recording_location) {
return {
x: item.recording_location.coordinates[0],
y: item.recording_location.coordinates[1],
};
}
return undefined;
}

return {
headers,
sharedHeaders,
Expand Down Expand Up @@ -358,6 +370,7 @@ export default defineComponent({
fetchSharedRecordings,
sortByMy,
sortByShared,
getItemLocation,
};
},
});
Expand Down Expand Up @@ -508,7 +521,7 @@ export default defineComponent({

<template #item.recording_location="{ item }">
<v-menu
v-if="item.recording_location"
v-if="item.recording_location || (configuration.mark_annotations_completed_enabled && item.grts_cell_id)"
open-on-hover
:close-on-content-click="false"
>
Expand All @@ -521,7 +534,7 @@ export default defineComponent({
<map-location
:editor="false"
:size="{width: 400, height: 400}"
:location="{ x: item.recording_location.coordinates[0], y: item.recording_location.coordinates[1]}"
:location="getItemLocation(item)"
:grts-cell-id="configuration.mark_annotations_completed_enabled ? item.grts_cell_id || undefined : undefined"
/>
</v-card>
Expand Down Expand Up @@ -723,7 +736,7 @@ export default defineComponent({
</template>
<template #item.recording_location="{ item }">
<v-menu
v-if="item.recording_location"
v-if="item.recording_location || (configuration.mark_annotations_completed_enabled && item.grts_cell_id)"
open-on-hover
:close-on-content-click="false"
>
Expand All @@ -736,7 +749,7 @@ export default defineComponent({
<map-location
:editor="false"
:size="{width: 400, height: 400}"
:location="{ x: item.recording_location.coordinates[0], y: item.recording_location.coordinates[1]}"
:location="getItemLocation(item)"
:grts-cell-id="configuration.mark_annotations_completed_enabled ? item.grts_cell_id || undefined : undefined"
/>
</v-card>
Expand Down