edx-enterprise-data 8.2.0__py3-none-any.whl → 8.3.1__py3-none-any.whl

{edx_enterprise_data-8.2.0.dist-info → edx_enterprise_data-8.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 8.2.0
+Version: 8.3.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -24,21 +24,21 @@ 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<=1.24.4
+Requires-Dist: pandas<=2.0.3
 Requires-Dist: requests
 Requires-Dist: rules
 Provides-Extra: reporting
-Requires-Dist: PGPy ; extra == 'reporting'
-Requires-Dist: awscli ; extra == 'reporting'
-Requires-Dist: boto3 ; extra == 'reporting'
-Requires-Dist: celery ==5.3.6 ; extra == 'reporting'
-Requires-Dist: cryptography ; extra == 'reporting'
-Requires-Dist: https ; extra == 'reporting'
-Requires-Dist: paramiko ; extra == 'reporting'
-Requires-Dist: pyminizip ; extra == 'reporting'
-Requires-Dist: snowflake-connector-python ; extra == 'reporting'
-Requires-Dist: unicodecsv ==0.14.1 ; extra == 'reporting'
-Requires-Dist: vertica-python ; extra == 'reporting'
+Requires-Dist: PGPy; extra == "reporting"
+Requires-Dist: awscli; extra == "reporting"
+Requires-Dist: boto3; extra == "reporting"
+Requires-Dist: celery==5.3.6; extra == "reporting"
+Requires-Dist: cryptography; extra == "reporting"
+Requires-Dist: https; extra == "reporting"
+Requires-Dist: paramiko; extra == "reporting"
+Requires-Dist: pyminizip; extra == "reporting"
+Requires-Dist: snowflake-connector-python; extra == "reporting"
+Requires-Dist: unicodecsv==0.14.1; extra == "reporting"
+Requires-Dist: vertica-python; extra == "reporting"
 
 Tools and products related to providing access to Enterprise data.

{edx_enterprise_data-8.2.0.dist-info → edx_enterprise_data-8.3.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=m1B80oppzBzILf9k9JMTLdt0jtuzOm21d91sVIZvtmM,123
+enterprise_data/__init__.py,sha256=9P5euSdqQ9R848n450LMmcWN8bT4_wUPcxDHek9waKk,123
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=GvQupy5TVYfO_IKC3yzXSAgNP54r-PtIjidM5ws9Iks,3947
 enterprise_data/constants.py,sha256=uCKjfpdlMYFZJsAj3n9RMw4Cmg5_6s3NuwocO-fch3s,238
@@ -10,9 +10,8 @@ enterprise_data/signals.py,sha256=8eqNPnlvmfsKf19lGWv5xTIuBgQIqR8EZSp9UYzC8Rc,10
 enterprise_data/urls.py,sha256=bqtKF5OEWEwrNmHG3os-pZNuNsmjlhxEqp7yM4TbPf4,243
 enterprise_data/utils.py,sha256=UruTQLJcEl-q5UWGPnJZrnBnV1OvzBvhuoB_JkRY4Is,2328
 enterprise_data/admin_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/admin_analytics/constants.py,sha256=m7mK2PxkwnuzRAWlcPfMRdjY1r8D3dpA_i6PD0_aqBM,587
 enterprise_data/admin_analytics/data_loaders.py,sha256=jP9CgUt_93Bl_ak1_6dBPN4PAEdDT1da3sEMjJ45NLg,4281
-enterprise_data/admin_analytics/database.py,sha256=PZRJ-URmZKo7ib88iEZbN61Nhp6uwc5NpzYrrff-gTg,857
+enterprise_data/admin_analytics/database.py,sha256=mNS_9xE5h6O7oMMzr6kr6LDTTSNvKzo8vaM-YG8tOd8,1312
 enterprise_data/admin_analytics/utils.py,sha256=Cock_rTtHkBEKcG3cq7VcYRPEuxC_SyJBlZn9KdVeCA,2465
 enterprise_data/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/api/urls.py,sha256=POqc_KATHdnpMf9zHtpO46pKD5KAlAExtx7G6iylLcU,273
@@ -148,8 +147,8 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=WtL-RqGgu2x5PP
 enterprise_reporting/tests/test_utils.py,sha256=Zt_TA0LVb-B6fQGkUkAKKVlUKKnQh8jnw1US1jKe7g8,9493
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-8.2.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.2.0.dist-info/METADATA,sha256=81erBLhfqTyzo75DfCtXfMt-qYPFnfrBSITELJCJCDw,1584
-edx_enterprise_data-8.2.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.2.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.2.0.dist-info/RECORD,,
+edx_enterprise_data-8.3.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-8.3.1.dist-info/METADATA,sha256=Wb7AA7AgVPyoHB7_BzDnbnjcZ_-xx1nXtUCf0vkrAs8,1569
+edx_enterprise_data-8.3.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-8.3.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-8.3.1.dist-info/RECORD,,

enterprise_data/__init__.py

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

enterprise_data/admin_analytics/database.py

@@ -4,12 +4,31 @@ Utility functions for interacting with the database.
 from contextlib import closing
 from logging import getLogger
 
-from enterprise_data.admin_analytics.constants import DATABASE_CONNECTION_CONFIG, DATABASE_CONNECTOR
+from mysql.connector import connect
+
+from django.conf import settings
+
 from enterprise_data.utils import timeit
 
 LOGGER = getLogger(__name__)
 
 
+def get_db_connection(database=settings.ENTERPRISE_REPORTING_DB_ALIAS):
+    """
+    Get a connection to the database.
+
+    Returns:
+        (mysql.connector.connection.MySQLConnection): The database connection.
+    """
+    return connect(
+        host=settings.DATABASES[database]['HOST'],
+        port=settings.DATABASES[database]['PORT'],
+        database=settings.DATABASES[database]['NAME'],
+        user=settings.DATABASES[database]['USER'],
+        password=settings.DATABASES[database]['PASSWORD'],
+    )
+
+
 @timeit
 def run_query(query):
     """
@@ -22,7 +41,7 @@ def run_query(query):
         (list): The results of the query.
     """
     try:
-        with closing(DATABASE_CONNECTOR(**DATABASE_CONNECTION_CONFIG)) as connection:
+        with closing(get_db_connection()) as connection:
             with closing(connection.cursor()) as cursor:
                 cursor.execute(query)
                 return cursor.fetchall()

enterprise_data/admin_analytics/constants.py

@@ -1,15 +0,0 @@
-"""
-Constants for admin analytics.
-"""
-import mysql.connector
-
-from django.conf import settings
-
-DATABASE_CONNECTION_CONFIG = {
-    'host': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['HOST'],
-    'port': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['PORT'],
-    'database': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['NAME'],
-    'user': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['USER'],
-    'password': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['PASSWORD'],
-}
-DATABASE_CONNECTOR = mysql.connector.connect