edx-enterprise-data 10.16.5__tar.gz → 10.16.8__tar.gz

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/CHANGELOG.rst

@@ -16,6 +16,18 @@ Unreleased
 
 =========================
 
+[10.16.8] - 2025-06-16
+---------------------
+  * feat: add skills by learning hours metric
+
+[10.16.7] - 2025-06-11
+---------------------
+  * chore: pin numpy to versions less then 2.3.0
+
+[10.16.6] - 2025-06-11
+---------------------
+  * Revert last requirements upgrade due to numpy 2.3.0
+
 [10.16.5] - 2025-06-11
 ---------------------
   * chore: upgrade python requirements

{edx_enterprise_data-10.16.5/edx_enterprise_data.egg-info → edx_enterprise_data-10.16.8}/PKG-INFO

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

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/enterprise_data/__init__.py

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

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py

@@ -1,6 +1,7 @@
 """
 Module containing queries for the skills_daily_rollup_admin_dash table.
 """
+from ..query_filters import QueryFilters
 
 
 class SkillsDailyRollupAdminDashQueries:
@@ -118,3 +119,31 @@ class SkillsDailyRollupAdminDashQueries:
             ORDER BY
                 total_completion_count DESC;
         """
+
+    @staticmethod
+    def get_skills_by_learning_hours(query_filters: QueryFilters, record_count: int = 25):
+        """
+        Get the query to fetch skills by learning hours for an enterprise customer.
+        """
+        return f"""
+            WITH filtered_data AS (
+                SELECT
+                    skill_name,
+                    total_learning_time_hours
+                FROM
+                    skills_daily_rollup_admin_dash
+                WHERE
+                    {query_filters.to_sql()}
+            )
+
+            SELECT
+                skill_name,
+                SUM(total_learning_time_hours) AS learning_hours
+            FROM
+                filtered_data
+            GROUP BY
+                skill_name
+            ORDER BY
+                learning_hours DESC
+            LIMIT {record_count};
+        """

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py

@@ -4,15 +4,19 @@ Module for interacting with the skills_daily_rollup_admin_dash table.
 from datetime import date
 from uuid import UUID
 
+from enterprise_data.admin_analytics.database.filters.mixins import CommonFiltersMixin
 from enterprise_data.admin_analytics.database.queries.skills_daily_rollup_admin_dash import (
     SkillsDailyRollupAdminDashQueries,
 )
+from enterprise_data.admin_analytics.database.query_filters import EqualQueryFilter
 from enterprise_data.admin_analytics.database.tables.base import BaseTable
 from enterprise_data.admin_analytics.database.utils import run_query
 from enterprise_data.cache.decorators import cache_it
 
+from ..query_filters import QueryFilters
 
-class SkillsDailyRollupAdminDashTable(BaseTable):
+
+class SkillsDailyRollupAdminDashTable(CommonFiltersMixin, BaseTable):
     """
     Class for communicating with the skills_daily_rollup_admin_dash table.
     """
@@ -96,3 +100,68 @@ class SkillsDailyRollupAdminDashTable(BaseTable):
             },
             as_dict=True,
         )
+
+    def get_skills_by_learning_hours(
+        self,
+        enterprise_customer_uuid: UUID,
+        start_date: date,
+        end_date: date,
+        course_key: str = None,
+        course_type: str = None,
+    ):
+        """
+        Get the skills by learning hours for the given enterprise customer.
+
+        Arguments:
+            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            start_date (date): The start date.
+            end_date (date): The end date.
+            course_key (str): The course key to filter by (optional).
+            course_type (str): The course type (OCM or Executive Education) to filter by (optional).
+
+        Returns:
+            list<dict>: A list of dictionaries containing the skill_name, subject_name, count.
+        """
+        optional_params = {}
+        course_key_filter = None
+        course_type_filter = None
+
+        default_params = {
+            'enterprise_customer_uuid': enterprise_customer_uuid,
+            'start_date': start_date,
+            'end_date': end_date,
+        }
+        query_filters = QueryFilters([
+            self.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
+            self.date_range_filter(
+                column='date',
+                start_date_params_key='start_date',
+                end_date_params_key='end_date',
+            ),
+        ])
+
+        if course_key:
+            course_key_filter = EqualQueryFilter(
+                column='course_key',
+                value_placeholder='course_key',
+            )
+
+            optional_params['course_key'] = course_key
+            query_filters.append(course_key_filter)
+
+        if course_type:
+            course_type_filter = EqualQueryFilter(
+                column='course_product_line',
+                value_placeholder='course_type',
+            )
+
+            optional_params['course_type'] = course_type
+            query_filters.append(course_type_filter)
+
+        params = {**default_params, **optional_params}
+
+        return run_query(
+            query=self.queries.get_skills_by_learning_hours(query_filters),
+            params=params,
+            as_dict=True,
+        )

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/enterprise_data/api/v1/views/enterprise_admin.py

@@ -180,10 +180,24 @@ class EnterpriseAdminAnalyticsSkillsView(APIView):
                 end_date
             )
 
+        # TODO: Handle course_key and course_type when they are provided in the request.
+        #       We have separate tickets to handle this implementation.
+        course_key = None
+        course_type = None
+        with timer('skills_by_learning_hours'):
+            skills_by_learning_hours = SkillsDailyRollupAdminDashTable().get_skills_by_learning_hours(
+                enterprise_id,
+                start_date,
+                end_date,
+                course_key,
+                course_type,
+            )
+
         response_data = {
             "top_skills": skills,
             "top_skills_by_enrollments": top_skills_by_enrollments,
             "top_skills_by_completions": top_skills_by_completions,
+            "skills_by_learning_hours": skills_by_learning_hours,
         }
 
         return Response(data=response_data, status=HTTP_200_OK)

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/enterprise_data/tests/admin_analytics/mock_analytics_data.py

@@ -470,3 +470,17 @@ TOP_SKILLS_BY_COMPLETIONS = [
         "count": 15.0
     },
 ]
+SKILLS_BY_LEARNING_HOURS = [
+    {
+        "skill_name": "Python (Programming Language)",
+        "learning_hours": 100.0
+    },
+    {
+        "skill_name": "Data Science",
+        "learning_hours": 80.0
+    },
+    {
+        "skill_name": "Algorithms",
+        "learning_hours": 60.0
+    },
+]

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/enterprise_data/tests/api/v1/views/test_enterprise_admin.py

@@ -16,6 +16,7 @@ from enterprise_data.admin_analytics.database.queries import (
     FactEnrollmentAdminDashQueries,
 )
 from enterprise_data.tests.admin_analytics.mock_analytics_data import (
+    SKILLS_BY_LEARNING_HOURS,
     TOP_SKILLS,
     TOP_SKILLS_BY_COMPLETIONS,
     TOP_SKILLS_BY_ENROLLMENTS,
@@ -137,8 +138,10 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
     @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_top_skills')
     @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_top_skills_by_enrollment')
     @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_top_skills_by_completion')
+    @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_skills_by_learning_hours')
     def test_get(
         self,
+        mock_get_skills_by_learning_hours,
         mock_get_top_skills_by_completion,
         mock_get_top_skills_by_enrollment,
         mock_get_top_skills,
@@ -151,6 +154,7 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
         mock_get_top_skills.return_value = TOP_SKILLS
         mock_get_top_skills_by_enrollment.return_value = TOP_SKILLS_BY_ENROLLMENTS
         mock_get_top_skills_by_completion.return_value = TOP_SKILLS_BY_COMPLETIONS
+        mock_get_skills_by_learning_hours.return_value = SKILLS_BY_LEARNING_HOURS
 
         response = self.client.get(self.url)
         assert response.status_code == status.HTTP_200_OK
@@ -210,6 +214,20 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
                     "count": 15.0,
                 },
             ],
+            "skills_by_learning_hours": [
+                {
+                    "skill_name": "Python (Programming Language)",
+                    "learning_hours": 100.0
+                },
+                {
+                    "skill_name": "Data Science",
+                    "learning_hours": 80.0
+                },
+                {
+                    "skill_name": "Algorithms",
+                    "learning_hours": 60.0
+                },
+            ]
         }
 
     @ddt.data(

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/requirements/base.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -10,17 +10,17 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.40.31
+awscli==1.40.34
     # via -r requirements/reporting.in
 bcrypt==4.3.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.38.32
+boto3==1.38.35
     # via
     #   -r requirements/reporting.in
     #   snowflake-connector-python
-botocore==1.38.32
+botocore==1.38.35
     # via
     #   awscli
     #   boto3
@@ -57,7 +57,7 @@ click-repl==0.3.0
     # via celery
 colorama==0.4.6
     # via awscli
-cryptography==45.0.3
+cryptography==45.0.4
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -66,9 +66,9 @@ cryptography==45.0.3
     #   pyjwt
     #   pyopenssl
     #   snowflake-connector-python
-django==4.2.22
+django==4.2.23
     # via
-    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-fernet-fields-v2
@@ -92,7 +92,7 @@ django-model-utils==5.0.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
-django-waffle==4.2.0
+django-waffle==5.0.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
@@ -128,7 +128,7 @@ edx-rest-api-client==6.2.0
     # via -r requirements/base.in
 factory-boy==3.3.3
     # via -r requirements/base.in
-faker==37.3.0
+faker==37.4.0
     # via factory-boy
 filelock==3.18.0
     # via snowflake-connector-python
@@ -148,8 +148,9 @@ monotonic==1.6
     # via py2neo
 mysql-connector-python==9.3.0
     # via -r requirements/base.in
-numpy==2.3.0
+numpy==2.2.6
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   pandas
 packaging==25.0
@@ -193,7 +194,7 @@ pyjwt[crypto]==2.10.1
     #   snowflake-connector-python
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.13.0
+pymongo==4.13.1
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
@@ -214,7 +215,7 @@ pytz==2025.2
     #   snowflake-connector-python
 pyyaml==6.0.2
     # via awscli
-requests==2.32.3
+requests==2.32.4
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -264,7 +265,7 @@ unicodecsv==0.14.1
     # via -r requirements/reporting.in
 urllib3==2.2.3
     # via
-    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   botocore
     #   py2neo
     #   requests

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/requirements/ci.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -10,7 +10,7 @@ chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-coverage==7.8.2
+coverage==7.9.0
     # via -r requirements/ci.in
 distlib==0.3.9
     # via virtualenv

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/requirements/common_constraints.txt

@@ -1,4 +1,12 @@
 
+
+
+
+
+
+
+
+
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #
@@ -30,3 +38,7 @@ pip<24.3
 # Cause: https://github.com/openedx/edx-lint/issues/475
 # This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
 urllib3<2.3.0
+
+# This is to allow Jenkins based jobs to run which is still using python 3.8
+# This can be unpinned when our Jenkins environment is upgraded to python 3.12
+numpy<2.3.0

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/requirements/dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -14,17 +14,19 @@ astroid==3.3.10
     # via
     #   pylint
     #   pylint-celery
-awscli==1.40.31
+awscli==1.40.34
     # via -r requirements/reporting.in
+backports-tarfile==1.2.0
+    # via jaraco-context
 bcrypt==4.3.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.38.32
+boto3==1.38.35
     # via
     #   -r requirements/reporting.in
     #   snowflake-connector-python
-botocore==1.38.32
+botocore==1.38.35
     # via
     #   awscli
     #   boto3
@@ -79,7 +81,7 @@ colorama==0.4.6
     # via
     #   awscli
     #   tox
-cryptography==45.0.3
+cryptography==45.0.4
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -95,9 +97,9 @@ dill==0.4.0
     # via pylint
 distlib==0.3.9
     # via virtualenv
-django==4.2.22
+django==4.2.23
     # via
-    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-fernet-fields-v2
@@ -122,7 +124,7 @@ django-model-utils==5.0.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
-django-waffle==4.2.0
+django-waffle==5.0.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
@@ -166,7 +168,7 @@ edx-rest-api-client==6.2.0
     # via -r requirements/base.in
 factory-boy==3.3.3
     # via -r requirements/base.in
-faker==37.3.0
+faker==37.4.0
     # via factory-boy
 filelock==3.18.0
     # via
@@ -179,6 +181,8 @@ idna==3.10
     # via
     #   requests
     #   snowflake-connector-python
+importlib-metadata==8.7.0
+    # via keyring
 interchange==2021.0.4
     # via py2neo
 isort==6.0.1
@@ -231,8 +235,9 @@ mysql-connector-python==9.3.0
     # via -r requirements/base.in
 nh3==0.2.21
     # via readme-renderer
-numpy==2.3.0
+numpy==2.2.6
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   pandas
 packaging==25.0
@@ -316,7 +321,7 @@ pylint-plugin-utils==0.8.2
     #   pylint-django
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.13.0
+pymongo==4.13.1
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
@@ -350,7 +355,7 @@ pyyaml==6.0.2
     #   edx-i18n-tools
 readme-renderer==43.0
     # via twine
-requests==2.32.3
+requests==2.32.4
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -425,7 +430,7 @@ unicodecsv==0.14.1
     # via -r requirements/reporting.in
 urllib3==2.2.3
     # via
-    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   botocore
     #   py2neo
     #   requests
@@ -445,6 +450,8 @@ wheel==0.45.1
     # via
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
+zipp==3.23.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

edx_enterprise_data-10.16.8/requirements/django.txt

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

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/requirements/pip.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -10,7 +10,7 @@ wheel==0.45.1
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
     # via
-    #   -c /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/pip.in
 setuptools==80.9.0
     # via -r requirements/pip.in

{edx_enterprise_data-10.16.5 → edx_enterprise_data-10.16.8}/requirements/pip_tools.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade