New client commit

Author: vdusek

src/apify/_actor.py

@@ -492,17 +492,21 @@ def new_client(
                 (increases exponentially from this value).
             timeout: The socket timeout of the HTTP requests sent to the Apify API.
         """
-        token = token or self.configuration.token
-        api_url = api_url or self.configuration.api_base_url
-        return ApifyClientAsync(
-            token=token,
-            api_url=api_url,
-            max_retries=max_retries,
-            min_delay_between_retries_millis=int(min_delay_between_retries.total_seconds() * 1000)
-            if min_delay_between_retries is not None
-            else None,
-            timeout_secs=int(timeout.total_seconds()) if timeout else None,
-        )
+        kwargs = {
+            'token': token or self.configuration.token,
+            'api_url': api_url or self.configuration.api_base_url,
+        }
+
+        if max_retries is not None:
+            kwargs['max_retries'] = max_retries
+
+        if min_delay_between_retries is not None:
+            kwargs['min_delay_between_retries_millis'] = int(min_delay_between_retries.total_seconds() * 1000)
+
+        if timeout is not None:
+            kwargs['timeout_secs'] = int(timeout.total_seconds())
+
+        return ApifyClientAsync(**kwargs)  # ty: ignore[invalid-argument-type]
 
     async def open_dataset(
         self,

tests/e2e/conftest.py

@@ -237,7 +237,13 @@ async def _make_actor(
         if (main_func and main_py) or (main_func and source_files) or (main_py and source_files):
             raise TypeError('Cannot specify more than one of `main_func`, `main_py` and `source_files` arguments')
 
-        client = ApifyClientAsync(token=apify_token, api_url=os.getenv(_API_URL_ENV_VAR))
+        api_url = os.getenv(_API_URL_ENV_VAR)
+        client = (
+            ApifyClientAsync(token=apify_token)
+            if api_url is None
+            else ApifyClientAsync(token=apify_token, api_url=api_url)
+        )
+
         actor_name = generate_unique_resource_name(label)
 
         # Get the source of main_func and convert it into a reasonable main_py file.
@@ -331,7 +337,12 @@ async def _make_actor(
 
     # Delete all the generated Actors.
     for actor_id in actors_for_cleanup:
-        apify_client = ApifyClient(token=apify_token, api_url=os.getenv(_API_URL_ENV_VAR))
+        api_url = os.getenv(_API_URL_ENV_VAR)
+
+        apify_client = (
+            ApifyClient(token=apify_token) if api_url is None else ApifyClient(token=apify_token, api_url=api_url)
+        )
+
         actor_client = apify_client.actor(actor_id)
         actor = actor_client.get()
 

tests/integration/conftest.py

@@ -37,8 +37,7 @@ def apify_token() -> str:
 def apify_client_async(apify_token: str) -> ApifyClientAsync:
     """Create an instance of the ApifyClientAsync."""
     api_url = os.getenv(_API_URL_ENV_VAR)
-
-    return ApifyClientAsync(apify_token, api_url=api_url)
+    return ApifyClientAsync(apify_token) if api_url is None else ApifyClientAsync(apify_token, api_url=api_url)
 
 
 @pytest.fixture