apify 2.5.1b7__py3-none-any.whl → 2.5.1b8__py3-none-any.whl

apify/_proxy_configuration.py

@@ -178,7 +178,9 @@ class ProxyConfiguration(CrawleeProxyConfiguration):
         self._country_code = country_code
 
     async def initialize(self) -> None:
-        """Load the Apify Proxy password if the API token is provided and check access to Apify Proxy and proxy groups.
+        """Check if using proxy, if so, check the access.
+
+        Load the Apify Proxy password from API (only if not passed to constructor or through env var).
 
         Only called if Apify Proxy configuration is used. Also checks if country has access to Apify Proxy groups
         if the country code is provided.
@@ -187,7 +189,17 @@ class ProxyConfiguration(CrawleeProxyConfiguration):
         `ProxyConfiguration` instance instead of calling this manually.
         """
         if self._uses_apify_proxy:
-            await self._maybe_fetch_password()
+            if not self._password:
+                await self._maybe_fetch_password()
+            if not self._password:
+                raise ValueError(
+                    'Apify Proxy password must be provided using the "password" constructor argument '
+                    f'or the "{ApifyEnvVars.PROXY_PASSWORD}" environment variable. '
+                    f'You can also provide your Apify token via the "${ApifyEnvVars.TOKEN}" environment variable, '
+                    f'so that the SDK can fetch the proxy password from Apify API, '
+                    f'when not provided through constructor or ${ApifyEnvVars.PROXY_PASSWORD}.'
+                )
+
             await self._check_access()
 
     async def new_proxy_info(
@@ -255,22 +267,7 @@ class ProxyConfiguration(CrawleeProxyConfiguration):
             user_info = await self._apify_client.user().get()
             if user_info:
                 password = user_info['proxy']['password']
-
-                if self._password:
-                    if self._password != password:
-                        logger.warning(
-                            'The Apify Proxy password you provided belongs to a different user than the Apify '
-                            'token you are using. Are you sure this is correct?'
-                        )
-                else:
-                    self._password = password
-
-        if not self._password:
-            raise ValueError(
-                'Apify Proxy password must be provided using the "password" constructor argument '
-                f'or the "{ApifyEnvVars.PROXY_PASSWORD}" environment variable. If you add '
-                f'the "{ApifyEnvVars.TOKEN}" environment variable, the password will be automatically inferred.'
-            )
+                self._password = password
 
     async def _check_access(self) -> None:
         proxy_status_url = f'{self._configuration.proxy_status_url}/?format=json'

{apify-2.5.1b7.dist-info → apify-2.5.1b8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apify
-Version: 2.5.1b7
+Version: 2.5.1b8
 Summary: Apify SDK for Python
 Project-URL: Homepage, https://docs.apify.com/sdk/python/
 Project-URL: Apify homepage, https://apify.com

{apify-2.5.1b7.dist-info → apify-2.5.1b8.dist-info}/RECORD

@@ -6,7 +6,7 @@ apify/_consts.py,sha256=_Xq4hOfOA1iZ3n1P967YWdyncKivpbX6RTlp_qanUoE,330
 apify/_crypto.py,sha256=8BgeQC0ZhYP5KdmLxxLQAW87Gq-Z4HlREbYGXr46w0U,6607
 apify/_models.py,sha256=-Y0rljBJWxMMCp8iDCTG4UV3bEvNZzp-kx2SYbPfeIY,7919
 apify/_platform_event_manager.py,sha256=igi9dRTfB7t0mRBM1bCfzMh7RBbr5adrJ0iRymUQ8S8,7990
-apify/_proxy_configuration.py,sha256=c-O6_PZ9pUD-i4J0RFEKTtfyJPP2rTRJJA1TH8NVsV8,13189
+apify/_proxy_configuration.py,sha256=eMeYr9mr2ITURBmgZw4Cel9kfkiLhdaxE47EDh-3okM,13091
 apify/_utils.py,sha256=7YL7VhmNND0XARsXtPQWWQCyK4825n-ZVB8n9cgWm0A,1838
 apify/log.py,sha256=j-E4t-WeA93bc1NCQRG8sTntehQCiiN8ia-MdQe3_Ts,1291
 apify/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -38,7 +38,7 @@ apify/scrapy/pipelines/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 apify/storages/__init__.py,sha256=FW-z6ubuPnHGM-Wp15T8mR5q6lnpDGrCW-IkgZd5L30,177
 apify/storages/_request_list.py,sha256=FCC4X2MX2V8vLZBCUi5Q1qg9w62y9UkF4ptOqyPVhG8,6052
 apify/storages/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apify-2.5.1b7.dist-info/METADATA,sha256=jCUxU2xFM8QmelPP_iv7AJblWJY4fOShi-YNogRlvkg,21557
-apify-2.5.1b7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-apify-2.5.1b7.dist-info/licenses/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
-apify-2.5.1b7.dist-info/RECORD,,
+apify-2.5.1b8.dist-info/METADATA,sha256=wCgLs9T_CIyul7M251sjURButHky0_k9D4iedFOd5lI,21557
+apify-2.5.1b8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+apify-2.5.1b8.dist-info/licenses/LICENSE,sha256=AsFjHssKjj4LGd2ZCqXn6FBzMqcWdjQre1byPPSypVw,11355
+apify-2.5.1b8.dist-info/RECORD,,