Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
8859e65
feat(osekit): install new osekit [osmose-app-304] (#305)
ElodieENSTA Jul 10, 2025
7f98246
feat(osekit update): update models (#319)
ElodieENSTA Jul 17, 2025
4270452
feat(datasets import): update for new osekit (#322)
ElodieENSTA Jul 21, 2025
03c1f45
fix rebase on master (v2.5.4)
ElodieENSTA Jul 24, 2025
a492586
feat(datasets): Display all imported datasets and details for each on…
ElodieENSTA Jul 29, 2025
36cf45f
feat(dataset): manage import (#328)
ElodieENSTA Aug 19, 2025
adf647f
feat(osekit): Update aplose to comply with new OSEkit [327] (#344)
ElodieENSTA Dec 4, 2025
9aad536
small fixes
ElodieENSTA Dec 4, 2025
2161e6f
Update OSEkit
ElodieENSTA Dec 8, 2025
808aa05
Fix migration
ElodieENSTA Dec 8, 2025
f831557
Fix migration
ElodieENSTA Dec 8, 2025
ba4dad1
Fix migration
ElodieENSTA Dec 8, 2025
2f161d6
fix(zoom): analysis without zoomLevel shouldn't allow zoom #356
ElodieENSTA Dec 10, 2025
94fedb5
fix(spectrogram list): duration was always 0 #358
ElodieENSTA Dec 10, 2025
951885c
fix(annotation): Cannot select previous annotation on spectrogram aft…
ElodieENSTA Dec 11, 2025
dd9eab0
fix(annotation): view was jumping when pointer position was shown
ElodieENSTA Dec 11, 2025
679317e
fix: correct   display
ElodieENSTA Dec 11, 2025
65fa49c
fix(annotation): after moving a strong annotation it came back to its…
ElodieENSTA Dec 11, 2025
4da8b60
fix(annotation): simplify update query
ElodieENSTA Dec 11, 2025
9d5c4c0
fix(acoustic features): Has harmonics wasn't saved #356
ElodieENSTA Dec 11, 2025
ef84c66
fix(acoustic features): Enter start/end frequencies #356
ElodieENSTA Dec 11, 2025
f5a7cd1
fix(acoustic features): Don't automatically move window while updatin…
ElodieENSTA Dec 11, 2025
6b8e7fb
fix(frontend): build
ElodieENSTA Dec 11, 2025
9f13e01
fix(frontend): update import annotations icon
ElodieENSTA Dec 11, 2025
e236e70
fix(frontend): cannot submit annotation update
ElodieENSTA Dec 15, 2025
4b10afc
fix(frontend): Update label and confidence filter "none" label to "all"
ElodieENSTA Dec 15, 2025
792396d
fix(acoustic feature): Could select start/end frequency outside the a…
ElodieENSTA Dec 16, 2025
e9d7d60
fix(acoustic feature): Cursor when selecting start/end frequency
ElodieENSTA Dec 16, 2025
19c975c
fix(annotation inputs): Cannot drag cursors or successfully add and r…
ElodieENSTA Dec 16, 2025
8085aa4
fix(searchbar): Search shouldn't be case dependant
ElodieENSTA Dec 16, 2025
40f5e5a
fix(phase): Cannot see annotations to check on verification phase [36…
ElodieENSTA Dec 17, 2025
3d645ad
fix(annotator): Can submit task using "Tab" key [364]
ElodieENSTA Dec 17, 2025
efe9308
fix(annotator): Cannot submit verification [368]
ElodieENSTA Jan 5, 2026
a26f106
fix(annotator): TimeBar display way too far when no audio is loaded
ElodieENSTA Jan 5, 2026
4d374cd
fix(annotator): Cannot add comment to others annotation [368]
ElodieENSTA Jan 5, 2026
2dbbaae
fix(annotator): Annotation comment are displayed as task comments too…
ElodieENSTA Jan 5, 2026
b679a83
fix(annotator): Improve annotation row display in annotator [368]
ElodieENSTA Jan 5, 2026
49ef938
fix(annotator): Task date filter - min and max are reversed
ElodieENSTA Jan 5, 2026
0bed581
fix(annotator): Task annotation filter - "None" label choice should b…
ElodieENSTA Jan 5, 2026
49d4c8d
fix(annotator): Prevent audio loading if audio doesn't exactly corres…
ElodieENSTA Jan 5, 2026
f2eada5
test backend
ElodieENSTA Jan 6, 2026
650f00e
test(frontend): fix navigation to Datasets page
ElodieENSTA Jan 7, 2026
dc71287
test(frontend): fix navigation to Campaign creation page
ElodieENSTA Jan 7, 2026
f54340e
test(frontend): fix test create campaign with minimal information
ElodieENSTA Jan 7, 2026
eeb83d4
test(frontend): fix can download results test
ElodieENSTA Jan 7, 2026
27cb03d
test(frontend): fix 06a_Spectrogram_annotation_base.spec.ts
ElodieENSTA Jan 7, 2026
217477e
test(frontend): fix comments and validation tests
ElodieENSTA Jan 7, 2026
628fd15
task(backend.api): rename views folder
ElodieENSTA Jan 8, 2026
c00b465
fix(backend): Recover spectrogram path for legacy dataset
ElodieENSTA Jan 8, 2026
1b85cd0
fix(backend): Recover spectrogram audio path for legacy dataset
ElodieENSTA Jan 8, 2026
ad70da4
fix(annotation): Start end frequency are reversed when selecting DESC…
ElodieENSTA Jan 13, 2026
a78c103
Merge branch 'master' into feat/303-update-osekit
ElodieENSTA Jan 13, 2026
a4454dc
lint
ElodieENSTA Jan 13, 2026
343ab80
fix(annotation import): Cannot set label when importing annotations […
ElodieENSTA Jan 13, 2026
a2f6f04
lint
ElodieENSTA Jan 13, 2026
263bfd4
fix: seed
ElodieENSTA Jan 13, 2026
9da4915
Try new playwright configuration
ElodieENSTA Jan 14, 2026
1062f9a
Try fix CI tests error
ElodieENSTA Jan 14, 2026
26c8a3a
Try fix CI tests error
ElodieENSTA Jan 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
poetry run black --check backend
- name: Check for missed pylint warnings (don't forget to run pylint)
run: |
poetry run pylint --disable=fixme --disable=too-few-public-methods --ignore migrations backend
poetry run pylint --disable=fixme --disable=too-few-public-methods --ignore migrations --ignore tests backend
- name: Check whether seeding still works
run: |
poetry run ./manage.py migrate
Expand Down
55 changes: 24 additions & 31 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
# Fichier gitlab-ci.yml pour le déploiement de l'application sur l'infrastructure d'IFREMER
#
# Les informations des conteneurs sont les suivantes :
#
# * osmose_back
# * Les variables d'environnement suivantes doivent être déclarées au run :
# * ENV : production (par défaut l'environnement est celui de développement)
# * SECRET_KEY : clé de sécurité pour l'application (ex : résultat de "openssl rand -base64 32")
# * OSMOSE_HOST : URL du projet (ex : osmose.ifremer.fr)
# * OSMOSE_DB_HOST : hôte (IP / DNS) de la BDD (ex : 127.0.0.1)
# * OSMOSE_DB_PORT : port de la BDD (ex : 5432)
# * OSMOSE_DB_USER : user BDD (ex : osmose)
# * OSMOSE_DB_PWD : mot de passe BDD
# * OSMOSE_DB_BASE : nom de la base dédiée à l'application (ex : osmose)
# * OSMOSE_SENTRY_URL : url pour le monitoring d'erreurs Sentry
# * OSMOSE_PROXY_URL : host:port du proxy si besoin (ex : proxy-wiz.ifremer.fr:3128)
# * Port exposé : 8000
# * Le conteneur peut être lancé avec l'UID:GID 202377:11436 (dcazau:gosmose)
# * Dossier destiné au montage datawork : /opt/datawork
# * Dossier destiné au montage des fichiers static du back : /opt/staticfiles
# * Following environment variables needs to be declared on the run:
# * ENV : production (by default, environment is set to development)
# * SECRET_KEY : security key for the application (ex: result of `openssl rand -base64 32`)
# * OSMOSE_HOST : URL of the application (ex: osmose.fr)
# * OSMOSE_DB_HOST : DB host (IP / DNS) (ex: 127.0.0.1)
# * OSMOSE_DB_PORT : DB port (ex: 5432)
# * OSMOSE_DB_USER : DB user (ex: osmose)
# * OSMOSE_DB_PWD : DB password
# * OSMOSE_DB_BASE : DB Aplose dedicated database name (ex: osmose)
# * OSMOSE_PROXY_URL : Proxy host:port if needed (ex: proxy-wiz.osmose.fr:3128)
# * Exposed port: 8000
# * Folder dedicated to "datawork" mount: /opt/datawork
# * Folder dedicated to server static files mount: /opt/staticfiles
#
# * osmose_front
# * Les variables d'environnement suivantes doivent être déclarées au run :
# * OSMOSE_BACK_HOST : hostname Docker du conteneur back (ex : osmose_back)
# * Port exposé : 8080
# * Le conteneur peut être lancé avec l'UID:GID 202377:11436 (dcazau:gosmose)
# * Dossier destiné au montage datawork : /opt/datawork
# * Dossier destiné au montage des fichiers static du back : /opt/staticfiles
# * Following environment variables needs to be declared on the run:
# * OSMOSE_BACK_HOST : Docker hostname of the back container (ex : osmose_back)
# * Exposed port: 8080
# * Folder dedicated to "datawork" mount: /opt/datawork
# * Folder dedicated to server static files mount: /opt/staticfiles


stages:
Expand All @@ -41,7 +34,7 @@ variables:
osmose_front:
script:
- test -n "${CI_JOB_TOKEN}" && docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} || true
- docker build -t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${APP_NAME}:${APP_VERSION} --build-arg UID=202377 --build-arg GID=11436 -f ./dockerfiles/front.dockerfile .
- docker build -t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${APP_NAME}:${APP_VERSION} --build-arg UID=${UID} --build-arg GID=${GID} -f ./dockerfiles/front.dockerfile .
- docker push ${REGISTRY_PATH} ${CI_REGISTRY}/${CI_PROJECT_PATH}/${APP_NAME}:${APP_VERSION}
stage: build_image
rules:
Expand All @@ -51,13 +44,13 @@ osmose_front:
variables:
APP_NAME: osmose_front
APP_VERSION: $CI_COMMIT_TAG
CI_REGISTRY: gitlab-registry.ifremer.fr
CI_PROJECT_PATH: dev-ops/shared_docker_image_factory/imt_osmose
CI_REGISTRY: $REGISTRY
CI_PROJECT_PATH: $PROJECT_PATH

osmose_back:
script:
- test -n "${CI_JOB_TOKEN}" && docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} || true
- docker build -t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${APP_NAME}:${APP_VERSION} --build-arg UID=202377 --build-arg GID=11436 -f ./dockerfiles/back.dockerfile .
- docker build -t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${APP_NAME}:${APP_VERSION} --build-arg UID=${UID} --build-arg GID=${GID} -f ./dockerfiles/back.dockerfile .
- docker push ${REGISTRY_PATH} ${CI_REGISTRY}/${CI_PROJECT_PATH}/${APP_NAME}:${APP_VERSION}
stage: build_image
rules:
Expand All @@ -67,5 +60,5 @@ osmose_back:
variables:
APP_NAME: osmose_back
APP_VERSION: $CI_COMMIT_TAG
CI_REGISTRY: gitlab-registry.ifremer.fr
CI_PROJECT_PATH: dev-ops/shared_docker_image_factory/imt_osmose
CI_REGISTRY: $REGISTRY
CI_PROJECT_PATH: $PROJECT_PATH
3 changes: 0 additions & 3 deletions backend/api/actions/__init__.py

This file was deleted.

110 changes: 0 additions & 110 deletions backend/api/actions/check_new_spectro_config_errors.py

This file was deleted.

Loading