Merge branch 'main' into feat/composition-schema-update

Author: shortcuts

clients/algoliasearch-client-javascript/packages/ingestion/src/ingestionClient.ts

@@ -1730,6 +1730,15 @@ export function createIngestionClient({
         data: pushTaskPayload,
       };
 
+      requestOptions = {
+        timeouts: {
+          connect: 180000,
+          read: 180000,
+          write: 180000,
+          ...requestOptions?.timeouts,
+        },
+      };
+
       return transporter.request(request, requestOptions);
     },
 
@@ -2075,6 +2084,15 @@ export function createIngestionClient({
         headers,
       };
 
+      requestOptions = {
+        timeouts: {
+          connect: 180000,
+          read: 180000,
+          write: 180000,
+          ...requestOptions?.timeouts,
+        },
+      };
+
       return transporter.request(request, requestOptions);
     },
 
@@ -2427,6 +2445,15 @@ export function createIngestionClient({
         data: sourceCreate ? sourceCreate : {},
       };
 
+      requestOptions = {
+        timeouts: {
+          connect: 180000,
+          read: 180000,
+          write: 180000,
+          ...requestOptions?.timeouts,
+        },
+      };
+
       return transporter.request(request, requestOptions);
     },
 
@@ -2466,6 +2493,15 @@ export function createIngestionClient({
         data: sourceUpdate,
       };
 
+      requestOptions = {
+        timeouts: {
+          connect: 180000,
+          read: 180000,
+          write: 180000,
+          ...requestOptions?.timeouts,
+        },
+      };
+
       return transporter.request(request, requestOptions);
     },
   };

clients/algoliasearch-client-python/algoliasearch/http/request_options.py

@@ -58,6 +58,7 @@ def merge(
         query_parameters: Optional[Dict[str, Any]] = None,
         headers: Optional[Dict[str, str]] = None,
         data: Optional[str] = None,
+        timeouts: Dict[str, int] = {},
         user_request_options: Optional[Union[Self, Dict[str, Any]]] = None,
     ) -> Self:
         """
@@ -74,9 +75,9 @@ def merge(
             "headers": headers,
             "query_parameters": query_parameters,
             "timeouts": {
-                "read": self._config.read_timeout,
-                "write": self._config.write_timeout,
-                "connect": self._config.connect_timeout,
+                "read": timeouts.get("read", self._config.read_timeout),
+                "write": timeouts.get("write", self._config.write_timeout),
+                "connect": timeouts.get("connect", self._config.connect_timeout),
             },
             "data": data,
         }

clients/algoliasearch-client-python/algoliasearch/ingestion/client.py

@@ -3512,6 +3512,11 @@ async def push_task_with_http_info(
             request_options=self._request_options.merge(
                 query_parameters=_query_parameters,
                 data=dumps(body_serializer(_data)),
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -4144,6 +4149,11 @@ async def trigger_docker_source_discover_with_http_info(
                 "{sourceID}", quote(str(source_id), safe="")
             ),
             request_options=self._request_options.merge(
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -4783,6 +4793,11 @@ async def validate_source_with_http_info(
             path="/1/sources/validate",
             request_options=self._request_options.merge(
                 data=dumps(body_serializer(_data)),
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -4854,6 +4869,11 @@ async def validate_source_before_update_with_http_info(
             ),
             request_options=self._request_options.merge(
                 data=dumps(body_serializer(_data)),
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -8267,6 +8287,11 @@ def push_task_with_http_info(
             request_options=self._request_options.merge(
                 query_parameters=_query_parameters,
                 data=dumps(body_serializer(_data)),
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -8899,6 +8924,11 @@ def trigger_docker_source_discover_with_http_info(
                 "{sourceID}", quote(str(source_id), safe="")
             ),
             request_options=self._request_options.merge(
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -9534,6 +9564,11 @@ def validate_source_with_http_info(
             path="/1/sources/validate",
             request_options=self._request_options.merge(
                 data=dumps(body_serializer(_data)),
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,
@@ -9605,6 +9640,11 @@ def validate_source_before_update_with_http_info(
             ),
             request_options=self._request_options.merge(
                 data=dumps(body_serializer(_data)),
+                timeouts={
+                    "read": 180000,
+                    "write": 180000,
+                    "connect": 180000,
+                },
                 user_request_options=request_options,
             ),
             use_read_transporter=False,

clients/algoliasearch-client-python/algoliasearch/search/client.py

@@ -354,6 +354,9 @@ async def browse_objects(
         """
         Helper: Iterate on the `browse` method of the client to allow aggregating objects of an index.
         """
+        if isinstance(browse_params, dict):
+            browse_params = BrowseParamsObject().from_dict(browse_params)
+
         if browse_params is None:
             browse_params = BrowseParamsObject(hits_per_page=1000)
 
@@ -385,6 +388,9 @@ async def browse_rules(
         """
         Helper: Iterate on the `search_rules` method of the client to allow aggregating rules of an index.
         """
+        if isinstance(search_rules_params, dict):
+            search_rules_params = SearchRulesParams().from_dict(search_rules_params)
+
         if search_rules_params is None:
             search_rules_params = SearchRulesParams(hits_per_page=1000)
 
@@ -418,6 +424,11 @@ async def browse_synonyms(
         """
         Helper: Iterate on the `search_synonyms` method of the client to allow aggregating synonyms of an index.
         """
+        if isinstance(search_synonyms_params, dict):
+            search_synonyms_params = SearchSynonymsParams().from_dict(
+                search_synonyms_params
+            )
+
         if search_synonyms_params is None:
             search_synonyms_params = SearchSynonymsParams(hits_per_page=1000, page=0)
         hits_per_page = 1000
@@ -453,6 +464,7 @@ async def generate_secured_api_key(
         """
         if restrictions is None:
             restrictions = SecuredApiKeyRestrictions()
+
         restrictions_dict = {}
         if isinstance(restrictions, SecuredApiKeyRestrictions):
             restrictions_dict = restrictions.to_dict()
@@ -5384,6 +5396,9 @@ def browse_objects(
         """
         Helper: Iterate on the `browse` method of the client to allow aggregating objects of an index.
         """
+        if isinstance(browse_params, dict):
+            browse_params = BrowseParamsObject().from_dict(browse_params)
+
         if browse_params is None:
             browse_params = BrowseParamsObject(hits_per_page=1000)
 
@@ -5415,6 +5430,9 @@ def browse_rules(
         """
         Helper: Iterate on the `search_rules` method of the client to allow aggregating rules of an index.
         """
+        if isinstance(search_rules_params, dict):
+            search_rules_params = SearchRulesParams().from_dict(search_rules_params)
+
         if search_rules_params is None:
             search_rules_params = SearchRulesParams(hits_per_page=1000)
 
@@ -5448,6 +5466,11 @@ def browse_synonyms(
         """
         Helper: Iterate on the `search_synonyms` method of the client to allow aggregating synonyms of an index.
         """
+        if isinstance(search_synonyms_params, dict):
+            search_synonyms_params = SearchSynonymsParams().from_dict(
+                search_synonyms_params
+            )
+
         if search_synonyms_params is None:
             search_synonyms_params = SearchSynonymsParams(hits_per_page=1000, page=0)
         hits_per_page = 1000
@@ -5481,6 +5504,7 @@ def generate_secured_api_key(
         """
         if restrictions is None:
             restrictions = SecuredApiKeyRestrictions()
+
         restrictions_dict = {}
         if isinstance(restrictions, SecuredApiKeyRestrictions):
             restrictions_dict = restrictions.to_dict()

clients/algoliasearch-client-ruby/lib/algolia/api/ingestion_client.rb

@@ -2151,6 +2151,7 @@ def push_task_with_http_info(task_id, push_task_payload, watch = nil, request_op
       query_params = query_params.merge(request_options[:query_params]) unless request_options[:query_params].nil?
       header_params = {}
       header_params = header_params.merge(request_options[:header_params]) unless request_options[:header_params].nil?
+      request_options[:timeout] ||= 180000
 
       post_body = request_options[:debug_body] || @api_client.object_to_http_body(push_task_payload)
 
@@ -2635,6 +2636,7 @@ def trigger_docker_source_discover_with_http_info(source_id, request_options = {
       query_params = query_params.merge(request_options[:query_params]) unless request_options[:query_params].nil?
       header_params = {}
       header_params = header_params.merge(request_options[:header_params]) unless request_options[:header_params].nil?
+      request_options[:timeout] ||= 180000
 
       post_body = request_options[:debug_body]
 
@@ -3113,6 +3115,7 @@ def validate_source_with_http_info(source_create = nil, request_options = {})
       query_params = query_params.merge(request_options[:query_params]) unless request_options[:query_params].nil?
       header_params = {}
       header_params = header_params.merge(request_options[:header_params]) unless request_options[:header_params].nil?
+      request_options[:timeout] ||= 180000
 
       post_body = request_options[:debug_body] || @api_client.object_to_http_body(source_create)
 
@@ -3166,6 +3169,7 @@ def validate_source_before_update_with_http_info(source_id, source_update, reque
       query_params = query_params.merge(request_options[:query_params]) unless request_options[:query_params].nil?
       header_params = {}
       header_params = header_params.merge(request_options[:header_params]) unless request_options[:header_params].nil?
+      request_options[:timeout] ||= 180000
 
       post_body = request_options[:debug_body] || @api_client.object_to_http_body(source_update)