Added distinctRecomms parameter to batch request

Author: OndraFiedler

recombee_api_client/api_requests/batch.py

@@ -15,11 +15,13 @@ class Batch(Request):
     - currently, batch size is limited to **10,000** requests; if you wish to execute even larger number of requests, please split the batch into multiple parts.
     """
 
-    def __init__(self,requests):
+    def __init__(self, requests, distinctRecomms=None):
         """
-        @param requests: List of Requests
+        @param requests: List of Requests.
+        @param distinctRecomms: Makes all the recommended items for a certain user distinct among multiple recommendation requests in the batch.
         """
         self.requests = requests
+        self.distinctRecomms = distinctRecomms
         self.timeout = sum([req.timeout for req in self.requests])
         self.ensure_https = True
         self.method = 'post'
@@ -32,7 +34,10 @@ def get_body_parameters(self):
         reqs = []
         for r in self.requests:
             reqs.append(self.__request_to_batch_dict(r))
-        return {'requests': reqs}
+        result = {'requests': reqs}
+        if self.distinctRecomms is not None:
+            result['distinctRecomms'] = self.distinctRecomms
+        return result
 
     def __request_to_batch_dict(self, req):
 

recombee_api_client/api_requests/list_groups.py

@@ -8,7 +8,7 @@ class ListGroups(Request):
     def __init__(self):
         """
         """
-        self.timeout = 1000
+        self.timeout = 30000
         self.ensure_https = False
         self.method = 'get'
         self.path = "/{databaseId}/groups/list/" % ()

recombee_api_client/api_requests/list_items.py

@@ -13,7 +13,7 @@ def __init__(self,filter=None):
         
         """
         self.filter = filter
-        self.timeout = 1000
+        self.timeout = 30000
         self.ensure_https = False
         self.method = 'get'
         self.path = "/{databaseId}/items/list/" % ()

recombee_api_client/api_requests/list_series.py

@@ -8,7 +8,7 @@ class ListSeries(Request):
     def __init__(self):
         """
         """
-        self.timeout = 1000
+        self.timeout = 30000
         self.ensure_https = False
         self.method = 'get'
         self.path = "/{databaseId}/series/list/" % ()

recombee_api_client/api_requests/list_users.py

@@ -8,7 +8,7 @@ class ListUsers(Request):
     def __init__(self):
         """
         """
-        self.timeout = 1000
+        self.timeout = 30000
         self.ensure_https = False
         self.method = 'get'
         self.path = "/{databaseId}/users/list/" % ()

recombee_api_client/api_requests/merge_users.py

@@ -5,7 +5,7 @@ class MergeUsers(Request):
     Merges purchases, ratings, bookmarks, and detail views of two different users under a single user ID. This is especially useful for online e-commerce applications working with anonymous users identified by unique tokens such as the session ID. In such applications, it may often happen that a user owns a persistent account, yet accesses the system anonymously while, e.g., putting items into a shopping cart. At some point in time, such as when the user wishes to confirm the purchase, (s)he logs into the system using his/her username and password. The interactions made under anonymous session ID then become connected with the persistent account, and merging these two together becomes desirable.
     
     
-    Merging happens between two users referred to as the *source* and the *target*. After the merge, all the interactions of the source user are attributed to the target user, and the source user is **deleted** unless special parameter `keepSourceUser` is set `true`.
+    Merging happens between two users referred to as the *target* and the *source*. After the merge, all the interactions of the source user are attributed to the target user, and the source user is **deleted** unless special parameter `keepSourceUser` is set `true`.
 
     """
 

setup.py

@@ -11,7 +11,7 @@
 setup(
     name='recombee-api-client',
 
-    version='1.2.3',
+    version='1.2.4',
 
     description='Client for Recombee recommendation API',
     long_description=long_description,

tests/test_cases/add_interaction.py

@@ -23,6 +23,13 @@ def test_add_interaction(self):
         req = self.create_request('entity_id','entity_id',timestamp='2013-10-29T09:38:41.341Z')
         resp = self.client.send(req)
         # it 'fails with nonexisting item id'
+        req = self.create_request('entity_id','nonex_id')
+        try:
+            self.client.send(req)
+            self.assertFail()
+        except ResponseException as ex:
+            self.assertEqual(ex.status_code, 404)
+        # it 'fails with nonexisting user id'
         req = self.create_request('nonex_id','entity_id')
         try:
             self.client.send(req)