Remove try/except from the batch_add_requests

Author: Pijukatel

src/apify_client/clients/resource_clients/request_queue.py

@@ -332,24 +332,20 @@ def batch_add_requests(
             for request in request_batch:
                 unprocessed_requests[request['uniqueKey']] = _get_unprocessed_request_from_request(request)
 
-            try:
-                # Send the batch to the API.
-                response = self.http_client.call(
-                    url=self._url('requests/batch'),
-                    method='POST',
-                    params=request_params,
-                    json=list(request_batch),
-                    timeout_secs=_MEDIUM_TIMEOUT,
-                )
-
-                response_parsed = parse_date_fields(pluck_data(response.json()))
-                processed_requests.extend(response_parsed.get('processedRequests', []))
+            # Send the batch to the API.
+            response = self.http_client.call(
+                url=self._url('requests/batch'),
+                method='POST',
+                params=request_params,
+                json=list(request_batch),
+                timeout_secs=_MEDIUM_TIMEOUT,
+            )
 
-                for processed_request in response_parsed.get('processedRequests', []):
-                    unprocessed_requests.pop(processed_request['uniqueKey'], None)
+            response_parsed = parse_date_fields(pluck_data(response.json()))
+            processed_requests.extend(response_parsed.get('processedRequests', []))
 
-            except Exception as exc:
-                logger.warning(f'Error occurred while processing a batch of requests: {exc}')
+            for processed_request in response_parsed.get('processedRequests', []):
+                unprocessed_requests.pop(processed_request['uniqueKey'], None)
 
         return {
             'processedRequests': processed_requests,
@@ -667,28 +663,22 @@ async def _batch_add_requests_worker(
             except asyncio.CancelledError:
                 break
 
-            try:
-                # Send the batch to the API.
-                response = await self.http_client.call(
-                    url=self._url('requests/batch'),
-                    method='POST',
-                    params=request_params,
-                    json=list(request_batch),
-                    timeout_secs=_MEDIUM_TIMEOUT,
-                )
-
-                response_parsed = parse_date_fields(pluck_data(response.json()))
-                processed_requests.extend(response_parsed.get('processedRequests', []))
-
-                for processed_request in response_parsed.get('processedRequests', []):
-                    unprocessed_requests.pop(processed_request['uniqueKey'], None)
-
-            except Exception as exc:
-                logger.warning(f'Error occurred while processing a batch of requests: {exc}')
-
-            finally:
-                # Mark the batch as done whether it succeeded or failed.
-                queue.task_done()
+            # Send the batch to the API.
+            response = await self.http_client.call(
+                url=self._url('requests/batch'),
+                method='POST',
+                params=request_params,
+                json=list(request_batch),
+                timeout_secs=_MEDIUM_TIMEOUT,
+            )
+
+            response_parsed = parse_date_fields(pluck_data(response.json()))
+            processed_requests.extend(response_parsed.get('processedRequests', []))
+
+            for processed_request in response_parsed.get('processedRequests', []):
+                unprocessed_requests.pop(processed_request['uniqueKey'], None)
+
+            queue.task_done()
 
         return {
             'processedRequests': processed_requests,

tests/unit/test_client_timeouts.py

@@ -116,7 +116,7 @@ def assert_timeout(expected_timeout: int, request: Request) -> Response:
     (RequestQueueClient, 'delete_request', request_queue._SMALL_TIMEOUT, {'request_id': 123}),
     (RequestQueueClient, 'prolong_request_lock', request_queue._MEDIUM_TIMEOUT, {'request_id': 123, 'lock_secs': 1}),
     (RequestQueueClient, 'delete_request_lock', request_queue._SMALL_TIMEOUT, {'request_id': 123}),
-    (RequestQueueClient, 'batch_add_requests', request_queue._MEDIUM_TIMEOUT, {'requests': [{}]}),
+    (RequestQueueClient, 'batch_add_requests', request_queue._MEDIUM_TIMEOUT, {'requests': [{'uniqueKey': '123'}]}),
     (RequestQueueClient, 'batch_delete_requests', request_queue._SMALL_TIMEOUT, {'requests': [{}]}),
     (RequestQueueClient, 'list_requests', request_queue._MEDIUM_TIMEOUT, {}),
 ]