apify 2.7.1b13__tar.gz → 2.7.1b15__tar.gz

{apify-2.7.1b13 → apify-2.7.1b15}/CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - Expose `APIFY_USER_IS_PAYING` env var to the configuration ([#507](https://github.com/apify/apify-sdk-python/pull/507)) ([0801e54](https://github.com/apify/apify-sdk-python/commit/0801e54887317c1280cc6828ecd3f2cc53287e76)) by [@stepskop](https://github.com/stepskop)
 - Resolve DeprecationWarning in ApifyEventManager ([#555](https://github.com/apify/apify-sdk-python/pull/555)) ([0c5111d](https://github.com/apify/apify-sdk-python/commit/0c5111dafe19796ec1fb9652a44c031bed9758df)) by [@vdusek](https://github.com/vdusek), closes [#343](https://github.com/apify/apify-sdk-python/issues/343)
 - Use same `client_key` for `Actor` created `request_queue` and improve its metadata estimation ([#552](https://github.com/apify/apify-sdk-python/pull/552)) ([7e4e5da](https://github.com/apify/apify-sdk-python/commit/7e4e5da81dd87e84ebeef2bd336c6c1d422cb9a7)) by [@Pijukatel](https://github.com/Pijukatel), closes [#536](https://github.com/apify/apify-sdk-python/issues/536)
+- Properly process pre-existing Actor input file ([#591](https://github.com/apify/apify-sdk-python/pull/591)) ([cc5075f](https://github.com/apify/apify-sdk-python/commit/cc5075fab8c72ca5711cfd97932037b34e6997cd)) by [@Pijukatel](https://github.com/Pijukatel), closes [#590](https://github.com/apify/apify-sdk-python/issues/590)
 
 ### Chore
 
@@ -89,6 +90,30 @@ All notable changes to this project will be documented in this file.
 - Tagline overlap ([#501](https://github.com/apify/apify-sdk-python/pull/501)) ([bae8340](https://github.com/apify/apify-sdk-python/commit/bae8340c46fea756ea35ea4d591da84c09d478e2)) by [@katzino](https://github.com/katzino)
 
 
+## [2.7.0](https://github.com/apify/apify-sdk-python/releases/tag/v2.7.0) (2025-07-14)
+
+### 🚀 Features
+
+- **crypto:** Decrypt secret objects ([#482](https://github.com/apify/apify-sdk-python/pull/482)) ([ce9daf7](https://github.com/apify/apify-sdk-python/commit/ce9daf7381212b8dc194e8a643e5ca0dedbc0078)) by [@MFori](https://github.com/MFori)
+
+### 🐛 Bug Fixes
+
+- Sync `@docusaurus` theme version [internal] ([#500](https://github.com/apify/apify-sdk-python/pull/500)) ([a7485e7](https://github.com/apify/apify-sdk-python/commit/a7485e7d2276fde464ce862573d5b95e7d4d836a)) by [@katzino](https://github.com/katzino)
+- Tagline overlap ([#501](https://github.com/apify/apify-sdk-python/pull/501)) ([bae8340](https://github.com/apify/apify-sdk-python/commit/bae8340c46fea756ea35ea4d591da84c09d478e2)) by [@katzino](https://github.com/katzino)
+
+
+## [2.7.0](https://github.com/apify/apify-sdk-python/releases/tag/v2.7.0) (2025-07-14)
+
+### 🚀 Features
+
+- **crypto:** Decrypt secret objects ([#482](https://github.com/apify/apify-sdk-python/pull/482)) ([ce9daf7](https://github.com/apify/apify-sdk-python/commit/ce9daf7381212b8dc194e8a643e5ca0dedbc0078)) by [@MFori](https://github.com/MFori)
+
+### 🐛 Bug Fixes
+
+- Sync `@docusaurus` theme version [internal] ([#500](https://github.com/apify/apify-sdk-python/pull/500)) ([a7485e7](https://github.com/apify/apify-sdk-python/commit/a7485e7d2276fde464ce862573d5b95e7d4d836a)) by [@katzino](https://github.com/katzino)
+- Tagline overlap ([#501](https://github.com/apify/apify-sdk-python/pull/501)) ([bae8340](https://github.com/apify/apify-sdk-python/commit/bae8340c46fea756ea35ea4d591da84c09d478e2)) by [@katzino](https://github.com/katzino)
+
+
 
 ## [2.7.3](https://github.com/apify/apify-sdk-python/releases/tag/v2.7.3) (2025-08-11)
 

{apify-2.7.1b13 → apify-2.7.1b15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apify
-Version: 2.7.1b13
+Version: 2.7.1b15
 Summary: Apify SDK for Python
 Project-URL: Apify Homepage, https://apify.com
 Project-URL: Changelog, https://docs.apify.com/sdk/python/docs/changelog

{apify-2.7.1b13 → apify-2.7.1b15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apify"
-version = "2.7.1b13"
+version = "2.7.1b15"
 description = "Apify SDK for Python"
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = { file = "LICENSE" }
@@ -65,17 +65,17 @@ dev = [
     "build~=1.3.0",
     "crawlee[parsel]",
     "dycw-pytest-only~=2.1.0",
-    "griffe~=1.13.0",
+    "griffe",
     "mypy~=1.17.0",
     "pre-commit~=4.3.0",
     "pydoc-markdown~=4.8.0",
     "pytest-asyncio~=1.1.0",
-    "pytest-cov~=6.2.0",
+    "pytest-cov~=7.0.0",
     "pytest-httpserver~=1.1.0",
     "pytest-timeout~=2.4.0",
     "pytest-xdist~=3.8.0",
     "pytest~=8.4.0",
-    "ruff~=0.12.0",
+    "ruff~=0.13.0",
     "setuptools", # setuptools are used by pytest but not explicitly required
     "types-cachetools~=6.2.0.20250827",
     "uvicorn[standard]",

{apify-2.7.1b13 → apify-2.7.1b15}/src/apify/storage_clients/_file_system/_key_value_store_client.py

@@ -1,4 +1,6 @@
 import asyncio
+import json
+from pathlib import Path
 
 from typing_extensions import override
 
@@ -23,9 +25,15 @@ class ApifyFileSystemKeyValueStoreClient(FileSystemKeyValueStoreClient):
         the `INPUT.json` file. It also updates the metadata to reflect that the store has been purged.
         """
         kvs_input_key = Configuration.get_global_configuration().input_key
+
+        # First try to find the alternative format of the input file and process it if it exists.
+        for file_path in self.path_to_kvs.glob('*'):
+            if file_path.name == f'{kvs_input_key}.json':
+                await self._process_input_json(file_path)
+
         async with self._lock:
             for file_path in self.path_to_kvs.glob('*'):
-                if file_path.name in {METADATA_FILENAME, f'{kvs_input_key}.json'}:
+                if file_path.name in {METADATA_FILENAME, kvs_input_key, f'{kvs_input_key}.{METADATA_FILENAME}'}:
                     continue
                 if file_path.is_file():
                     await asyncio.to_thread(file_path.unlink, missing_ok=True)
@@ -34,3 +42,16 @@ class ApifyFileSystemKeyValueStoreClient(FileSystemKeyValueStoreClient):
                 update_accessed_at=True,
                 update_modified_at=True,
             )
+
+    async def _process_input_json(self, path: Path) -> None:
+        """Process simple input json file to format expected by the FileSystemKeyValueStoreClient.
+
+        For example: INPUT.json -> INPUT, INPUT.json.metadata
+        """
+        try:
+            f = await asyncio.to_thread(path.open)
+            input_data = json.load(f)
+        finally:
+            f.close()
+        await asyncio.to_thread(path.unlink, missing_ok=True)
+        await self.set_value(key=path.stem, value=input_data)

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/actor/test_actor_helpers.py

@@ -122,7 +122,6 @@ async def test_abort_actor_run(apify_client_async_patcher: ApifyClientAsyncPatch
 # NOTE: The following methods are properly tested using integrations tests.
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_metamorph_fails_locally(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level('WARNING')
     async with Actor:
@@ -133,7 +132,6 @@ async def test_metamorph_fails_locally(caplog: pytest.LogCaptureFixture) -> None
     assert 'Actor.metamorph() is only supported when running on the Apify platform.' in caplog.records[0].message
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_reboot_fails_locally(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level('WARNING')
     async with Actor:
@@ -144,7 +142,6 @@ async def test_reboot_fails_locally(caplog: pytest.LogCaptureFixture) -> None:
     assert 'Actor.reboot() is only supported when running on the Apify platform.' in caplog.records[0].message
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_add_webhook_fails_locally(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level('WARNING')
     async with Actor:
@@ -157,7 +154,6 @@ async def test_add_webhook_fails_locally(caplog: pytest.LogCaptureFixture) -> No
     assert 'Actor.add_webhook() is only supported when running on the Apify platform.' in caplog.records[0].message
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_set_status_message_locally(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level('INFO')
     async with Actor:
@@ -169,7 +165,6 @@ async def test_set_status_message_locally(caplog: pytest.LogCaptureFixture) -> N
     assert '[Status message]: test-status-message' in matching_records[0].message
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_set_terminal_status_message_locally(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level('INFO')
     async with Actor:

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/actor/test_actor_log.py

@@ -2,14 +2,15 @@ from __future__ import annotations
 
 import contextlib
 import logging
-
-import pytest
+from typing import TYPE_CHECKING
 
 from apify import Actor
 from apify.log import logger
 
+if TYPE_CHECKING:
+    import pytest
+
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_actor_logs_messages_correctly(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level(logging.DEBUG, logger='apify')
 

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/conftest.py

@@ -16,12 +16,33 @@ from apify_shared.consts import ApifyEnvVars
 from crawlee import service_locator
 
 import apify._actor
+import apify.log
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
+    from logging import Logger
     from pathlib import Path
 
 
+@pytest.fixture
+def _patch_propagate_logger(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
+    """Patch enabling `propagate` for the crawlee logger.
+
+    This is necessary for tests requiring log interception using `caplog`.
+    """
+
+    original_configure_logger = apify.log.configure_logger
+
+    def propagate_logger(logger: Logger, **kwargs: Any) -> None:
+        original_configure_logger(logger, **kwargs)
+        logger.propagate = True
+
+    monkeypatch.setattr('crawlee._log_config.configure_logger', propagate_logger)
+    monkeypatch.setattr(apify.log, 'configure_logger', propagate_logger)
+    yield
+    monkeypatch.undo()
+
+
 @pytest.fixture
 def prepare_test_env(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> Callable[[], None]:
     """Prepare the testing environment by resetting the global state before each test.
@@ -66,7 +87,10 @@ def prepare_test_env(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> Callabl
 
 
 @pytest.fixture(autouse=True)
-def _isolate_test_environment(prepare_test_env: Callable[[], None]) -> None:
+def _isolate_test_environment(
+    prepare_test_env: Callable[[], None],
+    _patch_propagate_logger: None,
+) -> None:
     """Isolate the testing environment by resetting global state before and after each test.
 
     This fixture ensures that each test starts with a clean slate and that any modifications during the test

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/events/test_apify_event_manager.py

@@ -22,7 +22,6 @@ if TYPE_CHECKING:
     from collections.abc import Callable
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_lifecycle_local(caplog: pytest.LogCaptureFixture) -> None:
     caplog.set_level(logging.DEBUG, logger='apify')
     config = Configuration.get_global_configuration()
@@ -132,7 +131,7 @@ async def test_lifecycle_on_platform_without_websocket(monkeypatch: pytest.Monke
     monkeypatch.setenv(ActorEnvVars.EVENTS_WEBSOCKET_URL, 'ws://localhost:56565')
     event_manager = ApifyEventManager(Configuration.get_global_configuration())
 
-    with pytest.raises(RuntimeError, match='Error connecting to platform events websocket!'):
+    with pytest.raises(RuntimeError, match=r'Error connecting to platform events websocket!'):
         async with event_manager:
             pass
 

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/scrapy/extensions/test_httpcache.py

@@ -67,5 +67,5 @@ def test_get_kvs_name(spider_name: str, expected: str) -> None:
     ],
 )
 def test_get_kvs_name_raises(spider_name: str) -> None:
-    with pytest.raises(ValueError, match='Unsupported spider name'):
+    with pytest.raises(ValueError, match=r'Unsupported spider name'):
         assert get_kvs_name(spider_name)

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/storage_clients/test_file_system.py

@@ -1,11 +1,17 @@
 from __future__ import annotations
 
 import asyncio
+import json
+from typing import TYPE_CHECKING
 
+from crawlee import service_locator
 from crawlee._consts import METADATA_FILENAME
 
-from apify import Configuration
-from apify.storage_clients._file_system import ApifyFileSystemKeyValueStoreClient
+from apify import Actor, Configuration
+from apify.storage_clients._file_system import ApifyFileSystemKeyValueStoreClient, ApifyFileSystemStorageClient
+
+if TYPE_CHECKING:
+    from pathlib import Path
 
 
 async def test_purge_preserves_input_file_and_metadata() -> None:
@@ -23,18 +29,21 @@ async def test_purge_preserves_input_file_and_metadata() -> None:
     kvs_path = kvs_storage_client.path_to_kvs
 
     # Create various files
-    input_file = kvs_path / f'{configuration.input_key}.json'
+    input_file = kvs_path / f'{configuration.input_key}'
+    input_metadata_file = kvs_path / f'{configuration.input_key}.{METADATA_FILENAME}.json'
     metadata_file = kvs_path / METADATA_FILENAME
     regular_file1 = kvs_path / 'regular_file1.json'
     regular_file2 = kvs_path / 'another_file.txt'
 
     # Write content to files
     await asyncio.to_thread(input_file.write_text, '{"test": "input"}')
+    await asyncio.to_thread(input_metadata_file.write_text, 'some text content')
     await asyncio.to_thread(regular_file1.write_text, '{"test": "data1"}')
     await asyncio.to_thread(regular_file2.write_text, 'some text content')
 
     # Verify all files exist before purge
     assert input_file.exists()
+    assert input_metadata_file.exists()
     assert metadata_file.exists()  # Should exist from client creation
     assert regular_file1.exists()
     assert regular_file2.exists()
@@ -53,3 +62,21 @@ async def test_purge_preserves_input_file_and_metadata() -> None:
     # Verify INPUT.json content is unchanged
     input_content = await asyncio.to_thread(input_file.read_text)
     assert input_content == '{"test": "input"}'
+
+
+async def test_pre_existing_input_used_by_actor(tmp_path: Path) -> None:
+    pre_existing_input = {
+        'foo': 'bar',
+    }
+
+    configuration = Configuration.get_global_configuration()
+    # Create pre-existing INPUT.json file
+    path_to_input = tmp_path / 'key_value_stores' / 'default'
+    path_to_input.mkdir(parents=True)
+    (path_to_input / f'{configuration.input_key}.json').write_text(json.dumps(pre_existing_input))
+
+    # Remove this line after https://github.com/apify/apify-sdk-python/pull/576
+    service_locator.set_storage_client(ApifyFileSystemStorageClient())
+
+    async with Actor():
+        assert pre_existing_input == await Actor.get_input()

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/test_crypto.py

@@ -68,7 +68,7 @@ def test_decryption_fails_with_invalid_password() -> None:
     encrypted = public_encrypt(test_value, public_key=PUBLIC_KEY)
     encrypted['encrypted_password'] = base64.b64encode(b'invalid_password').decode('utf-8')
 
-    with pytest.raises(ValueError, match='Ciphertext length must be equal to key size.'):
+    with pytest.raises(ValueError, match=r'Ciphertext length must be equal to key size.'):
         private_decrypt(**encrypted, private_key=PRIVATE_KEY)
 
 
@@ -79,7 +79,7 @@ def test_decryption_fails_with_manipulated_cipher() -> None:
         b'invalid_cipher' + base64.b64decode(encrypted['encrypted_value'].encode('utf-8')),
     ).decode('utf-8')
 
-    with pytest.raises(ValueError, match='Decryption failed, malformed encrypted value or password.'):
+    with pytest.raises(ValueError, match=r'Decryption failed, malformed encrypted value or password.'):
         private_decrypt(**encrypted, private_key=PRIVATE_KEY)
 
 

{apify-2.7.1b13 → apify-2.7.1b15}/tests/unit/test_proxy_configuration.py

@@ -88,19 +88,19 @@ def test_invalid_arguments() -> None:
         with pytest.raises(ValueError, match=match_pattern):
             ProxyConfiguration(country_code=invalid_country_code)  # type: ignore[arg-type]
 
-    with pytest.raises(ValueError, match='Exactly one of .* must be specified'):
+    with pytest.raises(ValueError, match=r'Exactly one of .* must be specified'):
         ProxyConfiguration(
             proxy_urls=['http://proxy.com:1111'],
             new_url_function=lambda session_id=None, request=None: 'http://proxy.com:2222',
         )
 
-    with pytest.raises(ValueError, match='Cannot combine custom proxies with Apify Proxy'):
+    with pytest.raises(ValueError, match=r'Cannot combine custom proxies with Apify Proxy'):
         ProxyConfiguration(proxy_urls=['http://proxy.com:1111'], groups=['GROUP1'])
 
     with pytest.raises(ValueError, match=re.escape('bad-url')):
         ProxyConfiguration(proxy_urls=['bad-url'])
 
-    with pytest.raises(ValueError, match='Cannot combine custom proxies with Apify Proxy'):
+    with pytest.raises(ValueError, match=r'Cannot combine custom proxies with Apify Proxy'):
         ProxyConfiguration(
             new_url_function=lambda session_id=None, request=None: 'http://proxy.com:2222', groups=['GROUP1']
         )
@@ -241,7 +241,7 @@ async def test_invalid_custom_new_url_function() -> None:
 
     proxy_configuration = ProxyConfiguration(new_url_function=custom_new_url_function)
 
-    with pytest.raises(ValueError, match='The provided "new_url_function" did not return a valid URL'):
+    with pytest.raises(ValueError, match=r'The provided "new_url_function" did not return a valid URL'):
         await proxy_configuration.new_url()
 
 
@@ -416,7 +416,7 @@ async def test_initialize_with_valid_configuration(
 async def test_initialize_without_password_or_token() -> None:
     proxy_configuration = ProxyConfiguration()
 
-    with pytest.raises(ValueError, match='Apify Proxy password must be provided'):
+    with pytest.raises(ValueError, match=r'Apify Proxy password must be provided'):
         await proxy_configuration.initialize()
 
 
@@ -472,10 +472,8 @@ async def test_initialize_prefering_password_from_env_over_calling_api(
 
 
 @pytest.mark.usefixtures('patched_impit_client')
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_initialize_with_manual_password_different_than_user_one(
     monkeypatch: pytest.MonkeyPatch,
-    caplog: pytest.LogCaptureFixture,
     httpserver: HTTPServer,
     patched_apify_client: ApifyClientAsync,
 ) -> None:
@@ -501,10 +499,6 @@ async def test_initialize_with_manual_password_different_than_user_one(
     assert proxy_configuration._password == different_dummy_password
     assert proxy_configuration.is_man_in_the_middle is True
 
-    assert len(caplog.records) == 1
-    assert caplog.records[0].levelname == 'WARNING'
-    assert 'The Apify Proxy password you provided belongs to a different user' in caplog.records[0].message
-
 
 @pytest.mark.usefixtures('patched_impit_client')
 async def test_initialize_when_not_connected(monkeypatch: pytest.MonkeyPatch, httpserver: HTTPServer) -> None:
@@ -526,7 +520,6 @@ async def test_initialize_when_not_connected(monkeypatch: pytest.MonkeyPatch, ht
         await proxy_configuration.initialize()
 
 
-@pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_initialize_when_status_page_unavailable(
     monkeypatch: pytest.MonkeyPatch, caplog: pytest.LogCaptureFixture, httpserver: HTTPServer
 ) -> None: