Merge remote-tracking branch 'origin/master' into alias-storage-configuration-mapping

Author: Pijukatel

.github/workflows/_check_code.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Run actionlint
-        uses: rhysd/actionlint@v1.7.10
+        uses: rhysd/actionlint@v1.7.11
 
   spell_check:
     name: Spell check

.github/workflows/_release_docs.yaml

@@ -68,6 +68,7 @@ jobs:
         run: uv run poe build-docs
         env:
           APIFY_SIGNING_TOKEN: ${{ secrets.APIFY_SIGNING_TOKEN }}
+          SEGMENT_TOKEN: ${{ secrets.SEGMENT_TOKEN }}
 
       - name: Set up GitHub Pages
         uses: actions/configure-pages@v5

.github/workflows/_tests.yaml

@@ -20,12 +20,123 @@ jobs:
       tests_concurrency: "1"
 
   integration_tests:
-    name: Integration tests
-    uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main
-    secrets: inherit
-    with:
-      python_versions: '["3.10", "3.14"]'
-      operating_systems: '["ubuntu-latest"]'
-      python_version_for_codecov: "3.14"
-      operating_system_for_codecov: ubuntu-latest
-      tests_concurrency: "16"
+    name: Integration tests (${{ matrix.python-version }}, ${{ matrix.os }})
+
+    if: >-
+      ${{
+        (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'apify') ||
+        (github.event_name == 'push' && github.ref == 'refs/heads/master')
+      }}
+
+    strategy:
+      matrix:
+        os: ["ubuntu-latest"]
+        python-version: ["3.10", "3.14"]
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      TESTS_CONCURRENCY: "8"
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Set up uv package manager
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Python dependencies
+        run: uv run poe install-dev
+
+      - name: Run integration tests
+        run: uv run poe integration-tests-cov
+        env:
+          APIFY_TEST_USER_API_TOKEN: ${{ secrets.APIFY_TEST_USER_PYTHON_SDK_API_TOKEN }}
+          APIFY_TEST_USER_2_API_TOKEN: ${{ secrets.APIFY_TEST_USER_2_API_TOKEN }}
+
+      - name: Upload integration test coverage
+        if: >-
+          ${{
+            matrix.os == 'ubuntu-latest' &&
+            matrix.python-version == '3.14' &&
+            env.CODECOV_TOKEN != ''
+          }}
+        uses: codecov/codecov-action@v5
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          token: ${{ env.CODECOV_TOKEN }}
+          files: coverage-integration.xml
+          flags: integration
+
+  e2e_tests:
+    name: E2E tests (${{ matrix.python-version }}, ${{ matrix.os }})
+
+    if: >-
+      ${{
+        (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'apify') ||
+        (github.event_name == 'push' && github.ref == 'refs/heads/master')
+      }}
+
+    # E2E tests build and run Actors on the platform. The combination of max-parallel 2 with 16 pytest
+    # workers and a global concurrency group is a compromise between stability and performance - it keeps
+    # the platform's resource usage in check while still allowing reasonable test throughput.
+    concurrency:
+      group: e2e-tests
+      cancel-in-progress: false
+
+    strategy:
+      max-parallel: 2
+      matrix:
+        os: ["ubuntu-latest"]
+        python-version: ["3.10", "3.14"]
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      TESTS_CONCURRENCY: "16"
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Set up uv package manager
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Python dependencies
+        run: uv run poe install-dev
+
+      - name: Run E2E tests
+        run: uv run poe e2e-tests-cov
+        env:
+          APIFY_TEST_USER_API_TOKEN: ${{ secrets.APIFY_TEST_USER_PYTHON_SDK_API_TOKEN }}
+          APIFY_TEST_USER_2_API_TOKEN: ${{ secrets.APIFY_TEST_USER_2_API_TOKEN }}
+
+      - name: Upload E2E test coverage
+        if: >-
+          ${{
+            matrix.os == 'ubuntu-latest' &&
+            matrix.python-version == '3.14' &&
+            env.CODECOV_TOKEN != ''
+          }}
+        uses: codecov/codecov-action@v5
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          token: ${{ env.CODECOV_TOKEN }}
+          files: coverage-e2e.xml
+          flags: e2e

CHANGELOG.md

@@ -3,14 +3,27 @@
 All notable changes to this project will be documented in this file.
 
 <!-- git-cliff-unreleased-start -->
-## 3.1.1 - **not yet released**
+## 3.2.1 - **not yet released**
+
+### 🐛 Bug Fixes
+
+- Fix crawler deadlock when API fails during marking request as handled ([#768](https://github.com/apify/apify-sdk-python/pull/768)) ([66ed5ea](https://github.com/apify/apify-sdk-python/commit/66ed5eaf819f9c9f411c814606187d76d32a4e11)) by [@Pijukatel](https://github.com/Pijukatel), closes [#1694](https://github.com/apify/apify-sdk-python/issues/1694)
+
+
+<!-- git-cliff-unreleased-end -->
+## [3.2.0](https://github.com/apify/apify-sdk-python/releases/tag/v3.2.0) (2026-02-11)
 
 ### 🚀 Features
 
 - Add `Actor` method `use_state` ([#738](https://github.com/apify/apify-sdk-python/pull/738)) ([8a78b6f](https://github.com/apify/apify-sdk-python/commit/8a78b6fc9324e948b3481b07a3582215d3c966fe)) by [@Mantisus](https://github.com/Mantisus), closes [#735](https://github.com/apify/apify-sdk-python/issues/735)
 
+### 🐛 Bug Fixes
+
+- Stop silently swallowing exceptions in request queue ([#777](https://github.com/apify/apify-sdk-python/pull/777)) ([6358d66](https://github.com/apify/apify-sdk-python/commit/6358d66aeb83484845b17f7c8632b6c763cef368)) by [@vdusek](https://github.com/vdusek)
+- Handle TimeoutError in Actor __aexit__ to prevent resource leaks ([#776](https://github.com/apify/apify-sdk-python/pull/776)) ([fb13765](https://github.com/apify/apify-sdk-python/commit/fb13765448a2a6e2b776de819ece68f90abff1e3)) by [@vdusek](https://github.com/vdusek)
+- Pass name instead of id for name param in SmartApifyStorageClient ([#775](https://github.com/apify/apify-sdk-python/pull/775)) ([56cfc38](https://github.com/apify/apify-sdk-python/commit/56cfc38aa98a2a6689dd077e9d5c5d8729872413)) by [@vdusek](https://github.com/vdusek)
+
 
-<!-- git-cliff-unreleased-end -->
 ## [3.1.0](https://github.com/apify/apify-sdk-python/releases/tag/v3.1.0) (2025-12-08)
 
 ### 🚀 Features

CONTRIBUTING.md

@@ -118,6 +118,26 @@ To run the documentation locally (requires Node.js):
 uv run poe run-docs
 ```
 
+## Commits
+
+We use [Conventional Commits](https://www.conventionalcommits.org/) format for commit messages. This convention is used to automatically determine version bumps during the release process.
+
+### Available commit types
+
+| Type | Description |
+| ---- | ----------- |
+| `feat` | A new feature |
+| `fix` | A bug fix |
+| `docs` | Documentation only changes |
+| `style` | Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) |
+| `refactor` | A code change that neither fixes a bug nor adds a feature |
+| `perf` | A code change that improves performance |
+| `test` | Adding missing tests or correcting existing tests |
+| `build` | Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm) |
+| `ci` | Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs) |
+| `chore` | Other changes that don't modify src or test files |
+| `revert` | Reverts a previous commit |
+
 ## Release process
 
 Publishing new versions to [PyPI](https://pypi.org/project/apify) is automated through GitHub Actions.

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apify"
-version = "3.1.1"
+version = "3.2.1"
 description = "Apify SDK for Python"
 authors = [{ name = "Apify Technologies s.r.o.", email = "support@apify.com" }]
 license = { file = "LICENSE" }
@@ -64,6 +64,11 @@ scrapy = ["scrapy>=2.11.0"]
 
 [dependency-groups]
 dev = [
+    # TODO: Remove this constraint once pydoc-markdown updates its dependencies.
+    # Package pydoc-markdown is unmaintained and pins old docspec-python with vulnerable black.
+    # See https://github.com/apify/apify-client-python/pull/582/ for more details.
+    # We explicitly constrain black>=24.3.0 to override the transitive dependency.
+    "black>=24.3.0",
     "build<2.0.0",
     "crawlee[parsel]",
     "dycw-pytest-only<3.0.0",
@@ -140,15 +145,13 @@ indent-style = "space"
 "**/{tests}/*" = [
     "D",       # Everything from the pydocstyle
     "INP001",  # File {filename} is part of an implicit namespace package, add an __init__.py
+    "PLC0415", # `import` should be at the top-level of a file
     "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
     "S101",    # Use of assert detected
     "SLF001",  # Private member accessed: `{name}`
     "T20",     # flake8-print
-    "TRY301",  # Abstract `raise` to an inner function
     "TID252",  # Prefer absolute imports over relative imports from parent modules
-]
-"**/{tests}/{integration}/*" = [
-    "PLC0415", # `import` should be at the top-level of a file
+    "TRY301",  # Abstract `raise` to an inner function
 ]
 "**/{docs,website}/**" = [
     "D",       # Everything from the pydocstyle
@@ -229,6 +232,8 @@ unit-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} tests/unit
 unit-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} --cov=src/apify --cov-report=xml:coverage-unit.xml tests/unit"
 integration-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} tests/integration"
 integration-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} --cov=src/apify --cov-report=xml:coverage-integration.xml tests/integration"
+e2e-tests = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} tests/e2e"
+e2e-tests-cov = "uv run pytest --numprocesses=${TESTS_CONCURRENCY:-auto} --cov=src/apify --cov-report=xml:coverage-e2e.xml tests/e2e"
 check-code = ["lint", "type-check", "unit-tests"]
 
 [tool.poe.tasks.install-dev]

src/apify/_actor.py

@@ -257,8 +257,12 @@ async def finalize() -> None:
             # Persist Actor state
             await self._save_actor_state()
 
-        await asyncio.wait_for(finalize(), self._cleanup_timeout.total_seconds())
-        self._is_initialized = False
+        try:
+            await asyncio.wait_for(finalize(), self._cleanup_timeout.total_seconds())
+        except TimeoutError:
+            self.log.exception('Actor cleanup timed out')
+        finally:
+            self._is_initialized = False
 
         if self._exit_process:
             sys.exit(self.exit_code)

src/apify/_charging.py

@@ -158,11 +158,11 @@ async def __aenter__(self) -> None:
         if self._configuration.test_pay_per_event:
             self._pricing_model = 'PAY_PER_EVENT'
         else:
-            self._pricing_model = pricing_info.pricing_model if pricing_info else None
+            self._pricing_model = pricing_info.pricing_model if pricing_info is not None else None
 
         # Load per-event pricing information
-        if pricing_info and pricing_info.pricing_model == 'PAY_PER_EVENT':
-            for event_name, event_pricing in pricing_info.pricing_per_event.actor_charge_events.items():  # ty:ignore[possibly-missing-attribute]
+        if pricing_info is not None and isinstance(pricing_info, PayPerEventActorPricingInfo):
+            for event_name, event_pricing in pricing_info.pricing_per_event.actor_charge_events.items():
                 self._pricing_info[event_name] = PricingInfoItem(
                     price=event_pricing.event_price_usd,
                     title=event_pricing.event_title,

src/apify/_utils.py

@@ -21,8 +21,7 @@ def get_system_info() -> dict:
         'os': sys.platform,
     }
 
-    if is_running_in_ipython():
-        system_info['is_running_in_ipython'] = True
+    system_info['is_running_in_ipython'] = is_running_in_ipython()
 
     return system_info
 

src/apify/storage_clients/_apify/_request_queue_shared_client.py

@@ -235,8 +235,8 @@ async def mark_request_as_handled(self, request: Request) -> ProcessedRequest |
                 processed_request=processed_request,
                 hydrated_request=request,
             )
-        except Exception as exc:
-            logger.debug(f'Error marking request {request.unique_key} as handled: {exc!s}')
+        except Exception:
+            logger.exception(f'Error marking request {request.unique_key} as handled.')
             return None
         else:
             return processed_request
@@ -279,8 +279,8 @@ async def reclaim_request(
                 if forefront:
                     self._should_check_for_forefront_requests = True
 
-            except Exception as exc:
-                logger.debug(f'Error reclaiming request {request.unique_key}: {exc!s}')
+            except Exception:
+                logger.exception(f'Error reclaiming request {request.unique_key}')
                 return None
             else:
                 return processed_request