apify 2.5.1b6__tar.gz → 2.5.1b8__tar.gz

{apify-2.5.1b6 → apify-2.5.1b8}/CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 ### 🐛 Bug Fixes
 
 - Fix duplicate logs from apify logger in Scrapy integration ([#457](https://github.com/apify/apify-sdk-python/pull/457)) ([2745ee6](https://github.com/apify/apify-sdk-python/commit/2745ee6529deecb4f2838c764b9bb3fb6606762b)) by [@vdusek](https://github.com/vdusek), closes [#391](https://github.com/apify/apify-sdk-python/issues/391)
+- Prefer proxy password from env var  ([#468](https://github.com/apify/apify-sdk-python/pull/468)) ([1c4ad9b](https://github.com/apify/apify-sdk-python/commit/1c4ad9bcfbf6ac404f942d7d2d249b036c2e7f54)) by [@stepskop](https://github.com/stepskop)
 
 
 <!-- git-cliff-unreleased-end -->

{apify-2.5.1b6 → apify-2.5.1b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apify
-Version: 2.5.1b6
+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.1b6 → apify-2.5.1b8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apify"
-version = "2.5.1b6"
+version = "2.5.1b8"
 description = "Apify SDK for Python"
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = { file = "LICENSE" }

{apify-2.5.1b6 → apify-2.5.1b8}/src/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.1b6 → apify-2.5.1b8}/tests/unit/test_proxy_configuration.py

@@ -432,6 +432,36 @@ async def test_initialize_with_manual_password(monkeypatch: pytest.MonkeyPatch,
     assert proxy_configuration.is_man_in_the_middle is False
 
 
+async def test_initialize_prefering_password_from_env_over_calling_api(
+    monkeypatch: pytest.MonkeyPatch,
+    respx_mock: MockRouter,
+    patched_apify_client: ApifyClientAsync,
+) -> None:
+    dummy_proxy_status_url = 'http://dummy-proxy-status-url.com'
+    monkeypatch.setenv(ApifyEnvVars.PROXY_STATUS_URL.value, dummy_proxy_status_url)
+    monkeypatch.setenv(ApifyEnvVars.PROXY_PASSWORD.value, DUMMY_PASSWORD)
+
+    respx_mock.get(dummy_proxy_status_url).mock(
+        httpx.Response(
+            200,
+            json={
+                'connected': True,
+                'connectionError': None,
+                'isManInTheMiddle': False,
+            },
+        )
+    )
+
+    proxy_configuration = ProxyConfiguration()
+
+    await proxy_configuration.initialize()
+
+    assert proxy_configuration._password == DUMMY_PASSWORD
+    assert proxy_configuration.is_man_in_the_middle is False
+
+    assert len(patched_apify_client.calls['user']['get']) == 0  # type: ignore[attr-defined]
+
+
 @pytest.mark.skip(reason='There are issues with log propagation to caplog, see issue #462.')
 async def test_initialize_with_manual_password_different_than_user_one(
     monkeypatch: pytest.MonkeyPatch,