fix(python): move verify_request_count to conftest.py in wire tests (#10841)

* fix(python): move verify_request_count to conftest.py in wire tests

Co-Authored-By: thomas@buildwithfern.com <tjb9dcshop@gmail.com>

* fix: add explicit import for verify_request_count in wire test files

Co-Authored-By: thomas@buildwithfern.com <tjb9dcshop@gmail.com>

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Author: tjb9dc

generators/python-v2/sdk/src/wire-tests/WireTestGenerator.ts

@@ -132,14 +132,10 @@ export class WireTestGenerator {
 
         // Add raw imports that the AST doesn't support (simple "import X" statements)
         statements.push(python.codeBlock("import pytest"));
-        statements.push(python.codeBlock("import requests"));
 
         // Add an import registration statement (for "from X import Y" style imports)
         statements.push(this.createImportRegistration());
 
-        // Add helper function for verifying request count
-        statements.push(this.generateVerifyRequestCountFunction());
-
         // Add test functions for each endpoint
         for (const { endpoint, example, service, exampleIndex } of testCases) {
             const testFunction = this.generateEndpointTestFunction(
@@ -170,73 +166,14 @@ export class WireTestGenerator {
 
         // Manually add references for "from X import Y" style imports
         // Note: simple "import X" statements are added as raw code blocks separately
-        node.addReference(python.reference({ name: "Optional", modulePath: ["typing"] }));
-        node.addReference(python.reference({ name: "Dict", modulePath: ["typing"] }));
-        node.addReference(python.reference({ name: "Any", modulePath: ["typing"] }));
-
         const clientModulePath = this.getClientModulePath();
         const clientName = this.getClientClassName();
         node.addReference(python.reference({ name: clientName, modulePath: clientModulePath }));
 
-        return node;
-    }
-
-    // =============================================================================
-    // HELPER FUNCTION GENERATION
-    // =============================================================================
+        // Import verify_request_count from conftest (pytest makes conftest importable)
+        node.addReference(python.reference({ name: "verify_request_count", modulePath: ["conftest"] }));
 
-    private generateVerifyRequestCountFunction(): python.Method {
-        const params = [
-            python.parameter({
-                name: "test_id",
-                type: python.Type.str()
-            }),
-            python.parameter({
-                name: "method",
-                type: python.Type.str()
-            }),
-            python.parameter({
-                name: "url_path",
-                type: python.Type.str()
-            }),
-            python.parameter({
-                name: "query_params",
-                type: python.Type.optional(python.Type.dict(python.Type.str(), python.Type.str()))
-            }),
-            python.parameter({
-                name: "expected",
-                type: python.Type.int()
-            })
-        ];
-
-        const statements = [
-            python.codeBlock(`wiremock_admin_url = "http://localhost:8080/__admin"`),
-            python.codeBlock(`request_body: Dict[str, Any] = {
-        "method": method,
-        "urlPath": url_path,
-        "headers": {"X-Test-Id": {"equalTo": test_id}}
-    }`),
-            python.codeBlock(`if query_params:
-        query_parameters = {k: {"equalTo": v} for k, v in query_params.items()}
-        request_body["queryParameters"] = query_parameters`),
-            python.codeBlock(`response = requests.post(f"{wiremock_admin_url}/requests/find", json=request_body)`),
-            python.codeBlock(`assert response.status_code == 200, "Failed to query WireMock requests"`),
-            python.codeBlock(`result = response.json()`),
-            python.codeBlock(`requests_found = len(result.get("requests", []))`),
-            python.codeBlock(
-                `assert requests_found == expected, f"Expected {expected} requests, found {requests_found}"`
-            )
-        ];
-
-        const method = python.method({
-            name: "verify_request_count",
-            parameters: params,
-            return_: python.Type.none(),
-            docstring: "Verifies the number of requests made to WireMock filtered by test ID for concurrency safety"
-        });
-
-        statements.forEach((stmt) => method.addStatement(stmt));
-        return method;
+        return node;
     }
 
     // =============================================================================

generators/python-v2/sdk/src/wire-tests/WireTestSetupGenerator.ts

@@ -101,7 +101,10 @@ This module manages the WireMock container lifecycle for integration tests.
 """
 import os
 import subprocess
+from typing import Any, Dict, Optional
+
 import pytest
+import requests
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -143,6 +146,30 @@ def wiremock_container():
         check=False,
         capture_output=True
     )
+
+
+def verify_request_count(
+    test_id: str,
+    method: str,
+    url_path: str,
+    query_params: Optional[Dict[str, str]],
+    expected: int,
+) -> None:
+    """Verifies the number of requests made to WireMock filtered by test ID for concurrency safety"""
+    wiremock_admin_url = "http://localhost:8080/__admin"
+    request_body: Dict[str, Any] = {
+        "method": method,
+        "urlPath": url_path,
+        "headers": {"X-Test-Id": {"equalTo": test_id}}
+    }
+    if query_params:
+        query_parameters = {k: {"equalTo": v} for k, v in query_params.items()}
+        request_body["queryParameters"] = query_parameters
+    response = requests.post(f"{wiremock_admin_url}/requests/find", json=request_body)
+    assert response.status_code == 200, "Failed to query WireMock requests"
+    result = response.json()
+    requests_found = len(result.get("requests", []))
+    assert requests_found == expected, f"Expected {expected} requests, found {requests_found}"
 `;
     }
 }