AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
fix(backend): bound AutoPilot trace export retries (#15182)
Nicholas Tindle42e0dbe79c1d
diff --git a/autogpt_platform/backend/backend/copilot/sdk/otel_setup_test.py b/autogpt_platform/backend/backend/copilot/sdk/otel_setup_test.pyindex 32e7d9a324..01062e5fb9 100644--- a/autogpt_platform/backend/backend/copilot/sdk/otel_setup_test.py+++ b/autogpt_platform/backend/backend/copilot/sdk/otel_setup_test.py@@ -21,6 +21,7 @@ class TestSetupLangfuseOtel:"LANGSMITH_TRACING","OTEL_EXPORTER_OTLP_ENDPOINT","OTEL_EXPORTER_OTLP_HEADERS",+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER",]saved = {k: os.environ.pop(k, None) for k in env_keys}try:@@ -60,6 +61,7 @@ class TestSetupLangfuseOtel:"LANGSMITH_TRACING","OTEL_EXPORTER_OTLP_ENDPOINT","OTEL_EXPORTER_OTLP_HEADERS",+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER","OTEL_RESOURCE_ATTRIBUTES",]saved = {k: os.environ.pop(k, None) for k in env_keys}@@ -74,6 +76,12 @@ class TestSetupLangfuseOtel:== "https://langfuse.example.com/api/public/otel")assert "Authorization=Basic" in os.environ["OTEL_EXPORTER_OTLP_HEADERS"]+ assert (+ os.environ[+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER"+ ]+ == "autogpt-copilot-traces"+ )assert (os.environ["OTEL_RESOURCE_ATTRIBUTES"]== "langfuse.environment=test"@@ -107,19 +115,33 @@ class TestSetupLangfuseOtel:):from backend.copilot.sdk.service import _setup_langfuse_otel- saved = os.environ.get("OTEL_EXPORTER_OTLP_ENDPOINT")+ env_keys = [+ "OTEL_EXPORTER_OTLP_ENDPOINT",+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER",+ ]+ saved = {key: os.environ.get(key) for key in env_keys}try:os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"] = "https://custom.endpoint/v1"+ os.environ[+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER"+ ] = "custom-provider"_setup_langfuse_otel()assert (os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"]== "https://custom.endpoint/v1")+ assert (+ os.environ[+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER"+ ]+ == "custom-provider"+ )finally:- if saved is not None:- os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"] = saved- elif "OTEL_EXPORTER_OTLP_ENDPOINT" in os.environ:- del os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"]+ for key, value in saved.items():+ if value is not None:+ os.environ[key] = value+ else:+ os.environ.pop(key, None)def test_graceful_failure_on_exception(self):"""Setup should not raise even if internal code fails."""diff --git a/autogpt_platform/backend/backend/copilot/sdk/service.py b/autogpt_platform/backend/backend/copilot/sdk/service.pyindex 7af777e5b1..14958d410e 100644--- a/autogpt_platform/backend/backend/copilot/sdk/service.py+++ b/autogpt_platform/backend/backend/copilot/sdk/service.py@@ -2038,6 +2038,10 @@ def _setup_langfuse_otel() -> None:os.environ.setdefault("OTEL_EXPORTER_OTLP_HEADERS", f"Authorization=Basic {creds}")+ os.environ.setdefault(+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER",+ "autogpt-copilot-traces",+ )# Set the Langfuse environment via OTEL resource attributes so the# Langfuse server maps it to the first-class environment field.diff --git a/autogpt_platform/backend/backend/copilot/sdk/trace_export.py b/autogpt_platform/backend/backend/copilot/sdk/trace_export.pynew file mode 100644index 0000000000..bf6bb881d9--- /dev/null+++ b/autogpt_platform/backend/backend/copilot/sdk/trace_export.py@@ -0,0 +1,47 @@+from random import uniform+from time import monotonic, sleep+from typing import Any++from requests import Response, Session+from requests.exceptions import ConnectionError, RequestException, SSLError+from requests.exceptions import Timeout as RequestTimeout+from urllib3.util import Timeout++_MAX_ATTEMPTS = 3+++def create_trace_export_session() -> Session:+ """Retry OTLP requests within a window of at most three request timeouts."""+ return _TraceExportSession()+++class _TraceExportSession(Session):+ def post(+ self,+ url: str | bytes,+ data: Any = None,+ json: Any = None,+ **kwargs: Any,+ ) -> Response:+ request_timeout = float(kwargs["timeout"])+ deadline = monotonic() + request_timeout * _MAX_ATTEMPTS+ last_error: RequestException | None = None+ for attempt in range(_MAX_ATTEMPTS):+ remaining = deadline - monotonic()+ if remaining <= 0:+ break+ kwargs["timeout"] = Timeout(total=min(request_timeout, remaining))+ try:+ return super().post(url, data=data, json=json, **kwargs)+ except SSLError as error:+ raise RequestException("OTLP trace export TLS failure") from error+ except (ConnectionError, RequestTimeout) as error:+ last_error = error+ remaining = deadline - monotonic()+ if attempt + 1 < _MAX_ATTEMPTS and remaining > 0:+ sleep(uniform(0, min(0.1 * 2**attempt, remaining / 2)))++ # ConnectionError would make the OTLP exporter retry the exhausted batch again.+ raise RequestException(+ "OTLP trace export transport retry budget exhausted"+ ) from last_errordiff --git a/autogpt_platform/backend/backend/copilot/sdk/trace_export_test.py b/autogpt_platform/backend/backend/copilot/sdk/trace_export_test.pynew file mode 100644index 0000000000..7327f1c9e7--- /dev/null+++ b/autogpt_platform/backend/backend/copilot/sdk/trace_export_test.py@@ -0,0 +1,238 @@+import os+import threading+import time+from collections.abc import Iterator+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer+from typing import cast+from unittest.mock import MagicMock, patch+from uuid import uuid4++import pytest+from langfuse import Langfuse+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter+from opentelemetry.proto.collector.trace.v1.trace_service_pb2 import (+ ExportTraceServiceRequest,+)+from opentelemetry.sdk.trace import TracerProvider+from opentelemetry.sdk.trace.export import SpanExportResult+from requests.exceptions import ConnectionError, ReadTimeout, RequestException, SSLError++from backend.copilot.sdk.service import _setup_langfuse_otel+from backend.copilot.sdk.trace_export import create_trace_export_session+++class _TraceServer(ThreadingHTTPServer):+ daemon_threads = True++ def __init__(self) -> None:+ super().__init__(("127.0.0.1", 0), _TraceHandler)+ self.bodies: list[bytes] = []+ self.accepted: list[bytes] = []+ self.fail_requests = 1+ self.response_delay = 1.2+ self.success_delay = 0.0+ self.response_status = 200+++class _TraceHandler(BaseHTTPRequestHandler):+ def do_POST(self) -> None:+ receiver = cast(_TraceServer, self.server)+ body = self.rfile.read(int(self.headers["Content-Length"]))+ receiver.bodies.append(body)+ status = receiver.response_status+ if len(receiver.bodies) <= receiver.fail_requests:+ time.sleep(receiver.response_delay)+ status = 504+ elif status == 200:+ time.sleep(receiver.success_delay)+ receiver.accepted.append(body)+ self.send_response(status)+ self.send_header("Content-Length", "0")+ self.send_header("Retry-After", "1")+ self.end_headers()++ def log_message(self, format: str, *args: object) -> None:+ pass+++def trace_receiver() -> Iterator[_TraceServer]:+ receiver = _TraceServer()+ worker = threading.Thread(target=receiver.serve_forever, daemon=True)+ worker.start()+ try:+ yield receiver+ finally:+ receiver.shutdown()+ receiver.server_close()+ worker.join()+++def trace_export_environment() -> Iterator[None]:+ with patch.dict(os.environ, {"LANGFUSE_TRACING_ENABLED": "true"}):+ for key in (+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER",+ "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER",+ ):+ os.environ.pop(key, None)+ yield+++def langfuse_client(+ trace_receiver: _TraceServer, trace_export_environment: None+) -> Iterator[Langfuse]:+ settings = MagicMock()+ settings.secrets.langfuse_public_key = f"pk-test-{uuid4()}"+ settings.secrets.langfuse_secret_key = "sk-test"+ settings.secrets.langfuse_host = f"http://127.0.0.1:{trace_receiver.server_port}"+ settings.secrets.langfuse_tracing_environment = "test"+ with (+ patch("backend.copilot.sdk.service._is_langfuse_configured", return_value=True),+ patch("backend.copilot.sdk.service.Settings", return_value=settings),+ patch("backend.copilot.sdk.service.configure_claude_agent_sdk"),+ ):+ _setup_langfuse_otel()++ provider = TracerProvider()+ client = Langfuse(+ public_key=settings.secrets.langfuse_public_key,+ secret_key=settings.secrets.langfuse_secret_key,+ base_url=settings.secrets.langfuse_host,+ timeout=1,+ tracer_provider=provider,+ tracing_enabled=True,+ )+ try:+ yield client+ finally:+ client.shutdown()+ provider.shutdown()+++def test_langfuse_retries_timed_out_span_batch(+ trace_receiver: _TraceServer, langfuse_client: Langfuse+) -> None:+ with langfuse_client.start_as_current_span(name="copilot-sdk-turn") as span:+ span.update(input="test", output="done")+ langfuse_client.flush()++ assert len(trace_receiver.bodies) == 2+ assert trace_receiver.bodies[0] == trace_receiver.bodies[1]+ assert len(trace_receiver.accepted) == 1+ request = ExportTraceServiceRequest.FromString(trace_receiver.accepted[0])+ exported = request.resource_spans[0].scope_spans[0].spans+ assert [item.name for item in exported] == ["copilot-sdk-turn"]+ assert exported[0].span_id.hex() == span.id+ assert exported[0].trace_id.hex() == span.trace_id+++def test_langfuse_allows_slow_success_within_request_timeout(+ trace_receiver: _TraceServer, langfuse_client: Langfuse+) -> None:+ trace_receiver.fail_requests = 0+ trace_receiver.success_delay = 0.6+ with langfuse_client.start_as_current_span(name="copilot-sdk-turn"):+ pass+ langfuse_client.flush()++ assert len(trace_receiver.bodies) == 1+ assert len(trace_receiver.accepted) == 1++[email protected]("error_type", [ConnectionError, ReadTimeout])+def test_trace_export_session_bounds_transport_retries(+ error_type: type[RequestException],+) -> None:+ with (+ create_trace_export_session() as session,+ patch(+ "backend.copilot.sdk.trace_export.Session.post",+ side_effect=error_type("connection failed"),+ ) as post,+ patch("backend.copilot.sdk.trace_export.sleep"),+ ):+ exporter = OTLPSpanExporter(session=session, timeout=1)+ with pytest.raises(RequestException, match="retry budget exhausted") as error:+ exporter.export([])+ exporter.shutdown()++ assert post.call_count == 3+ assert error.type is RequestException+++def test_exporter_bounds_retry_window_and_recovers_next_batch(+ trace_receiver: _TraceServer,+) -> None:+ trace_receiver.fail_requests = 100+ trace_receiver.response_delay = 0.4+ with create_trace_export_session() as session:+ exporter = OTLPSpanExporter(+ endpoint=f"http://127.0.0.1:{trace_receiver.server_port}/v1/traces",+ timeout=0.1,+ session=session,+ )+ started = time.monotonic()+ with pytest.raises(RequestException):+ exporter.export([])+ elapsed = time.monotonic() - started+ assert 1 <= len(trace_receiver.bodies) <= 3+ assert not trace_receiver.accepted++ trace_receiver.fail_requests = 0+ assert exporter.export([]) == SpanExportResult.SUCCESS+ exporter.shutdown()++ assert elapsed < 0.7+ assert len(trace_receiver.accepted) == 1+++def test_exporter_does_not_retry_after_timeout_budget_is_spent() -> None:+ with (+ create_trace_export_session() as session,+ patch(+ "backend.copilot.sdk.trace_export.Session.post",+ side_effect=ReadTimeout("request timed out"),+ ) as post,+ patch("backend.copilot.sdk.trace_export.monotonic", side_effect=[0, 0, 4, 4]),+ patch("backend.copilot.sdk.trace_export.sleep") as sleep,+ ):+ with pytest.raises(RequestException, match="retry budget exhausted"):+ session.post("https://example.com/v1/traces", data=b"batch", timeout=1)++ post.assert_called_once()+ sleep.assert_not_called()+++def test_exporter_does_not_retry_tls_errors() -> None:+ with (+ create_trace_export_session() as session,+ patch(+ "backend.copilot.sdk.trace_export.Session.post",+ side_effect=SSLError("certificate rejected"),+ ) as post,+ ):+ exporter = OTLPSpanExporter(session=session, timeout=1)+ with pytest.raises(RequestException, match="TLS failure"):+ exporter.export([])+ exporter.shutdown()++ post.assert_called_once()++[email protected]("status", [401, 429, 503])+def test_trace_export_session_leaves_status_handling_to_exporter(+ trace_receiver: _TraceServer, status: int+) -> None:+ trace_receiver.fail_requests = 0+ trace_receiver.response_status = status+ with create_trace_export_session() as session:+ response = session.post(+ f"http://127.0.0.1:{trace_receiver.server_port}/v1/traces",+ data=b"span batch",+ timeout=1,+ )++ assert response.status_code == status+ assert trace_receiver.bodies == [b"span batch"]diff --git a/autogpt_platform/backend/poetry.lock b/autogpt_platform/backend/poetry.lockindex 8e1c8b6d98..3cf506e917 100644--- a/autogpt_platform/backend/poetry.lock+++ b/autogpt_platform/backend/poetry.lock@@ -1,4 +1,4 @@-# This file is automatically @generated by Poetry 2.4.1 and should not be changed by hand.+# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand.[[package]]name = "agentmail"@@ -864,7 +864,7 @@ version = "3.4.4"description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."optional = falsepython-versions = ">=3.7"-groups = ["main", "dev"]+groups = ["main"]files = [{file = "charset_normalizer-3.4.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e824f1492727fa856dd6eda4f7cee25f8518a12f3c4a56a74e8095695089cf6d"},{file = "charset_normalizer-3.4.4-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4bd5d4137d500351a30687c2d3971758aac9a19208fc110ccb9d7188fbe709e8"},@@ -2060,16 +2060,16 @@ files = [google-auth = ">=2.14.1,<3.0.0"googleapis-common-protos = ">=1.56.2,<2.0.0"grpcio = [- {version = ">=1.33.2,<2.0.0", optional = true, markers = "extra == \"grpc\""},{version = ">=1.49.1,<2.0.0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""},+ {version = ">=1.33.2,<2.0.0", optional = true, markers = "extra == \"grpc\""},]grpcio-status = [- {version = ">=1.33.2,<2.0.0", optional = true, markers = "extra == \"grpc\""},{version = ">=1.49.1,<2.0.0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""},+ {version = ">=1.33.2,<2.0.0", optional = true, markers = "extra == \"grpc\""},]proto-plus = [- {version = ">=1.22.3,<2.0.0"},{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},+ {version = ">=1.22.3,<2.0.0"},]protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"requests = ">=2.18.0,<3.0.0"@@ -2179,8 +2179,8 @@ google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0", extrasgoogle-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0"grpcio = ">=1.33.2,<2.0.0"proto-plus = [- {version = ">=1.22.3,<2.0.0"},{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},+ {version = ">=1.22.3,<2.0.0"},]protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"@@ -2240,9 +2240,9 @@ google-cloud-core = ">=2.0.0,<3.0.0"grpc-google-iam-v1 = ">=0.12.4,<1.0.0"opentelemetry-api = ">=1.9.0"proto-plus = [- {version = ">=1.22.0,<2.0.0", markers = "python_version < \"3.11\""},- {version = ">=1.22.2,<2.0.0", markers = "python_version >= \"3.11\" and python_version < \"3.13\""},{version = ">=1.25.0,<2.0.0", markers = "python_version >= \"3.13\""},+ {version = ">=1.22.2,<2.0.0", markers = "python_version >= \"3.11\" and python_version < \"3.13\""},+ {version = ">=1.22.0,<2.0.0", markers = "python_version < \"3.11\""},]protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<7.0.0"@@ -2636,7 +2636,7 @@ files = [[package.dependencies]googleapis-common-protos = ">=1.5.5"grpcio = ">=1.71.2"-protobuf = ">=5.26.1,<6.0.dev0"+protobuf = ">=5.26.1,<6.0dev"[[package]]name = "h11"@@ -3279,7 +3279,7 @@ files = [[package.dependencies]attrs = ">=22.2.0"-jsonschema-specifications = ">=2023.3.6"+jsonschema-specifications = ">=2023.03.6"referencing = ">=0.28.4"rpds-py = ">=0.25.0"@@ -4540,9 +4540,9 @@ files = [[package.dependencies]numpy = [- {version = ">=1.22.4", markers = "python_version < \"3.11\""},- {version = ">=1.23.2", markers = "python_version == \"3.11\""},{version = ">=1.26.0", markers = "python_version >= \"3.12\""},+ {version = ">=1.23.2", markers = "python_version == \"3.11\""},+ {version = ">=1.22.4", markers = "python_version < \"3.11\""},]python-dateutil = ">=2.8.2"pytz = ">=2020.1"@@ -6502,10 +6502,10 @@ files = [grpcio = ">=1.41.0"httpx = {version = ">=0.20.0", extras = ["http2"]}numpy = [- {version = ">=1.21,<2.3.0", markers = "python_version == \"3.10\""},+ {version = ">=2.1.0", markers = "python_version == \"3.13\""},{version = ">=1.21", markers = "python_version == \"3.11\""},{version = ">=1.26", markers = "python_version == \"3.12\""},- {version = ">=2.1.0", markers = "python_version == \"3.13\""},+ {version = ">=1.21,<2.3.0", markers = "python_version == \"3.10\""},]portalocker = ">=2.7.0,<4.0"protobuf = ">=3.20.0"@@ -6834,7 +6834,7 @@ version = "2.32.5"description = "Python HTTP for Humans."optional = falsepython-versions = ">=3.9"-groups = ["main", "dev"]+groups = ["main"]files = [{file = "requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6"},{file = "requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf"},@@ -7848,7 +7848,7 @@ version = "2.6.3"description = "HTTP library with thread-safe connection pooling, file post, and more."optional = falsepython-versions = ">=3.9"-groups = ["main", "dev"]+groups = ["main"]files = [{file = "urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4"},{file = "urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"},@@ -8929,9 +8929,9 @@ files = [][package.extras]-cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and python_version < \"3.14\"", "cffi (>=2.0.0b0) ; platform_python_implementation != \"PyPy\" and python_version >= \"3.14\""]+cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and python_version < \"3.14\"", "cffi (>=2.0.0b) ; platform_python_implementation != \"PyPy\" and python_version >= \"3.14\""][metadata]lock-version = "2.1"python-versions = ">=3.10,<3.14"-content-hash = "b0e521f9ac5ca2e76866dff633eabc71e5798e68ea94054470f4c6928b2b3a34"+content-hash = "383b24770df895281c3dc78100940d1c6220425190fff459738c3fec2a7f5b82"diff --git a/autogpt_platform/backend/pyproject.toml b/autogpt_platform/backend/pyproject.tomlindex 3368f1e141..b3484611a3 100644--- a/autogpt_platform/backend/pyproject.toml+++ b/autogpt_platform/backend/pyproject.toml@@ -70,6 +70,7 @@ python-multipart = ">=0.0.22,<0.0.33"redis = "^8.1.0"regex = ">=2025.9.18,<2027.0.0"replicate = "^1.0.6"+requests = "^2.32.5"sentry-sdk = {extras = ["anthropic", "fastapi", "openai", "sqlalchemy"], version = "^2.44.0"}slack-sdk = "^3.41.0"sqlalchemy = "^2.0.40"@@ -121,7 +122,6 @@ pyright = "^1.1.407"pytest-cov = "^7.1.0"pytest-mock = "^3.15.1"pytest-watcher = "^0.6.3"-requests = "^2.32.5"ruff = "^0.15.0"# NOTE: please insert new dependencies in their alphabetical location@@ -156,6 +156,9 @@ expert-style-eval = "backend.copilot.eval.style.runner:main"oauth-tool = "backend.cli.oauth_tool:cli"publish-skills-catalog = "backend.cli.publish_skills_catalog:main"+[tool.poetry.plugins."opentelemetry_otlp_credential_provider"]+autogpt-copilot-traces = "backend.copilot.sdk.trace_export:create_trace_export_session"+[tool.isort]profile = "black"extend_skip_glob = ["test/fixtures/*", "*/test/fixtures/*"]diff --git a/autogpt_platform/backend/scripts/backfill_store_sub_headings.py b/autogpt_platform/backend/scripts/backfill_store_sub_headings.pyindex 1512484530..8642a95940 100644--- a/autogpt_platform/backend/scripts/backfill_store_sub_headings.py+++ b/autogpt_platform/backend/scripts/backfill_store_sub_headings.py@@ -108,7 +108,7 @@ async def find_listings_without_sub_heading(status_clause = ("" if include_unapproved else "AND \"submissionStatus\" = 'APPROVED'")- limit_clause = f"LIMIT {int(limit)}" if limit else ""+ limit_clause = "LIMIT $1" if limit is not None else ""rows = await get_client().query_raw(f"""SELECT id, name, description@@ -117,7 +117,8 @@ async def find_listings_without_sub_heading({status_clause}ORDER BY "createdAt" DESC{limit_clause}- """+ """,+ *([int(limit)] if limit is not None else []),)return [(r["id"], r["name"], r["description"]) for r in rows]diff --git a/autogpt_platform/backend/scripts/test_backfill_store_sub_headings.py b/autogpt_platform/backend/scripts/test_backfill_store_sub_headings.pyindex 2f7fc1c50d..2b1d84ae47 100644--- a/autogpt_platform/backend/scripts/test_backfill_store_sub_headings.py+++ b/autogpt_platform/backend/scripts/test_backfill_store_sub_headings.py@@ -2,13 +2,34 @@import csvfrom pathlib import Path-from unittest.mock import AsyncMock+from unittest.mock import AsyncMock, MagicMockimport pytestimport scripts.backfill_store_sub_headings as backfill[email protected]("limit", [None, 0, 10])[email protected]("include_unapproved", [False, True])+async def test_listing_query_binds_limit(+ limit: int | None,+ include_unapproved: bool,+ monkeypatch: pytest.MonkeyPatch,+) -> None:+ client = MagicMock(query_raw=AsyncMock(return_value=[]))+ monkeypatch.setattr("prisma.get_client", lambda: client)++ assert (+ await backfill.find_listings_without_sub_heading(limit, include_unapproved)+ == []+ )++ query, *parameters = client.query_raw.call_args.args+ assert parameters == ([] if limit is None else [limit])+ assert ("LIMIT $1" in query) == (limit is not None)+ assert ("submissionStatus" in query) == (not include_unapproved)++@pytest.mark.parametrize(("cell", "expected"),[