apify 1.5.2b4__tar.gz → 1.5.3__tar.gz

{apify-1.5.2b4 → apify-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.5.2b4
+Version: 1.5.3
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -24,8 +24,8 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apify-client~=1.6.0
-Requires-Dist: apify-shared~=1.1.0
+Requires-Dist: apify-client~=1.6.2
+Requires-Dist: apify-shared~=1.1.1
 Requires-Dist: aiofiles>=22.1.0
 Requires-Dist: aioshutil>=1.0
 Requires-Dist: colorama>=0.4.6

{apify-1.5.2b4 → apify-1.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apify"
-version = "1.5.2b4"
+version = "1.5.3"
 description = "Apify SDK for Python"
 readme = "README.md"
 license = { text = "Apache Software License" }
@@ -26,8 +26,8 @@ requires-python = ">=3.8"
 # compatibility with a wide range of external packages. This decision was discussed in detail in the following PR:
 # https://github.com/apify/apify-sdk-python/pull/154
 dependencies = [
-    "apify-client ~= 1.6.0",
-    "apify-shared ~= 1.1.0",
+    "apify-client ~= 1.6.2",
+    "apify-shared ~= 1.1.1",
     "aiofiles >= 22.1.0",
     "aioshutil >= 1.0",
     "colorama >= 0.4.6",
@@ -111,7 +111,6 @@ ignore = [
     "S303",    # Use of insecure MD2, MD4, MD5, or SHA1 hash function
     "S311",    # Standard pseudo-random generators are not suitable for cryptographic purposes
     "TD002",   # Missing author in TODO; try: `# TODO(<author_name>): ...` or `# TODO @<author_name>: ...
-    "TID252",  # Relative imports from parent modules are bannedRuff
     "TRY003",  # Avoid specifying long messages outside the exception class
 
     # TODO: Remove this once the following issue is fixed
@@ -139,6 +138,7 @@ indent-style = "space"
     "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
     "S101",    # Use of assert detected
     "T20",     # flake8-print
+    "TID252",  # Relative imports from parent modules are banned
     "TRY301",  # Abstract `raise` to an inner function
 ]
 
@@ -147,7 +147,7 @@ docstring-quotes = "double"
 inline-quotes = "single"
 
 [tool.ruff.lint.isort]
-known-first-party = ["apify", "apify_client", "apify_shared"]
+known-local-folder = ["apify"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_crypto.py

@@ -4,14 +4,13 @@ import base64
 import secrets
 from typing import Any
 
+from apify_shared.utils import ignore_docs
 from cryptography.exceptions import InvalidTag as InvalidTagException
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import padding, rsa
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
-from apify_shared.utils import ignore_docs
-
-from .consts import ENCRYPTED_INPUT_VALUE_REGEXP
+from apify.consts import ENCRYPTED_INPUT_VALUE_REGEXP
 
 ENCRYPTION_KEY_LENGTH = 32
 ENCRYPTION_IV_LENGTH = 16

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/file_storage_utils.py

@@ -4,10 +4,9 @@ import os
 
 import aiofiles
 from aiofiles.os import makedirs
-
 from apify_shared.utils import json_dumps
 
-from .._utils import force_remove
+from apify._utils import force_remove
 
 
 async def update_metadata(*, data: dict, entity_directory: str, write_metadata: bool) -> None:

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/memory_storage_client.py

@@ -8,17 +8,16 @@ from pathlib import Path
 import aioshutil
 from aiofiles import ospath
 from aiofiles.os import rename, scandir
-
 from apify_shared.consts import ApifyEnvVars
 from apify_shared.utils import ignore_docs
 
-from .._utils import maybe_parse_bool
-from .resource_clients.dataset import DatasetClient
-from .resource_clients.dataset_collection import DatasetCollectionClient
-from .resource_clients.key_value_store import KeyValueStoreClient
-from .resource_clients.key_value_store_collection import KeyValueStoreCollectionClient
-from .resource_clients.request_queue import RequestQueueClient
-from .resource_clients.request_queue_collection import RequestQueueCollectionClient
+from apify._memory_storage.resource_clients.dataset import DatasetClient
+from apify._memory_storage.resource_clients.dataset_collection import DatasetCollectionClient
+from apify._memory_storage.resource_clients.key_value_store import KeyValueStoreClient
+from apify._memory_storage.resource_clients.key_value_store_collection import KeyValueStoreCollectionClient
+from apify._memory_storage.resource_clients.request_queue import RequestQueueClient
+from apify._memory_storage.resource_clients.request_queue_collection import RequestQueueCollectionClient
+from apify._utils import maybe_parse_bool
 
 """
 Memory storage emulates data storages that are available on the Apify platform.

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/base_resource_client.py

@@ -10,7 +10,7 @@ from apify_shared.utils import ignore_docs
 if TYPE_CHECKING:
     from typing_extensions import Self
 
-    from ..memory_storage_client import MemoryStorageClient
+    from apify._memory_storage.memory_storage_client import MemoryStorageClient
 
 
 @ignore_docs

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/base_resource_collection_client.py

@@ -7,11 +7,11 @@ from typing import TYPE_CHECKING, Generic, TypeVar, cast
 from apify_shared.models import ListPage
 from apify_shared.utils import ignore_docs
 
-from ..file_storage_utils import update_metadata
-from .base_resource_client import BaseResourceClient
+from apify._memory_storage.file_storage_utils import update_metadata
+from apify._memory_storage.resource_clients.base_resource_client import BaseResourceClient
 
 if TYPE_CHECKING:
-    from ..memory_storage_client import MemoryStorageClient
+    from apify._memory_storage.memory_storage_client import MemoryStorageClient
 
 
 ResourceClientType = TypeVar('ResourceClientType', bound=BaseResourceClient, contravariant=True)  # noqa: PLC0105

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/dataset.py

@@ -7,20 +7,19 @@ from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any, AsyncIterator
 
 import aioshutil
-
 from apify_shared.models import ListPage
 from apify_shared.utils import ignore_docs
 
-from ..._crypto import crypto_random_object_id
-from ..._utils import force_rename, raise_on_duplicate_storage, raise_on_non_existing_storage
-from ...consts import StorageTypes
-from ..file_storage_utils import _update_dataset_items, update_metadata
-from .base_resource_client import BaseResourceClient
+from apify._crypto import crypto_random_object_id
+from apify._memory_storage.file_storage_utils import _update_dataset_items, update_metadata
+from apify._memory_storage.resource_clients.base_resource_client import BaseResourceClient
+from apify._utils import force_rename, raise_on_duplicate_storage, raise_on_non_existing_storage
+from apify.consts import StorageTypes
 
 if TYPE_CHECKING:
     from apify_shared.types import JSONSerializable
 
-    from ..memory_storage_client import MemoryStorageClient
+    from apify._memory_storage.memory_storage_client import MemoryStorageClient
 
 # This is what API returns in the x-apify-pagination-limit
 # header when no limit query parameter is used.

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/dataset_collection.py

@@ -4,8 +4,8 @@ from typing import TYPE_CHECKING
 
 from apify_shared.utils import ignore_docs
 
-from .base_resource_collection_client import BaseResourceCollectionClient
-from .dataset import DatasetClient
+from apify._memory_storage.resource_clients.base_resource_collection_client import BaseResourceCollectionClient
+from apify._memory_storage.resource_clients.dataset import DatasetClient
 
 if TYPE_CHECKING:
     from apify_shared.models import ListPage

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/key_value_store.py

@@ -13,11 +13,12 @@ from typing import TYPE_CHECKING, Any, AsyncIterator, TypedDict
 import aiofiles
 import aioshutil
 from aiofiles.os import makedirs
-
 from apify_shared.utils import ignore_docs, is_file_or_bytes, json_dumps
 
-from ..._crypto import crypto_random_object_id
-from ..._utils import (
+from apify._crypto import crypto_random_object_id
+from apify._memory_storage.file_storage_utils import update_metadata
+from apify._memory_storage.resource_clients.base_resource_client import BaseResourceClient
+from apify._utils import (
     force_remove,
     force_rename,
     guess_file_extension,
@@ -25,15 +26,13 @@ from ..._utils import (
     raise_on_duplicate_storage,
     raise_on_non_existing_storage,
 )
-from ...consts import DEFAULT_API_PARAM_LIMIT, StorageTypes
-from ...log import logger
-from ..file_storage_utils import update_metadata
-from .base_resource_client import BaseResourceClient
+from apify.consts import DEFAULT_API_PARAM_LIMIT, StorageTypes
+from apify.log import logger
 
 if TYPE_CHECKING:
     from typing_extensions import NotRequired
 
-    from ..memory_storage_client import MemoryStorageClient
+    from apify._memory_storage.memory_storage_client import MemoryStorageClient
 
 
 class KeyValueStoreRecord(TypedDict):

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/key_value_store_collection.py

@@ -4,8 +4,8 @@ from typing import TYPE_CHECKING
 
 from apify_shared.utils import ignore_docs
 
-from .base_resource_collection_client import BaseResourceCollectionClient
-from .key_value_store import KeyValueStoreClient
+from apify._memory_storage.resource_clients.base_resource_collection_client import BaseResourceCollectionClient
+from apify._memory_storage.resource_clients.key_value_store import KeyValueStoreClient
 
 if TYPE_CHECKING:
     from apify_shared.models import ListPage

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/request_queue.py

@@ -8,18 +8,17 @@ from decimal import Decimal
 from typing import TYPE_CHECKING
 
 import aioshutil
-from sortedcollections import ValueSortedDict
-
 from apify_shared.utils import filter_out_none_values_recursively, ignore_docs, json_dumps
+from sortedcollections import ValueSortedDict
 
-from ..._crypto import crypto_random_object_id
-from ..._utils import force_rename, raise_on_duplicate_storage, raise_on_non_existing_storage, unique_key_to_request_id
-from ...consts import StorageTypes
-from ..file_storage_utils import delete_request, update_metadata, update_request_queue_item
-from .base_resource_client import BaseResourceClient
+from apify._crypto import crypto_random_object_id
+from apify._memory_storage.file_storage_utils import delete_request, update_metadata, update_request_queue_item
+from apify._memory_storage.resource_clients.base_resource_client import BaseResourceClient
+from apify._utils import force_rename, raise_on_duplicate_storage, raise_on_non_existing_storage, unique_key_to_request_id
+from apify.consts import StorageTypes
 
 if TYPE_CHECKING:
-    from ..memory_storage_client import MemoryStorageClient
+    from apify._memory_storage.memory_storage_client import MemoryStorageClient
 
 
 @ignore_docs

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_memory_storage/resource_clients/request_queue_collection.py

@@ -4,8 +4,8 @@ from typing import TYPE_CHECKING
 
 from apify_shared.utils import ignore_docs
 
-from .base_resource_collection_client import BaseResourceCollectionClient
-from .request_queue import RequestQueueClient
+from apify._memory_storage.resource_clients.base_resource_collection_client import BaseResourceCollectionClient
+from apify._memory_storage.resource_clients.request_queue import RequestQueueClient
 
 if TYPE_CHECKING:
     from apify_shared.models import ListPage

{apify-1.5.2b4 → apify-1.5.3}/src/apify/_utils.py

@@ -35,7 +35,6 @@ import aioshutil
 import psutil
 from aiofiles import ospath
 from aiofiles.os import remove, rename
-
 from apify_shared.consts import (
     BOOL_ENV_VARS,
     BOOL_ENV_VARS_TYPE,
@@ -57,7 +56,7 @@ from apify_shared.utils import (
     maybe_extract_enum_member_value,
 )
 
-from .consts import REQUEST_ID_LENGTH, StorageTypes
+from apify.consts import REQUEST_ID_LENGTH, StorageTypes
 
 T = TypeVar('T')
 

{apify-1.5.2b4 → apify-1.5.3}/src/apify/actor.py

@@ -12,8 +12,8 @@ from apify_client import ApifyClientAsync
 from apify_shared.consts import ActorEnvVars, ActorEventTypes, ActorExitCodes, ApifyEnvVars, WebhookEventType
 from apify_shared.utils import ignore_docs, maybe_extract_enum_member_value
 
-from ._crypto import decrypt_input_secrets, load_private_key
-from ._utils import (
+from apify._crypto import decrypt_input_secrets, load_private_key
+from apify._utils import (
     dualproperty,
     fetch_and_parse_env_var,
     get_cpu_usage_percent,
@@ -23,18 +23,18 @@ from ._utils import (
     run_func_at_interval_async,
     wrap_internal,
 )
-from .config import Configuration
-from .consts import EVENT_LISTENERS_TIMEOUT_SECS
-from .event_manager import EventManager
-from .log import logger
-from .proxy_configuration import ProxyConfiguration
-from .storages import Dataset, KeyValueStore, RequestQueue, StorageClientManager
+from apify.config import Configuration
+from apify.consts import EVENT_LISTENERS_TIMEOUT_SECS
+from apify.event_manager import EventManager
+from apify.log import logger
+from apify.proxy_configuration import ProxyConfiguration
+from apify.storages import Dataset, KeyValueStore, RequestQueue, StorageClientManager
 
 if TYPE_CHECKING:
     import logging
     from types import TracebackType
 
-    from ._memory_storage import MemoryStorageClient
+    from apify._memory_storage import MemoryStorageClient
 
 T = TypeVar('T')
 MainReturnType = TypeVar('MainReturnType')

{apify-1.5.2b4 → apify-1.5.3}/src/apify/config.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from apify_shared.consts import ActorEnvVars, ApifyEnvVars
 
-from ._utils import fetch_and_parse_env_var
+from apify._utils import fetch_and_parse_env_var
 
 
 class Configuration:

{apify-1.5.2b4 → apify-1.5.3}/src/apify/event_manager.py

@@ -8,16 +8,15 @@ from collections import defaultdict
 from typing import TYPE_CHECKING, Any, Callable, Coroutine, Union
 
 import websockets.client
-from pyee.asyncio import AsyncIOEventEmitter
-
 from apify_shared.utils import ignore_docs, maybe_extract_enum_member_value, parse_date_fields
+from pyee.asyncio import AsyncIOEventEmitter
 
-from .log import logger
+from apify.log import logger
 
 if TYPE_CHECKING:
     from apify_shared.consts import ActorEventTypes
 
-    from .config import Configuration
+    from apify.config import Configuration
 
 ListenerType = Union[Callable[[], None], Callable[[Any], None], Callable[[], Coroutine[Any, Any, None]], Callable[[Any], Coroutine[Any, Any, None]]]
 

{apify-1.5.2b4 → apify-1.5.3}/src/apify/log.py

@@ -6,9 +6,8 @@ import textwrap
 import traceback
 from typing import Any
 
-from colorama import Fore, Style, just_fix_windows_console
-
 from apify_shared.utils import ignore_docs
+from colorama import Fore, Style, just_fix_windows_console
 
 just_fix_windows_console()
 

{apify-1.5.2b4 → apify-1.5.3}/src/apify/proxy_configuration.py

@@ -7,17 +7,15 @@ from typing import TYPE_CHECKING, Any, Awaitable, Callable, Pattern, TypedDict
 from urllib.parse import urljoin, urlparse
 
 import httpx
-
 from apify_shared.consts import ApifyEnvVars
 from apify_shared.utils import ignore_docs
 
-from .config import Configuration
-from .log import logger
+from apify.config import Configuration
+from apify.log import logger
 
 if TYPE_CHECKING:
-    from typing_extensions import NotRequired
-
     from apify_client import ApifyClientAsync
+    from typing_extensions import NotRequired
 
 APIFY_PROXY_VALUE_REGEX = re.compile(r'^[\w._~]+$')
 COUNTRY_CODE_REGEX = re.compile(r'^[A-Z]{2}$')

{apify-1.5.2b4 → apify-1.5.3}/src/apify/scrapy/middlewares/apify_proxy.py

@@ -12,9 +12,9 @@ except ImportError as exc:
         'To use this module, you need to install the "scrapy" extra. Run "pip install apify[scrapy]".',
     ) from exc
 
-from ...actor import Actor
-from ...proxy_configuration import ProxyConfiguration
-from ..utils import get_basic_auth_header
+from apify.actor import Actor
+from apify.proxy_configuration import ProxyConfiguration
+from apify.scrapy.utils import get_basic_auth_header
 
 
 class ApifyHttpProxyMiddleware:

{apify-1.5.2b4 → apify-1.5.3}/src/apify/scrapy/middlewares/apify_retry.py

@@ -13,11 +13,11 @@ except ImportError as exc:
         'To use this module, you need to install the "scrapy" extra. Run "pip install apify[scrapy]".',
     ) from exc
 
-from ...actor import Actor
-from ..utils import nested_event_loop, open_queue_with_custom_client, to_apify_request
+from apify.actor import Actor
+from apify.scrapy.utils import nested_event_loop, open_queue_with_custom_client, to_apify_request
 
 if TYPE_CHECKING:
-    from ...storages import RequestQueue
+    from apify.storages import RequestQueue
 
 
 class ApifyRetryMiddleware(RetryMiddleware):

{apify-1.5.2b4 → apify-1.5.3}/src/apify/scrapy/pipelines/actor_dataset_push.py

@@ -9,7 +9,7 @@ except ImportError as exc:
         'To use this module, you need to install the "scrapy" extra. Run "pip install apify[scrapy]".',
     ) from exc
 
-from ...actor import Actor
+from apify.actor import Actor
 
 
 class ActorDatasetPushPipeline:

{apify-1.5.2b4 → apify-1.5.3}/src/apify/scrapy/scheduler.py

@@ -12,10 +12,10 @@ except ImportError as exc:
         'To use this module, you need to install the "scrapy" extra. Run "pip install apify[scrapy]".',
     ) from exc
 
-from .._crypto import crypto_random_object_id
-from ..actor import Actor
-from ..storages import RequestQueue
-from .utils import nested_event_loop, open_queue_with_custom_client, to_apify_request, to_scrapy_request
+from apify._crypto import crypto_random_object_id
+from apify.actor import Actor
+from apify.scrapy.utils import nested_event_loop, open_queue_with_custom_client, to_apify_request, to_scrapy_request
+from apify.storages import RequestQueue
 
 
 class ApifyScheduler(BaseScheduler):

{apify-1.5.2b4 → apify-1.5.3}/src/apify/scrapy/utils.py

@@ -8,6 +8,8 @@ from urllib.parse import unquote
 
 try:
     from scrapy import Request, Spider
+    from scrapy.settings import Settings  # noqa: TCH002
+    from scrapy.utils.project import get_project_settings
     from scrapy.utils.python import to_bytes
     from scrapy.utils.request import request_from_dict
 except ImportError as exc:
@@ -15,9 +17,9 @@ except ImportError as exc:
         'To use this module, you need to install the "scrapy" extra. Run "pip install apify[scrapy]".',
     ) from exc
 
-from .._crypto import crypto_random_object_id
-from ..actor import Actor
-from ..storages import RequestQueue, StorageClientManager
+from apify._crypto import crypto_random_object_id
+from apify.actor import Actor
+from apify.storages import RequestQueue, StorageClientManager
 
 nested_event_loop: asyncio.AbstractEventLoop = asyncio.new_event_loop()
 
@@ -47,6 +49,9 @@ def to_apify_request(scrapy_request: Request, spider: Spider) -> dict:
         scrapy_request: The Scrapy request to be converted.
         spider: The Scrapy spider that the request is associated with.
 
+    Raises:
+        TypeError: If the scrapy_request is not an instance of the scrapy.Request class.
+
     Returns:
         The converted Apify request.
     """
@@ -88,6 +93,10 @@ def to_scrapy_request(apify_request: dict, spider: Spider) -> Request:
         apify_request: The Apify request to be converted.
         spider: The Scrapy spider that the request is associated with.
 
+    Raises:
+        TypeError: If the apify_request is not a dictionary.
+        ValueError: If the apify_request does not contain the required keys.
+
     Returns:
         The converted Scrapy request.
     """
@@ -98,7 +107,7 @@ def to_scrapy_request(apify_request: dict, spider: Spider) -> Request:
     missing_keys = [key for key in required_keys if key not in apify_request]
 
     if missing_keys:
-        raise ValueError(f"apify_request must contain {', '.join(map(repr, missing_keys))} key(s)")
+        raise ValueError(f'apify_request must contain {", ".join(map(repr, missing_keys))} key(s)')
 
     call_id = crypto_random_object_id(8)
     Actor.log.debug(f'[{call_id}]: to_scrapy_request was called (apify_request={apify_request})...')
@@ -146,6 +155,45 @@ def to_scrapy_request(apify_request: dict, spider: Spider) -> Request:
     return scrapy_request
 
 
+def apply_apify_settings(*, settings: Settings | None = None, proxy_config: dict | None = None) -> Settings:
+    """Integrates Apify configuration into a Scrapy project settings.
+
+    Note: The function directly modifies the passed `settings` object and also returns it.
+
+    Args:
+        settings: Scrapy project settings to be modified.
+        proxy_config: Proxy configuration to be stored in the settings.
+
+    Returns:
+        Scrapy project settings with custom configurations.
+    """
+    if settings is None:
+        settings = get_project_settings()
+
+    # Use ApifyScheduler as the scheduler
+    settings['SCHEDULER'] = 'apify.scrapy.scheduler.ApifyScheduler'
+
+    # Add the ActorDatasetPushPipeline into the item pipelines, assigning it the highest integer (1000),
+    # ensuring it is executed as the final step in the pipeline sequence
+    settings['ITEM_PIPELINES']['apify.scrapy.pipelines.ActorDatasetPushPipeline'] = 1000
+
+    # Disable the default RobotsTxtMiddleware, Apify's custom scheduler already handles robots.txt
+    settings['DOWNLOADER_MIDDLEWARES']['scrapy.downloadermiddlewares.robotstxt.RobotsTxtMiddleware'] = None
+
+    # Disable the default HttpProxyMiddleware and add ApifyHttpProxyMiddleware
+    settings['DOWNLOADER_MIDDLEWARES']['scrapy.downloadermiddlewares.httpproxy.HttpProxyMiddleware'] = None
+    settings['DOWNLOADER_MIDDLEWARES']['apify.scrapy.middlewares.ApifyHttpProxyMiddleware'] = 950
+
+    # Disable the default RetryMiddleware and add ApifyRetryMiddleware with the highest integer (1000)
+    settings['DOWNLOADER_MIDDLEWARES']['scrapy.downloadermiddlewares.retry.RetryMiddleware'] = None
+    settings['DOWNLOADER_MIDDLEWARES']['apify.scrapy.middlewares.ApifyRetryMiddleware'] = 1000
+
+    # Store the proxy configuration
+    settings['APIFY_PROXY_SETTINGS'] = proxy_config
+
+    return settings
+
+
 async def open_queue_with_custom_client() -> RequestQueue:
     """Open a Request Queue with custom Apify Client.
 

{apify-1.5.2b4 → apify-1.5.3}/src/apify/storages/base_storage.py

@@ -6,10 +6,10 @@ from typing import TYPE_CHECKING, Generic, TypeVar, cast
 
 from apify_shared.utils import ignore_docs
 
-from .._memory_storage import MemoryStorageClient
-from .._memory_storage.resource_clients import BaseResourceClient, BaseResourceCollectionClient
-from ..config import Configuration
-from .storage_client_manager import StorageClientManager
+from apify._memory_storage import MemoryStorageClient
+from apify._memory_storage.resource_clients import BaseResourceClient, BaseResourceCollectionClient
+from apify.config import Configuration
+from apify.storages.storage_client_manager import StorageClientManager
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync

{apify-1.5.2b4 → apify-1.5.3}/src/apify/storages/dataset.py

@@ -7,10 +7,10 @@ from typing import TYPE_CHECKING, AsyncIterator, Iterable, Iterator
 
 from apify_shared.utils import ignore_docs, json_dumps
 
-from .._utils import wrap_internal
-from ..consts import MAX_PAYLOAD_SIZE_BYTES
-from .base_storage import BaseStorage
-from .key_value_store import KeyValueStore
+from apify._utils import wrap_internal
+from apify.consts import MAX_PAYLOAD_SIZE_BYTES
+from apify.storages.base_storage import BaseStorage
+from apify.storages.key_value_store import KeyValueStore
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync
@@ -18,9 +18,9 @@ if TYPE_CHECKING:
     from apify_shared.models import ListPage
     from apify_shared.types import JSONSerializable
 
-    from .._memory_storage import MemoryStorageClient
-    from .._memory_storage.resource_clients import DatasetClient, DatasetCollectionClient
-    from ..config import Configuration
+    from apify._memory_storage import MemoryStorageClient
+    from apify._memory_storage.resource_clients import DatasetClient, DatasetCollectionClient
+    from apify.config import Configuration
 
 # 0.01%
 SAFETY_BUFFER_PERCENT = 0.01 / 100

{apify-1.5.2b4 → apify-1.5.3}/src/apify/storages/key_value_store.py

@@ -5,15 +5,15 @@ from typing import TYPE_CHECKING, Any, AsyncIterator, NamedTuple, TypedDict, Typ
 from apify_client.clients import KeyValueStoreClientAsync, KeyValueStoreCollectionClientAsync
 from apify_shared.utils import ignore_docs
 
-from .._utils import wrap_internal
-from .base_storage import BaseStorage
+from apify._utils import wrap_internal
+from apify.storages.base_storage import BaseStorage
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync
 
-    from .._memory_storage import MemoryStorageClient
-    from .._memory_storage.resource_clients import KeyValueStoreClient, KeyValueStoreCollectionClient
-    from ..config import Configuration
+    from apify._memory_storage import MemoryStorageClient
+    from apify._memory_storage.resource_clients import KeyValueStoreClient, KeyValueStoreCollectionClient
+    from apify.config import Configuration
 
 
 T = TypeVar('T')

{apify-1.5.2b4 → apify-1.5.3}/src/apify/storages/request_queue.py

@@ -8,19 +8,19 @@ from typing import OrderedDict as OrderedDictType
 
 from apify_shared.utils import ignore_docs
 
-from .._crypto import crypto_random_object_id
-from .._utils import LRUCache, budget_ow, unique_key_to_request_id
-from ..consts import REQUEST_QUEUE_HEAD_MAX_LIMIT
-from ..log import logger
-from .base_storage import BaseStorage
+from apify._crypto import crypto_random_object_id
+from apify._utils import LRUCache, budget_ow, unique_key_to_request_id
+from apify.consts import REQUEST_QUEUE_HEAD_MAX_LIMIT
+from apify.log import logger
+from apify.storages.base_storage import BaseStorage
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync
     from apify_client.clients import RequestQueueClientAsync, RequestQueueCollectionClientAsync
 
-    from .._memory_storage import MemoryStorageClient
-    from .._memory_storage.resource_clients import RequestQueueClient, RequestQueueCollectionClient
-    from ..config import Configuration
+    from apify._memory_storage import MemoryStorageClient
+    from apify._memory_storage.resource_clients import RequestQueueClient, RequestQueueCollectionClient
+    from apify.config import Configuration
 
 
 MAX_CACHED_REQUESTS = 1_000_000

{apify-1.5.2b4 → apify-1.5.3}/src/apify/storages/storage_client_manager.py

@@ -4,8 +4,8 @@ from typing import TYPE_CHECKING
 
 from apify_shared.utils import ignore_docs
 
-from .._memory_storage import MemoryStorageClient
-from ..config import Configuration
+from apify._memory_storage import MemoryStorageClient
+from apify.config import Configuration
 
 if TYPE_CHECKING:
     from apify_client import ApifyClientAsync

{apify-1.5.2b4 → apify-1.5.3}/src/apify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.5.2b4
+Version: 1.5.3
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -24,8 +24,8 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apify-client~=1.6.0
-Requires-Dist: apify-shared~=1.1.0
+Requires-Dist: apify-client~=1.6.2
+Requires-Dist: apify-shared~=1.1.1
 Requires-Dist: aiofiles>=22.1.0
 Requires-Dist: aioshutil>=1.0
 Requires-Dist: colorama>=0.4.6

{apify-1.5.2b4 → apify-1.5.3}/src/apify.egg-info/requires.txt

@@ -1,5 +1,5 @@
-apify-client~=1.6.0
-apify-shared~=1.1.0
+apify-client~=1.6.2
+apify-shared~=1.1.1
 aiofiles>=22.1.0
 aioshutil>=1.0
 colorama>=0.4.6