Merge branch 'dev_v4' into Badatos/mariadb_CI

Author: Badatos

.github/workflows/pod_dev.yml

@@ -37,6 +37,23 @@ jobs:
       DATABASE_PASSWORD: root
 
     steps:
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: false
+          swap-storage: true
+
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4

Makefile

@@ -10,6 +10,10 @@ help:
 	@echo "Syntax: [make target] where target is in this list:"
 	@awk '/^#/{c=substr($$0,3);next}c&&/^[[:alpha:]][[:alnum:]_-]+:/{print substr($$1,1,index($$1,":")),c}1{c=0}' $(MAKEFILE_LIST) | column -s: -t
 
+# Affiche la doc technique de Pod v4
+doc:
+	open https://esupportail.github.io/Esup-Pod/4.x/index
+
 # Démarre le serveur de test
 start:
 	(sleep 15 ; open http://pod.localhost:8000) &
@@ -33,17 +37,17 @@ install:
 
 # Mise à jour de Pod
 upgrade:
-	git pull origin master
+	git pull origin main
 	python3 -m pip install -r requirements.txt
 	make updatedb
 	make migrate
 	make statics
 
 # Création des données initiales dans la BDD SQLite intégrée
 createDB:
-	find . -path "*/migrations/*.py" -not -name "__init__.py" -delete
-	find . -path "*/migrations/*.pyc" -delete
 	python3 manage.py delete_flatpages_migrations
+	find . -path "*/migrations/*.py" -not -name "__init__.py" -not -path "./.venv/*" -delete
+	find . -path "*/migrations/*.pyc" -delete
 	make updatedb
 	make migrate
 	python3 -Wd manage.py loaddata initial_data

pod/ai_enhancement/templates/choose_video_element.html

@@ -122,6 +122,6 @@
   {{ form.media }}
   <script src="{% static 'ai_enhancement/js/enrich-form.js' %}?ver={{ VERSION }}"></script>
   <script>
-    addEventListeners("{{ video.slug }}", "{{ video.title }}", "{{ video.description|safe }}", "{{ video.disciplines }}", "{% url 'ai_enhancement:enhance_video_json' video_slug=video.slug %}");
+    addEventListeners("{{ video.slug }}", "{{ video.title|escapejs }}", "{{ video.description|escapejs  }}", "{{ video.disciplines|escapejs }}", "{% url 'ai_enhancement:enhance_video_json' video_slug=video.slug %}");
   </script>
 {% endblock more_script %}

pod/ai_enhancement/utils.py

@@ -253,19 +253,19 @@ def enhancement_is_ready(video: Video) -> bool:
     return AIEnhancement.objects.filter(video=video, is_ready=True).exists()
 
 
-def notify_user(video: Video):
+def notify_user(video: Video, success: bool = True):
     """Notify user at the end of enhancement."""
     if (
         USE_NOTIFICATIONS
         and video.owner.owner.accepts_notifications
         and PushInformation.objects.filter(user=video.owner).exists()
     ):
-        send_notification_enhancement(video)
+        send_notification_enhancement(video, success)
     if EMAIL_ON_ENHANCEMENT_COMPLETION:
-        send_email_enhancement(video)
+        send_email_enhancement(video, success)
 
 
-def send_notification_enhancement(video):
+def send_notification_enhancement(video, success: bool = True):
     """Send push notification on video encoding or transcripting completion."""
     subject = "[%s] %s" % (
         __TITLE_SITE__,
@@ -279,6 +279,14 @@ def send_notification_enhancement(video):
         "content_title": video.title,
         "site_title": __TITLE_SITE__,
     }
+    if not success:
+        message = _(
+            "Something went wrong with AI improvement on “%(content_title)s”."
+            + " Suggestions for improvement can’t be available on %(site_title)s."
+        ) % {
+            "content_title": video.title,
+            "site_title": __TITLE_SITE__,
+        }
 
     pwa_notify_user(
         video.owner,
@@ -288,30 +296,38 @@ def send_notification_enhancement(video):
     )
 
 
-def send_email_enhancement(video) -> None:
+def send_email_enhancement(video, success: bool = True) -> None:
     """Send email notification on video improvement completion."""
     if DEBUG:
-        logger.info("SEND EMAIL ON IA IMPROVEMENT COMPLETION")
+        logger.info("SEND EMAIL ON AI IMPROVEMENT COMPLETION %s", success)
     url_scheme = "https" if SECURE_SSL_REDIRECT else "http"
     content_url = "%s:%s" % (url_scheme, video.get_full_url())
     subject = "[%s] %s" % (
         __TITLE_SITE__,
-        _("IA improvement #%(content_id)s completed") % {"content_id": video.id},
+        _("AI improvement #%(content_id)s completed") % {"content_id": video.id},
     )
+    main_text = _(
+        "AI improvement “%(content_title)s” has been completed"
+        + ", and is now available on %(site_title)s."
+    ) % {
+        "content_title": "<strong>%s</strong>" % video.title,
+        "site_title": __TITLE_SITE__,
+    }
+    if not success:
+        main_text = _(
+            "Something went wrong with AI improvement on “%(content_title)s” "
+            + " on %(site_title)s."
+        ) % {
+            "content_title": "<strong>%s</strong>" % video.title,
+            "site_title": __TITLE_SITE__,
+        }
 
     html_message = (
         '<p>%s</p><p>%s</p><p>%s<br><a href="%s"><i>%s</i></a>\
                 </p><p>%s</p>'
         % (
             _("Hello,"),
-            _(
-                "IA improvement “%(content_title)s” has been completed"
-                + ", and is now available on %(site_title)s."
-            )
-            % {
-                "content_title": "<strong>%s</strong>" % video.title,
-                "site_title": __TITLE_SITE__,
-            },
+            main_text,
             _("You will find it here:"),
             content_url,
             content_url,

pod/ai_enhancement/views.py

@@ -72,6 +72,7 @@ def toggle_webhook(request: WSGIRequest):
                     notify_user(enhancement.video)
                     return JsonResponse({"status": "OK"}, status=200)
                 else:
+                    notify_user(enhancement.video, success=False)
                     return JsonResponse(
                         {"status": "Enhancement has not yet been successfully achieved."},
                         status=500,