edx-enterprise-data 9.6.0__tar.gz → 10.0.1__tar.gz

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/CHANGELOG.rst

@@ -16,6 +16,20 @@ Unreleased
 
 =========================
 
+[10.0.1] - 2024-10-25
+---------------------
+  * Same as ``10.0.0`` 
+  * Bumping the version so a new tag can be created in the GitHub 
+
+[10.0.0] - 2024-10-25
+---------------------
+  * feat!: Python 3.12 Upgrade
+  * Dropped support for ``Python<3.12``
+
+[9.7.0] - 2024-10-23
+---------------------
+  * feat: Add API to fetch enterprise budgets information
+
 [9.6.0] - 2024-10-14
 ---------------------
   * feat: Added caching for API endpoints related to advanced analytics.

{edx_enterprise_data-9.6.0/edx_enterprise_data.egg-info → edx_enterprise_data-10.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 9.6.0
+Version: 10.0.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -9,7 +9,6 @@ License: AGPL 3.0
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 Requires-Dist: Django
@@ -24,8 +23,8 @@ Requires-Dist: edx-rbac
 Requires-Dist: edx-rest-api-client
 Requires-Dist: factory_boy
 Requires-Dist: mysql-connector-python
-Requires-Dist: numpy<=1.24.4
-Requires-Dist: pandas<=2.0.3
+Requires-Dist: numpy
+Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: rules
 Provides-Extra: reporting

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1/edx_enterprise_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 9.6.0
+Version: 10.0.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -9,7 +9,6 @@ License: AGPL 3.0
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 Requires-Dist: Django
@@ -24,8 +23,8 @@ Requires-Dist: edx-rbac
 Requires-Dist: edx-rest-api-client
 Requires-Dist: factory_boy
 Requires-Dist: mysql-connector-python
-Requires-Dist: numpy<=1.24.4
-Requires-Dist: pandas<=2.0.3
+Requires-Dist: numpy
+Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: rules
 Provides-Extra: reporting

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/edx_enterprise_data.egg-info/requires.txt

@@ -10,8 +10,8 @@ edx-rbac
 edx-rest-api-client
 factory_boy
 mysql-connector-python
-numpy<=1.24.4
-pandas<=2.0.3
+numpy
+pandas
 requests
 rules
 

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/enterprise_data/__init__.py

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

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/enterprise_data/api/v1/serializers.py

@@ -240,6 +240,19 @@ class EnterpriseExecEdLCModulePerformanceSerializer(serializers.ModelSerializer)
         return obj.extensions_requested if obj.extensions_requested is not None else 0
 
 
+class EnterpriseBudgetSerializer(serializers.ModelSerializer):
+    """
+    Serializer for EnterpriseSubsidyBudget model.
+    """
+
+    class Meta:
+        model = EnterpriseSubsidyBudget
+        fields = (
+            'subsidy_access_policy_uuid',
+            'subsidy_access_policy_display_name',
+        )
+
+
 class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: disable=abstract-method
     """Serializer for validating query params"""
     RESPONSE_TYPES = [

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/enterprise_data/api/v1/urls.py

@@ -96,6 +96,11 @@ urlpatterns = [
         enterprise_admin_views.EnterpriseAdminAnalyticsSkillsView.as_view(),
         name='enterprise-admin-analytics-skills'
     ),
+    re_path(
+        fr'^enterprise/(?P<enterprise_uuid>{UUID4_REGEX})/budgets',
+        enterprise_admin_views.EnterpriseBudgetView.as_view(),
+        name='enterprise-budgets'
+    ),
 ]
 
 urlpatterns += router.urls

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/enterprise_data/api/v1/views/enterprise_admin.py

@@ -21,6 +21,7 @@ from enterprise_data.models import (
     EnterpriseAdminLearnerProgress,
     EnterpriseAdminSummarizeInsights,
     EnterpriseExecEdLCModulePerformance,
+    EnterpriseSubsidyBudget,
 )
 from enterprise_data.utils import timer
 
@@ -206,3 +207,26 @@ class EnterpriseExecEdLCModulePerformanceViewSet(EnterpriseViewSetMixin, viewset
         return EnterpriseExecEdLCModulePerformance.objects.filter(
             enterprise_customer_uuid=self.kwargs['enterprise_id'],
         )
+
+
+class EnterpriseBudgetView(APIView):
+    """
+    View for getting budgets information for an enterprise.
+    """
+    authentication_classes = (JwtAuthentication,)
+    http_method_names = ["get"]
+
+    @permission_required("can_access_enterprise", fn=lambda request, enterprise_uuid: enterprise_uuid)
+    def get(self, request, enterprise_uuid):
+        """
+        Return the queryset of EnterpriseSubsidyBudget objects.
+        """
+        budgets = EnterpriseSubsidyBudget.objects.filter(
+            enterprise_customer_uuid=enterprise_uuid,
+        ).values(
+            'subsidy_access_policy_uuid',
+            'subsidy_access_policy_display_name',
+        )
+
+        serializer = serializers.EnterpriseBudgetSerializer(budgets, many=True)
+        return Response(serializer.data)

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/enterprise_data/api/v1/views/enterprise_learner.py

@@ -150,6 +150,10 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
         if search_start_date:
             queryset = queryset.filter(course_start_date=search_start_date)
 
+        budget_uuid = query_filters.get('budget_uuid')
+        if budget_uuid:
+            queryset = queryset.filter(budget_id=budget_uuid)
+
         offer_id = query_filters.get('offer_id')
         if offer_id:
             queryset = self.filter_by_offer_id(queryset, offer_id)

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/enterprise_data/tests/api/v1/views/test_enterprise_admin.py

@@ -21,7 +21,7 @@ from enterprise_data.tests.admin_analytics.mock_analytics_data import (
     TOP_SKILLS_BY_ENROLLMENTS,
 )
 from enterprise_data.tests.mixins import JWTTestMixin
-from enterprise_data.tests.test_utils import UserFactory, get_dummy_enterprise_api_data
+from enterprise_data.tests.test_utils import EnterpriseSubsidyBudgetFactory, UserFactory, get_dummy_enterprise_api_data
 from enterprise_data_roles.constants import ENTERPRISE_DATA_ADMIN_ROLE
 from enterprise_data_roles.models import EnterpriseDataFeatureRole, EnterpriseDataRoleAssignment
 
@@ -245,3 +245,49 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
         response = self.client.get(self.url, params)
         assert response.status_code == status.HTTP_400_BAD_REQUEST
         assert response.json() == error
+
+
+@ddt.ddt
+class TestEnterpriseBudgetAPI(JWTTestMixin, APITransactionTestCase):
+    """Tests for EnterpriseBudgetView."""
+
+    def setUp(self):
+        """
+        Setup method.
+        """
+        super().setUp()
+        self.user = UserFactory(is_staff=True)
+        role, __ = EnterpriseDataFeatureRole.objects.get_or_create(
+            name=ENTERPRISE_DATA_ADMIN_ROLE
+        )
+        self.role_assignment = EnterpriseDataRoleAssignment.objects.create(
+            role=role, user=self.user
+        )
+        self.client.force_authenticate(user=self.user)
+
+        self.enterprise_uuid = "ee5e6b3a069a4947bb8dd2dbc323396c"
+        self.set_jwt_cookie()
+
+        self.url = reverse(
+            "v1:enterprise-budgets",
+            kwargs={"enterprise_uuid": self.enterprise_uuid},
+        )
+
+        self.enterprise_subsidy_budget = EnterpriseSubsidyBudgetFactory(
+            enterprise_customer_uuid=self.enterprise_uuid,
+            subsidy_access_policy_uuid='8d6503dd-e40d-42b8-442b-37dd4c5450e3',
+            subsidy_access_policy_display_name='test-budget'
+        )
+
+    def test_get(self):
+        """
+        Test the GET method for the EnterpriseBudgetView works.
+        """
+        response = self.client.get(self.url)
+        assert response.status_code == status.HTTP_200_OK
+        assert response.json() == [
+            {
+                'subsidy_access_policy_uuid': '8d6503dd-e40d-42b8-442b-37dd4c5450e3',
+                'subsidy_access_policy_display_name': 'test-budget',
+            }
+        ]

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/requirements/base.in

@@ -13,6 +13,6 @@ django-model-utils
 edx-rbac
 rules
 factory_boy
-numpy<=1.24.4
-pandas<=2.0.3
+numpy
+pandas
 mysql-connector-python

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/requirements/base.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    make upgrade
@@ -10,15 +10,15 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.34.29
+awscli==1.35.14
     # via -r requirements/reporting.in
 bcrypt==4.2.0
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.29
+boto3==1.35.48
     # via -r requirements/reporting.in
-botocore==1.35.29
+botocore==1.35.48
     # via
     #   awscli
     #   boto3
@@ -35,7 +35,7 @@ cffi==1.17.1
     #   cryptography
     #   pynacl
     #   snowflake-connector-python
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via
     #   requests
     #   snowflake-connector-python
@@ -54,7 +54,7 @@ click-repl==0.3.0
     # via celery
 colorama==0.4.6
     # via awscli
-cryptography==43.0.1
+cryptography==43.0.3
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -100,18 +100,18 @@ djangorestframework==3.15.2
     #   edx-drf-extensions
 djangorestframework-csv==3.0.2
     # via -r requirements/base.in
-dnspython==2.6.1
+dnspython==2.7.0
     # via pymongo
 docutils==0.16
     # via awscli
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-django-utils==5.15.0
+edx-django-utils==7.0.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==10.4.0
+edx-drf-extensions==10.5.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
@@ -125,7 +125,7 @@ edx-rest-api-client==6.0.0
     # via -r requirements/base.in
 factory-boy==3.3.1
     # via -r requirements/base.in
-faker==30.0.0
+faker==30.8.1
     # via factory-boy
 filelock==3.16.1
     # via snowflake-connector-python
@@ -143,23 +143,20 @@ kombu==5.4.2
     # via celery
 monotonic==1.6
     # via py2neo
-mysql-connector-python==9.0.0
+mysql-connector-python==9.1.0
     # via -r requirements/base.in
-newrelic==10.0.0
+newrelic==10.2.0
     # via edx-django-utils
-numpy==1.24.4
+numpy==2.1.2
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   pandas
 packaging==24.1
     # via
     #   py2neo
     #   snowflake-connector-python
-pandas==2.0.3
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+pandas==2.2.3
+    # via -r requirements/base.in
 pansi==2020.7.3
     # via py2neo
 paramiko==3.5.0
@@ -172,7 +169,7 @@ platformdirs==4.3.6
     # via snowflake-connector-python
 prompt-toolkit==3.0.48
     # via click-repl
-psutil==6.0.0
+psutil==6.1.0
     # via edx-django-utils
 py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via -r requirements/reporting.in
@@ -192,7 +189,7 @@ pyjwt[crypto]==2.9.0
     #   snowflake-connector-python
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.9.1
+pymongo==4.10.1
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
@@ -224,7 +221,7 @@ rsa==4.7.2
     # via awscli
 rules==3.5
     # via -r requirements/base.in
-s3transfer==0.10.2
+s3transfer==0.10.3
     # via
     #   awscli
     #   boto3
@@ -238,7 +235,7 @@ six==1.16.0
     #   py2neo
     #   python-dateutil
     #   vertica-python
-snowflake-connector-python==3.12.2
+snowflake-connector-python==3.12.3
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -253,6 +250,7 @@ tomlkit==0.13.2
 typing-extensions==4.12.2
     # via
     #   edx-opaque-keys
+    #   faker
     #   snowflake-connector-python
 tzdata==2024.2
     # via
@@ -261,9 +259,8 @@ tzdata==2024.2
     #   pandas
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.20
+urllib3==2.2.3
     # via
-    #   -c requirements/constraints.txt
     #   botocore
     #   py2neo
     #   requests

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/requirements/ci.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    make upgrade
@@ -10,9 +10,9 @@ chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-coverage==7.6.1
+coverage==7.6.4
     # via -r requirements/ci.in
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
 filelock==3.16.1
     # via
@@ -30,7 +30,7 @@ pluggy==1.5.0
     # via tox
 pyproject-api==1.8.0
     # via tox
-tox==4.20.0
+tox==4.23.2
     # via -r requirements/ci.in
-virtualenv==20.26.6
+virtualenv==20.27.0
     # via tox

{edx_enterprise_data-9.6.0 → edx_enterprise_data-10.0.1}/requirements/constraints.txt

@@ -12,18 +12,3 @@
 
 # Common constraints for edx repos
 -c common_constraints.txt
-
-# Needed for Django 4.2 + Python 3.12 compatibility
-backports.zoneinfo; python_version<"3.9"
-
-# botocore 1.34.145 depends on urllib3<1.27 and >=1.25.4; python_version < "3.10"
-urllib3<2.0.0
-
-numpy<=1.24.4
-pandas<=2.0.3
-
-# this is the last supported version for python 3.8.x
-astroid<=3.2.4
-
-# upgrade to 5.4.0 causes issues with `importlib`
-edx-lint<=5.3.7