Keep previous input possibilities

Author: Pijukatel

src/apify_client/_utils.py

@@ -143,10 +143,6 @@ def encode_key_value_store_record_value(value: Any, content_type: str | None = N
             content_type = 'application/json; charset=utf-8'
 
     if 'application/json' in content_type and not is_file_or_bytes(value) and not isinstance(value, str):
-        value = _to_json(value).encode('utf-8')
+        value = json.dumps(value, ensure_ascii=False, indent=2, allow_nan=False, default=str).encode('utf-8')
 
-    return value, content_type
-
-
-def _to_json(value: Any) -> str:
-    return json.dumps(value, ensure_ascii=False, indent=2, allow_nan=False, default=str)
+    return (value, content_type)

src/apify_client/clients/resource_clients/actor.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 from typing import TYPE_CHECKING, Any
 
 from apify_shared.utils import (
@@ -10,7 +9,7 @@
     parse_date_fields,
 )
 
-from apify_client._utils import _to_json, encode_webhook_list_to_base64, pluck_data
+from apify_client._utils import encode_key_value_store_record_value, encode_webhook_list_to_base64, pluck_data
 from apify_client.clients.base import ResourceClient, ResourceClientAsync
 from apify_client.clients.resource_clients.actor_version import ActorVersionClient, ActorVersionClientAsync
 from apify_client.clients.resource_clients.actor_version_collection import (
@@ -31,8 +30,6 @@
 
     from apify_shared.consts import ActorJobStatus, MetaOrigin
 
-logger = logging.getLogger(__name__)
-
 
 def get_actor_representation(
     *,
@@ -219,7 +216,7 @@ def delete(self) -> None:
     def start(
         self,
         *,
-        run_input: str | dict | None = None,
+        run_input: Any = None,
         content_type: str | None = None,
         build: str | None = None,
         max_items: int | None = None,
@@ -235,7 +232,7 @@ def start(
 
         Args:
             run_input: The input to pass to the Actor run.
-            content_type: Deprecated.
+            content_type: The content type of the input.
             build: Specifies the Actor build to run. It can be either a build tag or build number. By default,
                 the run uses the build specified in the default run configuration for the Actor (typically latest).
             max_items: Maximum number of results that will be returned by this run. If the Actor is charged
@@ -258,11 +255,7 @@ def start(
         Returns:
             The run object.
         """
-        if content_type:
-            logger.warning('`content_type` is deprecated and not used anymore.')
-
-        if not isinstance(run_input, str):
-            run_input = _to_json(run_input)
+        run_input, content_type = encode_key_value_store_record_value(run_input, content_type)
 
         request_params = self._params(
             build=build,
@@ -277,7 +270,7 @@ def start(
         response = self.http_client.call(
             url=self._url('runs'),
             method='POST',
-            headers={'content-type': 'application/json'},
+            headers={'content-type': content_type},
             data=run_input,
             params=request_params,
         )
@@ -466,22 +459,22 @@ def webhooks(self) -> WebhookCollectionClient:
         """Retrieve a client for webhooks associated with this Actor."""
         return WebhookCollectionClient(**self._sub_resource_init_options())
 
-    def validate_input(self, run_input: str | bytes | dict | None = None) -> bool:
+    def validate_input(self, run_input: Any = None, content_type: str | None = None) -> bool:
         """Validate the input for the Actor.
 
         Args:
-            run_input: The input to validate. Either json string or a dictionary.
+            run_input: The input to validate.
+            content_type: The content type of the input.
 
         Returns:
             True if the input is valid, else raise an exception with validation error details.
         """
-        if not isinstance(run_input, str):
-            run_input = _to_json(run_input)
+        run_input, content_type = encode_key_value_store_record_value(run_input, content_type)
 
         self.http_client.call(
             url=self._url('validate-input'),
             method='POST',
-            headers={'content-type': 'application/json'},
+            headers={'content-type': content_type},
             data=run_input,
         )
 
@@ -611,7 +604,7 @@ async def delete(self) -> None:
     async def start(
         self,
         *,
-        run_input: str | dict | None = None,
+        run_input: Any = None,
         content_type: str | None = None,
         build: str | None = None,
         max_items: int | None = None,
@@ -627,7 +620,7 @@ async def start(
 
         Args:
             run_input: The input to pass to the Actor run.
-            content_type: Deprecated.
+            content_type: The content type of the input.
             build: Specifies the Actor build to run. It can be either a build tag or build number. By default,
                 the run uses the build specified in the default run configuration for the Actor (typically latest).
             max_items: Maximum number of results that will be returned by this run. If the Actor is charged
@@ -650,11 +643,7 @@ async def start(
         Returns:
             The run object.
         """
-        if content_type:
-            logger.warning('`content_type` is deprecated and not used anymore.')
-
-        if not isinstance(run_input, str):
-            run_input = _to_json(run_input)
+        run_input, content_type = encode_key_value_store_record_value(run_input, content_type)
 
         request_params = self._params(
             build=build,
@@ -669,7 +658,7 @@ async def start(
         response = await self.http_client.call(
             url=self._url('runs'),
             method='POST',
-            headers={'content-type': 'application/json'},
+            headers={'content-type': content_type},
             data=run_input,
             params=request_params,
         )
@@ -862,22 +851,22 @@ def webhooks(self) -> WebhookCollectionClientAsync:
         """Retrieve a client for webhooks associated with this Actor."""
         return WebhookCollectionClientAsync(**self._sub_resource_init_options())
 
-    async def validate_input(self, run_input: str | dict | None = None) -> bool:
+    async def validate_input(self, run_input: Any = None, content_type: str | None = None) -> bool:
         """Validate the input for the Actor.
 
         Args:
-            run_input: The input to validate. Either json string or a dictionary.
+            run_input: The input to validate.
+            content_type: The content type of the input.
 
         Returns:
             True if the input is valid, else raise an exception with validation error details.
         """
-        if not isinstance(run_input, str):
-            run_input = _to_json(run_input)
+        run_input, content_type = encode_key_value_store_record_value(run_input, content_type)
 
         await self.http_client.call(
             url=self._url('validate-input'),
             method='POST',
-            headers={'content-type': 'application/json'},
+            headers={'content-type': content_type},
             data=run_input,
         )