apify 1.1.4b3__tar.gz → 1.1.5__tar.gz

{apify-1.1.4b3 → apify-1.1.5}/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Apify Technologies s.r.o.
+   Copyright 2023 Apify Technologies s.r.o.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

{apify-1.1.4b3 → apify-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.1.4b3
+Version: 1.1.5
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -22,8 +22,51 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: aiofiles>=22.1.0
+Requires-Dist: aioshutil>=1.0
+Requires-Dist: apify-client~=1.4.0
+Requires-Dist: apify-shared~=1.0.2
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: cryptography>=39.0.0
+Requires-Dist: httpx>=0.24.1
+Requires-Dist: psutil>=5.9.5
+Requires-Dist: pyee>=9.0.0
+Requires-Dist: sortedcollections>=2.0.1
+Requires-Dist: typing-extensions>=4.1.0
+Requires-Dist: websockets>=10.1
+Provides-Extra: dev
+Requires-Dist: autopep8~=2.0.2; extra == "dev"
+Requires-Dist: build~=0.10.0; extra == "dev"
+Requires-Dist: filelock~=3.12.0; extra == "dev"
+Requires-Dist: flake8~=6.0.0; extra == "dev"
+Requires-Dist: flake8-bugbear~=23.5.9; extra == "dev"
+Requires-Dist: flake8-commas~=2.1.0; extra == "dev"
+Requires-Dist: flake8-comprehensions~=3.12.0; extra == "dev"
+Requires-Dist: flake8-datetimez~=20.10.0; extra == "dev"
+Requires-Dist: flake8-docstrings~=1.7.0; extra == "dev"
+Requires-Dist: flake8-encodings~=0.5.0; extra == "dev"
+Requires-Dist: flake8-isort~=6.0.0; extra == "dev"
+Requires-Dist: flake8-noqa~=1.3.1; extra == "dev"
+Requires-Dist: flake8-pytest-style~=1.7.2; extra == "dev"
+Requires-Dist: flake8-quotes~=3.3.2; extra == "dev"
+Requires-Dist: flake8-simplify~=0.20.0; extra == "dev"
+Requires-Dist: flake8-unused-arguments~=0.0.13; extra == "dev"
+Requires-Dist: isort~=5.12.0; extra == "dev"
+Requires-Dist: mypy~=1.3.0; extra == "dev"
+Requires-Dist: pep8-naming~=0.13.3; extra == "dev"
+Requires-Dist: pre-commit~=3.3.2; extra == "dev"
+Requires-Dist: pydoc-markdown~=4.8.2; extra == "dev"
+Requires-Dist: pytest~=7.3.1; extra == "dev"
+Requires-Dist: pytest-asyncio~=0.21.0; extra == "dev"
+Requires-Dist: pytest-only~=2.0.0; extra == "dev"
+Requires-Dist: pytest-timeout~=2.1.0; extra == "dev"
+Requires-Dist: pytest-xdist~=3.3.1; extra == "dev"
+Requires-Dist: respx~=0.20.1; extra == "dev"
+Requires-Dist: twine~=4.0.2; extra == "dev"
+Requires-Dist: types-aiofiles~=23.1.0.3; extra == "dev"
+Requires-Dist: types-colorama~=0.4.15.11; extra == "dev"
+Requires-Dist: types-psutil~=5.9.5.12; extra == "dev"
 
 # Apify SDK for Python
 
@@ -46,9 +89,10 @@ import requests
 
 async def main():
     async with Actor:
-        response = requests.get('https://apify.com')
+        input = await Actor.get_input()
+        response = requests.get(input['url'])
         soup = BeautifulSoup(response.content, 'html.parser')
-        await Actor.push_data({ 'url': url, 'title': soup.title.string })
+        await Actor.push_data({ 'url': input['url'], 'title': soup.title.string })
 ```
 
 ## What are Actors?

{apify-1.1.4b3 → apify-1.1.5}/README.md

@@ -19,9 +19,10 @@ import requests
 
 async def main():
     async with Actor:
-        response = requests.get('https://apify.com')
+        input = await Actor.get_input()
+        response = requests.get(input['url'])
         soup = BeautifulSoup(response.content, 'html.parser')
-        await Actor.push_data({ 'url': url, 'title': soup.title.string })
+        await Actor.push_data({ 'url': input['url'], 'title': soup.title.string })
 ```
 
 ## What are Actors?

{apify-1.1.4b3 → apify-1.1.5}/pyproject.toml

@@ -1,186 +1,92 @@
 [project]
-
 name = "apify"
-
-version = "1.1.4b3"
+version = "1.1.5"
 description = "Apify SDK for Python"
-
 readme = "README.md"
-
 license = {text = "Apache Software License"}
-
 authors = [
-
-    { name = "Apify Technologies s.r.o.", email = "support@apify.com" },
-
+    {name = "Apify Technologies s.r.o.", email = "support@apify.com"},
 ]
-
 keywords = ["apify", "sdk", "actor", "scraping", "automation"]
 
-
-
 classifiers = [
-
     "Development Status :: 5 - Production/Stable",
-
     "Intended Audience :: Developers",
-
     "License :: OSI Approved :: Apache Software License",
-
     "Operating System :: OS Independent",
-
     "Programming Language :: Python :: 3.8",
-
     "Programming Language :: Python :: 3.9",
-
     "Programming Language :: Python :: 3.10",
-
     "Programming Language :: Python :: 3.11",
-
     "Topic :: Software Development :: Libraries",
-
 ]
 
-
-
 requires-python = ">=3.8"
-
 dependencies = [
-
     "aiofiles >= 22.1.0",
-
     "aioshutil >= 1.0",
-
-    "apify-client == 1.4.0",
-
-    "apify-shared == 1.0.2",
-
+    "apify-client ~= 1.4.0",
+    "apify-shared ~= 1.0.2",
     "colorama >= 0.4.6",
-
     "cryptography >= 39.0.0",
-
     "httpx >= 0.24.1",
-
     "psutil >= 5.9.5",
-
     "pyee >= 9.0.0",
-
     "sortedcollections >= 2.0.1",
-
     "typing-extensions >= 4.1.0",
-
     "websockets >= 10.1",
-
 ]
 
-
-
 [project.optional-dependencies]
-
 dev = [
-
     "autopep8 ~= 2.0.2",
-
     "build ~= 0.10.0",
-
     "filelock ~= 3.12.0",
-
     "flake8 ~= 6.0.0",
-
     "flake8-bugbear ~= 23.5.9",
-
     "flake8-commas ~= 2.1.0",
-
     "flake8-comprehensions ~= 3.12.0",
-
     "flake8-datetimez ~= 20.10.0",
-
     "flake8-docstrings ~= 1.7.0",
-
     "flake8-encodings ~= 0.5.0",
-
     "flake8-isort ~= 6.0.0",
-
     "flake8-noqa ~= 1.3.1",
-
     "flake8-pytest-style ~= 1.7.2",
-
     "flake8-quotes ~= 3.3.2",
-
     "flake8-simplify ~= 0.20.0",
-
     "flake8-unused-arguments ~= 0.0.13",
-
     "isort ~= 5.12.0",
-
     "mypy ~= 1.3.0",
-
     "pep8-naming ~= 0.13.3",
-
     "pre-commit ~= 3.3.2",
-
+    "pydoc-markdown ~= 4.8.2",
     "pytest ~= 7.3.1",
-
     "pytest-asyncio ~= 0.21.0",
-
     "pytest-only ~= 2.0.0",
-
     "pytest-timeout ~= 2.1.0",
-
     "pytest-xdist ~= 3.3.1",
-
     "respx ~= 0.20.1",
-
-    "sphinx ~= 6.1.3",
-
-    "sphinx-autodoc-typehints ~= 1.22",
-
-    "sphinx-markdown-builder == 0.5.4",  # pinned to 0.5.4, because 0.5.5 has a formatting bug
-
     "twine ~= 4.0.2",
-
     "types-aiofiles ~= 23.1.0.3",
-
     "types-colorama ~= 0.4.15.11",
-
     "types-psutil ~= 5.9.5.12",
-
 ]
 
-
-
 [project.urls]
-
 "Homepage" = "https://docs.apify.com/sdk/python/"
-
 "Documentation" = "https://docs.apify.com/sdk/python/"
-
 "Source" = "https://github.com/apify/apify-sdk-python"
-
 "Issue tracker" = "https://github.com/apify/apify-sdk-python/issues"
-
 "Changelog" = "https://github.com/apify/apify-sdk-python/blob/master/CHANGELOG.md"
-
 "Apify Homepage" = "https://apify.com"
 
-
-
 [build-system]
-
 requires = ["setuptools>=64.0.0", "wheel"]
-
 build-backend = "setuptools.build_meta"
 
-
-
 [tool.setuptools.packages.find]
-
 where = ["src"]
-
 include = ["apify*"]
 
-
-
 [tool.setuptools.package-data]
-
 apify = ["py.typed"]

{apify-1.1.4b3 → apify-1.1.5}/src/apify/actor.py

@@ -36,7 +36,6 @@ MainReturnType = TypeVar('MainReturnType')
 
 # This metaclass is needed so you can do `async with Actor: ...` instead of `async with Actor() as a: ...`
 # and have automatic `Actor.init()` and `Actor.exit()`
-# TODO: decide if this mumbo jumbo is worth it or not, or if it maybe breaks something
 
 
 class _ActorContextManager(type):

{apify-1.1.4b3 → apify-1.1.5}/src/apify/consts.py

@@ -3,14 +3,14 @@ import warnings
 from enum import Enum
 from typing import Any
 
-from apify_shared.consts import BOOL_ENV_VARS as _BOOL_ENV_VARS
-from apify_shared.consts import DATETIME_ENV_VARS as _DATETIME_ENV_VARS
-from apify_shared.consts import FLOAT_ENV_VARS as _FLOAT_ENV_VARS
-from apify_shared.consts import INTEGER_ENV_VARS as _INTEGER_ENV_VARS
-from apify_shared.consts import STRING_ENV_VARS as _STRING_ENV_VARS
-from apify_shared.consts import ActorEventTypes as _ActorEventTypes
-from apify_shared.consts import ActorExitCodes as _ActorExitCodes
-from apify_shared.consts import ApifyEnvVars as _ApifyEnvVars
+from apify_shared.consts import BOOL_ENV_VARS as _BOOL_ENV_VARS  # noqa: F401
+from apify_shared.consts import DATETIME_ENV_VARS as _DATETIME_ENV_VARS  # noqa: F401
+from apify_shared.consts import FLOAT_ENV_VARS as _FLOAT_ENV_VARS  # noqa: F401
+from apify_shared.consts import INTEGER_ENV_VARS as _INTEGER_ENV_VARS  # noqa: F401
+from apify_shared.consts import STRING_ENV_VARS as _STRING_ENV_VARS  # noqa: F401
+from apify_shared.consts import ActorEventTypes as _ActorEventTypes  # noqa: F401
+from apify_shared.consts import ActorExitCodes as _ActorExitCodes  # noqa: F401
+from apify_shared.consts import ApifyEnvVars as _ApifyEnvVars  # noqa: F401
 
 DEPRECATED_NAMES = [
     'BOOL_ENV_VARS',
@@ -61,4 +61,5 @@ BASE64_REGEXP = '[-A-Za-z0-9+/]*={0,3}'
 ENCRYPTED_INPUT_VALUE_PREFIX = 'ENCRYPTED_VALUE'
 ENCRYPTED_INPUT_VALUE_REGEXP = re.compile(f'^{ENCRYPTED_INPUT_VALUE_PREFIX}:({BASE64_REGEXP}):({BASE64_REGEXP})$')
 
-MAX_PAYLOAD_SIZE_BYTES = 9437184  # 9MB
+# 9MB
+MAX_PAYLOAD_SIZE_BYTES = 9437184

{apify-1.1.4b3 → apify-1.1.5}/src/apify/event_manager.py

@@ -34,7 +34,7 @@ class EventManager:
     _connected_to_platform_websocket: Optional[asyncio.Future] = None
 
     def __init__(self, config: Configuration) -> None:
-        """Crate an instance of EventManager.
+        """Create an instance of the EventManager.
 
         Args:
             config (Configuration): The actor configuration to be used in this event manager.

{apify-1.1.4b3 → apify-1.1.5}/src/apify/log.py

@@ -17,6 +17,7 @@ logger_name = __name__.split('.')[0]
 # Logger used throughout the library
 logger = logging.getLogger(logger_name)
 
+_LOG_NAME_COLOR = Fore.LIGHTBLACK_EX
 
 _LOG_LEVEL_COLOR = {
     logging.DEBUG: Fore.BLUE,
@@ -54,6 +55,15 @@ class ActorLogFormatter(logging.Formatter):
     # and extract all the extra ones not present in the empty log record
     empty_record = logging.LogRecord('dummy', 0, 'dummy', 0, 'dummy', None, None)
 
+    def __init__(self, include_logger_name: bool = False, *args: tuple, **kwargs: dict) -> None:
+        """Create an instance of the ActorLogFormatter.
+
+        Args:
+            include_logger_name: Include logger name at the beginning of the log line. Defaults to False.
+        """
+        super().__init__(*args, **kwargs)  # type: ignore
+        self.include_logger_name = include_logger_name
+
     def _get_extra_fields(self, record: logging.LogRecord) -> Dict[str, Any]:
         extra_fields: Dict[str, Any] = {}
         for key, value in record.__dict__.items():
@@ -72,6 +82,8 @@ class ActorLogFormatter(logging.Formatter):
         - then has the stringified extra log fields
         - then, if an exception is a part of the log record, prints the formatted exception.
         """
+        logger_name_string = f'{_LOG_NAME_COLOR}[{record.name}]{Style.RESET_ALL} '
+
         # Colorize the log level, and shorten it to 6 chars tops
         level_color_code = _LOG_LEVEL_COLOR.get(record.levelno, '')
         level_short_alias = _LOG_LEVEL_SHORT_ALIAS.get(record.levelno, record.levelname)
@@ -97,4 +109,8 @@ class ActorLogFormatter(logging.Formatter):
         log_string = super().format(record)
         log_string = textwrap.indent(log_string, _LOG_MESSAGE_INDENT).lstrip()
 
-        return f'{level_string}{log_string}{extra_string}{exception_string}'
+        if self.include_logger_name:
+            # Include logger name at the beginning of the log line
+            return f'{logger_name_string}{level_string}{log_string}{extra_string}{exception_string}'
+        else:
+            return f'{level_string}{log_string}{extra_string}{exception_string}'

{apify-1.1.4b3 → apify-1.1.5}/src/apify/storages/dataset.py

@@ -17,7 +17,8 @@ from ..consts import MAX_PAYLOAD_SIZE_BYTES
 from .base_storage import BaseStorage
 from .key_value_store import KeyValueStore
 
-SAFETY_BUFFER_PERCENT = 0.01 / 100  # 0.01%
+# 0.01%
+SAFETY_BUFFER_PERCENT = 0.01 / 100
 EFFECTIVE_LIMIT_BYTES = MAX_PAYLOAD_SIZE_BYTES - math.ceil(MAX_PAYLOAD_SIZE_BYTES * SAFETY_BUFFER_PERCENT)
 
 

{apify-1.1.4b3 → apify-1.1.5}/src/apify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.1.4b3
+Version: 1.1.5
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -22,8 +22,51 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: aiofiles>=22.1.0
+Requires-Dist: aioshutil>=1.0
+Requires-Dist: apify-client~=1.4.0
+Requires-Dist: apify-shared~=1.0.2
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: cryptography>=39.0.0
+Requires-Dist: httpx>=0.24.1
+Requires-Dist: psutil>=5.9.5
+Requires-Dist: pyee>=9.0.0
+Requires-Dist: sortedcollections>=2.0.1
+Requires-Dist: typing-extensions>=4.1.0
+Requires-Dist: websockets>=10.1
+Provides-Extra: dev
+Requires-Dist: autopep8~=2.0.2; extra == "dev"
+Requires-Dist: build~=0.10.0; extra == "dev"
+Requires-Dist: filelock~=3.12.0; extra == "dev"
+Requires-Dist: flake8~=6.0.0; extra == "dev"
+Requires-Dist: flake8-bugbear~=23.5.9; extra == "dev"
+Requires-Dist: flake8-commas~=2.1.0; extra == "dev"
+Requires-Dist: flake8-comprehensions~=3.12.0; extra == "dev"
+Requires-Dist: flake8-datetimez~=20.10.0; extra == "dev"
+Requires-Dist: flake8-docstrings~=1.7.0; extra == "dev"
+Requires-Dist: flake8-encodings~=0.5.0; extra == "dev"
+Requires-Dist: flake8-isort~=6.0.0; extra == "dev"
+Requires-Dist: flake8-noqa~=1.3.1; extra == "dev"
+Requires-Dist: flake8-pytest-style~=1.7.2; extra == "dev"
+Requires-Dist: flake8-quotes~=3.3.2; extra == "dev"
+Requires-Dist: flake8-simplify~=0.20.0; extra == "dev"
+Requires-Dist: flake8-unused-arguments~=0.0.13; extra == "dev"
+Requires-Dist: isort~=5.12.0; extra == "dev"
+Requires-Dist: mypy~=1.3.0; extra == "dev"
+Requires-Dist: pep8-naming~=0.13.3; extra == "dev"
+Requires-Dist: pre-commit~=3.3.2; extra == "dev"
+Requires-Dist: pydoc-markdown~=4.8.2; extra == "dev"
+Requires-Dist: pytest~=7.3.1; extra == "dev"
+Requires-Dist: pytest-asyncio~=0.21.0; extra == "dev"
+Requires-Dist: pytest-only~=2.0.0; extra == "dev"
+Requires-Dist: pytest-timeout~=2.1.0; extra == "dev"
+Requires-Dist: pytest-xdist~=3.3.1; extra == "dev"
+Requires-Dist: respx~=0.20.1; extra == "dev"
+Requires-Dist: twine~=4.0.2; extra == "dev"
+Requires-Dist: types-aiofiles~=23.1.0.3; extra == "dev"
+Requires-Dist: types-colorama~=0.4.15.11; extra == "dev"
+Requires-Dist: types-psutil~=5.9.5.12; extra == "dev"
 
 # Apify SDK for Python
 
@@ -46,9 +89,10 @@ import requests
 
 async def main():
     async with Actor:
-        response = requests.get('https://apify.com')
+        input = await Actor.get_input()
+        response = requests.get(input['url'])
         soup = BeautifulSoup(response.content, 'html.parser')
-        await Actor.push_data({ 'url': url, 'title': soup.title.string })
+        await Actor.push_data({ 'url': input['url'], 'title': soup.title.string })
 ```
 
 ## What are Actors?

{apify-1.1.4b3 → apify-1.1.5}/src/apify.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiofiles>=22.1.0
 aioshutil>=1.0
-apify-client==1.4.0
-apify-shared==1.0.2
+apify-client~=1.4.0
+apify-shared~=1.0.2
 colorama>=0.4.6
 cryptography>=39.0.0
 httpx>=0.24.1
@@ -32,15 +32,13 @@ isort~=5.12.0
 mypy~=1.3.0
 pep8-naming~=0.13.3
 pre-commit~=3.3.2
+pydoc-markdown~=4.8.2
 pytest~=7.3.1
 pytest-asyncio~=0.21.0
 pytest-only~=2.0.0
 pytest-timeout~=2.1.0
 pytest-xdist~=3.3.1
 respx~=0.20.1
-sphinx~=6.1.3
-sphinx-autodoc-typehints~=1.22
-sphinx-markdown-builder==0.5.4
 twine~=4.0.2
 types-aiofiles~=23.1.0.3
 types-colorama~=0.4.15.11