Skip to content

Oct 2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SCGR-1 merged 3 commits into from
Oct 31, 2025
Merged

Oct 2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c631b2
optimize query & remove legacy structure
SCGR-1 Oct 31, 2025
9213aa8
B tree indexing
SCGR-1 Oct 31, 2025
a75de05
admin page model selection logic
SCGR-1 Oct 31, 2025
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
65 changes: 34 additions & 31 deletions frontend/src/pages/AdminPage/AdminPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,33 @@ export default function AdminPage() {
localStorage.setItem(SELECTED_MODEL_KEY, firstAvailableModel.m_code);
}
}

// Fetch current fallback model after models are loaded
fetch('/api/admin/fallback-model', {
headers: {
'Authorization': `Bearer ${localStorage.getItem('adminToken')}`
}
})
.then(r => {
if (!r.ok) {
throw new Error(`HTTP ${r.status}: ${r.statusText}`);
}
return r.json();
})
.then(fallbackData => {
console.log('Fallback model data received:', fallbackData);
if (fallbackData.fallback_model) {
setSelectedFallbackModel(fallbackData.fallback_model.m_code);
} else {
const stubModel = modelsData.models.find((m: ModelData) => m.m_code === 'STUB_MODEL' && m.is_available);
setSelectedFallbackModel(stubModel ? 'STUB_MODEL' : '');
}
})
.catch((error) => {
console.error('Error fetching fallback model:', error);
const stubModel = modelsData.models.find((m: ModelData) => m.m_code === 'STUB_MODEL' && m.is_available);
setSelectedFallbackModel(stubModel ? 'STUB_MODEL' : '');
});
} else {
console.error('Expected models object but got:', modelsData);
setAvailableModels([]);
Expand All @@ -144,31 +171,6 @@ export default function AdminPage() {
console.error('Error fetching models:', error);
setAvailableModels([]);
});

// Fetch current fallback model
fetch('/api/admin/fallback-model', {
headers: {
'Authorization': `Bearer ${localStorage.getItem('adminToken')}`
}
})
.then(r => {
if (!r.ok) {
throw new Error(`HTTP ${r.status}: ${r.statusText}`);
}
return r.json();
})
.then(fallbackData => {
console.log('Fallback model data received:', fallbackData);
if (fallbackData.fallback_model) {
setSelectedFallbackModel(fallbackData.fallback_model.m_code);
} else {
setSelectedFallbackModel('');
}
})
.catch((error) => {
console.error('Error fetching fallback model:', error);
setSelectedFallbackModel('');
});
}, []);

const fetchPrompts = useCallback(() => {
Expand Down Expand Up @@ -791,7 +793,10 @@ Model "${newModelData.label}" added successfully!
label="Model"
name="selected-model"
value={selectedModel}
onChange={(newValue) => handleModelChange(newValue || '')}
onChange={(newValue) => {
const modelCode = newValue || (availableModels.find(m => m.m_code === 'STUB_MODEL' && m.is_available)?.m_code || 'STUB_MODEL');
handleModelChange(modelCode);
}}
options={[
{ value: 'random', label: 'Random' },
...(availableModels || [])
Expand All @@ -809,16 +814,14 @@ Model "${newModelData.label}" added successfully!
label="Fallback"
name="fallback-model"
value={selectedFallbackModel}
onChange={(newValue) => handleFallbackModelChange(newValue || '')}
options={[
{ value: '', label: 'No fallback (use STUB_MODEL)' },
...(availableModels || [])
onChange={(newValue) => handleFallbackModelChange(newValue || 'STUB_MODEL')}
options={(availableModels || [])
.filter(model => model.is_available)
.map(model => ({
value: model.m_code,
label: model.label
}))
]}
}
keySelector={(o) => o.value}
labelSelector={(o) => o.label}
/>
Expand Down
90 changes: 39 additions & 51 deletions frontend/src/pages/ExplorePage/ExplorePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export default function ExplorePage() {
const [showExportModal, setShowExportModal] = useState(false);
const [isExporting, setIsExporting] = useState(false);
const [exportSuccess, setExportSuccess] = useState(false);
const [fetchError, setFetchError] = useState<string | null>(null);

// Delete state management
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
Expand All @@ -86,11 +87,13 @@ export default function ExplorePage() {

const fetchCaptions = useCallback(() => {
setIsLoadingContent(true);
setFetchError(null);

// Build query parameters for server-side filtering and pagination
const params = new URLSearchParams({
page: currentPage.toString(),
limit: itemsPerPage.toString()
limit: itemsPerPage.toString(),
include_count: 'true'
});

if (search) params.append('search', search);
Expand All @@ -105,74 +108,40 @@ export default function ExplorePage() {
fetch(`/api/images/grouped?${params.toString()}`)
.then(r => {
if (!r.ok) {
console.error('ExplorePage: Grouped endpoint failed, trying legacy endpoint');
// Fallback to legacy endpoint for backward compatibility
return fetch('/api/captions/legacy').then(r2 => {
if (!r2.ok) {
console.error('ExplorePage: Legacy endpoint failed, trying regular images endpoint');
return fetch('/api/images').then(r3 => {
if (!r3.ok) {
throw new Error(`HTTP ${r3.status}: ${r3.statusText}`);
}
return r3.json();
});
}
return r2.json();
});
throw new Error(`Failed to fetch images: ${r.status} ${r.statusText}`);
}
return r.json();
})
.then(data => {
console.log('ExplorePage: Fetched captions:', data);
setCaptions(data);
if (data.items && typeof data.total_count === 'number') {
setCaptions(data.items);
setTotalItems(data.total_count);
setTotalPages(Math.ceil(data.total_count / itemsPerPage));
} else if (Array.isArray(data)) {
setCaptions(data);
} else {
throw new Error('Unexpected response format');
}
setFetchError(null);
})
.catch(error => {
console.error('ExplorePage: Error fetching captions:', error);
setFetchError(error instanceof Error ? error.message : 'Failed to load images. Please try again later.');
setCaptions([]);
setTotalItems(0);
setTotalPages(0);
})
.finally(() => {
setIsLoadingContent(false);
});
}, [currentPage, search, srcFilter, catFilter, regionFilter, countryFilter, imageTypeFilter, uploadTypeFilter, showReferenceExamples, itemsPerPage]);

const fetchTotalCount = useCallback(() => {
// Build query parameters for count endpoint
const params = new URLSearchParams();

if (search) params.append('search', search);
if (srcFilter) params.append('source', srcFilter);
if (catFilter) params.append('event_type', catFilter);
if (regionFilter) params.append('region', regionFilter);
if (countryFilter) params.append('country', countryFilter);
if (imageTypeFilter) params.append('image_type', imageTypeFilter);
if (uploadTypeFilter) params.append('upload_type', uploadTypeFilter);
if (showReferenceExamples) params.append('starred_only', 'true');

fetch(`/api/images/grouped/count?${params.toString()}`)
.then(r => {
if (!r.ok) {
console.error('ExplorePage: Count endpoint failed');
return { total_count: 0 };
}
return r.json();
})
.then(data => {
console.log('ExplorePage: Total count:', data.total_count);
setTotalItems(data.total_count);
setTotalPages(Math.ceil(data.total_count / itemsPerPage));
})
.catch(error => {
console.error('ExplorePage: Error fetching total count:', error);
setTotalItems(0);
setTotalPages(0);
});
}, [search, srcFilter, catFilter, regionFilter, countryFilter, imageTypeFilter, uploadTypeFilter, showReferenceExamples, itemsPerPage]);

// Fetch data when component mounts or filters change
useEffect(() => {
fetchCaptions();
fetchTotalCount();
}, [fetchCaptions, fetchTotalCount]);
}, [fetchCaptions]);

// Reset to first page when filters change (but not when currentPage changes)
useEffect(() => {
Expand Down Expand Up @@ -672,8 +641,27 @@ export default function ExplorePage() {
</div>
)}

{/* Error State */}
{!isLoadingContent && fetchError && (
<div className="text-center py-12">
<Container withInternalPadding className="bg-red-50 border border-red-200 rounded-md max-w-2xl mx-auto">
<div className="flex flex-col items-center gap-4">
<div className="text-red-800 font-semibold text-lg">Failed to Load Images</div>
<div className="text-red-700">{fetchError}</div>
<Button
name="retry-fetch"
variant="primary"
onClick={() => fetchCaptions()}
>
Retry
</Button>
</div>
</Container>
</div>
)}

{/* Content */}
{!isLoadingContent && (
{!isLoadingContent && !fetchError && (
<div className="space-y-4">
{paginatedResults.map(c => (
<div key={c.image_id} className="flex items-center gap-4">
Expand Down
47 changes: 47 additions & 0 deletions py_backend/alembic/versions/0022_add_filtering_indexes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
"""add_filtering_indexes

Revision ID: 0022
Revises: 0021
Create Date: 2024-12-19 12:00:00.000000

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '0022'
down_revision = '0021'
branch_labels = None
depends_on = None


def upgrade():
# Indexes for images table - commonly filtered columns
# Note: ix_images_captured_at already exists from migration 0016, skip it here
op.execute("CREATE INDEX IF NOT EXISTS ix_images_source ON images(source)")
op.execute("CREATE INDEX IF NOT EXISTS ix_images_event_type ON images(event_type)")
op.execute("CREATE INDEX IF NOT EXISTS ix_images_image_type ON images(image_type)")

# Indexes for captions table - filtered and ordered columns
op.execute("CREATE INDEX IF NOT EXISTS ix_captions_starred ON captions(starred)")
op.execute("CREATE INDEX IF NOT EXISTS ix_captions_created_at ON captions(created_at)")

# Indexes for join tables - improve join performance
op.execute("CREATE INDEX IF NOT EXISTS ix_image_countries_image_id ON image_countries(image_id)")
op.execute("CREATE INDEX IF NOT EXISTS ix_image_countries_c_code ON image_countries(c_code)")

# Index on Country.r_code for region filtering
op.execute("CREATE INDEX IF NOT EXISTS ix_countries_r_code ON countries(r_code)")


def downgrade():
op.drop_index('ix_countries_r_code', table_name='countries', if_exists=True)
op.drop_index('ix_image_countries_c_code', table_name='image_countries', if_exists=True)
op.drop_index('ix_image_countries_image_id', table_name='image_countries', if_exists=True)
op.drop_index('ix_captions_created_at', table_name='captions', if_exists=True)
op.drop_index('ix_captions_starred', table_name='captions', if_exists=True)
op.drop_index('ix_images_image_type', table_name='images', if_exists=True)
op.drop_index('ix_images_event_type', table_name='images', if_exists=True)
op.drop_index('ix_images_source', table_name='images', if_exists=True)

Loading
Loading