apify 2.7.1b14__py3-none-any.whl → 2.7.1b15__py3-none-any.whl

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.1b14.dist-info → apify-2.7.1b15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apify
-Version: 2.7.1b14
+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.1b14.dist-info → apify-2.7.1b15.dist-info}/RECORD

@@ -42,11 +42,11 @@ apify/storage_clients/_apify/_request_queue_client.py,sha256=LuKH_7Y9TMU1qtSagWR
 apify/storage_clients/_apify/_storage_client.py,sha256=5me6gHOeNAG3JaHxKRdzsZaa3FsqLDbObjhECGGWrr4,2890
 apify/storage_clients/_apify/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/storage_clients/_file_system/__init__.py,sha256=rDbXatXV9wHKPhKTrXDzWnexhTm7sIJQWucMi-P-SD4,130
-apify/storage_clients/_file_system/_key_value_store_client.py,sha256=DHDv_e0kFwhBCIXUadZAamHhUao3NsSniUEXgnttnVY,1430
+apify/storage_clients/_file_system/_key_value_store_client.py,sha256=fnSJ1EIOPCGfcE6e5S3Tux9VbnMVLCJjugkaQoH_9yo,2267
 apify/storage_clients/_file_system/_storage_client.py,sha256=UwxuSvhbyQ7zR1db1hTmZ1h38yH7btHNp82X7e8MWWE,1290
 apify/storages/__init__.py,sha256=-9tEYJVabVs_eRVhUehxN58GH0UG8OfuGjGwuDieP2M,122
 apify/storages/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify-2.7.1b14.dist-info/METADATA,sha256=hKa1ufnBfaSa3vq9dx0zm36o9q3o1iD5IqIH9P992y8,22579
-apify-2.7.1b14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-apify-2.7.1b14.dist-info/licenses/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
-apify-2.7.1b14.dist-info/RECORD,,
+apify-2.7.1b15.dist-info/METADATA,sha256=Pnzk7qNSYZPx9Yjv3hg_Ua2zfTcbr_4VfM6I0duOIrY,22579
+apify-2.7.1b15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+apify-2.7.1b15.dist-info/licenses/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-2.7.1b15.dist-info/RECORD,,