Skip to content

Commit

Permalink
[RELEASE] Esup-Pod 3.8.2
Browse files Browse the repository at this point in the history
## New functionalities:
* Use Whisper to format vtt subtitle (EsupPortail#1187)
* Remove BBB module and add sipmediagw feature (EsupPortail#1190)
* Add NOTIFY_SENDER boolean parameter (EsupPortail#1192)
* Add fields to recording rest response (EsupPortail#1193)
* Add return thumbnail url,width and height to oembed (EsupPortail#1194)
* Add optional proxy URL for request coming from Aristote (EsupPortail#1218)

## Bugs corrected:
* Change all filter_fields = () in filterset_fields = [], as filter_fields is deprecated  (EsupPortail#1191)
* Fix multi carousel (EsupPortail#1200)
* Change regroup videos by theme when ORGANIZE_BY_THEME = True (EsupPortail#1203)
* Bug habillage (EsupPortail#1211)
* Fix migration script for BBB (EsupPortail#1214)
* Improve RSS Feeds (EsupPortail#1215)
* Fix BBB meeting deletion link (issue EsupPortail#1216)
* No crop on thumbnail (EsupPortail#1217)
* Use `get_thumbnail` to serve video thumbnail via caching system, to prevent video folder url to be publicly available (EsupPortail#1221)
* Addition of a toolbar in the theme description editor of a chain. (issue EsupPortail#1185)
* Correction enabling channels and themes to be assigned to a set of videos (issue EsupPortail#1106)
* Manage restricted video access right in playlist

## Accessibility improvements: (EsupPortail#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
  • Loading branch information
Badatos authored Oct 29, 2024
2 parents 59edb5d + 39b25f9 commit c1692ca
Show file tree
Hide file tree
Showing 111 changed files with 1,320 additions and 5,667 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ omit = pod/*settings*.py
*/migrations/*
pod/recorder/plugins/type_*.py
pod/*/forms.py
scripts/bbb-pod-live/*.*
pod/live/pilotingInterface.py
4 changes: 3 additions & 1 deletion .gitguardian.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
exclude_paths:
version: 2
secret:
ignored_paths:
- pod/enrichment/tests/test_views.py
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pod/custom/*
pod/main/static/custom/img
!pod/custom/settings_local.py.example
settings_local.py
scripts/bbb-pod-live/docker-compose.yml
transcription/*

# Unit test utilities #
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
- repo: https://github.com/gitguardian/ggshield
rev: v1.27.0
rev: v1.32.0
hooks:
- id: ggshield
language_version: python3
stages: [commit]
stages: [pre-commit]
38 changes: 19 additions & 19 deletions CONFIGURATION_EN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#

##
##

* `CAS`
> default value: `1.5.2`
Expand Down Expand Up @@ -29,7 +29,7 @@
* `tagging`
> default value: `0.5.0`
##
##

### Database

Expand Down Expand Up @@ -381,7 +381,7 @@
> default value: `False`
>>

##
##

### AI Enhancement application configuration

Expand Down Expand Up @@ -415,7 +415,7 @@ Set `USE_AI_ENHANCEMENT` to True to activate this application.<br>
> default value: `False`
>> Activation of artificial intelligence enhancements. Allows users to use it.<br>

###
###

* `AFFILIATION`
> default value: ``
Expand Down Expand Up @@ -559,10 +559,10 @@ Set `USE_AI_ENHANCEMENT` to True to activate this application.<br>
> default value: `False`
>>

###
###


###
###

* `ACTIVE_MODEL_ENRICH`
> default value: `False`
Expand Down Expand Up @@ -619,7 +619,7 @@ Set `USE_DRESSING` to True to activate this application.<br>
> default value: `True`
>> Activation of dressings. Allows users to customize a video with watermark & credits.<br>

###
###


### Seaker application configuration
Expand Down Expand Up @@ -659,7 +659,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
> default value: `True`
>> Directory that will contain the video files generated by bbb-recorder.<br>

###
###

* `AFFILIATION_EVENT`
> default value: `['faculty', 'employee', 'staff']`
Expand Down Expand Up @@ -717,7 +717,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
> default value: `60`
>>

###
###

* `LTI_ENABLED`
> default value: `False`
Expand All @@ -737,7 +737,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
>> ```
>>

###
###

* `HOMEPAGE_VIEW_VIDEOS_FROM_NON_VISIBLE_CHANNELS`
> default value: `False`
Expand All @@ -764,7 +764,7 @@ Set `USE_IMPORT_VIDEO` to True to activate this application.<br>
> default value: `False`
>> Webtv mode allows you to switch POD into a webtv application removing the connection buttons for example<br>

###
###



Expand Down Expand Up @@ -864,7 +864,7 @@ Set `USE_PLAYLIST` to True to activate this application.<br>
> default value: `True`
>> Activation of promoted playlists. Allows users to use the promoted playlists.<br>

###
###

* `FILES_DIR`
> default value: `files`
Expand All @@ -879,7 +879,7 @@ Set `USE_PLAYLIST` to True to activate this application.<br>
> default value: `('jpg', 'jpeg', 'bmp', 'png', 'gif', 'tiff', 'webp')`
>> Allowed extensions for images uploaded in the file manager (must be lowercase).<br>

###
###

* `USE_NOTIFICATIONS`
> default value: `True`
Expand All @@ -906,7 +906,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
> default value: `True`
>> Activation of quizzes. Allows users to create, respond and use quizzes in videos.<br>

###
###

* `ALLOW_MANUAL_RECORDING_CLAIMING`
> default value: `False`
Expand Down Expand Up @@ -968,7 +968,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
> default value: `False`
>> If True, displays the video preview icon in the "Claim a recording" page.<br>

###
###

* `ACTIVE_VIDEO_COMMENT`
> default value: `False`
Expand Down Expand Up @@ -1076,7 +1076,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
> default value: `False`
>>

###
###



Expand Down Expand Up @@ -1125,7 +1125,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
> default value: `[]`
>>

###
###

* `ES_INDEX`
> default value: `pod`
Expand All @@ -1146,7 +1146,7 @@ Set `USE_QUIZ` to True to activate this application.<br>
> default value: `{}`
>>

###
###

Application for sending xAPI statements to an LRS.<br>
No statements persist in Pod, they are all sent to the configured LRS.<br>
Expand Down
15 changes: 12 additions & 3 deletions CONFIGURATION_FR.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ Voici les configurations des applications tierces utilisées par Esup-Pod.<br>
* `EMAIL_SUBJECT_PREFIX`
> valeur par défaut : ``
>> Préfixe par défaut pour l’objet des courriels.<br>
* `NOTIFY_SENDER`
> valeur par défaut : `True`
>> En mode non authentifié, lors de l'utilisation du formulaire de contact, envoie une copie du message à l'adresse saisie dans le formulaire.<br>
* `SERVER_EMAIL`
> valeur par défaut : `noreply`
>> Expediteur par défaut pour les envois automatique (erreur de code etc.)<br>
Expand Down Expand Up @@ -745,6 +748,10 @@ Mettre `USE_AI_ENHANCEMENT` à True pour activer cette application.<br>
* `USE_AI_ENHANCEMENT`
> valeur par défaut : `False`
>> Activation des améliorations de l'intelligence artificielle. Permet aux utilisateurs de l'utiliser.<br>
* `AI_ENHANCEMENT_PROXY_URL`
> valeur par défaut : ``
>> L’URL du serveur proxy pour les requêtes venant d'Aristote.<br>
>> Exemple : '<https://proxy_aristote.univ.fr>'<br>
### Configuration de l’application authentification
Expand Down Expand Up @@ -1144,15 +1151,15 @@ Mettre `USE_IMPORT_VIDEO` à True pour activer cette application.<br>
* `USE_BBB`
> valeur par défaut : `False`
>> Utilisation de BigBlueButton<br>
>> [TODO] À retirer dans les futures versions de Pod<br>
>> Retiré à partir de la version 3.8.2 de Pod (remplacé par le module des réunions)<br>
* `USE_BBB_LIVE`
> valeur par défaut : `False`
>> Utilisation du système de diffusion de Webinaires en lien avec BigBlueButton<br>
>> [TODO] À retirer dans les futures versions de Pod<br>
>> Retiré à partir de la version 3.8.2 de Pod (remplacé par le module des réunions)<br>
* `USE_LIVE_TRANSCRIPTION`
> valeur par défaut : `False`
>>
>> Activer l’auto-transcription pour les directs<br>
>>
* `VIEW_EXPIRATION_DELAY`
> valeur par défaut : `60`
>> Délai (en seconde) selon lequel une vue est considérée comme expirée<br>
Expand Down Expand Up @@ -1331,9 +1338,11 @@ Mettre `USE_MEETING` à True pour activer cette application.<br>
* `MEETING_WEBINAR_SIPMEDIAGW_URL`
> valeur par défaut : ``
>> URL du serveur SIPMediaGW qui gère les webinaires (Ex: `https://sipmediagw.univ.fr`)<br>
>> Retiré à partir de la version 3.8.2 de Pod (remplacé par le module des réunions, cf. passerelle de live)<br>
* `MEETING_WEBINAR_SIPMEDIAGW_TOKEN`
> valeur par défaut : ``
>> Jeton bearer du serveur SIPMediaGW qui gère les webinaires<br>
>> Retiré à partir de la version 3.8.2 de Pod (cf. passerelle de live)<br>
* `MEETING_WEBINAR_FIELDS`
> valeur par défaut : `("is_webinar", "enable_chat")`
>> Permet de définir les champs complémentaires du formulaire de création d’un webinaire<br>
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Affiche la liste des commandes disponibles
help:
echo "Syntax: [make target] where target is in this list:"
@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

# Démarre le serveur de test
Expand Down
13 changes: 8 additions & 5 deletions pod/ai_enhancement/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
settings, "AI_ENHANCEMENT_CLIENT_SECRET", "mocked_secret"
)
AI_ENHANCEMENT_TO_STAFF_ONLY = getattr(settings, "AI_ENHANCEMENT_TO_STAFF_ONLY", True)
AI_ENHANCEMENT_PROXY_URL = getattr(settings, "AI_ENHANCEMENT_PROXY_URL", "")
LANG_CHOICES = getattr(
settings,
"LANG_CHOICES",
Expand Down Expand Up @@ -95,14 +96,16 @@ def send_enhancement_creation_request(
+ request.user.username
).encode("utf-8")
).hexdigest()
if AI_ENHANCEMENT_PROXY_URL:
base_url = AI_ENHANCEMENT_PROXY_URL
else:
base_url = url_scheme + "://" + get_current_site(request).domain

creation_response = aristote.create_enhancement_from_url(
url_scheme + "://" + get_current_site(request).domain + mp3_url,
base_url + mp3_url,
["video/mp3"],
end_user_identifier + "@%s" % get_current_site(request).domain,
url_scheme
+ "://"
+ get_current_site(request).domain
+ reverse("ai_enhancement:webhook"),
base_url + reverse("ai_enhancement:webhook"),
)
if creation_response:
if creation_response["status"] == "OK":
Expand Down
4 changes: 2 additions & 2 deletions pod/authentication/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class Meta:
"email",
"groups",
)
filter_fields = ("id", "username", "email")
filterset_fields = ["id", "username", "email"]


class GroupSerializer(serializers.HyperlinkedModelSerializer):
Expand Down Expand Up @@ -88,7 +88,7 @@ class OwnerViewSet(viewsets.ModelViewSet):
class UserViewSet(viewsets.ModelViewSet):
queryset = User.objects.all().order_by("-date_joined")
serializer_class = UserSerializer
filter_fields = ("id", "username", "email")
filterset_fields = ["id", "username", "email"]


class GroupViewSet(viewsets.ModelViewSet):
Expand Down
Empty file removed pod/bbb/__init__.py
Empty file.
85 changes: 0 additions & 85 deletions pod/bbb/admin.py

This file was deleted.

6 changes: 0 additions & 6 deletions pod/bbb/apps.py

This file was deleted.

Loading

0 comments on commit c1692ca

Please sign in to comment.