Skip to content

Commit c1692ca

Browse files
authored
[RELEASE] Esup-Pod 3.8.2
## New functionalities: * Use Whisper to format vtt subtitle (#1187) * Remove BBB module and add sipmediagw feature (#1190) * Add NOTIFY_SENDER boolean parameter (#1192) * Add fields to recording rest response (#1193) * Add return thumbnail url,width and height to oembed (#1194) * Add optional proxy URL for request coming from Aristote (#1218) ## Bugs corrected: * Change all filter_fields = () in filterset_fields = [], as filter_fields is deprecated (#1191) * Fix multi carousel (#1200) * Change regroup videos by theme when ORGANIZE_BY_THEME = True (#1203) * Bug habillage (#1211) * Fix migration script for BBB (#1214) * Improve RSS Feeds (#1215) * Fix BBB meeting deletion link (issue #1216) * No crop on thumbnail (#1217) * Use `get_thumbnail` to serve video thumbnail via caching system, to prevent video folder url to be publicly available (#1221) * Addition of a toolbar in the theme description editor of a chain. (issue #1185) * Correction enabling channels and themes to be assigned to a set of videos (issue #1106) * Manage restricted video access right in playlist ## Accessibility improvements: (#1219) * Modify some redundant title strings, adding the targeted object * Remove some redundant titles * Correct i18n strings * Correct duplicated id * Remove broken aria-label id * Add flatpage title in h1 for accessibility + remove H1 title in legal notice and accessibility statement pages ## Quality of Code: * Minor code formatting * Add missing DocStrings * Upgrade GitGuardian config version
2 parents 59edb5d + 39b25f9 commit c1692ca

File tree

111 files changed

+1320
-5667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1320
-5667
lines changed

.coveragerc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ omit = pod/*settings*.py
2424
*/migrations/*
2525
pod/recorder/plugins/type_*.py
2626
pod/*/forms.py
27-
scripts/bbb-pod-live/*.*
2827
pod/live/pilotingInterface.py

.gitguardian.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
exclude_paths:
1+
version: 2
2+
secret:
3+
ignored_paths:
24
- pod/enrichment/tests/test_views.py

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ pod/custom/*
4949
pod/main/static/custom/img
5050
!pod/custom/settings_local.py.example
5151
settings_local.py
52-
scripts/bbb-pod-live/docker-compose.yml
5352
transcription/*
5453

5554
# Unit test utilities #

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
- repo: https://github.com/gitguardian/ggshield
3-
rev: v1.27.0
3+
rev: v1.32.0
44
hooks:
55
- id: ggshield
66
language_version: python3
7-
stages: [commit]
7+
stages: [pre-commit]

CONFIGURATION_EN.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#
1+
#
22

3-
##
3+
##
44

55
* `CAS`
66
> default value: `1.5.2`
@@ -29,7 +29,7 @@
2929
* `tagging`
3030
> default value: `0.5.0`
3131
32-
##
32+
##
3333

3434
### Database
3535

@@ -381,7 +381,7 @@
381381
> default value: `False`
382382
>>
383383
384-
##
384+
##
385385

386386
### AI Enhancement application configuration
387387

@@ -415,7 +415,7 @@ Set `USE_AI_ENHANCEMENT` to True to activate this application.<br>
415415
> default value: `False`
416416
>> Activation of artificial intelligence enhancements. Allows users to use it.<br>
417417
418-
###
418+
###
419419

420420
* `AFFILIATION`
421421
> default value: ``
@@ -559,10 +559,10 @@ Set `USE_AI_ENHANCEMENT` to True to activate this application.<br>
559559
> default value: `False`
560560
>>
561561
562-
###
562+
###
563563

564564

565-
###
565+
###
566566

567567
* `ACTIVE_MODEL_ENRICH`
568568
> default value: `False`
@@ -619,7 +619,7 @@ Set `USE_DRESSING` to True to activate this application.<br>
619619
> default value: `True`
620620
>> Activation of dressings. Allows users to customize a video with watermark & credits.<br>
621621
622-
###
622+
###
623623

624624

625625
### Seaker application configuration
@@ -659,7 +659,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
659659
> default value: `True`
660660
>> Directory that will contain the video files generated by bbb-recorder.<br>
661661
662-
###
662+
###
663663

664664
* `AFFILIATION_EVENT`
665665
> default value: `['faculty', 'employee', 'staff']`
@@ -717,7 +717,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
717717
> default value: `60`
718718
>>
719719
720-
###
720+
###
721721

722722
* `LTI_ENABLED`
723723
> default value: `False`
@@ -737,7 +737,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
737737
>> ```
738738
>>
739739
740-
###
740+
###
741741
742742
* `HOMEPAGE_VIEW_VIDEOS_FROM_NON_VISIBLE_CHANNELS`
743743
> default value: `False`
@@ -764,7 +764,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
764764
> default value: `False`
765765
>> Webtv mode allows you to switch POD into a webtv application removing the connection buttons for example<br>
766766
767-
###
767+
###
768768
769769
770770
@@ -864,7 +864,7 @@ Set `USE_PLAYLIST` to True to activate this application.<br>
864864
> default value: `True`
865865
>> Activation of promoted playlists. Allows users to use the promoted playlists.<br>
866866
867-
###
867+
###
868868
869869
* `FILES_DIR`
870870
> default value: `files`
@@ -879,7 +879,7 @@ Set `USE_PLAYLIST` to True to activate this application.<br>
879879
> default value: `('jpg', 'jpeg', 'bmp', 'png', 'gif', 'tiff', 'webp')`
880880
>> Allowed extensions for images uploaded in the file manager (must be lowercase).<br>
881881
882-
###
882+
###
883883
884884
* `USE_NOTIFICATIONS`
885885
> default value: `True`
@@ -906,7 +906,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
906906
> default value: `True`
907907
>> Activation of quizzes. Allows users to create, respond and use quizzes in videos.<br>
908908
909-
###
909+
###
910910

911911
* `ALLOW_MANUAL_RECORDING_CLAIMING`
912912
> default value: `False`
@@ -968,7 +968,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
968968
> default value: `False`
969969
>> If True, displays the video preview icon in the "Claim a recording" page.<br>
970970
971-
###
971+
###
972972

973973
* `ACTIVE_VIDEO_COMMENT`
974974
> default value: `False`
@@ -1076,7 +1076,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
10761076
> default value: `False`
10771077
>>
10781078
1079-
###
1079+
###
10801080

10811081

10821082

@@ -1125,7 +1125,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
11251125
> default value: `[]`
11261126
>>
11271127
1128-
###
1128+
###
11291129

11301130
* `ES_INDEX`
11311131
> default value: `pod`
@@ -1146,7 +1146,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
11461146
> default value: `{}`
11471147
>>
11481148
1149-
###
1149+
###
11501150

11511151
Application for sending xAPI statements to an LRS.<br>
11521152
No statements persist in Pod, they are all sent to the configured LRS.<br>

CONFIGURATION_FR.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Voici les configurations des applications tierces utilisées par Esup-Pod.<br>
155155
* `EMAIL_SUBJECT_PREFIX`
156156
> valeur par défaut : ``
157157
>> Préfixe par défaut pour l’objet des courriels.<br>
158+
* `NOTIFY_SENDER`
159+
> valeur par défaut : `True`
160+
>> En mode non authentifié, lors de l'utilisation du formulaire de contact, envoie une copie du message à l'adresse saisie dans le formulaire.<br>
158161
* `SERVER_EMAIL`
159162
> valeur par défaut : `noreply`
160163
>> Expediteur par défaut pour les envois automatique (erreur de code etc.)<br>
@@ -745,6 +748,10 @@ Mettre `USE_AI_ENHANCEMENT` à True pour activer cette application.<br>
745748
* `USE_AI_ENHANCEMENT`
746749
> valeur par défaut : `False`
747750
>> Activation des améliorations de l'intelligence artificielle. Permet aux utilisateurs de l'utiliser.<br>
751+
* `AI_ENHANCEMENT_PROXY_URL`
752+
> valeur par défaut : ``
753+
>> L’URL du serveur proxy pour les requêtes venant d'Aristote.<br>
754+
>> Exemple : '<https://proxy_aristote.univ.fr>'<br>
748755
749756
### Configuration de l’application authentification
750757
@@ -1144,15 +1151,15 @@ Mettre `USE_IMPORT_VIDEO` à True pour activer cette application.<br>
11441151
* `USE_BBB`
11451152
> valeur par défaut : `False`
11461153
>> Utilisation de BigBlueButton<br>
1147-
>> [TODO] À retirer dans les futures versions de Pod<br>
1154+
>> Retiré à partir de la version 3.8.2 de Pod (remplacé par le module des réunions)<br>
11481155
* `USE_BBB_LIVE`
11491156
> valeur par défaut : `False`
11501157
>> Utilisation du système de diffusion de Webinaires en lien avec BigBlueButton<br>
1151-
>> [TODO] À retirer dans les futures versions de Pod<br>
1158+
>> Retiré à partir de la version 3.8.2 de Pod (remplacé par le module des réunions)<br>
11521159
* `USE_LIVE_TRANSCRIPTION`
11531160
> valeur par défaut : `False`
1154-
>>
11551161
>> Activer l’auto-transcription pour les directs<br>
1162+
>>
11561163
* `VIEW_EXPIRATION_DELAY`
11571164
> valeur par défaut : `60`
11581165
>> Délai (en seconde) selon lequel une vue est considérée comme expirée<br>
@@ -1331,9 +1338,11 @@ Mettre `USE_MEETING` à True pour activer cette application.<br>
13311338
* `MEETING_WEBINAR_SIPMEDIAGW_URL`
13321339
> valeur par défaut : ``
13331340
>> URL du serveur SIPMediaGW qui gère les webinaires (Ex: `https://sipmediagw.univ.fr`)<br>
1341+
>> Retiré à partir de la version 3.8.2 de Pod (remplacé par le module des réunions, cf. passerelle de live)<br>
13341342
* `MEETING_WEBINAR_SIPMEDIAGW_TOKEN`
13351343
> valeur par défaut : ``
13361344
>> Jeton bearer du serveur SIPMediaGW qui gère les webinaires<br>
1345+
>> Retiré à partir de la version 3.8.2 de Pod (cf. passerelle de live)<br>
13371346
* `MEETING_WEBINAR_FIELDS`
13381347
> valeur par défaut : `("is_webinar", "enable_chat")`
13391348
>> Permet de définir les champs complémentaires du formulaire de création d’un webinaire<br>

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Affiche la liste des commandes disponibles
99
help:
10-
echo "Syntax: [make target] where target is in this list:"
10+
@echo "Syntax: [make target] where target is in this list:"
1111
@awk '/^#/{c=substr($$0,3);next}c&&/^[[:alpha:]][[:alnum:]_-]+:/{print substr($$1,1,index($$1,":")),c}1{c=0}' $(MAKEFILE_LIST) | column -s: -t
1212

1313
# Démarre le serveur de test

pod/ai_enhancement/views.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
settings, "AI_ENHANCEMENT_CLIENT_SECRET", "mocked_secret"
3535
)
3636
AI_ENHANCEMENT_TO_STAFF_ONLY = getattr(settings, "AI_ENHANCEMENT_TO_STAFF_ONLY", True)
37+
AI_ENHANCEMENT_PROXY_URL = getattr(settings, "AI_ENHANCEMENT_PROXY_URL", "")
3738
LANG_CHOICES = getattr(
3839
settings,
3940
"LANG_CHOICES",
@@ -95,14 +96,16 @@ def send_enhancement_creation_request(
9596
+ request.user.username
9697
).encode("utf-8")
9798
).hexdigest()
99+
if AI_ENHANCEMENT_PROXY_URL:
100+
base_url = AI_ENHANCEMENT_PROXY_URL
101+
else:
102+
base_url = url_scheme + "://" + get_current_site(request).domain
103+
98104
creation_response = aristote.create_enhancement_from_url(
99-
url_scheme + "://" + get_current_site(request).domain + mp3_url,
105+
base_url + mp3_url,
100106
["video/mp3"],
101107
end_user_identifier + "@%s" % get_current_site(request).domain,
102-
url_scheme
103-
+ "://"
104-
+ get_current_site(request).domain
105-
+ reverse("ai_enhancement:webhook"),
108+
base_url + reverse("ai_enhancement:webhook"),
106109
)
107110
if creation_response:
108111
if creation_response["status"] == "OK":

pod/authentication/rest_views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Meta:
5656
"email",
5757
"groups",
5858
)
59-
filter_fields = ("id", "username", "email")
59+
filterset_fields = ["id", "username", "email"]
6060

6161

6262
class GroupSerializer(serializers.HyperlinkedModelSerializer):
@@ -88,7 +88,7 @@ class OwnerViewSet(viewsets.ModelViewSet):
8888
class UserViewSet(viewsets.ModelViewSet):
8989
queryset = User.objects.all().order_by("-date_joined")
9090
serializer_class = UserSerializer
91-
filter_fields = ("id", "username", "email")
91+
filterset_fields = ["id", "username", "email"]
9292

9393

9494
class GroupViewSet(viewsets.ModelViewSet):

pod/bbb/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)