learning-paths-plugin 0.3.1__tar.gz → 0.3.2__tar.gz

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/CHANGELOG.rst

@@ -16,6 +16,32 @@ Unreleased
 
 *
 
+0.3.2 - 2025-05-02
+******************
+
+Added
+=====
+
+* Course key selection in admin forms.
+* Learning Path selection field in admin forms.
+* Enrollment status to the Learning Path list and retrieve APIs.
+* Invite-only functionality for Learning Paths.
+* Course enrollment API.
+
+Changed
+=======
+
+* The Learning Path ``subtitle`` to ``TextField`` and made it optional.
+* The image URL field to ``ImageField``.
+* The user field on the admin enrollments page to raw ID, to prevent the page
+  from retrieving all users in the system.
+
+Removed
+=======
+
+* The ``slug`` field from the Learning Path model.
+* The UUID compatibility layer from Learning Path keys.
+
 0.3.1 - 2025-04-14
 ******************
 

{learning_paths_plugin-0.3.1/learning_paths_plugin.egg-info → learning_paths_plugin-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: learning-paths-plugin
-Version: 0.3.1
+Version: 0.3.2
 Summary: Learning Paths plugin
 Home-page: https://github.com/open-craft/learning-paths-plugin
 Author: OpenCraft
@@ -24,6 +24,7 @@ Requires-Dist: edx-django-utils
 Requires-Dist: edx-opaque-keys
 Requires-Dist: openedx-atlas
 Requires-Dist: openedx-completion-aggregator
+Requires-Dist: pillow
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -120,6 +121,32 @@ Unreleased
 
 *
 
+0.3.2 - 2025-05-02
+******************
+
+Added
+=====
+
+* Course key selection in admin forms.
+* Learning Path selection field in admin forms.
+* Enrollment status to the Learning Path list and retrieve APIs.
+* Invite-only functionality for Learning Paths.
+* Course enrollment API.
+
+Changed
+=======
+
+* The Learning Path ``subtitle`` to ``TextField`` and made it optional.
+* The image URL field to ``ImageField``.
+* The user field on the admin enrollments page to raw ID, to prevent the page
+  from retrieving all users in the system.
+
+Removed
+=======
+
+* The ``slug`` field from the Learning Path model.
+* The UUID compatibility layer from Learning Path keys.
+
 0.3.1 - 2025-04-14
 ******************
 

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/__init__.py

@@ -2,4 +2,4 @@
 Learning Paths plugin.
 """
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/admin.py

@@ -29,13 +29,59 @@ def get_course_keys_choices():
         yield key, key
 
 
+class CourseKeyDatalistWidget(forms.TextInput):
+    """A widget that provides a datalist for course keys."""
+
+    def __init__(self, choices=None, attrs=None):
+        """Initialize the widget with a datalist and apply styles."""
+        attrs = attrs or {}
+        attrs.update(
+            {
+                "style": "width: 30em;",
+                "class": "form-control datalist-input",
+                "placeholder": _("Type to search courses..."),
+            }
+        )
+        super().__init__(attrs)
+        self.choices = choices or []
+
+    def render(self, name, value, attrs=None, renderer=None):
+        """Render the widget with a datalist."""
+        final_attrs = attrs or {}
+        data_list_id = f"datalist_{name}"
+        final_attrs["list"] = data_list_id
+
+        text_input_html = super().render(name, value, attrs, renderer)
+        data_list_id = f"datalist_{name}"
+        options = "\n".join(f'<option value="{choice}" />' for choice in self.choices)
+        datalist_html = f'<datalist id="{data_list_id}">\n{options}\n</datalist>'
+        return f"{text_input_html}\n{datalist_html}"
+
+
 class LearningPathStepForm(forms.ModelForm):
-    """Admin form for Learning Path step."""
+    """Form for Learning Path step."""
+
+    def __init__(self, *args, **kwargs):
+        """Lazily fetch course keys to avoid calling compat code in all environments."""
+        super().__init__(*args, **kwargs)
+        self._course_keys = get_course_keys_with_outlines()
+        self.fields["course_key"].widget = CourseKeyDatalistWidget(
+            choices=self._course_keys
+        )
+
+    course_key = forms.CharField(label=_("Course"))
+
+    def clean_course_key(self):
+        """Validate that the course key is on the list of available course keys."""
+        course_key = self.cleaned_data.get("course_key")
+        valid_keys = {str(key).strip() for key in self._course_keys}
+
+        if course_key not in valid_keys:
+            raise ValidationError(
+                _("Invalid course key. Please select a course from the suggestions.")
+            )
 
-    # TODO: Use autocomplete select instead.
-    # See <https://github.com/open-craft/section-to-course/blob/db6fd6f8f4478e91bb531e6c2fa50143e1c2e012/
-    #      section_to_course/admin.py#L31-L140>
-    course_key = forms.ChoiceField(choices=get_course_keys_choices, label=_("Course"))
+        return course_key
 
 
 class LearningPathStepInline(admin.TabularInline):
@@ -102,17 +148,17 @@ class LearningPathAdmin(admin.ModelAdmin):
     form = BulkEnrollUsersForm
 
     search_fields = [
-        "slug",
         "display_name",
         "key",
     ]
     list_display = (
         "key",
-        "slug",
         "display_name",
         "level",
         "duration_in_days",
+        "invite_only",
     )
+    list_filter = ("invite_only",)
     readonly_fields = ("key",)
 
     inlines = [
@@ -148,12 +194,13 @@ class EnrolledUsersAdmin(admin.ModelAdmin):
     """Admin for Learning Path enrollment."""
 
     model = LearningPathEnrollment
+    raw_id_fields = ("user",)
+    autocomplete_fields = ["learning_path"]
 
     search_fields = [
         "id",
         "user__username",
         "learning_path__key",
-        "learning_path__slug",
         "learning_path__display_name",
     ]
 

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/api/v1/serializers.py

@@ -35,15 +35,15 @@ class LearningPathAsProgramSerializer(serializers.ModelSerializer):
     course_codes = serializers.SerializerMethodField()
 
     def get_marketing_slug(self, obj):
-        return obj.slug
+        return str(obj.key)
 
     def get_status(self, obj):  # pylint: disable=unused-argument
         return DEFAULT_STATUS
 
     def get_banner_image_urls(self, obj):
-        if obj.image_url:
+        if obj.image:
             image_key = f"w{IMAGE_WIDTH}h{IMAGE_HEIGHT}"
-            return {image_key: obj.image_url}
+            return {image_key: obj.image.url}
         return {}
 
     def get_organizations(self, obj):  # pylint: disable=unused-argument
@@ -107,19 +107,31 @@ class LearningPathListSerializer(serializers.ModelSerializer):
     required_completion = serializers.FloatField(
         source="grading_criteria.required_completion", read_only=True
     )
+    is_enrolled = serializers.SerializerMethodField()
+    invite_only = serializers.BooleanField()
+    image = serializers.ImageField(read_only=True)
 
     class Meta:
         model = LearningPath
         fields = [
             "key",
-            "slug",
             "display_name",
-            "image_url",
+            "image",
             "sequential",
             "steps",
             "required_completion",
+            "is_enrolled",
+            "invite_only",
         ]
 
+    def get_is_enrolled(self, obj):
+        """
+        Check if the current user is enrolled in this learning path.
+        """
+        if hasattr(obj, "is_enrolled"):
+            return obj.is_enrolled
+        return False
+
 
 class SkillSerializer(serializers.ModelSerializer):
     class Meta:
@@ -151,38 +163,26 @@ class AcquiredSkillSerializer(serializers.ModelSerializer):
         fields = ["skill", "level"]
 
 
-class LearningPathDetailSerializer(serializers.ModelSerializer):
+class LearningPathDetailSerializer(LearningPathListSerializer):
     """
     Serializer for learning path details.
     """
 
-    steps = LearningPathStepSerializer(many=True, read_only=True)
     required_skills = RequiredSkillSerializer(
         source="requiredskill_set", many=True, read_only=True
     )
     acquired_skills = AcquiredSkillSerializer(
         source="acquiredskill_set", many=True, read_only=True
     )
-    required_completion = serializers.FloatField(
-        source="grading_criteria.required_completion", read_only=True
-    )
 
-    class Meta:
-        model = LearningPath
-        fields = [
-            "key",
-            "slug",
-            "display_name",
+    class Meta(LearningPathListSerializer.Meta):
+        fields = LearningPathListSerializer.Meta.fields + [
             "subtitle",
             "description",
-            "image_url",
             "level",
             "duration_in_days",
-            "sequential",
-            "steps",
             "required_skills",
             "acquired_skills",
-            "required_completion",
         ]
 
 

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/api/v1/urls.py

@@ -6,13 +6,14 @@ from rest_framework import routers
 from learning_paths.api.v1.views import (
     BulkEnrollView,
     LearningPathAsProgramViewSet,
+    LearningPathCourseEnrollmentView,
     LearningPathEnrollmentView,
     LearningPathUserGradeView,
     LearningPathUserProgressView,
     LearningPathViewSet,
     ListEnrollmentsView,
 )
-from learning_paths.keys import LEARNING_PATH_URL_PATTERN
+from learning_paths.keys import COURSE_KEY_URL_PATTERN, LEARNING_PATH_URL_PATTERN
 
 router = routers.SimpleRouter()
 router.register(
@@ -32,7 +33,7 @@ urlpatterns = router.urls + [
         name="learning-path-grade",
     ),
     re_path(
-        rf"{LEARNING_PATH_URL_PATTERN}/enrollments/",
+        rf"{LEARNING_PATH_URL_PATTERN}/enrollments/$",
         LearningPathEnrollmentView.as_view(),
         name="learning-path-enrollments",
     ),
@@ -46,4 +47,9 @@ urlpatterns = router.urls + [
         BulkEnrollView.as_view(),
         name="bulk-enroll",
     ),
+    re_path(
+        rf"{LEARNING_PATH_URL_PATTERN}/enrollments/{COURSE_KEY_URL_PATTERN}/",
+        LearningPathCourseEnrollmentView.as_view(),
+        name="learning-path-course-enroll",
+    ),
 ]

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/api/v1/views.py

@@ -11,8 +11,9 @@ from django.core.exceptions import ObjectDoesNotExist, PermissionDenied, Validat
 from django.core.validators import validate_email
 from django.shortcuts import get_object_or_404
 from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import CourseKey
 from rest_framework import generics, status, viewsets
-from rest_framework.exceptions import NotFound
+from rest_framework.exceptions import NotFound, ParseError
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.permissions import IsAdminUser, IsAuthenticated
 from rest_framework.response import Response
@@ -26,6 +27,7 @@ from learning_paths.api.v1.serializers import (
     LearningPathListSerializer,
     LearningPathProgressSerializer,
 )
+from learning_paths.compat import enroll_user_in_course
 from learning_paths.keys import LearningPathKey
 from learning_paths.models import (
     LearningPath,
@@ -51,11 +53,14 @@ class LearningPathAsProgramViewSet(viewsets.ReadOnlyModelViewSet):
     https://github.com/openedx/course-discovery/blob/d6a57fd69479b3d5f5afb682d2668b58503a6af6/course_discovery/apps/course_metadata/data_loaders/api.py#L843
     """
 
-    queryset = LearningPath.objects.all()
     permission_classes = (IsAuthenticated,)
     serializer_class = LearningPathAsProgramSerializer
     pagination_class = PageNumberPagination
 
+    def get_queryset(self):
+        """Get the learning paths visible to the current user."""
+        return LearningPath.objects.get_paths_visible_to_user(self.request.user)
+
 
 class LearningPathUserProgressView(APIView):
     """
@@ -68,8 +73,10 @@ class LearningPathUserProgressView(APIView):
         """
         Fetch the learning path progress
         """
-        learning_path_key = LearningPathKey.from_string(learning_path_key_str)
-        learning_path = get_object_or_404(LearningPath, key=learning_path_key)
+        learning_path = get_object_or_404(
+            LearningPath.objects.get_paths_visible_to_user(self.request.user),
+            key=learning_path_key_str,
+        )
 
         progress = get_aggregate_progress(request.user, learning_path)
         required_completion = None
@@ -80,7 +87,7 @@ class LearningPathUserProgressView(APIView):
             pass
 
         data = {
-            "learning_path_key": str(learning_path_key),
+            "learning_path_key": learning_path_key_str,
             "progress": progress,
             "required_completion": required_completion,
         }
@@ -103,8 +110,10 @@ class LearningPathUserGradeView(APIView):
         Fetch learning path grade
         """
 
-        learning_path_key = LearningPathKey.from_string(learning_path_key_str)
-        learning_path = get_object_or_404(LearningPath, key=learning_path_key)
+        learning_path = get_object_or_404(
+            LearningPath.objects.get_paths_visible_to_user(self.request.user),
+            key=learning_path_key_str,
+        )
 
         try:
             grading_criteria = learning_path.grading_criteria
@@ -117,7 +126,7 @@ class LearningPathUserGradeView(APIView):
         grade = grading_criteria.calculate_grade(request.user)
 
         data = {
-            "learning_path_key": str(learning_path_key),
+            "learning_path_key": learning_path_key_str,
             "grade": grade,
             "required_grade": grading_criteria.required_grade,
         }
@@ -134,11 +143,23 @@ class LearningPathViewSet(viewsets.ReadOnlyModelViewSet):
     including steps and associated skills.
     """
 
-    queryset = LearningPath.objects.prefetch_related("steps", "grading_criteria")
     permission_classes = (IsAuthenticated,)
     pagination_class = PageNumberPagination
     lookup_field = "key"
 
+    def get_queryset(self):
+        """
+        Get all learning paths and prefetch the related data.
+        """
+        user = self.request.user
+        queryset = LearningPath.objects.get_paths_visible_to_user(
+            user
+        ).prefetch_related(
+            "steps",
+            "grading_criteria",
+        )
+        return queryset
+
     def get_serializer_class(self):
         if self.action == "list":
             return LearningPathListSerializer
@@ -159,6 +180,17 @@ class LearningPathEnrollmentView(APIView):
 
     permission_classes = [IsAuthenticated, IsAdminOrSelf]
 
+    def _get_learning_path(self, learning_path_key_str: str) -> LearningPath:
+        """
+        Get the learning path and verify user has access to it.
+
+        :raises: Http404 if the learning path is not found or user does not have access.
+        """
+        return get_object_or_404(
+            LearningPath.objects.get_paths_visible_to_user(self.request.user),
+            key=learning_path_key_str,
+        )
+
     def get(self, request, learning_path_key_str: str):
         """Get the learning path of users.
 
@@ -169,8 +201,7 @@ class LearningPathEnrollmentView(APIView):
             username (optional): When provided it returns the enrollment for
                 the specified user.
         """
-        learning_path_key = LearningPathKey.from_string(learning_path_key_str)
-        learning_path = get_object_or_404(LearningPath, key=learning_path_key)
+        learning_path = self._get_learning_path(learning_path_key_str)
 
         enrollments = LearningPathEnrollment.objects.filter(
             learning_path=learning_path, is_active=True
@@ -189,7 +220,7 @@ class LearningPathEnrollmentView(APIView):
         """Enroll learners in Learning Paths.
 
         Staff/Admin can enroll anyone with the username query param.
-        Learners can enroll only themselves.
+        Learners can enroll only themselves, and only if the learning path is not invite-only.
 
         Example payload::
 
@@ -198,8 +229,7 @@ class LearningPathEnrollmentView(APIView):
             }
 
         """
-        learning_path_key = LearningPathKey.from_string(learning_path_key_str)
-        learning_path = get_object_or_404(LearningPath, key=learning_path_key)
+        learning_path = self._get_learning_path(learning_path_key_str)
         username = request.data.get("username")
         user = get_object_or_404(User, username=username) if username else request.user
 
@@ -235,8 +265,7 @@ class LearningPathEnrollmentView(APIView):
             }
 
         """
-        learning_path_key = LearningPathKey.from_string(learning_path_key_str)
-        learning_path = get_object_or_404(LearningPath, key=learning_path_key)
+        learning_path = self._get_learning_path(learning_path_key_str)
         username = request.data.get("username")
         user = get_object_or_404(User, username=username) if username else request.user
 
@@ -369,3 +398,42 @@ class BulkEnrollView(APIView):
             },
             status=status.HTTP_201_CREATED,
         )
+
+
+class LearningPathCourseEnrollmentView(APIView):
+    """API View to enroll a user in a course that's part of a learning path."""
+
+    permission_classes = [IsAuthenticated, IsAdminOrSelf]
+
+    def _get_enrolled_learning_path(self, learning_path_key_str: str) -> LearningPath:
+        """
+        Get the learning path and verify the user has access and is enrolled.
+
+        :raises: Http404 if the learning path is not found or the user does not have access.
+        """
+        return get_object_or_404(
+            LearningPath.objects.get_paths_visible_to_user(self.request.user).filter(
+                is_enrolled=True
+            ),
+            key=learning_path_key_str,
+        )
+
+    def post(self, request, learning_path_key_str: str, course_key_str: str):
+        """
+        Enroll a user in a course that's part of a learning path.
+
+        The user must be enrolled in the learning path, and the course must be a step in the path.
+        """
+        learning_path = self._get_enrolled_learning_path(learning_path_key_str)
+        course_key = CourseKey.from_string(course_key_str)
+
+        if not learning_path.steps.filter(course_key=course_key).exists():
+            raise ParseError("The course is not part of this learning path.")
+
+        if enroll_user_in_course(request.user, course_key):
+            return Response(
+                {"detail": "User successfully enrolled in the course."},
+                status=status.HTTP_201_CREATED,
+            )
+        else:
+            raise ParseError("Failed to enroll the user in the course.")

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/compat.py

@@ -2,11 +2,14 @@
 Compatibility layer for testing without Open edX.
 """
 
+import logging
 from datetime import datetime
 
 from django.contrib.auth.models import AbstractBaseUser
 from opaque_keys.edx.keys import CourseKey
 
+log = logging.getLogger(__name__)
+
 
 def get_user_course_grade(user: AbstractBaseUser, course_key: CourseKey):
     """
@@ -31,7 +34,7 @@ def get_catalog_api_client(user: AbstractBaseUser):
     return api_client(user)
 
 
-def get_course_keys_with_outlines():
+def get_course_keys_with_outlines() -> list[CourseKey]:
     """
     Retrieve course keys.
     """
@@ -57,9 +60,19 @@ def get_course_due_date(course_key: CourseKey) -> datetime | None:
         return None
 
 
-__all__ = [
-    "get_course_keys_with_outlines",
-    "get_catalog_api_client",
-    "get_user_course_grade",
-    "get_course_due_date",
-]
+def enroll_user_in_course(user: AbstractBaseUser, course_key: CourseKey) -> bool:
+    """Enroll a user in a course."""
+    # pylint: disable=import-outside-toplevel, import-error
+    from common.djangoapps.student.api import CourseEnrollment
+    from common.djangoapps.student.models.course_enrollment import (
+        CourseEnrollmentException,
+    )
+
+    try:
+        CourseEnrollment.enroll(user, course_key)
+        return True
+    except CourseEnrollmentException as exc:
+        log.exception(
+            "Failed to enroll user %s in course %s: %s", user, course_key, exc
+        )
+        return False

learning_paths_plugin-0.3.2/learning_paths/conftest.py

@@ -0,0 +1,13 @@
+"""Pytest fixtures."""
+
+import pytest
+from django.test import override_settings
+
+
+@pytest.fixture
+def temp_media(tmpdir):
+    """Temporarily override MEDIA_ROOT to a pytest tmpdir."""
+    temp_dir = str(tmpdir.mkdir("media"))
+
+    with override_settings(MEDIA_ROOT=temp_dir):
+        yield temp_dir

{learning_paths_plugin-0.3.1 → learning_paths_plugin-0.3.2}/learning_paths/keys.py

@@ -10,6 +10,12 @@ from opaque_keys import InvalidKeyError
 from opaque_keys.edx.django.models import LearningContextKeyField
 from opaque_keys.edx.keys import LearningContextKey
 
+COURSE_KEY_NAMESPACE = "course-v1"
+COURSE_KEY_PATTERN = r"([^+]+)\+([^+]+)\+([^+]+)"
+COURSE_KEY_URL_PATTERN = (
+    rf"(?P<course_key_str>{COURSE_KEY_NAMESPACE}:{COURSE_KEY_PATTERN})"
+)
+
 LEARNING_PATH_NAMESPACE = "path-v1"
 LEARNING_PATH_PATTERN = r"([^+]+)\+([^+]+)\+([^+]+)\+([^+]+)"
 LEARNING_PATH_URL_PATTERN = (
@@ -62,14 +68,7 @@ class LearningPathKeyField(LearningContextKeyField):
 
     def to_python(self, value):
         """Convert the input value to a LearningPathKey object."""
-        # TODO: https://github.com/open-craft/learning-paths-plugin/issues/12
-        if not value:
-            return None
-
         try:
-            if not value:
-                raise InvalidKeyError(self.KEY_CLASS, None)
-
             return super().to_python(value)
         except InvalidKeyError:
             raise ValidationError(  # pylint: disable=raise-missing-from

learning_paths_plugin-0.3.2/learning_paths/migrations/0009_remove_learningpath_slug.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.20 on 2025-04-22 21:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("learning_paths", "0008_remove_learningpathstep_relative_due_date_in_days"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="learningpath",
+            name="slug",
+        ),
+    ]

learning_paths_plugin-0.3.2/learning_paths/migrations/0010_learningpath_invite_only.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.20 on 2025-04-23 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("learning_paths", "0009_remove_learningpath_slug"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="learningpath",
+            name="invite_only",
+            field=models.BooleanField(
+                default=True,
+                help_text="If enabled, only staff can enroll users and only enrolled users can see the learning path.",
+                verbose_name="Invite only",
+            ),
+        ),
+    ]

learning_paths_plugin-0.3.2/learning_paths/migrations/0011_replace_learningpath_image_url_with_image.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.20 on 2025-04-27 20:14
+
+from django.db import migrations, models
+import learning_paths.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("learning_paths", "0010_learningpath_invite_only"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="learningpath",
+            name="image_url",
+        ),
+        migrations.AddField(
+            model_name="learningpath",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                help_text="Image representing this Learning Path.",
+                null=True,
+                upload_to=learning_paths.models.LearningPath._learning_path_image_upload_path,
+                verbose_name="Image",
+            ),
+        ),
+    ]