Spaces:
Sleeping
Sleeping
Commit ·
e94c8b7
1
Parent(s): 652c203
fix: enforce per-project admin roles and remove demo bootstrap
Browse files- Change role assignment from global to per-project basis
- User is admin only in projects they created or assigned to
- User is validator only in projects they were invited to
- Remove demo bootstrap messaging and fallback
- Add first-login onboarding instructions for project creation
- Update login message to show per-project role counts
- Add admin scope indicator in Admin tab
- All tests passing (120 passed)
- src/ui/app_factory.py +148 -70
- src/ui/login_page.py +18 -1
- tests/unit/test_app_factory_audio_helpers.py +1 -2
src/ui/app_factory.py
CHANGED
|
@@ -855,15 +855,6 @@ def _bootstrap_auth_and_projects(
|
|
| 855 |
user_access = _load_user_access_from_file(user_access_file_path or runtime_config.user_access_file_path)
|
| 856 |
pending_invites = _load_pending_invites_from_file(invites_file_path or runtime_config.invites_file_path)
|
| 857 |
|
| 858 |
-
used_demo_fallback = False
|
| 859 |
-
if not projects and runtime_config.enable_demo_bootstrap:
|
| 860 |
-
projects = _default_projects()
|
| 861 |
-
used_demo_fallback = True
|
| 862 |
-
|
| 863 |
-
if not user_access and runtime_config.enable_demo_bootstrap:
|
| 864 |
-
user_access = _default_user_access()
|
| 865 |
-
used_demo_fallback = True
|
| 866 |
-
|
| 867 |
for project in projects:
|
| 868 |
_ = admin_manager.register_project(project)
|
| 869 |
|
|
@@ -888,18 +879,8 @@ def _bootstrap_auth_and_projects(
|
|
| 888 |
"Emergency admin access was granted to username 'admin_user'."
|
| 889 |
)
|
| 890 |
|
| 891 |
-
if used_demo_fallback:
|
| 892 |
-
base_message = (
|
| 893 |
-
"⚠️ Demo bootstrap enabled via BIRDNET_ENABLE_DEMO_BOOTSTRAP. "
|
| 894 |
-
"Use BIRDNET_PROJECTS_FILE and BIRDNET_USER_ACCESS_FILE for production auth/project setup."
|
| 895 |
-
)
|
| 896 |
-
return f"{base_message}\n\n{emergency_admin_message}" if emergency_admin_message else base_message
|
| 897 |
-
|
| 898 |
if not projects:
|
| 899 |
-
return
|
| 900 |
-
"⚠️ Production bootstrap incomplete. Create your first project in Admin, or configure "
|
| 901 |
-
"BIRDNET_PROJECTS_FILE and BIRDNET_USER_ACCESS_FILE (or enable demo bootstrap for local testing)."
|
| 902 |
-
)
|
| 903 |
|
| 904 |
return emergency_admin_message
|
| 905 |
|
|
@@ -2443,7 +2424,7 @@ def create_app() -> gr.Blocks:
|
|
| 2443 |
[project["project_slug"] for project in admin_manager.list_projects()],
|
| 2444 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2445 |
project_map=_current_project_map(),
|
| 2446 |
-
allow_demo_defaults=
|
| 2447 |
)
|
| 2448 |
service_ref: dict[str, DetectionQueueService] = {"queue": queue_service}
|
| 2449 |
audio_service = AudioFetchService(EphemeralCacheManager(ttl_seconds=300, max_files=128))
|
|
@@ -2488,6 +2469,25 @@ def create_app() -> gr.Blocks:
|
|
| 2488 |
result[slug] = project
|
| 2489 |
return result
|
| 2490 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2491 |
def _persist_admin_state() -> tuple[bool, str]:
|
| 2492 |
try:
|
| 2493 |
_persist_bootstrap_state(
|
|
@@ -2524,6 +2524,7 @@ def create_app() -> gr.Blocks:
|
|
| 2524 |
# ===== TAB 2: Admin Panel =====
|
| 2525 |
with gr.Tab("⚙️ Admin", id="admin_tab"):
|
| 2526 |
admin_info = gr.Markdown(value="⚠️ Login first")
|
|
|
|
| 2527 |
|
| 2528 |
def create_admin_display(session):
|
| 2529 |
"""Show admin panel or access denied message."""
|
|
@@ -2532,13 +2533,13 @@ def create_app() -> gr.Blocks:
|
|
| 2532 |
"❌ **Not authenticated** — Login first in the **Login** tab.",
|
| 2533 |
gr.update(visible=False),
|
| 2534 |
)
|
| 2535 |
-
|
| 2536 |
-
return (
|
| 2537 |
-
"❌ **Access denied** — Only administrators can access this panel.",
|
| 2538 |
-
gr.update(visible=False),
|
| 2539 |
-
)
|
| 2540 |
return (
|
| 2541 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2542 |
gr.update(visible=True),
|
| 2543 |
)
|
| 2544 |
|
|
@@ -2572,8 +2573,8 @@ def create_app() -> gr.Blocks:
|
|
| 2572 |
create_project_message = gr.Markdown()
|
| 2573 |
|
| 2574 |
def create_project(session, slug: str, name: str, repo_id: str, visibility: str, project_token: str):
|
| 2575 |
-
if session is None
|
| 2576 |
-
return "❌ Access denied.
|
| 2577 |
|
| 2578 |
slug = (slug or "").strip()
|
| 2579 |
name = (name or "").strip()
|
|
@@ -2597,18 +2598,19 @@ def create_app() -> gr.Blocks:
|
|
| 2597 |
)
|
| 2598 |
)
|
| 2599 |
if not created:
|
|
|
|
| 2600 |
return (
|
| 2601 |
f"⚠️ Project '{slug}' already exists.",
|
| 2602 |
_project_rows(),
|
| 2603 |
-
gr.update(choices=
|
| 2604 |
-
gr.update(),
|
| 2605 |
-
gr.update(),
|
| 2606 |
-
gr.update(),
|
| 2607 |
gr.update(),
|
| 2608 |
gr.update(),
|
| 2609 |
gr.update(),
|
| 2610 |
gr.update(),
|
| 2611 |
gr.update(),
|
|
|
|
|
|
|
|
|
|
| 2612 |
gr.update(),
|
| 2613 |
session,
|
| 2614 |
)
|
|
@@ -2621,10 +2623,11 @@ def create_app() -> gr.Blocks:
|
|
| 2621 |
_project_slugs(),
|
| 2622 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2623 |
project_map=_project_map(),
|
| 2624 |
-
allow_demo_defaults=
|
| 2625 |
)
|
| 2626 |
service_ref["queue"] = refreshed_service
|
| 2627 |
refreshed_session = auth_service.refresh_session_authorizations(session.session_id) or session
|
|
|
|
| 2628 |
|
| 2629 |
return (
|
| 2630 |
(
|
|
@@ -2633,15 +2636,15 @@ def create_app() -> gr.Blocks:
|
|
| 2633 |
else f"✅ Project '{slug}' created, but could not persist bootstrap files: {persist_error}"
|
| 2634 |
),
|
| 2635 |
_project_rows(),
|
| 2636 |
-
gr.update(choices=
|
| 2637 |
gr.update(value=""),
|
| 2638 |
gr.update(value=""),
|
| 2639 |
gr.update(value=""),
|
| 2640 |
gr.update(value="collaborative"),
|
| 2641 |
gr.update(value=""),
|
| 2642 |
-
gr.update(choices=
|
| 2643 |
-
gr.update(choices=
|
| 2644 |
-
gr.update(choices=["all", *
|
| 2645 |
refreshed_warning,
|
| 2646 |
refreshed_session,
|
| 2647 |
)
|
|
@@ -2654,8 +2657,36 @@ def create_app() -> gr.Blocks:
|
|
| 2654 |
)
|
| 2655 |
refresh_projects_btn = gr.Button("🔄 Refresh List")
|
| 2656 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2657 |
def refresh_projects(session):
|
| 2658 |
-
if session is None
|
| 2659 |
return []
|
| 2660 |
return _project_rows()
|
| 2661 |
|
|
@@ -2681,8 +2712,10 @@ def create_app() -> gr.Blocks:
|
|
| 2681 |
token_update_btn = gr.Button("Update Project Token")
|
| 2682 |
|
| 2683 |
def update_project_token(session, project_slug: str, new_token: str, clear_token: bool):
|
| 2684 |
-
if session is None
|
| 2685 |
-
return "❌ Access denied.
|
|
|
|
|
|
|
| 2686 |
project = admin_manager.get_project(project_slug)
|
| 2687 |
if project is None:
|
| 2688 |
return "⚠️ Select a valid project.", gr.update(), gr.update()
|
|
@@ -2705,7 +2738,7 @@ def create_app() -> gr.Blocks:
|
|
| 2705 |
_project_slugs(),
|
| 2706 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2707 |
project_map=_project_map(),
|
| 2708 |
-
allow_demo_defaults=
|
| 2709 |
)
|
| 2710 |
service_ref["queue"] = refreshed_service
|
| 2711 |
if refreshed_warning:
|
|
@@ -2739,8 +2772,10 @@ def create_app() -> gr.Blocks:
|
|
| 2739 |
invite_btn = gr.Button("✉️ Invite")
|
| 2740 |
|
| 2741 |
def assign_user(session, username: str, project: str, role: str):
|
| 2742 |
-
if session is None
|
| 2743 |
-
return "❌ Access denied.
|
|
|
|
|
|
|
| 2744 |
success, msg = admin_manager.assign_user_to_project(
|
| 2745 |
username, project, role
|
| 2746 |
)
|
|
@@ -2758,8 +2793,10 @@ def create_app() -> gr.Blocks:
|
|
| 2758 |
)
|
| 2759 |
|
| 2760 |
def invite_user(session, username: str, project: str, role: str):
|
| 2761 |
-
if session is None
|
| 2762 |
-
return "❌ Access denied.
|
|
|
|
|
|
|
| 2763 |
success, msg = admin_manager.invite_user_to_project(
|
| 2764 |
invited_by=session.username,
|
| 2765 |
username=username,
|
|
@@ -2787,8 +2824,10 @@ def create_app() -> gr.Blocks:
|
|
| 2787 |
delete_project_btn = gr.Button("🗑️ Delete Project", variant="stop")
|
| 2788 |
|
| 2789 |
def delete_project(session, project_slug: str):
|
| 2790 |
-
if session is None
|
| 2791 |
-
return "❌ Access denied.
|
|
|
|
|
|
|
| 2792 |
|
| 2793 |
success, msg = admin_manager.delete_project(project_slug)
|
| 2794 |
if not success:
|
|
@@ -2802,19 +2841,20 @@ def create_app() -> gr.Blocks:
|
|
| 2802 |
_project_slugs(),
|
| 2803 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2804 |
project_map=_project_map(),
|
| 2805 |
-
allow_demo_defaults=
|
| 2806 |
)
|
| 2807 |
service_ref["queue"] = refreshed_service
|
| 2808 |
refreshed_session = auth_service.refresh_session_authorizations(session.session_id) or session
|
| 2809 |
|
|
|
|
| 2810 |
return (
|
| 2811 |
msg,
|
| 2812 |
_project_rows(),
|
| 2813 |
-
gr.update(choices=
|
| 2814 |
-
gr.update(choices=
|
| 2815 |
refreshed_session,
|
| 2816 |
refreshed_warning,
|
| 2817 |
-
gr.update(value=
|
| 2818 |
)
|
| 2819 |
|
| 2820 |
delete_project_btn.click(
|
|
@@ -2850,7 +2890,7 @@ def create_app() -> gr.Blocks:
|
|
| 2850 |
refresh_pending_invites_btn = gr.Button("Refresh Pending Invites")
|
| 2851 |
revoke_invite_btn = gr.Button("Revoke Invite")
|
| 2852 |
|
| 2853 |
-
def _pending_invites_rows(project_filter: str):
|
| 2854 |
def _remaining_from_iso(iso_value: str) -> str:
|
| 2855 |
raw = str(iso_value or "").strip()
|
| 2856 |
if not raw:
|
|
@@ -2877,6 +2917,10 @@ def create_app() -> gr.Blocks:
|
|
| 2877 |
|
| 2878 |
selected = (project_filter or "all").strip().lower()
|
| 2879 |
project = None if selected == "all" else project_filter
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2880 |
invites = admin_manager.list_pending_invites(project_slug=project)
|
| 2881 |
return [
|
| 2882 |
[
|
|
@@ -2888,23 +2932,26 @@ def create_app() -> gr.Blocks:
|
|
| 2888 |
_remaining_from_iso(str(row.get("expires_at", ""))),
|
| 2889 |
]
|
| 2890 |
for row in invites
|
|
|
|
| 2891 |
]
|
| 2892 |
|
| 2893 |
refresh_pending_invites_btn.click(
|
| 2894 |
fn=_pending_invites_rows,
|
| 2895 |
-
inputs=[pending_invites_filter_project],
|
| 2896 |
outputs=[pending_invites_table],
|
| 2897 |
)
|
| 2898 |
|
| 2899 |
def revoke_invite(session, username: str, project_slug: str, project_filter: str):
|
| 2900 |
-
if session is None
|
| 2901 |
-
return "❌ Access denied.
|
|
|
|
|
|
|
| 2902 |
success, msg = admin_manager.revoke_invite(username=username, project_slug=project_slug)
|
| 2903 |
if success:
|
| 2904 |
persisted, persist_error = _persist_admin_state()
|
| 2905 |
if not persisted:
|
| 2906 |
msg = f"{msg} | ⚠️ Persistence failed: {persist_error}"
|
| 2907 |
-
return msg, _pending_invites_rows(project_filter)
|
| 2908 |
|
| 2909 |
revoke_invite_btn.click(
|
| 2910 |
fn=revoke_invite,
|
|
@@ -2914,7 +2961,7 @@ def create_app() -> gr.Blocks:
|
|
| 2914 |
|
| 2915 |
pending_invites_filter_project.change(
|
| 2916 |
fn=_pending_invites_rows,
|
| 2917 |
-
inputs=[pending_invites_filter_project],
|
| 2918 |
outputs=[pending_invites_table],
|
| 2919 |
)
|
| 2920 |
|
|
@@ -2945,11 +2992,35 @@ def create_app() -> gr.Blocks:
|
|
| 2945 |
)
|
| 2946 |
|
| 2947 |
session_state.change(
|
| 2948 |
-
fn=
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2949 |
inputs=[session_state],
|
| 2950 |
outputs=[admin_users_controls],
|
| 2951 |
)
|
| 2952 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2953 |
# ===== TAB 3: Project Selection =====
|
| 2954 |
with gr.Tab("📁 Select Project", id="project_tab"):
|
| 2955 |
project_info_display = gr.Markdown(
|
|
@@ -2982,7 +3053,14 @@ def create_app() -> gr.Blocks:
|
|
| 2982 |
if not projects:
|
| 2983 |
return (
|
| 2984 |
gr.Dropdown(choices=[], value=None, interactive=False),
|
| 2985 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2986 |
None,
|
| 2987 |
"",
|
| 2988 |
)
|
|
@@ -3628,7 +3706,7 @@ def create_app() -> gr.Blocks:
|
|
| 3628 |
rows=rows,
|
| 3629 |
cache_key=cache_key,
|
| 3630 |
evt=evt,
|
| 3631 |
-
allow_demo_fallback=
|
| 3632 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3633 |
)
|
| 3634 |
|
|
@@ -3717,7 +3795,7 @@ def create_app() -> gr.Blocks:
|
|
| 3717 |
dataset_repo=repo,
|
| 3718 |
rows=rows,
|
| 3719 |
cache_key=cache_key,
|
| 3720 |
-
allow_demo_fallback=
|
| 3721 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3722 |
),
|
| 3723 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
@@ -3737,7 +3815,7 @@ def create_app() -> gr.Blocks:
|
|
| 3737 |
rows=rows,
|
| 3738 |
selected_index=int(idx),
|
| 3739 |
previous_cache_key=cache_key,
|
| 3740 |
-
allow_demo_fallback=
|
| 3741 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3742 |
),
|
| 3743 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
@@ -3763,7 +3841,7 @@ def create_app() -> gr.Blocks:
|
|
| 3763 |
dataset_repo=repo,
|
| 3764 |
rows=rows,
|
| 3765 |
cache_key=cache_key,
|
| 3766 |
-
allow_demo_fallback=
|
| 3767 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3768 |
),
|
| 3769 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
@@ -3779,7 +3857,7 @@ def create_app() -> gr.Blocks:
|
|
| 3779 |
dataset_repo=repo,
|
| 3780 |
rows=rows,
|
| 3781 |
cache_key=cache_key,
|
| 3782 |
-
allow_demo_fallback=
|
| 3783 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3784 |
),
|
| 3785 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
@@ -3795,7 +3873,7 @@ def create_app() -> gr.Blocks:
|
|
| 3795 |
dataset_repo=repo,
|
| 3796 |
rows=rows,
|
| 3797 |
cache_key=cache_key,
|
| 3798 |
-
allow_demo_fallback=
|
| 3799 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3800 |
),
|
| 3801 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
@@ -4064,7 +4142,7 @@ def create_app() -> gr.Blocks:
|
|
| 4064 |
rows=rows,
|
| 4065 |
selected_index=int(idx),
|
| 4066 |
cache_key=cache_key,
|
| 4067 |
-
allow_demo_fallback=
|
| 4068 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4069 |
),
|
| 4070 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
@@ -4078,7 +4156,7 @@ def create_app() -> gr.Blocks:
|
|
| 4078 |
rows=rows,
|
| 4079 |
selected_index=int(idx),
|
| 4080 |
cache_key=cache_key,
|
| 4081 |
-
allow_demo_fallback=
|
| 4082 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4083 |
),
|
| 4084 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
@@ -4092,7 +4170,7 @@ def create_app() -> gr.Blocks:
|
|
| 4092 |
rows=rows,
|
| 4093 |
selected_index=int(idx),
|
| 4094 |
cache_key=cache_key,
|
| 4095 |
-
allow_demo_fallback=
|
| 4096 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4097 |
),
|
| 4098 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
@@ -4106,7 +4184,7 @@ def create_app() -> gr.Blocks:
|
|
| 4106 |
rows=rows,
|
| 4107 |
selected_index=int(idx),
|
| 4108 |
cache_key=cache_key,
|
| 4109 |
-
allow_demo_fallback=
|
| 4110 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4111 |
),
|
| 4112 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
|
|
| 855 |
user_access = _load_user_access_from_file(user_access_file_path or runtime_config.user_access_file_path)
|
| 856 |
pending_invites = _load_pending_invites_from_file(invites_file_path or runtime_config.invites_file_path)
|
| 857 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 858 |
for project in projects:
|
| 859 |
_ = admin_manager.register_project(project)
|
| 860 |
|
|
|
|
| 879 |
"Emergency admin access was granted to username 'admin_user'."
|
| 880 |
)
|
| 881 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 882 |
if not projects:
|
| 883 |
+
return ""
|
|
|
|
|
|
|
|
|
|
| 884 |
|
| 885 |
return emergency_admin_message
|
| 886 |
|
|
|
|
| 2424 |
[project["project_slug"] for project in admin_manager.list_projects()],
|
| 2425 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2426 |
project_map=_current_project_map(),
|
| 2427 |
+
allow_demo_defaults=False,
|
| 2428 |
)
|
| 2429 |
service_ref: dict[str, DetectionQueueService] = {"queue": queue_service}
|
| 2430 |
audio_service = AudioFetchService(EphemeralCacheManager(ttl_seconds=300, max_files=128))
|
|
|
|
| 2469 |
result[slug] = project
|
| 2470 |
return result
|
| 2471 |
|
| 2472 |
+
def _admin_projects_for_session(session) -> list[str]:
|
| 2473 |
+
if session is None:
|
| 2474 |
+
return []
|
| 2475 |
+
admin_projects: list[str] = []
|
| 2476 |
+
for project_slug in session.authorized_projects:
|
| 2477 |
+
role = auth_service.get_user_role_for_project(session.username, project_slug)
|
| 2478 |
+
if role == Role.admin:
|
| 2479 |
+
admin_projects.append(project_slug)
|
| 2480 |
+
return sorted(admin_projects)
|
| 2481 |
+
|
| 2482 |
+
def _is_admin_for_project(session, project_slug: str) -> bool:
|
| 2483 |
+
if session is None:
|
| 2484 |
+
return False
|
| 2485 |
+
slug = (project_slug or "").strip()
|
| 2486 |
+
if not slug:
|
| 2487 |
+
return False
|
| 2488 |
+
role = auth_service.get_user_role_for_project(session.username, slug)
|
| 2489 |
+
return role == Role.admin
|
| 2490 |
+
|
| 2491 |
def _persist_admin_state() -> tuple[bool, str]:
|
| 2492 |
try:
|
| 2493 |
_persist_bootstrap_state(
|
|
|
|
| 2524 |
# ===== TAB 2: Admin Panel =====
|
| 2525 |
with gr.Tab("⚙️ Admin", id="admin_tab"):
|
| 2526 |
admin_info = gr.Markdown(value="⚠️ Login first")
|
| 2527 |
+
admin_scope_info = gr.Markdown(value="")
|
| 2528 |
|
| 2529 |
def create_admin_display(session):
|
| 2530 |
"""Show admin panel or access denied message."""
|
|
|
|
| 2533 |
"❌ **Not authenticated** — Login first in the **Login** tab.",
|
| 2534 |
gr.update(visible=False),
|
| 2535 |
)
|
| 2536 |
+
admin_projects = _admin_projects_for_session(session)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2537 |
return (
|
| 2538 |
+
(
|
| 2539 |
+
f"✅ **Admin Panel** — Welcome, {session.username}. "
|
| 2540 |
+
f"You are admin in {len(admin_projects)} project(s). "
|
| 2541 |
+
"You can always create a new project and become its admin."
|
| 2542 |
+
),
|
| 2543 |
gr.update(visible=True),
|
| 2544 |
)
|
| 2545 |
|
|
|
|
| 2573 |
create_project_message = gr.Markdown()
|
| 2574 |
|
| 2575 |
def create_project(session, slug: str, name: str, repo_id: str, visibility: str, project_token: str):
|
| 2576 |
+
if session is None:
|
| 2577 |
+
return "❌ Access denied. Login required.", gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), session
|
| 2578 |
|
| 2579 |
slug = (slug or "").strip()
|
| 2580 |
name = (name or "").strip()
|
|
|
|
| 2598 |
)
|
| 2599 |
)
|
| 2600 |
if not created:
|
| 2601 |
+
admin_projects = _admin_projects_for_session(session)
|
| 2602 |
return (
|
| 2603 |
f"⚠️ Project '{slug}' already exists.",
|
| 2604 |
_project_rows(),
|
| 2605 |
+
gr.update(choices=admin_projects),
|
|
|
|
|
|
|
|
|
|
| 2606 |
gr.update(),
|
| 2607 |
gr.update(),
|
| 2608 |
gr.update(),
|
| 2609 |
gr.update(),
|
| 2610 |
gr.update(),
|
| 2611 |
+
gr.update(choices=admin_projects),
|
| 2612 |
+
gr.update(choices=admin_projects),
|
| 2613 |
+
gr.update(choices=["all", *admin_projects], value="all"),
|
| 2614 |
gr.update(),
|
| 2615 |
session,
|
| 2616 |
)
|
|
|
|
| 2623 |
_project_slugs(),
|
| 2624 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2625 |
project_map=_project_map(),
|
| 2626 |
+
allow_demo_defaults=False,
|
| 2627 |
)
|
| 2628 |
service_ref["queue"] = refreshed_service
|
| 2629 |
refreshed_session = auth_service.refresh_session_authorizations(session.session_id) or session
|
| 2630 |
+
admin_projects = _admin_projects_for_session(refreshed_session)
|
| 2631 |
|
| 2632 |
return (
|
| 2633 |
(
|
|
|
|
| 2636 |
else f"✅ Project '{slug}' created, but could not persist bootstrap files: {persist_error}"
|
| 2637 |
),
|
| 2638 |
_project_rows(),
|
| 2639 |
+
gr.update(choices=admin_projects, value=slug),
|
| 2640 |
gr.update(value=""),
|
| 2641 |
gr.update(value=""),
|
| 2642 |
gr.update(value=""),
|
| 2643 |
gr.update(value="collaborative"),
|
| 2644 |
gr.update(value=""),
|
| 2645 |
+
gr.update(choices=admin_projects, value=slug),
|
| 2646 |
+
gr.update(choices=admin_projects, value=slug),
|
| 2647 |
+
gr.update(choices=["all", *admin_projects], value="all"),
|
| 2648 |
refreshed_warning,
|
| 2649 |
refreshed_session,
|
| 2650 |
)
|
|
|
|
| 2657 |
)
|
| 2658 |
refresh_projects_btn = gr.Button("🔄 Refresh List")
|
| 2659 |
|
| 2660 |
+
def _render_admin_scope_info(session, selected_admin_project: str):
|
| 2661 |
+
if session is None:
|
| 2662 |
+
return ""
|
| 2663 |
+
|
| 2664 |
+
selected = (selected_admin_project or "").strip()
|
| 2665 |
+
if not selected:
|
| 2666 |
+
admin_projects = _admin_projects_for_session(session)
|
| 2667 |
+
if not admin_projects:
|
| 2668 |
+
return (
|
| 2669 |
+
"ℹ️ You are authenticated, but currently not admin of any existing project. "
|
| 2670 |
+
"Create a project to become admin of it."
|
| 2671 |
+
)
|
| 2672 |
+
return (
|
| 2673 |
+
f"ℹ️ Select a project to manage. "
|
| 2674 |
+
f"You are admin in {len(admin_projects)} project(s): {', '.join(admin_projects)}"
|
| 2675 |
+
)
|
| 2676 |
+
|
| 2677 |
+
role = auth_service.get_user_role_for_project(session.username, selected)
|
| 2678 |
+
role_label = role.value.upper() if role is not None else "NO ACCESS"
|
| 2679 |
+
if role == Role.admin:
|
| 2680 |
+
return f"✅ Effective role on project '{selected}': {role_label}"
|
| 2681 |
+
if role == Role.validator:
|
| 2682 |
+
return (
|
| 2683 |
+
f"⚠️ Effective role on project '{selected}': {role_label}. "
|
| 2684 |
+
"Management actions require ADMIN for this project."
|
| 2685 |
+
)
|
| 2686 |
+
return f"❌ You do not have access to project '{selected}'."
|
| 2687 |
+
|
| 2688 |
def refresh_projects(session):
|
| 2689 |
+
if session is None:
|
| 2690 |
return []
|
| 2691 |
return _project_rows()
|
| 2692 |
|
|
|
|
| 2712 |
token_update_btn = gr.Button("Update Project Token")
|
| 2713 |
|
| 2714 |
def update_project_token(session, project_slug: str, new_token: str, clear_token: bool):
|
| 2715 |
+
if session is None:
|
| 2716 |
+
return "❌ Access denied. Login required.", gr.update(), gr.update()
|
| 2717 |
+
if not _is_admin_for_project(session, project_slug):
|
| 2718 |
+
return "❌ Access denied. You must be admin of the selected project.", gr.update(), gr.update()
|
| 2719 |
project = admin_manager.get_project(project_slug)
|
| 2720 |
if project is None:
|
| 2721 |
return "⚠️ Select a valid project.", gr.update(), gr.update()
|
|
|
|
| 2738 |
_project_slugs(),
|
| 2739 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2740 |
project_map=_project_map(),
|
| 2741 |
+
allow_demo_defaults=False,
|
| 2742 |
)
|
| 2743 |
service_ref["queue"] = refreshed_service
|
| 2744 |
if refreshed_warning:
|
|
|
|
| 2772 |
invite_btn = gr.Button("✉️ Invite")
|
| 2773 |
|
| 2774 |
def assign_user(session, username: str, project: str, role: str):
|
| 2775 |
+
if session is None:
|
| 2776 |
+
return "❌ Access denied. Login required.", gr.update(), gr.update(), gr.update()
|
| 2777 |
+
if not _is_admin_for_project(session, project):
|
| 2778 |
+
return "❌ Access denied. You must be admin of the selected project.", gr.update(), gr.update(), gr.update()
|
| 2779 |
success, msg = admin_manager.assign_user_to_project(
|
| 2780 |
username, project, role
|
| 2781 |
)
|
|
|
|
| 2793 |
)
|
| 2794 |
|
| 2795 |
def invite_user(session, username: str, project: str, role: str):
|
| 2796 |
+
if session is None:
|
| 2797 |
+
return "❌ Access denied. Login required.", gr.update(), gr.update(), gr.update()
|
| 2798 |
+
if not _is_admin_for_project(session, project):
|
| 2799 |
+
return "❌ Access denied. You must be admin of the selected project.", gr.update(), gr.update(), gr.update()
|
| 2800 |
success, msg = admin_manager.invite_user_to_project(
|
| 2801 |
invited_by=session.username,
|
| 2802 |
username=username,
|
|
|
|
| 2824 |
delete_project_btn = gr.Button("🗑️ Delete Project", variant="stop")
|
| 2825 |
|
| 2826 |
def delete_project(session, project_slug: str):
|
| 2827 |
+
if session is None:
|
| 2828 |
+
return "❌ Access denied. Login required.", gr.update(), gr.update(), gr.update(), session, gr.update(), gr.update()
|
| 2829 |
+
if not _is_admin_for_project(session, project_slug):
|
| 2830 |
+
return "❌ Access denied. You must be admin of the selected project.", gr.update(), gr.update(), gr.update(), session, gr.update(), gr.update()
|
| 2831 |
|
| 2832 |
success, msg = admin_manager.delete_project(project_slug)
|
| 2833 |
if not success:
|
|
|
|
| 2841 |
_project_slugs(),
|
| 2842 |
seed_file_path=runtime_config.detection_seed_path,
|
| 2843 |
project_map=_project_map(),
|
| 2844 |
+
allow_demo_defaults=False,
|
| 2845 |
)
|
| 2846 |
service_ref["queue"] = refreshed_service
|
| 2847 |
refreshed_session = auth_service.refresh_session_authorizations(session.session_id) or session
|
| 2848 |
|
| 2849 |
+
admin_projects = _admin_projects_for_session(refreshed_session)
|
| 2850 |
return (
|
| 2851 |
msg,
|
| 2852 |
_project_rows(),
|
| 2853 |
+
gr.update(choices=admin_projects, value=None),
|
| 2854 |
+
gr.update(choices=admin_projects, value=None),
|
| 2855 |
refreshed_session,
|
| 2856 |
refreshed_warning,
|
| 2857 |
+
gr.update(choices=admin_projects, value=None),
|
| 2858 |
)
|
| 2859 |
|
| 2860 |
delete_project_btn.click(
|
|
|
|
| 2890 |
refresh_pending_invites_btn = gr.Button("Refresh Pending Invites")
|
| 2891 |
revoke_invite_btn = gr.Button("Revoke Invite")
|
| 2892 |
|
| 2893 |
+
def _pending_invites_rows(project_filter: str, session):
|
| 2894 |
def _remaining_from_iso(iso_value: str) -> str:
|
| 2895 |
raw = str(iso_value or "").strip()
|
| 2896 |
if not raw:
|
|
|
|
| 2917 |
|
| 2918 |
selected = (project_filter or "all").strip().lower()
|
| 2919 |
project = None if selected == "all" else project_filter
|
| 2920 |
+
if project is not None and not _is_admin_for_project(session, project):
|
| 2921 |
+
return []
|
| 2922 |
+
|
| 2923 |
+
admin_scope = set(_admin_projects_for_session(session))
|
| 2924 |
invites = admin_manager.list_pending_invites(project_slug=project)
|
| 2925 |
return [
|
| 2926 |
[
|
|
|
|
| 2932 |
_remaining_from_iso(str(row.get("expires_at", ""))),
|
| 2933 |
]
|
| 2934 |
for row in invites
|
| 2935 |
+
if str(row.get("project_slug", "")) in admin_scope
|
| 2936 |
]
|
| 2937 |
|
| 2938 |
refresh_pending_invites_btn.click(
|
| 2939 |
fn=_pending_invites_rows,
|
| 2940 |
+
inputs=[pending_invites_filter_project, session_state],
|
| 2941 |
outputs=[pending_invites_table],
|
| 2942 |
)
|
| 2943 |
|
| 2944 |
def revoke_invite(session, username: str, project_slug: str, project_filter: str):
|
| 2945 |
+
if session is None:
|
| 2946 |
+
return "❌ Access denied. Login required.", _pending_invites_rows(project_filter, session)
|
| 2947 |
+
if not _is_admin_for_project(session, project_slug):
|
| 2948 |
+
return "❌ Access denied. You must be admin of the selected project.", _pending_invites_rows(project_filter, session)
|
| 2949 |
success, msg = admin_manager.revoke_invite(username=username, project_slug=project_slug)
|
| 2950 |
if success:
|
| 2951 |
persisted, persist_error = _persist_admin_state()
|
| 2952 |
if not persisted:
|
| 2953 |
msg = f"{msg} | ⚠️ Persistence failed: {persist_error}"
|
| 2954 |
+
return msg, _pending_invites_rows(project_filter, session)
|
| 2955 |
|
| 2956 |
revoke_invite_btn.click(
|
| 2957 |
fn=revoke_invite,
|
|
|
|
| 2961 |
|
| 2962 |
pending_invites_filter_project.change(
|
| 2963 |
fn=_pending_invites_rows,
|
| 2964 |
+
inputs=[pending_invites_filter_project, session_state],
|
| 2965 |
outputs=[pending_invites_table],
|
| 2966 |
)
|
| 2967 |
|
|
|
|
| 2992 |
)
|
| 2993 |
|
| 2994 |
session_state.change(
|
| 2995 |
+
fn=_render_admin_scope_info,
|
| 2996 |
+
inputs=[session_state, admin_project],
|
| 2997 |
+
outputs=[admin_scope_info],
|
| 2998 |
+
)
|
| 2999 |
+
|
| 3000 |
+
session_state.change(
|
| 3001 |
+
fn=lambda s: gr.update(visible=bool(s is not None)),
|
| 3002 |
inputs=[session_state],
|
| 3003 |
outputs=[admin_users_controls],
|
| 3004 |
)
|
| 3005 |
|
| 3006 |
+
session_state.change(
|
| 3007 |
+
fn=lambda s: (
|
| 3008 |
+
gr.update(choices=_admin_projects_for_session(s), value=None),
|
| 3009 |
+
gr.update(choices=_admin_projects_for_session(s), value=None),
|
| 3010 |
+
gr.update(choices=_admin_projects_for_session(s), value=None),
|
| 3011 |
+
gr.update(choices=["all", *_admin_projects_for_session(s)], value="all"),
|
| 3012 |
+
[],
|
| 3013 |
+
),
|
| 3014 |
+
inputs=[session_state],
|
| 3015 |
+
outputs=[admin_project, token_project_select, pending_invite_project, pending_invites_filter_project, pending_invites_table],
|
| 3016 |
+
)
|
| 3017 |
+
|
| 3018 |
+
admin_project.change(
|
| 3019 |
+
fn=_render_admin_scope_info,
|
| 3020 |
+
inputs=[session_state, admin_project],
|
| 3021 |
+
outputs=[admin_scope_info],
|
| 3022 |
+
)
|
| 3023 |
+
|
| 3024 |
# ===== TAB 3: Project Selection =====
|
| 3025 |
with gr.Tab("📁 Select Project", id="project_tab"):
|
| 3026 |
project_info_display = gr.Markdown(
|
|
|
|
| 3053 |
if not projects:
|
| 3054 |
return (
|
| 3055 |
gr.Dropdown(choices=[], value=None, interactive=False),
|
| 3056 |
+
(
|
| 3057 |
+
"ℹ️ **Nenhum projeto disponível ainda**\n\n"
|
| 3058 |
+
"Para começar:\n"
|
| 3059 |
+
"1. Vá para a aba **Admin**.\n"
|
| 3060 |
+
"2. Preencha **New Project Slug**, **Project Name** e **HF Dataset Repo ID**.\n"
|
| 3061 |
+
"3. Clique em **Create Project**.\n"
|
| 3062 |
+
"4. Volte para **Select Project** e selecione o projeto criado."
|
| 3063 |
+
),
|
| 3064 |
None,
|
| 3065 |
"",
|
| 3066 |
)
|
|
|
|
| 3706 |
rows=rows,
|
| 3707 |
cache_key=cache_key,
|
| 3708 |
evt=evt,
|
| 3709 |
+
allow_demo_fallback=False,
|
| 3710 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3711 |
)
|
| 3712 |
|
|
|
|
| 3795 |
dataset_repo=repo,
|
| 3796 |
rows=rows,
|
| 3797 |
cache_key=cache_key,
|
| 3798 |
+
allow_demo_fallback=False,
|
| 3799 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3800 |
),
|
| 3801 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
|
|
| 3815 |
rows=rows,
|
| 3816 |
selected_index=int(idx),
|
| 3817 |
previous_cache_key=cache_key,
|
| 3818 |
+
allow_demo_fallback=False,
|
| 3819 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3820 |
),
|
| 3821 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
|
|
| 3841 |
dataset_repo=repo,
|
| 3842 |
rows=rows,
|
| 3843 |
cache_key=cache_key,
|
| 3844 |
+
allow_demo_fallback=False,
|
| 3845 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3846 |
),
|
| 3847 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
|
|
| 3857 |
dataset_repo=repo,
|
| 3858 |
rows=rows,
|
| 3859 |
cache_key=cache_key,
|
| 3860 |
+
allow_demo_fallback=False,
|
| 3861 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3862 |
),
|
| 3863 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
|
|
| 3873 |
dataset_repo=repo,
|
| 3874 |
rows=rows,
|
| 3875 |
cache_key=cache_key,
|
| 3876 |
+
allow_demo_fallback=False,
|
| 3877 |
hf_token=_project_fetch_token(project_slug, session),
|
| 3878 |
),
|
| 3879 |
inputs=[selected_project_state, selected_dataset_repo_state, table, cache_key_state, session_state],
|
|
|
|
| 4142 |
rows=rows,
|
| 4143 |
selected_index=int(idx),
|
| 4144 |
cache_key=cache_key,
|
| 4145 |
+
allow_demo_fallback=False,
|
| 4146 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4147 |
),
|
| 4148 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
|
|
| 4156 |
rows=rows,
|
| 4157 |
selected_index=int(idx),
|
| 4158 |
cache_key=cache_key,
|
| 4159 |
+
allow_demo_fallback=False,
|
| 4160 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4161 |
),
|
| 4162 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
|
|
| 4170 |
rows=rows,
|
| 4171 |
selected_index=int(idx),
|
| 4172 |
cache_key=cache_key,
|
| 4173 |
+
allow_demo_fallback=False,
|
| 4174 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4175 |
),
|
| 4176 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
|
|
|
| 4184 |
rows=rows,
|
| 4185 |
selected_index=int(idx),
|
| 4186 |
cache_key=cache_key,
|
| 4187 |
+
allow_demo_fallback=False,
|
| 4188 |
hf_token=_project_fetch_token(project_slug, session),
|
| 4189 |
),
|
| 4190 |
inputs=[selected_project_state, selected_dataset_repo_state, table, selected_index, cache_key_state, session_state],
|
src/ui/login_page.py
CHANGED
|
@@ -67,7 +67,24 @@ def create_login_page(auth_service: AuthService) -> Tuple[gr.Blocks, gr.Textbox,
|
|
| 67 |
if session is None:
|
| 68 |
return "", f"❌ User '{username}' not found or inactive"
|
| 69 |
|
| 70 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
|
| 72 |
login_button.click(
|
| 73 |
fn=perform_login,
|
|
|
|
| 67 |
if session is None:
|
| 68 |
return "", f"❌ User '{username}' not found or inactive"
|
| 69 |
|
| 70 |
+
admin_projects = 0
|
| 71 |
+
validator_projects = 0
|
| 72 |
+
for project_slug in session.authorized_projects:
|
| 73 |
+
project_role = auth_service.get_user_role_for_project(username, project_slug)
|
| 74 |
+
if project_role is None:
|
| 75 |
+
continue
|
| 76 |
+
if project_role.value == "admin":
|
| 77 |
+
admin_projects += 1
|
| 78 |
+
else:
|
| 79 |
+
validator_projects += 1
|
| 80 |
+
|
| 81 |
+
return (
|
| 82 |
+
session.session_id,
|
| 83 |
+
(
|
| 84 |
+
f"✅ Welcome, {username}! "
|
| 85 |
+
f"Admin in {admin_projects} project(s), validator in {validator_projects} project(s)."
|
| 86 |
+
),
|
| 87 |
+
)
|
| 88 |
|
| 89 |
login_button.click(
|
| 90 |
fn=perform_login,
|
tests/unit/test_app_factory_audio_helpers.py
CHANGED
|
@@ -831,8 +831,7 @@ def test_bootstrap_auth_and_projects_warns_when_not_configured(tmp_path: Path) -
|
|
| 831 |
admin_manager = AdminPanelManager(auth_service)
|
| 832 |
|
| 833 |
warning = _bootstrap_auth_and_projects(auth_service, admin_manager, runtime_config)
|
| 834 |
-
|
| 835 |
-
assert "Production bootstrap incomplete" in warning
|
| 836 |
|
| 837 |
|
| 838 |
def test_bootstrap_auth_and_projects_recovers_emergency_admin_when_missing(tmp_path: Path) -> None:
|
|
|
|
| 831 |
admin_manager = AdminPanelManager(auth_service)
|
| 832 |
|
| 833 |
warning = _bootstrap_auth_and_projects(auth_service, admin_manager, runtime_config)
|
| 834 |
+
assert warning == ""
|
|
|
|
| 835 |
|
| 836 |
|
| 837 |
def test_bootstrap_auth_and_projects_recovers_emergency_admin_when_missing(tmp_path: Path) -> None:
|