Skip to content

Commit d7b9273

Browse files
committed
Create a docker image when pushing the pro_version branch
1 parent 985ee48 commit d7b9273

File tree

14 files changed

+34
-27
lines changed

14 files changed

+34
-27
lines changed

.github/workflows/docker.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Create and publish a Docker image
22

33
on:
44
push:
5-
branches: main
5+
branches:
6+
- main
7+
- pro_version
68

79
env:
810
REGISTRY: ghcr.io

src/dashboard.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
import streamlit as st
99

10-
from ui_utils import setup_page_config
11-
from session_manager import initialize_pro_session, get_or_load_pro_clip
12-
from selection_handlers import get_pro_user_selections
13-
from ui_components import (
10+
from ui.ui_utils import setup_page_config
11+
from session.session_manager import initialize_pro_session, get_or_load_pro_clip
12+
from handlers.selection_handlers import get_pro_user_selections
13+
from ui.ui_components import (
1414
render_pro_page_header,
1515
render_pro_help_section,
1616
render_pro_clip_section,
1717
render_pro_empty_validation_placeholder,
1818
render_pro_all_validated_placeholder,
1919
)
20-
from validation_handlers import render_pro_validation_form
21-
from queries import get_top_species_for_database
20+
from handlers.validation_handlers import render_pro_validation_form
21+
from database.queries import get_top_species_for_database
2222

2323

2424
def main():

src/database/__init__.py

Whitespace-only changes.

src/queries.py renamed to src/database/queries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def get_top_species_for_database():
4545
return [row[0] for row in conn.execute(query).fetchall()]
4646

4747

48-
@st.cache_data(ttl=600, show_spinner="Loading assigned clips...") # Cache for 10 minutes
48+
@st.cache_data(ttl=1800, show_spinner="Loading assigned clips...") # Cache for 10 minutes
4949
def get_assigned_clips_for_user(user_id):
5050
"""
5151
Get all assigned clips for a specific userID.

src/handlers/__init__.py

Whitespace-only changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import streamlit as st
44
from config import LANGUAGE_MAPPING
5-
from queries import check_user_has_annotations
6-
from ui_utils import render_sidebar_logo
5+
from database.queries import check_user_has_annotations
6+
from ui.ui_utils import render_sidebar_logo
77

88

99
def render_pro_authentication():
Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pandas as pd
55
import streamlit as st
66

7-
from queries import get_remaining_pro_clips_count, get_top_species_for_database
7+
from database.queries import get_remaining_pro_clips_count, get_top_species_for_database
88
from utils import get_species_display_names, load_species_translations
99

1010

@@ -152,16 +152,21 @@ def _handle_pro_validation_submission(result, selections, selected_species, othe
152152

153153
all_identified_species = selected_species + additional_species
154154

155+
# Parse arrays from parquet to ensure they're proper lists
156+
birdnet_species = _parse_array_string(result.get("species_array", []))
157+
birdnet_confidences = _parse_array_string(result.get("confidence_array", []))
158+
birdnet_uncertainties = _parse_array_string(result.get("uncertainty_array", []))
159+
155160
# Prepare validation data
156161
validation_data = {
157162
"filename": result["filename"],
158163
"userID": selections["user_id"],
159164
"deployment_id": result.get("deployment_id", ""),
160-
"birdnet_species_detected": result.get("species_array", []),
161-
"birdnet_confidences": result.get("confidence_array", []),
162-
"birdnet_uncertainties": result.get("uncertainty_array", []), # Array of uncertainties
165+
"birdnet_species_detected": birdnet_species,
166+
"birdnet_confidences": birdnet_confidences,
167+
"birdnet_uncertainties": birdnet_uncertainties,
163168
"start_time": result["start_time"],
164-
"identified_species": all_identified_species, # List of species user confirmed/added
169+
"identified_species": all_identified_species,
165170
"species_count": len(all_identified_species), # Number of species identified
166171
"user_confidence": user_confidence,
167172
"user_notes": user_notes,

src/session/__init__.py

Whitespace-only changes.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"""Expert Mode Session Management."""
22

33
import streamlit as st
4-
from queries import get_random_assigned_clip
5-
from session_utils import init_base_session, init_state_vars, check_params_changed
4+
from database.queries import get_random_assigned_clip
5+
from session.session_utils import init_base_session, init_state_vars, check_params_changed
66

77

88
def initialize_pro_session():
@@ -25,7 +25,7 @@ def clear_pro_clip_state():
2525
st.session_state.expert_validated_clips_session = set()
2626
st.session_state.expert_remaining_count = None
2727

28-
from queries import get_validated_pro_clips, get_remaining_pro_clips_count
28+
from database.queries import get_validated_pro_clips, get_remaining_pro_clips_count
2929
get_validated_pro_clips.clear()
3030
get_remaining_pro_clips_count.clear()
3131

@@ -46,7 +46,7 @@ def get_or_load_pro_clip(selections):
4646
if st.session_state.expert_current_clip is None:
4747
# Initialize remaining count on first load
4848
if st.session_state.expert_remaining_count is None:
49-
from queries import get_remaining_pro_clips_count
49+
from database.queries import get_remaining_pro_clips_count
5050
st.session_state.expert_remaining_count = get_remaining_pro_clips_count(selections["user_id"])
5151

5252
st.session_state.expert_current_clip = get_random_assigned_clip(

0 commit comments

Comments
 (0)