edx-enterprise-data 5.4.1__py3-none-any.whl → 5.5.1__py3-none-any.whl

{edx_enterprise_data-5.4.1.dist-info → edx_enterprise_data-5.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 5.4.1
+Version: 5.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -31,8 +31,8 @@ Requires-Dist: awscli ; extra == 'reporting'
 Requires-Dist: boto3 ; extra == 'reporting'
 Requires-Dist: celery ==4.4.7 ; extra == 'reporting'
 Requires-Dist: cryptography ; extra == 'reporting'
+Requires-Dist: https ; extra == 'reporting'
 Requires-Dist: paramiko ; extra == 'reporting'
-Requires-Dist: py2neo ; extra == 'reporting'
 Requires-Dist: pyminizip ; extra == 'reporting'
 Requires-Dist: snowflake-connector-python ; extra == 'reporting'
 Requires-Dist: unicodecsv ==0.14.1 ; extra == 'reporting'

{edx_enterprise_data-5.4.1.dist-info → edx_enterprise_data-5.5.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-enterprise_data/__init__.py,sha256=vowx0vqntZ5qvS4mcq1yafEqJDZ-jKFZGii6eTVnm6M,123
+enterprise_data/__init__.py,sha256=dC_EnL5TAyJtgKEiiE010yYxoMn6H4OL7KrAtv41FHo,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=pS65L4mimz7hd_cLml_mXdU0GJ7hs0X8UQ8MNjC5hCU,234
 enterprise_data/filters.py,sha256=SsDCfD6YTBPySUqGphJ8ZtuswTafTvsYt4JI93DFRX4,5686
-enterprise_data/models.py,sha256=cX9rO0k2tVFHaH0TiGUH3Egstw7lpIW032rm5zuRtfA,18321
+enterprise_data/models.py,sha256=oDnvuQ-XlFTLaZNSiv5aviStpeQrEgALtlB63jVZKcA,18376
 enterprise_data/paginators.py,sha256=YPrC5TeXFt-ymenT2H8H2nCbDCnAzJQlH9kFPElRxWE,269
 enterprise_data/signals.py,sha256=8eqNPnlvmfsKf19lGWv5xTIuBgQIqR8EZSp9UYzC8Rc,1024
 enterprise_data/urls.py,sha256=bqtKF5OEWEwrNmHG3os-pZNuNsmjlhxEqp7yM4TbPf4,243
@@ -73,6 +73,7 @@ enterprise_data/migrations/0034_auto_20230907_0834.py,sha256=30davBk2QD9tZCoSCHl
 enterprise_data/migrations/0035_auto_20230907_1154.py,sha256=nVz53sDLzygo0wR8E1dMaedEdGsUdc6LkdOVnH8FiZk,743
 enterprise_data/migrations/0036_enterprisesubsidybudget_subsidy_access_policy_display_name.py,sha256=KqMw3rcVshujU-bYVXnAHCRF-l_Gtd5EYemakFQGE2U,450
 enterprise_data/migrations/0037_alter_enterpriseenrollment_consent_granted.py,sha256=MF9-RRhCR1efO51UPgSn746V5EnymdwNYrL8dA_P7Q8,471
+enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py,sha256=8St3DsKb-VI3LGGC-Mc7OvmFn67kVob0HKCPGKcjvu4,436
 enterprise_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/settings/test.py,sha256=Ei2K4fCCIdeKh9VSRoW7yivMlyoxY1Vbvu5I-Rk7rL0,3988
@@ -110,7 +111,7 @@ enterprise_data_roles/tests/test_models.py,sha256=wJv7ywk0BSbjlW_U142h0aFxZleAHy
 enterprise_reporting/__init__.py,sha256=yQO9ureIxFnl-1a_34H53elDwuAzXrSmhLlzqqD2SJ0,112
 enterprise_reporting/delivery_method.py,sha256=bG-JCGhrK3nuC3P6D88zBRSwDJCbaDxN35nNlXzvoRM,4813
 enterprise_reporting/external_resource_link_report.py,sha256=-KEB8jLkx4KFTTcoB1eznKte38XoAkya_VoFGUORz6o,8066
-enterprise_reporting/reporter.py,sha256=LNUsQr_uToVT1PM4ckTOhWAFdidpKleLQ1bhpLKJbV4,13707
+enterprise_reporting/reporter.py,sha256=3wI46qH-CNCUC5r9-Eme1mQdMjwEsFk9myRb-ajzJkM,13807
 enterprise_reporting/send_enterprise_reports.py,sha256=usseqP7tG0oyG7goaBA-kz2nQnU6wGLOIv0jlfq_4Lg,4753
 enterprise_reporting/utils.py,sha256=7t0IUeaLVxHmunLhYU6EVKrmizY_fquwUf3xdHWlkAE,13860
 enterprise_reporting/clients/__init__.py,sha256=Y2XqHWyEfgHBWnfwdO1P-MWLVqCivzWIJFm_lQFUMyI,5122
@@ -130,8 +131,8 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=WtL-RqGgu2x5PP
 enterprise_reporting/tests/test_utils.py,sha256=7Y5GmeibiC8Q5kIpYuIAkFpeyIDRs2U3ItxsabhR1zM,9493
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-5.4.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-5.4.1.dist-info/METADATA,sha256=kk74BesG-_H83crhJ0PU-yVX3hphGTYyI1kjxmyZMUY,1475
-edx_enterprise_data-5.4.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edx_enterprise_data-5.4.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-5.4.1.dist-info/RECORD,,
+edx_enterprise_data-5.5.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-5.5.1.dist-info/METADATA,sha256=PCX9-g2TUh3yRC4MaiPPAWFquLMPTyUuNnVH-mMckNo,1474
+edx_enterprise_data-5.5.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+edx_enterprise_data-5.5.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-5.5.1.dist-info/RECORD,,

{edx_enterprise_data-5.4.1.dist-info → edx_enterprise_data-5.5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

enterprise_data/__init__.py

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

enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2023-10-19 15:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0037_alter_enterpriseenrollment_consent_granted'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterpriseoffer',
+            name='export_timestamp',
+            field=models.DateTimeField(null=True),
+        ),
+    ]

enterprise_data/models.py

@@ -310,6 +310,7 @@ class EnterpriseOffer(models.Model):
     remaining_balance = models.FloatField(null=True)
     amount_offer_spent_ocm = models.FloatField(null=True)
     amount_offer_spent_exec_ed = models.FloatField(null=True)
+    export_timestamp = models.DateTimeField(null=True)
 
     def __str__(self):
         """

enterprise_reporting/reporter.py

@@ -20,7 +20,12 @@ from enterprise_reporting.clients.enterprise import (
 from enterprise_reporting.clients.s3 import S3Client
 from enterprise_reporting.clients.vertica import VerticaClient
 from enterprise_reporting.delivery_method import SFTPDeliveryMethod, SMTPDeliveryMethod
-from enterprise_reporting.utils import decrypt_string, extract_catalog_uuids_from_reporting_config, generate_data
+from enterprise_reporting.utils import (
+    decrypt_string,
+    extract_catalog_uuids_from_reporting_config,
+    generate_data,
+    retry_on_exception,
+)
 
 LOGGER = logging.getLogger(__name__)
 NOW = datetime.datetime.now().strftime("%Y-%m-%d")
@@ -115,6 +120,7 @@ class EnterpriseReportSender:
         """Get a full path to the report file that can be modified with arbitrary formatting."""
         return '_{}.'.join(self.data_report_file_name.rsplit('.'))
 
+    @retry_on_exception(max_retries=2, delay=1, backoff=2)
     def send_enterprise_report(self):
         """Generate the report file of the appropriate type and send it through the configured delivery method."""
         LOGGER.info(f'Starting process to send report to {self.enterprise_customer_name}')