edx-enterprise-data 10.9.0__tar.gz → 10.9.2__tar.gz

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/CHANGELOG.rst

@@ -16,10 +16,18 @@ Unreleased
 
 =========================
 
+[10.9.2] - 2025-03-11
+---------------------
+  * feat: support flex groups in csv report on LPR.
+
 [10.9.0] - 2025-02-24
 ---------------------
   * feat: get groups data from membership endpoint using enterprise client.
 
+[10.8.1] - 2025-02-20
+---------------------
+  * fix: Limited accuracy of floating pointing numbers to 2 places.
+
 [10.8.1] - 2025-02-20
 ---------------------
   * feat: Added 2 new columns in module performance report model and exposed them via associated REST API.

{edx_enterprise_data-10.9.0/edx_enterprise_data.egg-info → edx_enterprise_data-10.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: edx-enterprise-data
-Version: 10.9.0
+Version: 10.9.2
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2/edx_enterprise_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: edx-enterprise-data
-Version: 10.9.0
+Version: 10.9.2
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -118,6 +118,7 @@ enterprise_data/migrations/0044_enterpriseexecedlcmoduleperformance.py
 enterprise_data/migrations/0045_alter_enterpriseexecedlcmoduleperformance_options_and_more.py
 enterprise_data/migrations/0046_enterprisegroupmembership.py
 enterprise_data/migrations/0047_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py
+enterprise_data/migrations/0048_alter_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py
 enterprise_data/migrations/__init__.py
 enterprise_data/settings/__init__.py
 enterprise_data/settings/test.py

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "10.9.0"
+__version__ = "10.9.2"

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/enterprise_data/api/v1/serializers.py

@@ -6,6 +6,7 @@ from uuid import UUID
 from rest_framework import serializers
 
 from enterprise_data.admin_analytics.constants import ResponseType
+from enterprise_data.cache.decorators import cache_it
 from enterprise_data.models import (
     EnterpriseAdminLearnerProgress,
     EnterpriseAdminSummarizeInsights,
@@ -26,6 +27,8 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
     course_api_url = serializers.SerializerMethodField()
     enterprise_user_id = serializers.SerializerMethodField()
     total_learning_time_hours = serializers.SerializerMethodField()
+    enterprise_flex_group_name = serializers.SerializerMethodField()
+    enterprise_flex_group_uuid = serializers.SerializerMethodField()
 
     class Meta:
         model = EnterpriseLearnerEnrollment
@@ -44,8 +47,9 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
             'last_activity_date', 'progress_status', 'passed_date', 'current_grade',
             'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
             'user_country_code', 'user_username', 'user_first_name', 'user_last_name', 'enterprise_name',
-            'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
-            'is_subsidy', 'course_product_line', 'budget_id', 'enterprise_group_name', 'enterprise_group_uuid',
+            'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url',
+            'total_learning_time_hours', 'is_subsidy', 'course_product_line', 'budget_id',
+            'enterprise_flex_group_name', 'enterprise_flex_group_uuid',
         )
 
     def get_course_api_url(self, obj):
@@ -62,6 +66,51 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
         """Returns the learners total learning time in hours"""
         return round((obj.total_learning_time_seconds or 0.0)/3600.0, 2)
 
+    @cache_it()
+    def _get_flex_groups(self, obj):
+        """
+        Returns list of tuples containing group (name, uuid) pairs for the learner.
+        This is cached to prevent duplicate database queries.
+        """
+        enterprise_user_id = obj.enterprise_user_id
+
+        if not enterprise_user_id:
+            return []
+
+        # Get all group memberships for this user in a single query
+        # Order by name for consistent ordering
+        return list(
+            EnterpriseGroupMembership.objects.filter(
+                enterprise_customer_user_id=enterprise_user_id,
+                membership_is_removed=False,
+                group_is_removed=False,
+                group_type="flex",
+            )
+            .order_by("enterprise_group_name")
+            .values_list("enterprise_group_name", "enterprise_group_uuid")
+            .distinct()
+        )
+
+    def get_enterprise_flex_group_name(self, obj):
+        """Returns a comma-separated list of enterprise group names that the learner is associated with"""
+        groups = self._get_flex_groups(obj)
+
+        if not groups:
+            return obj.enterprise_group_name
+
+        # Return comma-separated list of group names (first element of each tuple)
+        return ', '.join(group[0] for group in groups)
+
+    def get_enterprise_flex_group_uuid(self, obj):
+        """Returns a comma-separated list of enterprise group UUIDs that the learner is associated with"""
+        groups = self._get_flex_groups(obj)
+
+        if not groups:
+            return obj.enterprise_group_uuid
+
+        # Return comma-separated list of group UUIDs (second element of each tuple)
+        return ', '.join(str(group[1]) for group in groups)
+
 
 class EnterpriseSubsidyBudgetSerializer(serializers.ModelSerializer):
     """

edx_enterprise_data-10.9.2/enterprise_data/migrations/0048_alter_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2025-02-25 08:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0047_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='avg_after_lo_score',
+            field=models.DecimalField(decimal_places=2, max_digits=38, null=True),
+        ),
+        migrations.AlterField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='avg_before_lo_score',
+            field=models.DecimalField(decimal_places=2, max_digits=38, null=True),
+        ),
+    ]

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/enterprise_data/models.py

@@ -559,8 +559,8 @@ class EnterpriseExecEdLCModulePerformance(models.Model):
     discussion_forum_activities_total_count = models.PositiveIntegerField(null=True)
     pass_grade = models.DecimalField(max_digits=38, decimal_places=2, null=True)
     question_name = models.CharField(max_length=500, null=True)
-    avg_before_lo_score = models.DecimalField(max_digits=38, decimal_places=6, null=True)
-    avg_after_lo_score = models.DecimalField(max_digits=38, decimal_places=6, null=True)
+    avg_before_lo_score = models.DecimalField(max_digits=38, decimal_places=2, null=True)
+    avg_after_lo_score = models.DecimalField(max_digits=38, decimal_places=2, null=True)
 
     def __str__(self):
         """

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/enterprise_data/renderers.py

@@ -27,7 +27,7 @@ class EnrollmentsCSVRenderer(CSVStreamingRenderer):
         'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
         'user_country_code', 'user_username', 'user_first_name', 'user_last_name', 'enterprise_name',
         'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
-        'is_subsidy', 'course_product_line', 'budget_id', 'enterprise_group_name', 'enterprise_group_uuid',
+        'is_subsidy', 'course_product_line', 'budget_id', 'enterprise_flex_group_name', 'enterprise_flex_group_uuid',
     ]
 
 

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/requirements/base.txt

@@ -10,15 +10,15 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.37.21
+awscli==1.38.9
     # via -r requirements/reporting.in
-bcrypt==4.2.1
+bcrypt==4.3.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.36.21
+boto3==1.37.9
     # via -r requirements/reporting.in
-botocore==1.36.21
+botocore==1.37.9
     # via
     #   awscli
     #   boto3
@@ -54,7 +54,7 @@ click-repl==0.3.0
     # via celery
 colorama==0.4.6
     # via awscli
-cryptography==44.0.1
+cryptography==44.0.2
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -63,7 +63,7 @@ cryptography==44.0.1
     #   pyjwt
     #   pyopenssl
     #   snowflake-connector-python
-django==4.2.19
+django==4.2.20
     # via
     #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -106,7 +106,7 @@ docutils==0.16
     # via awscli
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-django-utils==7.1.0
+edx-django-utils==7.2.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -125,7 +125,7 @@ edx-rest-api-client==6.1.0
     # via -r requirements/base.in
 factory-boy==3.3.3
     # via -r requirements/base.in
-faker==36.1.1
+faker==37.0.0
     # via factory-boy
 filelock==3.17.0
     # via snowflake-connector-python
@@ -145,7 +145,7 @@ monotonic==1.6
     # via py2neo
 mysql-connector-python==9.2.0
     # via -r requirements/base.in
-newrelic==10.6.0
+newrelic==10.7.0
     # via edx-django-utils
 numpy==2.2.3
     # via
@@ -191,13 +191,13 @@ pyjwt[crypto]==2.10.1
     #   snowflake-connector-python
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.11.1
+pymongo==4.11.2
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==24.3.0
+pyopenssl==25.0.0
     # via snowflake-connector-python
 python-dateutil==2.9.0.post0
     # via
@@ -222,7 +222,7 @@ rsa==4.7.2
     # via awscli
 rules==3.5
     # via -r requirements/base.in
-s3transfer==0.11.2
+s3transfer==0.11.4
     # via
     #   awscli
     #   boto3
@@ -235,13 +235,13 @@ six==1.17.0
     #   py2neo
     #   python-dateutil
     #   vertica-python
-snowflake-connector-python==3.13.2
+snowflake-connector-python==3.14.0
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
 sqlparse==0.5.3
     # via django
-stevedore==5.4.0
+stevedore==5.4.1
     # via
     #   edx-django-utils
     #   edx-opaque-keys
@@ -250,6 +250,7 @@ tomlkit==0.13.2
 typing-extensions==4.12.2
     # via
     #   edx-opaque-keys
+    #   pyopenssl
     #   snowflake-connector-python
 tzdata==2025.1
     # via

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/requirements/ci.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cachetools==5.5.1
+cachetools==5.5.2
     # via tox
 chardet==5.2.0
     # via tox
@@ -30,7 +30,7 @@ pluggy==1.5.0
     # via tox
 pyproject-api==1.9.0
     # via tox
-tox==4.24.1
+tox==4.24.2
     # via -r requirements/ci.in
-virtualenv==20.29.2
+virtualenv==20.29.3
     # via tox

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/requirements/dev.txt

@@ -10,26 +10,26 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-astroid==3.3.8
+astroid==3.3.9
     # via
     #   pylint
     #   pylint-celery
-awscli==1.37.21
+awscli==1.38.9
     # via -r requirements/reporting.in
-bcrypt==4.2.1
+bcrypt==4.3.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.36.21
+boto3==1.37.9
     # via -r requirements/reporting.in
-botocore==1.36.21
+botocore==1.37.9
     # via
     #   awscli
     #   boto3
     #   s3transfer
 build==1.2.2.post1
     # via pip-tools
-cachetools==5.5.1
+cachetools==5.5.2
     # via tox
 celery==5.3.6
     # via -r requirements/reporting.in
@@ -76,7 +76,7 @@ colorama==0.4.6
     # via
     #   awscli
     #   tox
-cryptography==44.0.1
+cryptography==44.0.2
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -86,13 +86,13 @@ cryptography==44.0.1
     #   pyopenssl
     #   secretstorage
     #   snowflake-connector-python
-diff-cover==9.2.2
+diff-cover==9.2.4
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.9
     # via pylint
 distlib==0.3.9
     # via virtualenv
-django==4.2.19
+django==4.2.20
     # via
     #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -138,7 +138,7 @@ docutils==0.16
     #   readme-renderer
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-django-utils==7.1.0
+edx-django-utils==7.2.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -163,7 +163,7 @@ edx-rest-api-client==6.1.0
     # via -r requirements/base.in
 factory-boy==3.3.3
     # via -r requirements/base.in
-faker==36.1.1
+faker==37.0.0
     # via factory-boy
 filelock==3.17.0
     # via
@@ -178,7 +178,7 @@ idna==3.10
     #   snowflake-connector-python
 interchange==2021.0.4
     # via py2neo
-isort==6.0.0
+isort==6.0.1
     # via
     #   -r requirements/quality.in
     #   pylint
@@ -188,11 +188,11 @@ jaraco-context==6.0.1
     # via keyring
 jaraco-functools==4.1.0
     # via keyring
-jeepney==0.8.0
+jeepney==0.9.0
     # via
     #   keyring
     #   secretstorage
-jinja2==3.1.5
+jinja2==3.1.6
     # via
     #   code-annotations
     #   diff-cover
@@ -226,9 +226,9 @@ more-itertools==10.6.0
     #   jaraco-functools
 mysql-connector-python==9.2.0
     # via -r requirements/base.in
-newrelic==10.6.0
+newrelic==10.7.0
     # via edx-django-utils
-nh3==0.2.20
+nh3==0.2.21
     # via readme-renderer
 numpy==2.2.3
     # via
@@ -298,7 +298,7 @@ pyjwt[crypto]==2.10.1
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   snowflake-connector-python
-pylint==3.3.4
+pylint==3.3.5
     # via
     #   edx-lint
     #   pylint-celery
@@ -314,13 +314,13 @@ pylint-plugin-utils==0.8.2
     #   pylint-django
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.11.1
+pymongo==4.11.2
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==24.3.0
+pyopenssl==25.0.0
     # via snowflake-connector-python
 pyproject-api==1.9.0
     # via tox
@@ -367,7 +367,7 @@ rsa==4.7.2
     # via awscli
 rules==3.5
     # via -r requirements/base.in
-s3transfer==0.11.2
+s3transfer==0.11.4
     # via
     #   awscli
     #   boto3
@@ -385,13 +385,13 @@ six==1.17.0
     #   vertica-python
 snowballstemmer==2.2.0
     # via pydocstyle
-snowflake-connector-python==3.13.2
+snowflake-connector-python==3.14.0
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
 sqlparse==0.5.3
     # via django
-stevedore==5.4.0
+stevedore==5.4.1
     # via
     #   code-annotations
     #   edx-django-utils
@@ -404,13 +404,14 @@ tomlkit==0.13.2
     # via
     #   pylint
     #   snowflake-connector-python
-tox==4.24.1
+tox==4.24.2
     # via -r requirements/dev-enterprise_data.in
 twine==6.1.0
     # via -r requirements/dev-enterprise_data.in
 typing-extensions==4.12.2
     # via
     #   edx-opaque-keys
+    #   pyopenssl
     #   snowflake-connector-python
 tzdata==2025.1
     # via
@@ -434,7 +435,7 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.29.2
+virtualenv==20.29.3
     # via tox
 wcwidth==0.2.13
     # via prompt-toolkit

edx_enterprise_data-10.9.2/requirements/django.txt

@@ -0,0 +1 @@
+django==4.2.20

{edx_enterprise_data-10.9.0 → edx_enterprise_data-10.9.2}/requirements/pip.txt

@@ -12,5 +12,5 @@ pip==24.2
     # via
     #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
     #   -r requirements/pip.in
-setuptools==75.8.0
+setuptools==76.0.0
     # via -r requirements/pip.in