v0.5.16 timeout support by ViMonks; new method "Get Smart Campaigns by Lead ID"

Author: jepcastelein

README.md

@@ -223,6 +223,13 @@ lead = mc.execute(method='merge_lead', id=3482183, leadIds=[3482182], mergeInCRM
 # returns True if successful
 ```
 
+Get Smart Campaigns by Lead ID
+------------------------------
+API Ref: https://developers.marketo.com/rest-api/endpoint-reference/lead-database-endpoint-reference/#!/Leads/getSmartCampaignMembershipUsingGET
+```python
+results = mc.execute(method='get_smart_campaigns_by_lead_id', lead_id=39881)
+```
+
 Get Lead Partitions
 -------------------
 API Ref: http://developers.marketo.com/documentation/rest/get-lead-partitions/

marketorestpython/client.py

@@ -35,7 +35,8 @@ def __init__(self, munchkin_id, client_id=None, client_secret=None, api_limit=No
         self.API_LIMIT = api_limit
         self.max_retry_time = max_retry_time
         if requests_timeout is not None:
-            error_message = "requests_timeout must be a postive float or int, or a two-element tuple of positive floats or ints"
+            error_message = "requests_timeout must be a positive float or int, or a two-element tuple of positive " \
+                            "floats or ints"
             if isinstance(requests_timeout, int) or isinstance(requests_timeout, float):
                 assert requests_timeout > 0, error_message
                 self.requests_timeout = requests_timeout
@@ -48,6 +49,8 @@ def __init__(self, munchkin_id, client_id=None, client_secret=None, api_limit=No
                 self.requests_timeout = requests_timeout
             else:
                 raise AssertionError(error_message)
+        else:
+            self.requests_timeout = None
 
     def _api_call(self, method, endpoint, *args, **kwargs):
         request = HttpLib(max_retry_time_conf=self.max_retry_time, requests_timeout=self.requests_timeout)
@@ -79,6 +82,7 @@ def execute(self, method, *args, **kargs):
                     'associate_lead': self.associate_lead,
                     'push_lead': self.push_lead,
                     'merge_lead': self.merge_lead,
+                    'get_smart_campaigns_by_lead_id': self.get_smart_campaigns_by_lead_id,
                     'get_lead_partitions': self.get_lead_partitions,
                     'create_list': self.create_list,
                     'update_list': self.update_list,
@@ -655,6 +659,19 @@ def merge_lead(self, id, leadIds, mergeInCRM=False):
         # there is no 'result' node returned in this call
         return result['success']
 
+    def get_smart_campaigns_by_lead_id(self, lead_id):
+        self.authenticate()
+        if lead_id is None:
+            raise ValueError("Invalid argument: required argument lead_id is none.")
+        args = {
+            'access_token': self.token
+        }
+        result = self._api_call(
+            'get', '{}/rest/v1/leads/{}/smartCampaignMembership.json'.format(self.host, lead_id), args)
+        if result is None:
+            raise Exception("Empty Response")
+        return result['result']
+
     # --------- LEAD PARTITIONS ---------
 
     def get_lead_partitions(self):
@@ -2386,8 +2403,6 @@ def get_emails_yield(self, offset=0, maxReturn=20, status=None, folderId=None, f
                     yield result
                 else:
                     yield result['result']
-                if len(result['result']) < maxReturn:
-                    break
             else:
                 break
             offset += maxReturn

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='marketorestpython',
-    version= '0.5.15',
+    version= '0.5.16',
     url='https://github.com/jepcastelein/marketo-rest-python',
     author='Jep Castelein',
     author_email='[email protected]',