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
367 changes: 176 additions & 191 deletions client/package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
"vuetify": "3.12.11"
},
"devDependencies": {
"@sentry/vite-plugin": "5.3.0",
"@sentry/vite-plugin": "5.4.0",
"@tsconfig/node24": "24.0.4",
"@types/geojson": "7946.0.16",
"@types/lodash": "4.17.24",
"@types/node": "25.6.0",
"@vitejs/plugin-vue": "6.0.7",
"@vue/eslint-config-typescript": "14.7.0",
"@vitejs/plugin-vue": "6.0.8",
"@vue/eslint-config-typescript": "14.9.0",
"@vue/tsconfig": "0.9.1",
"eslint": "10.4.1",
"eslint": "10.8.0",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-vue": "10.9.1",
"eslint-plugin-vue": "10.10.0",
"jiti": "2.7.0",
"npm-run-all2": "8.0.4",
"prettier": "3.8.3",
"prettier": "3.9.6",
"sass-embedded": "1.100.0",
"typescript": "5.9.3",
"vite": "8.0.14",
"vite": "8.1.5",
"vite-plugin-vuetify": "2.1.3",
"vue-tsc": "3.3.2"
"vue-tsc": "3.3.8"
}
}
3 changes: 1 addition & 2 deletions client/src/api/NABatApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ export interface NABatRecordingDataResponse {
recordingId: string;
}
export type NABatRecordingResponse =
| NABatRecordingCompleteResponse
| NABatRecordingDataResponse;
NABatRecordingCompleteResponse | NABatRecordingDataResponse;

function isNABatRecordingCompleteResponse(
response: NABatRecordingResponse,
Expand Down
14 changes: 2 additions & 12 deletions client/src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,7 @@ export interface RecordingListParams {
/** Filter by tags: recording must have all listed tags. Comma-separated or array. */
tags?: string | string[];
sort_by?:
| "id"
| "name"
| "created"
| "modified"
| "recorded_date"
| "owner_username";
"id" | "name" | "created" | "modified" | "recorded_date" | "owner_username";
sort_direction?: "asc" | "desc";
page?: number;
limit?: number;
Expand Down Expand Up @@ -376,12 +371,7 @@ async function getRecording(id: string) {

export interface UnsubmittedNeighborsParams {
sort_by?:
| "id"
| "name"
| "created"
| "modified"
| "recorded_date"
| "owner_username";
"id" | "name" | "created" | "modified" | "recorded_date" | "owner_username";
sort_direction?: "asc" | "desc";
/** Comma-separated or array of tag texts; recording must have all listed tags. */
tags?: string | string[];
Expand Down
14 changes: 3 additions & 11 deletions client/src/components/NABat/NABatAdminBrowser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ export default defineComponent({
offset?: number;
limit?: number;
sort_by?:
| "created"
| "recording_id"
| "survey_event_id"
| "annotation_count";
"created" | "recording_id" | "survey_event_id" | "annotation_count";
sort_direction?: "asc" | "desc";
}>({});

Expand Down Expand Up @@ -114,10 +111,7 @@ export default defineComponent({
].includes(sortBy.value[0].key)
) {
filters.value.sort_by = sortBy.value[0].key as
| "created"
| "recording_id"
| "survey_event_id"
| "annotation_count";
"created" | "recording_id" | "survey_event_id" | "annotation_count";
filters.value.sort_direction =
sortBy.value[0].order === "asc" ? "asc" : "desc";
}
Expand Down Expand Up @@ -165,9 +159,7 @@ export default defineComponent({
)
) {
annotationFilters.value.sort_by = sortByAnnotations.value[0].key as
| "created"
| "user_email"
| "confidence";
"created" | "user_email" | "confidence";
annotationFilters.value.sort_direction =
sortByAnnotations.value[0].order === "asc" ? "asc" : "desc";
}
Expand Down
3 changes: 1 addition & 2 deletions client/src/components/RecordingLocationsMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ export default defineComponent({
async function refreshSource() {
if (!mapRef.value) return;
const src = mapRef.value.getSource("recording-locations") as
| GeoJSONSource
| undefined;
GeoJSONSource | undefined;
if (!src) return;
loading.value = true;
error.value = null;
Expand Down
4 changes: 1 addition & 3 deletions client/src/components/geoJS/layers/editAnnotationLayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,7 @@ export default class EditAnnotationLayer {
*/
formatData(
annotationData:
| SpectrogramAnnotation
| null
| SpectrogramSequenceAnnotation,
SpectrogramAnnotation | null | SpectrogramSequenceAnnotation,
type: "pulse" | "sequence",
) {
this.selectedHandleIndex = -1;
Expand Down
6 changes: 2 additions & 4 deletions client/src/components/geoJS/layers/types.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
export type StyleFunction<T, D> =
| T
| ((point: [number, number], index: number, data: D) => T | undefined);
T | ((point: [number, number], index: number, data: D) => T | undefined);
export type ObjectFunction<T, D> =
| T
| ((data: D, index: number) => T | undefined);
T | ((data: D, index: number) => T | undefined);
export type PointFunction<T, D> = T | ((data: D) => T | undefined);

export interface LayerStyle<D> {
Expand Down
16 changes: 9 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"django-resonant-utils[allauth,s3_storage]==0.19.0",
"django-s3-file-field[s3]==1.1.0",
"django-storages[s3]==1.14.6",
"django-stubs-ext==6.0.5",
"django-stubs-ext==6.0.7",
"psycopg[binary]==3.3.4",
"pydantic==2.13.4",
"requests==2.34.2",
Expand Down Expand Up @@ -71,21 +71,21 @@ dev = [
# The "dev" dependency group is installed by default,
# so use this to install "development" and "tasks" extras by default too
"bats-ai[development,tasks]",
"tox==4.55.0",
"tox-uv==1.35.2",
"tox==4.58.0",
"tox-uv==1.36.0",
]
lint = [
"ruff==0.15.15",
"ruff==0.16.0",
]
type = [
"mypy==1.20.2",
"celery-types==0.26.0",
"django-stubs[compatible-mypy]==6.0.5",
"types-requests==2.33.0.20260518",
"django-stubs[compatible-mypy]==6.0.7",
"types-requests==2.33.0.20260712",
]
test = [
"factory-boy==3.3.3",
"pytest==9.0.3",
"pytest==9.1.1",
"pytest-django==4.12.0",
"pytest-mock==3.15.1",
# Enable with "pytest --random-order ..."
Expand Down Expand Up @@ -142,10 +142,12 @@ ignore = [

# Overly burdensome
"ANN", # flake8-annotations
"CPY001", # missing-copyright-notice
"D1", # undocumented-*
"EM", # flake8-errmsg
"ERA001", # commented-out-code
"FIX", # flake8-fixme
"PLR0917", # too-many-positional-arguments
"PLR2004", # magic-value-comparison
"RET505", # superfluous-else-return
"RET506", # superfluous-else-raise
Expand Down
Loading