Merge branch 'main' into trainer-update-deps

Author: tomolopolis

medcat-trainer/docker-compose-dev.yml

@@ -25,7 +25,7 @@ services:
     environment:
       - MCT_VERSION=latest
       # OIDC Settings
-      - USE_OIDC=1
+      - USE_OIDC=0
       - KEYCLOAK_URL=http://keycloak.cogstack.localhost
       - KEYCLOAK_REALM=cogstack-realm
       - KEYCLOAK_FRONTEND_CLIENT_ID=cogstack-medcattrainer-frontend

medcat-trainer/docs/installation.md

@@ -78,6 +78,9 @@ Environment variables are used to configure the app:
 |EMAIL_PASS|The password or authentication key which will be used with the email address|
 |EMAIL_HOST|The hostname of the SMTP server which will be used to send email (default: mail.cogstack.org)|
 |EMAIL_PORT|The port that the SMTP server is listening to, common numbers are 25, 465, 587 (default: 465)|
+|MCTRAINER_BOOTSTRAP_ADMIN_USERNAME|Username for the default admin user created on initial startup (default: admin)|
+|MCTRAINER_BOOTSTRAP_ADMIN_EMAIL|Email address for the default admin user created on initial startup (default: admin@example.com)|
+|MCTRAINER_BOOTSTRAP_ADMIN_PASSWORD|Password for the default admin user created on initial startup (default: admin)|
 
 Set these and re-run the docker-compose file.
 

medcat-trainer/webapp/api/api/models.py

@@ -136,7 +136,11 @@ def save(self, *args, skip_load=False, **kwargs):
             super().save(*args, **kwargs)
         else:
             # For new objects, just update the FK fields without full save
-            # Fixes psycopg.errors.UniqueViolation: duplicate key value violates unique constraint "api_modelpack_pkey" 
+            # Remove force_insert if present and set force_update to ensure Django treats this as an update
+            # Removing the kwarg fixes error "Cannot force both insert and updating in model saving."
+            # Setting update_fields fixes errorpsycopg.errors.UniqueViolation: duplicate key value violates unique constraint "api_modelpack_pkey"
+            kwargs.pop('force_insert', None)
+            kwargs['force_update'] = True
             super().save(*args, update_fields=['concept_db', 'vocab'], **kwargs)
 
     def __str__(self):

medcat-trainer/webapp/scripts/run.sh

@@ -21,13 +21,17 @@ uv run python /home/api/manage.py migrate api --noinput
 # Generates the runtime configuration for the web app and copies it to the static directory for web access
 /home/scripts/nginx-entrypoint.sh
 
-# create a new super user, with username and password 'admin'
+# create a new super user, with configurable username, email, and password via env vars
 # also create a user group `user_group` that prevents users from deleting models
-echo "from django.contrib.auth import get_user_model
+echo "import os
+from django.contrib.auth import get_user_model
 User = get_user_model()
-if not User.objects.filter(username='admin').exists():
-    User.objects.create_superuser('admin', 'admin@example.com', 'admin')
-" | (cd /home/api && uv run python manage.py shell)
+admin_username = os.getenv('MCTRAINER_BOOTSTRAP_ADMIN_USERNAME') or 'admin'
+admin_email = os.getenv('MCTRAINER_BOOTSTRAP_ADMIN_EMAIL') or 'admin@example.com'
+admin_password = os.getenv('MCTRAINER_BOOTSTRAP_ADMIN_PASSWORD') or 'admin'
+if not User.objects.filter(username=admin_username).exists():
+    User.objects.create_superuser(admin_username, admin_email, admin_password)
+" | python manage.py shell
 
 if [ $LOAD_EXAMPLES ]; then
   echo "Loading examples..."