Merge pull request #198 from Amsterdam/feature/refactor-bag-import

Feature/refactor bag import

docker-compose.yml

@@ -10,8 +10,10 @@ x-app: &base-app
     context: .
     target: app
   depends_on:
-    - database
-    - azurite
+    database:
+      condition: service_healthy
+    azurite:
+      condition: service_healthy
   volumes:
     - ./src:/src
     - ./deploy:/deploy
@@ -24,7 +26,6 @@ x-app: &base-app
     PYTHONBREAKPOINT: true
     UWSGI_STATIC_MAP: '/iiif-metadata/static=/static'
     AZURITE_STORAGE_CONNECTION_STRING: 'AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;DefaultEndpointsProtocol=http;BlobEndpoint=http://azurite:10000/devstoreaccount1/;'
-  entrypoint: /deploy/wait-for-it.sh database:5432 --
 
 services:
   database:
@@ -37,11 +38,20 @@ services:
       POSTGRES_PASSWORD: dev
     volumes:
       - "~/.ssh/datapunt.key:/root/.ssh/datapunt.key"
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "dev", "-U", "dev" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 
   azurite:
     image: mcr.microsoft.com/azure-storage/azurite
     ports:
       - 10000 # Blob service
+    healthcheck:
+      test: nc 127.0.0.1 10000 -z
+      interval: 1s
+      retries: 30
 
   app:
     <<: *base-app
@@ -50,7 +60,8 @@ services:
       target: app
     image: ${REGISTRY:-localhost:5000}/${REPOSITORY:-opdrachten/iiif-metadata-server}:${VERSION:-latest}
     depends_on:
-      - database
+      database:
+        condition: service_healthy
 
   dev:
     <<: *base-app

requirements.in

@@ -1,6 +1,7 @@
 # Define all requirements, only pin when necessary (and if so, add a comment explaining why).
 # See # https://git.datapunt.amsterdam.nl/Datapunt/python-best-practices/blob/master/dependency_management/
 
+toolz # Zero-dependency library with a set of utility functions for iterators, functions, and dictionaries.
 datapunt-authorization-django
 jwcrypto
 psycopg2-binary

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --allow-unsafe --output-file=requirements.txt requirements.in
@@ -66,7 +66,7 @@ debtcollector==3.0.0
     #   python-keystoneclient
 defusedxml==0.7.1
     # via djangorestframework-xml
-django==5.1.3
+django==5.1.4
     # via
     #   -r requirements.in
     #   datapunt-authorization-django
@@ -107,9 +107,9 @@ drf-extensions==0.7.1
     # via drf-amsterdam
 drf-yasg==1.21.8
     # via -r requirements.in
-google-api-core==2.23.0
+google-api-core==2.24.0
     # via opencensus
-google-auth==2.36.0
+google-auth==2.37.0
     # via google-api-core
 googleapis-common-protos==1.66.0
     # via google-api-core
@@ -179,7 +179,7 @@ oslo-i18n==6.5.0
     #   python-keystoneclient
 oslo-serialization==5.6.0
     # via python-keystoneclient
-oslo-utils==7.4.0
+oslo-utils==8.0.0
     # via
     #   oslo-serialization
     #   python-keystoneclient
@@ -200,7 +200,7 @@ portalocker==2.10.1
     # via msal-extensions
 proto-plus==1.25.0
     # via google-api-core
-protobuf==5.29.0
+protobuf==5.29.1
     # via
     #   google-api-core
     #   googleapis-common-protos
@@ -259,18 +259,18 @@ requests==2.32.3
     #   python-swiftclient
 rfc3986==2.0.0
     # via oslo-config
-rpds-py==0.22.1
+rpds-py==0.22.3
     # via
     #   jsonschema
     #   referencing
 rsa==4.9
     # via google-auth
-six==1.16.0
+six==1.17.0
     # via
     #   azure-core
     #   opencensus
     #   python-dateutil
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via
     #   django
     #   django-debug-toolbar
@@ -279,9 +279,10 @@ stevedore==5.4.0
     #   keystoneauth1
     #   oslo-config
     #   python-keystoneclient
+toolz==1.0.0
+    # via -r requirements.in
 typing-extensions==4.12.2
     # via
-    #   asgiref
     #   azure-core
     #   azure-identity
     #   azure-keyvault-certificates

requirements_dev.in

@@ -1,6 +1,8 @@
 # Base dependencies
 -r ./requirements.txt
 
+model-bakery
+parameterized
 factory-boy
 pytest-django
 pytest-cov