No dependencies parsons DO NOT MERGE

parsons/aws/s3.py

@@ -29,7 +29,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None, aws_sessi
 
             self.session = boto3.Session(aws_access_key_id=aws_access_key_id,
                                          aws_secret_access_key=aws_secret_access_key,
-                                         aws_session_token=aws_session_token)
+                                         aws_session_token='')
 
         else:
             self.session = boto3.Session()

parsons/facebook_ads/facebook_ads.py

@@ -274,6 +274,50 @@ def _add_batch_to_custom_audience(app_id, app_secret, access_token, audience_id,
         CustomAudience(audience_id).add_users(schema, batch, is_raw=True)
         logger.info(f"Added {added_so_far+len(batch)}/{total_rows} users to custom audience...")
 
+    def _remove_batch_from_custom_audience(app_id, app_secret, access_token, audience_id, schema,
+                                      batch, added_so_far, total_rows):
+        FacebookAdsApi.init(app_id, app_secret, access_token)
+
+        CustomAudience(audience_id).remove_users(schema, batch, is_raw=True)
+        logger.info(f"Removed {added_so_far+len(batch)}/{total_rows} users from custom audience...")
+
+    def _change_users_in_custom_audience(self, audience_id, users_table, adding=True):
+        match_table = FacebookAds.get_match_table_for_users_table(users_table)
+        if not match_table.columns:
+            raise KeyError("No valid columns found for audience matching. "
+                           "See FacebookAds.KeyMatchMap for supported columns")
+
+        num_rows = match_table.num_rows
+        logger.info(f"Found {num_rows} rows with valid FB matching keys")
+        logger.info(f"Using FB matching keys: {match_table.columns}")
+
+        (schema, data) = FacebookAds._get_match_schema_and_data(match_table)
+
+        # Use the FB API to add users, respecting the limit per API call.
+        # Process and upload batches in parallel, to improve performance.
+
+        batch_size = MAX_FB_AUDIENCE_API_USERS
+
+        if adding:
+            parallel_jobs = (
+                delayed(FacebookAds._add_batch_to_custom_audience)(
+                    self.app_id, self.app_secret, self.access_token, audience_id, schema,
+                    data[i:i+batch_size], i, num_rows
+                )
+                for i in range(0, len(data), batch_size)
+            )
+        else:
+            parallel_jobs = (
+                delayed(FacebookAds._remove_batch_from_custom_audience)(
+                    self.app_id, self.app_secret, self.access_token, audience_id, schema,
+                    data[i:i+batch_size], i, num_rows
+                )
+                for i in range(0, len(data), batch_size)
+            )
+
+        n_jobs = os.environ.get('PARSONS_NUM_PARALLEL_JOBS', 4)
+        Parallel(n_jobs=n_jobs)(parallel_jobs)
+
     def add_users_to_custom_audience(self, audience_id, users_table):
         """
         Adds user data to a custom audience.
@@ -352,29 +396,10 @@ def add_users_to_custom_audience(self, audience_id, users_table):
         logger.info(f"Adding custom audience users from provided table with "
                     f"{users_table.num_rows} rows")
 
-        match_table = FacebookAds.get_match_table_for_users_table(users_table)
-        if not match_table.columns:
-            raise KeyError("No valid columns found for audience matching. "
-                           "See FacebookAds.KeyMatchMap for supported columns")
-
-        num_rows = match_table.num_rows
-        logger.info(f"Found {num_rows} rows with valid FB matching keys")
-        logger.info(f"Using FB matching keys: {match_table.columns}")
+        FacebookAds._change_users_in_custom_audience(self, audience_id, users_table)
 
-        (schema, data) = FacebookAds._get_match_schema_and_data(match_table)
-
-        # Use the FB API to add users, respecting the limit per API call.
-        # Process and upload batches in parallel, to improve performance.
-
-        batch_size = MAX_FB_AUDIENCE_API_USERS
-
-        parallel_jobs = (
-            delayed(FacebookAds._add_batch_to_custom_audience)(
-                self.app_id, self.app_secret, self.access_token, audience_id, schema,
-                data[i:i+batch_size], i, num_rows
-            )
-            for i in range(0, len(data), batch_size)
-        )
+    def remove_users_from_custom_audience(self, audience_id, users_table):
+        logger.info(f"Removing custom audience users from provided table with "
+                    f"{users_table.num_rows} rows")
 
-        n_jobs = os.environ.get('PARSONS_NUM_PARALLEL_JOBS', 4)
-        Parallel(n_jobs=n_jobs)(parallel_jobs)
+        FacebookAds._change_users_in_custom_audience(self, audience_id, users_table, adding=False)

requirements.txt

@@ -1,52 +1,53 @@
-requests==2.25.1
-petl==1.6.8
+requests==2.27.1
+petl==1.7.11
 boto3==1.17.98
-boxsdk==2.10.0
-civis==1.16.0
-slackclient==1.3.0
-psycopg2-binary==2.9.3
+#boxsdk==2.10.0
+#civis==1.16.0
+#slackclient==1.3.0
+#psycopg2-binary==2.9.3
 xmltodict==0.11.0
 gspread==3.7.0
 oauth2client==4.1.3
 google-auth==2.6.2
-facebook-business==13.0.0
+facebook-business==17.0.0
+# facebook_business @ git+https://github.com/stac-labs/facebook-python-business-sdk.git@main
 google-api-python-client==1.7.7
-google-resumable-media==2.3.2
-grpcio==1.45.0
+#google-resumable-media==2.3.2
+grpcio==1.48.0
 httplib2==0.19.0
 validate-email==1.3
 paramiko==2.11.0
 xmltodict==0.11.0
 joblib==1.2.0
-censusgeocode==0.4.3.post1
-airtable-python-wrapper==0.13.0
-google-cloud-storage==2.2.0
-google-cloud-bigquery==3.0.1
+#censusgeocode==0.4.3.post1
+#airtable-python-wrapper==0.13.0
+google-cloud-storage>=2.2.0
+google-cloud-bigquery>=2.24.1
 docutils<0.18,>=0.14
-urllib3==1.26.5
+urllib3==1.26.8
 simplejson==3.16.0
-twilio==6.30.0
-simple-salesforce==1.11.6
+# twilio==6.30.0
+# simple-salesforce==0.74.3
 suds-py3==1.3.4.0
-newmode==0.1.6
-mysql-connector-python==8.0.18
-braintree==4.0.0
+# newmode==0.1.6
+# mysql-connector-python==8.0.18
+# braintree==4.0.0
 python-dateutil==2.8.1
-azure-storage-blob==12.3.2
-PyGitHub==1.51
-surveygizmo==1.2.3
+# azure-storage-blob==12.3.2
+# PyGitHub==1.51
+# surveygizmo==1.2.3
 PyJWT==2.4.0 # Otherwise `import jwt` would refer to python-jwt package
 SQLAlchemy==1.3.23
 requests_oauthlib==1.3.0
 
 # Testing Requirements
-requests-mock==1.5.2
-flake8==4.0.1
-testfixtures==6.18.5
-pytest==7.1.1
-pytest-datadir==1.3.0
+# requests-mock==1.5.2
+# flake8==4.0.1
+# testfixtures==6.18.5
+# pytest==7.1.1
+# pytest-datadir==1.3.0
 
-# Stuff for TMC scripts
-# TODO Remove when we have a TMC-specific Docker image
-selenium==3.141.0
-jinja2==3.0.2
+# # Stuff for TMC scripts
+# # TODO Remove when we have a TMC-specific Docker image
+# selenium==4.1.0
+# jinja2==3.0.2