apify 1.1.4b3__py3-none-any.whl → 1.1.6b2__py3-none-any.whl

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/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/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/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/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.dist-info → apify-1.1.6b2.dist-info}/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.dist-info → apify-1.1.6b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apify
-Version: 1.1.4b3
+Version: 1.1.6b2
 Summary: Apify SDK for Python
 Author-email: "Apify Technologies s.r.o." <support@apify.com>
 License: Apache Software License
@@ -25,8 +25,8 @@ Description-Content-Type: text/markdown
 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: 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
@@ -56,15 +56,13 @@ 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: sphinx ~=6.1.3 ; extra == 'dev'
-Requires-Dist: sphinx-autodoc-typehints ~=1.22 ; extra == 'dev'
-Requires-Dist: sphinx-markdown-builder ==0.5.4 ; 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'
@@ -91,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.dist-info → apify-1.1.6b2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 apify/__init__.py,sha256=aAjho-r0-XAqUjD9j55ueCo4lZJzyytOWjk0VCmkeeY,283
 apify/_crypto.py,sha256=aFgJ6LZM_ZM_Hb3FCHVGt2DEjWJxOXWzOdCKdkBHoSA,5753
 apify/_utils.py,sha256=uYX3ro6yM5Ppuz4vEGz-xiChGEJaaIl3U2w4AVk2q3k,12602
-apify/actor.py,sha256=BXudfMdty73pWdmhGLElYBr-YGV74VJvOJOnGN0nUHk,59688
+apify/actor.py,sha256=gom2J--Ypgw9UZCgZwKw6EFwlj55CWycbyNJBl5T9VI,59601
 apify/config.py,sha256=MCk-n03H62hrc15dHmhzGM5ivW9H-wqJNpzgLzkhO2I,8717
-apify/consts.py,sha256=dsm_MaegObXIYyCKHC3Tptv4a58pNLa7D0Qxffcb75U,2117
-apify/event_manager.py,sha256=Z2QaZPa4hWVlPMptGm_ZSLd8xkm3T8Da_xNBn5hfM50,10431
-apify/log.py,sha256=G5Bk71lIXmSXCPNIfjE8cG-uLhPwUPV3JtqKzUu6oOA,4026
+apify/consts.py,sha256=ElVGmjDAP6tPWqz-fR-r_1zuCX8AyAA1llgYjPS6SQU,2228
+apify/event_manager.py,sha256=2-QcQHGOSZd3mJN8_-MbGucXMPS3ZqMPJVzlnCrG9P8,10436
+apify/log.py,sha256=kGsbTFbbezPEPwIk2wiopb-mI0k0hHqVFeCN6Xec17Y,4770
 apify/proxy_configuration.py,sha256=wE8FEtZXaE5mknhvUXYlNVo_xNI0l60gqgNNclVYKb4,15545
 apify/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 apify/_memory_storage/__init__.py,sha256=frNb9kh6bfKtZNEMe2PA_QlT6DTUbhffcNfWhELiZNQ,90
@@ -22,12 +22,12 @@ apify/_memory_storage/resource_clients/request_queue.py,sha256=Fp1EdBSHtFt9zQlbz
 apify/_memory_storage/resource_clients/request_queue_collection.py,sha256=_diuJAIoMKJrUTcY2U8IwHOcI21i-znS004YKcTmmLo,1480
 apify/storages/__init__.py,sha256=oYUCrNcECYMXX0wtHbaYhD2hWH3drau8OyXVdtNOk80,249
 apify/storages/base_storage.py,sha256=l0OB1w23rwDK_cnvp33W725T4aHUXexlOHRUCNCs4RU,7089
-apify/storages/dataset.py,sha256=kyhlddpE_a3QetoT-LgY1Q2F_YWHE2ZSP1HXjP68QC0,23436
+apify/storages/dataset.py,sha256=1F4GIx44S1rgYxlyuCeiWwcXhki5voJJkw9xR-ZtUGU,23435
 apify/storages/key_value_store.py,sha256=3lF3dNb3uvWKSmza5Qb9-Dna4czCOcPOImzwDVzgdjc,10132
 apify/storages/request_queue.py,sha256=KCvSYzJ-9pgGvfTnX-K05Mdb3wq7UROtxW8zczrE6ZI,25891
 apify/storages/storage_client_manager.py,sha256=zqrjVpSE4eM6BM3Z87yLmNxMsiZep8bf0aSaX8125PE,2224
-apify-1.1.4b3.dist-info/LICENSE,sha256=_yIHo4TZezG4fMaWG1Er6OH7DW7MiZI-KO4dnONASZI,11355
-apify-1.1.4b3.dist-info/METADATA,sha256=hwZOal8_4B4xdGLpKVQZkowaWFvgws-OC9VKM6hbjQM,6285
-apify-1.1.4b3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-apify-1.1.4b3.dist-info/top_level.txt,sha256=2oFNsHggn5m_rCaaP7xijQg_-Va2ByOSYuvKgACsS5w,6
-apify-1.1.4b3.dist-info/RECORD,,
+apify-1.1.6b2.dist-info/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-1.1.6b2.dist-info/METADATA,sha256=82BvlCffLotMaU3wUNtAcGftMjrAC9OKqHfb_BuExDo,6207
+apify-1.1.6b2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+apify-1.1.6b2.dist-info/top_level.txt,sha256=2oFNsHggn5m_rCaaP7xijQg_-Va2ByOSYuvKgACsS5w,6
+apify-1.1.6b2.dist-info/RECORD,,