+ Upgrade all py packages

+ remove some ES deprecations

dockerfile-dev-with-volumes/pod/Dockerfile

@@ -38,7 +38,7 @@ RUN mkdir /tmp/node_modules/
 COPY --from=source-build-js /tmp/pod/node_modules/ /tmp/node_modules/
 
 RUN pip3 install --no-cache-dir -r requirements-conteneur.txt \
-    && pip3 install elasticsearch==8.9.0
+    && pip3 install elasticsearch==8.16.0
 
 # ENTRYPOINT:
 COPY ./dockerfile-dev-with-volumes/pod/my-entrypoint.sh /tmp/my-entrypoint.sh

pod/authentication/tests/test_populated.py

@@ -435,7 +435,7 @@ def test_populate_user_from_entry_unpopulate_group(self) -> None:
             )
 
 
-@skip("# Esup-Pod 4.0 is no more comapible with Shibb (until someone correct this)")
+@skip("# Esup-Pod 4.0 is no more compatible with Shibb (until someone correct this)")
 class PopulatedShibTestCase(TestCase):
     def setUp(self) -> None:
         """Set up PopulatedShibTestCase create user Pod."""

pod/live/urls.py

@@ -1,5 +1,4 @@
-from django.urls import path
-from django.urls import re_path
+from django.urls import path, re_path
 
 from .pilotingInterface import ajax_get_mandatory_parameters
 from .views import (

pod/main/rest_router.py

@@ -1,7 +1,7 @@
 """Esup-Pod Main REST api url router."""
 
 from rest_framework import routers
-from django.urls import include, path, re_path
+from django.urls import include, path
 from pod.authentication import rest_views as authentication_views
 from pod.video import rest_views as video_views
 # from pod.main import rest_views as main_views
@@ -106,13 +106,13 @@
         auth_views.accessgroups_remove_users_by_name,
         name="accessgroups_set_users_by_name",
     ),
-    re_path(
-        r"accessgroups_set_user_accessgroup /$",
+    path(
+        "accessgroups_set_user_accessgroup/",
         auth_views.accessgroups_set_user_accessgroup,
         name="accessgroups_set_user_accessgroup ",
     ),
-    re_path(
-        r"accessgroups_remove_user_accessgroup /$",
+    path(
+        "accessgroups_remove_user_accessgroup/",
         auth_views.accessgroups_remove_user_accessgroup,
         name="accessgroups_remove_user_accessgroup ",
     ),

pod/main/templates/block/card_list.html

@@ -3,7 +3,7 @@
 <div class="pod-inner edito-card-list" id="edito-videos-list-{{ uniq_id }}">
   <h2>{{ title |capfirst|truncatechars:43 }}</h2>
 
-  {% if type == "video" %} 
+  {% if type == "video" %}
     {% include "videos/video_list.html" with videos=elements %}
   {% elif type == "event" %}
     {% include "live/events_list.html" with events=elements hide_counter=True %}

pod/main/templates/maintenance.html

@@ -1,9 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load static %}
-{% load thumbnail %}
-{% load video_filters %}
-{% load video_tags %}
+{% load i18n static thumbnail video_filters video_tags %}
 
 {% block page_content %}
   {% if MAINTENANCE_MODE %}

pod/podfile/urls.py

@@ -1,7 +1,6 @@
 """Esup-Pod podfile URL Configuration."""
 
-from django.urls import path
-from django.urls import re_path
+from django.urls import path, re_path
 
 from .views import home, get_folder_files, get_file
 from .views import editfolder, deletefolder

pod/progressive_web_app/utils.py

@@ -7,7 +7,7 @@
 DEFAULT_ICON = static("img/icon_x1024.png")
 
 
-def notify_user(user, title, message, url=None, icon=None):
+def notify_user(user, title, message, url=None, icon=None) -> None:
     """Fill the payload to send a webpush notification to users devices."""
     payload = {
         "head": title,

pod/recorder/studio_urls_digest.py

@@ -1,5 +1,5 @@
-from django.urls import path
-from django.urls import re_path
+"""Esup-Pod Studio Recorder urls digest."""
+from django.urls import path, re_path
 
 from pod.recorder.views import (
     digest_admin_ng_series,

pod/video/context_processors.py

@@ -1,3 +1,5 @@
+"""Esup-Pod vido context processor."""
+
 from django.conf import settings as django_settings
 
 from pod.video.models import Type

pod/video/models.py

@@ -765,7 +765,6 @@ class Video(models.Model):
             "Separate tags with spaces, "
             "enclose the tags consist of several words in quotation marks."
         ),
-        null=True,
         blank=True,
         verbose_name=_("Tags"),
     )

pod/video/templates/videos/card_select.html

@@ -1,6 +1,4 @@
-{% load i18n %}
-{% load video_tags %}
-{% load video_quiz %}
+{% load i18n video_tags video_quiz %}
 
 {% spaceless %}
 <div class="card box-shadow pod-card--video video-card">

pod/video/templates/videos/video-info.html

@@ -1,9 +1,5 @@
-{% load i18n %}
-{% load static %}
-{% load thumbnail %}
-{% load video_tags %}
-{% load playlist_stats %}
-{% load favorites_playlist %}
+{% load i18n static thumbnail %}
+{% load video_tags playlist_stats favorites_playlist %}
 {% load speaker_template_tags %}
 
 <div class="video-info_duration-view-share">
@@ -87,7 +83,7 @@
       {% if video.tags %}
         <p class="tag-list">{% trans 'Tags:' %}
           {% for tag in video.tags.all %}
-            <a href="{% url 'videos:videos' %}?tag={{ tag }}"
+            <a href="{% url 'videos:videos' %}?tag={{ tag.slug }}"
               {% if request.GET.is_iframe %} target="_blank" {% endif %}
               class="btn btn-link btn-sm"
               title="{% blocktrans with video_tag=tag %}Show video list having tag “{{ video_tag }}”{% endblocktrans %}" data-bs-toggle="tooltip" data-bs-placement="bottom">

pod/video/templates/videos/video.html

@@ -1,9 +1,6 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load static custom_tags %}
-{% load thumbnail %}
-{% load video_filters %}
-{% load video_tags %}
+{% load i18n static custom_tags thumbnail %}
+{% load video_filters video_tags %}
 {% load favorites_playlist %}
 
 {% block opengraph %}

pod/video/templates/videos/video_row_select.html

@@ -1,7 +1,4 @@
-{% load i18n %}
-{% load favorites_playlist %}
-{% load playlist_buttons %}
-{% load video_tags %}
+{% load i18n favorites_playlist playlist_buttons video_tags %}
 
 {% spaceless %}
   {% if playlist %}

pod/video/templatetags/video_tags.py

@@ -34,7 +34,7 @@ def get_marker_time_for_user(video: Video, user: User):
 
 
 @register.simple_tag(name="get_percent_marker_for_user")
-def get_percent_marker_for_user(video: Video, user: User):
+def get_percent_marker_for_user(video: Video, user: User) -> int:
     """Tag to get the percent time of the video viewed by the authenticated user."""
     if video.duration and video.duration != 0:
         return int((video.get_marker_time_for_user(user) / video.duration) * 100)
@@ -43,7 +43,7 @@ def get_percent_marker_for_user(video: Video, user: User):
 
 
 @register.filter(name="file_exists")
-def file_exists(filepath):
+def file_exists(filepath) -> bool:
     return check_file(filepath.path)
 
 
@@ -60,7 +60,7 @@ def file_date_modified(filepath):
 
 
 @register.simple_tag
-def get_app_link(video, app):
+def get_app_link(video, app) -> str:
     mod = importlib.import_module("pod.%s.models" % app)
     if hasattr(mod, capfirst(app)):
         video_app = eval(

pod/video/urls.py

@@ -1,6 +1,5 @@
 from django.conf import settings
-from django.urls import re_path
-from django.urls import include, path
+from django.urls import include, path, re_path
 
 from .views import (
     video,

pod/video/views.py

@@ -1647,7 +1647,7 @@ def get_com_tree(com):
     return tree
 
 
-def can_edit_or_remove_note_or_com(request, nc, action):
+def can_edit_or_remove_note_or_com(request, nc, action) -> None:
     """
     Check if the current user can apply action to the note or comment nc.
 
@@ -1671,7 +1671,7 @@ def can_edit_or_remove_note_or_com(request, nc, action):
         raise PermissionDenied
 
 
-def can_see_note_or_com(request, nc):
+def can_see_note_or_com(request, nc) -> None:
     """
     Check if the current user can view the note or comment nc.
 

pod/video_search/readme → pod/video_search/Readme.md

@@ -1,15 +1,30 @@
-Installation of version 6 on debian:
-$>https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html
-Installation of ICU Analysis
+# Installation of ElasticSearch on Debian
+
+https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html
+
+## Installation of ICU Analysis
+
+```sh
 $>root@Pod:/usr/share/elasticsearch# bin/elasticsearch-plugin install analysis-icu
-Configuration
+````
+
+## Configuration
+
+```sh
 $>root@Pod:/etc/elasticsearch# vim elasticsearch.yml
  - cluster.name: pod-application
  - node.name: pod-1
  - discovery.zen.ping.unicast.hosts: ["elasticsearch.localhost"]
-?? Use Cerebro: https://github.com/lmenezes/cerebro
+```
+
+## To create pod index
 
-To create pod index:
+```sh
 (django_pod) pod@Pod:~/django_projects/podv3$ python manage.py create_pod_index
-To delete pod index:
+```
+
+## To delete pod index
+
+```sh
 $>curl -XDELETE elasticsearch.localhost:9200/pod
+```

pod/video_search/forms.py

@@ -25,6 +25,6 @@ class SearchForm(forms.Form):
         widget=widgets.AdminDateWidget(attrs={"type": "date"}),
     )
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         super(SearchForm, self).__init__(*args, **kwargs)
         self.fields = add_placeholder_and_asterisk(self.fields)

pod/video_search/models.py

@@ -16,7 +16,7 @@
 @receiver(post_save, sender=Video)
 def update_video_index(
     sender, instance=None, created=False, **kwargs
-):  # pragma: no cover
+) -> None:  # pragma: no cover
     """Start index_video as daemon thread."""
     if ES_URL is None:
         return
@@ -25,7 +25,7 @@ def update_video_index(
     t.start()
 
 
-def index_video(video):  # pragma: no cover
+def index_video(video) -> None:  # pragma: no cover
     """Add video in ES index."""
     if video.is_draft is False and video.encoding_in_progress is False:
         index_es(video)
@@ -36,7 +36,7 @@ def index_video(video):  # pragma: no cover
 @receiver(pre_delete, sender=Video)
 def delete_video_index(
     sender, instance=None, created=False, **kwargs
-):  # pragma: no cover
+) -> None:  # pragma: no cover
     """Start delete_es as daemon thread."""
     if ES_URL is None:
         return