airbyte-agent-zendesk-support 0.18.39__py3-none-any.whl → 0.18.51__py3-none-any.whl

airbyte_agent_zendesk_support/__init__.py

@@ -53,42 +53,52 @@ from .models import (
     ZendeskSupportExecuteResult,
     ZendeskSupportExecuteResultWithMeta,
     TicketsListResult,
-    TicketsGetResult,
     UsersListResult,
-    UsersGetResult,
     OrganizationsListResult,
-    OrganizationsGetResult,
     GroupsListResult,
-    GroupsGetResult,
     TicketCommentsListResult,
-    AttachmentsGetResult,
     TicketAuditsListResult,
     TicketMetricsListResult,
     TicketFieldsListResult,
-    TicketFieldsGetResult,
     BrandsListResult,
-    BrandsGetResult,
     ViewsListResult,
-    ViewsGetResult,
     MacrosListResult,
-    MacrosGetResult,
     TriggersListResult,
-    TriggersGetResult,
     AutomationsListResult,
-    AutomationsGetResult,
     TagsListResult,
     SatisfactionRatingsListResult,
-    SatisfactionRatingsGetResult,
     GroupMembershipsListResult,
     OrganizationMembershipsListResult,
     SlaPoliciesListResult,
-    SlaPoliciesGetResult,
     TicketFormsListResult,
-    TicketFormsGetResult,
     ArticlesListResult,
-    ArticlesGetResult,
     ArticleAttachmentsListResult,
-    ArticleAttachmentsGetResult
+    AirbyteSearchHit,
+    AirbyteSearchResult,
+    BrandsSearchData,
+    BrandsSearchResult,
+    GroupsSearchData,
+    GroupsSearchResult,
+    OrganizationsSearchData,
+    OrganizationsSearchResult,
+    SatisfactionRatingsSearchData,
+    SatisfactionRatingsSearchResult,
+    TagsSearchData,
+    TagsSearchResult,
+    TicketAuditsSearchData,
+    TicketAuditsSearchResult,
+    TicketCommentsSearchData,
+    TicketCommentsSearchResult,
+    TicketFieldsSearchData,
+    TicketFieldsSearchResult,
+    TicketFormsSearchData,
+    TicketFormsSearchResult,
+    TicketMetricsSearchData,
+    TicketMetricsSearchResult,
+    TicketsSearchData,
+    TicketsSearchResult,
+    UsersSearchData,
+    UsersSearchResult
 )
 from .types import (
     TicketsListParams,
@@ -130,7 +140,218 @@ from .types import (
     ArticlesGetParams,
     ArticleAttachmentsListParams,
     ArticleAttachmentsGetParams,
-    ArticleAttachmentsDownloadParams
+    ArticleAttachmentsDownloadParams,
+    AirbyteSearchParams,
+    AirbyteSortOrder,
+    BrandsSearchFilter,
+    BrandsSearchQuery,
+    BrandsCondition,
+    GroupsSearchFilter,
+    GroupsSearchQuery,
+    GroupsCondition,
+    OrganizationsSearchFilter,
+    OrganizationsSearchQuery,
+    OrganizationsCondition,
+    SatisfactionRatingsSearchFilter,
+    SatisfactionRatingsSearchQuery,
+    SatisfactionRatingsCondition,
+    TagsSearchFilter,
+    TagsSearchQuery,
+    TagsCondition,
+    TicketAuditsSearchFilter,
+    TicketAuditsSearchQuery,
+    TicketAuditsCondition,
+    TicketCommentsSearchFilter,
+    TicketCommentsSearchQuery,
+    TicketCommentsCondition,
+    TicketFieldsSearchFilter,
+    TicketFieldsSearchQuery,
+    TicketFieldsCondition,
+    TicketFormsSearchFilter,
+    TicketFormsSearchQuery,
+    TicketFormsCondition,
+    TicketMetricsSearchFilter,
+    TicketMetricsSearchQuery,
+    TicketMetricsCondition,
+    TicketsSearchFilter,
+    TicketsSearchQuery,
+    TicketsCondition,
+    UsersSearchFilter,
+    UsersSearchQuery,
+    UsersCondition
 )
 
-__all__ = ["ZendeskSupportConnector", "ZendeskSupportAuthConfig", "Ticket", "User", "Organization", "Group", "TicketComment", "Attachment", "TicketAudit", "TicketMetric", "TicketField", "Brand", "View", "Macro", "Trigger", "Automation", "Tag", "SatisfactionRating", "GroupMembership", "OrganizationMembership", "SLAPolicy", "TicketForm", "Article", "ArticleAttachment", "TicketsListResultMeta", "UsersListResultMeta", "OrganizationsListResultMeta", "GroupsListResultMeta", "TicketCommentsListResultMeta", "TicketAuditsListResultMeta", "TicketMetricsListResultMeta", "TicketFieldsListResultMeta", "BrandsListResultMeta", "ViewsListResultMeta", "MacrosListResultMeta", "TriggersListResultMeta", "AutomationsListResultMeta", "TagsListResultMeta", "SatisfactionRatingsListResultMeta", "GroupMembershipsListResultMeta", "OrganizationMembershipsListResultMeta", "SlaPoliciesListResultMeta", "TicketFormsListResultMeta", "ArticlesListResultMeta", "ArticleAttachmentsListResultMeta", "ZendeskSupportExecuteResult", "ZendeskSupportExecuteResultWithMeta", "TicketsListResult", "TicketsGetResult", "UsersListResult", "UsersGetResult", "OrganizationsListResult", "OrganizationsGetResult", "GroupsListResult", "GroupsGetResult", "TicketCommentsListResult", "AttachmentsGetResult", "TicketAuditsListResult", "TicketMetricsListResult", "TicketFieldsListResult", "TicketFieldsGetResult", "BrandsListResult", "BrandsGetResult", "ViewsListResult", "ViewsGetResult", "MacrosListResult", "MacrosGetResult", "TriggersListResult", "TriggersGetResult", "AutomationsListResult", "AutomationsGetResult", "TagsListResult", "SatisfactionRatingsListResult", "SatisfactionRatingsGetResult", "GroupMembershipsListResult", "OrganizationMembershipsListResult", "SlaPoliciesListResult", "SlaPoliciesGetResult", "TicketFormsListResult", "TicketFormsGetResult", "ArticlesListResult", "ArticlesGetResult", "ArticleAttachmentsListResult", "ArticleAttachmentsGetResult", "TicketsListParams", "TicketsGetParams", "UsersListParams", "UsersGetParams", "OrganizationsListParams", "OrganizationsGetParams", "GroupsListParams", "GroupsGetParams", "TicketCommentsListParams", "AttachmentsGetParams", "AttachmentsDownloadParams", "TicketAuditsListParams", "TicketAuditsListParams", "TicketMetricsListParams", "TicketFieldsListParams", "TicketFieldsGetParams", "BrandsListParams", "BrandsGetParams", "ViewsListParams", "ViewsGetParams", "MacrosListParams", "MacrosGetParams", "TriggersListParams", "TriggersGetParams", "AutomationsListParams", "AutomationsGetParams", "TagsListParams", "SatisfactionRatingsListParams", "SatisfactionRatingsGetParams", "GroupMembershipsListParams", "OrganizationMembershipsListParams", "SlaPoliciesListParams", "SlaPoliciesGetParams", "TicketFormsListParams", "TicketFormsGetParams", "ArticlesListParams", "ArticlesGetParams", "ArticleAttachmentsListParams", "ArticleAttachmentsGetParams", "ArticleAttachmentsDownloadParams"]
+__all__ = [
+    "ZendeskSupportConnector",
+    "ZendeskSupportAuthConfig",
+    "Ticket",
+    "User",
+    "Organization",
+    "Group",
+    "TicketComment",
+    "Attachment",
+    "TicketAudit",
+    "TicketMetric",
+    "TicketField",
+    "Brand",
+    "View",
+    "Macro",
+    "Trigger",
+    "Automation",
+    "Tag",
+    "SatisfactionRating",
+    "GroupMembership",
+    "OrganizationMembership",
+    "SLAPolicy",
+    "TicketForm",
+    "Article",
+    "ArticleAttachment",
+    "TicketsListResultMeta",
+    "UsersListResultMeta",
+    "OrganizationsListResultMeta",
+    "GroupsListResultMeta",
+    "TicketCommentsListResultMeta",
+    "TicketAuditsListResultMeta",
+    "TicketMetricsListResultMeta",
+    "TicketFieldsListResultMeta",
+    "BrandsListResultMeta",
+    "ViewsListResultMeta",
+    "MacrosListResultMeta",
+    "TriggersListResultMeta",
+    "AutomationsListResultMeta",
+    "TagsListResultMeta",
+    "SatisfactionRatingsListResultMeta",
+    "GroupMembershipsListResultMeta",
+    "OrganizationMembershipsListResultMeta",
+    "SlaPoliciesListResultMeta",
+    "TicketFormsListResultMeta",
+    "ArticlesListResultMeta",
+    "ArticleAttachmentsListResultMeta",
+    "ZendeskSupportExecuteResult",
+    "ZendeskSupportExecuteResultWithMeta",
+    "TicketsListResult",
+    "UsersListResult",
+    "OrganizationsListResult",
+    "GroupsListResult",
+    "TicketCommentsListResult",
+    "TicketAuditsListResult",
+    "TicketMetricsListResult",
+    "TicketFieldsListResult",
+    "BrandsListResult",
+    "ViewsListResult",
+    "MacrosListResult",
+    "TriggersListResult",
+    "AutomationsListResult",
+    "TagsListResult",
+    "SatisfactionRatingsListResult",
+    "GroupMembershipsListResult",
+    "OrganizationMembershipsListResult",
+    "SlaPoliciesListResult",
+    "TicketFormsListResult",
+    "ArticlesListResult",
+    "ArticleAttachmentsListResult",
+    "AirbyteSearchHit",
+    "AirbyteSearchResult",
+    "BrandsSearchData",
+    "BrandsSearchResult",
+    "GroupsSearchData",
+    "GroupsSearchResult",
+    "OrganizationsSearchData",
+    "OrganizationsSearchResult",
+    "SatisfactionRatingsSearchData",
+    "SatisfactionRatingsSearchResult",
+    "TagsSearchData",
+    "TagsSearchResult",
+    "TicketAuditsSearchData",
+    "TicketAuditsSearchResult",
+    "TicketCommentsSearchData",
+    "TicketCommentsSearchResult",
+    "TicketFieldsSearchData",
+    "TicketFieldsSearchResult",
+    "TicketFormsSearchData",
+    "TicketFormsSearchResult",
+    "TicketMetricsSearchData",
+    "TicketMetricsSearchResult",
+    "TicketsSearchData",
+    "TicketsSearchResult",
+    "UsersSearchData",
+    "UsersSearchResult",
+    "TicketsListParams",
+    "TicketsGetParams",
+    "UsersListParams",
+    "UsersGetParams",
+    "OrganizationsListParams",
+    "OrganizationsGetParams",
+    "GroupsListParams",
+    "GroupsGetParams",
+    "TicketCommentsListParams",
+    "AttachmentsGetParams",
+    "AttachmentsDownloadParams",
+    "TicketAuditsListParams",
+    "TicketAuditsListParams",
+    "TicketMetricsListParams",
+    "TicketFieldsListParams",
+    "TicketFieldsGetParams",
+    "BrandsListParams",
+    "BrandsGetParams",
+    "ViewsListParams",
+    "ViewsGetParams",
+    "MacrosListParams",
+    "MacrosGetParams",
+    "TriggersListParams",
+    "TriggersGetParams",
+    "AutomationsListParams",
+    "AutomationsGetParams",
+    "TagsListParams",
+    "SatisfactionRatingsListParams",
+    "SatisfactionRatingsGetParams",
+    "GroupMembershipsListParams",
+    "OrganizationMembershipsListParams",
+    "SlaPoliciesListParams",
+    "SlaPoliciesGetParams",
+    "TicketFormsListParams",
+    "TicketFormsGetParams",
+    "ArticlesListParams",
+    "ArticlesGetParams",
+    "ArticleAttachmentsListParams",
+    "ArticleAttachmentsGetParams",
+    "ArticleAttachmentsDownloadParams",
+    "AirbyteSearchParams",
+    "AirbyteSortOrder",
+    "BrandsSearchFilter",
+    "BrandsSearchQuery",
+    "BrandsCondition",
+    "GroupsSearchFilter",
+    "GroupsSearchQuery",
+    "GroupsCondition",
+    "OrganizationsSearchFilter",
+    "OrganizationsSearchQuery",
+    "OrganizationsCondition",
+    "SatisfactionRatingsSearchFilter",
+    "SatisfactionRatingsSearchQuery",
+    "SatisfactionRatingsCondition",
+    "TagsSearchFilter",
+    "TagsSearchQuery",
+    "TagsCondition",
+    "TicketAuditsSearchFilter",
+    "TicketAuditsSearchQuery",
+    "TicketAuditsCondition",
+    "TicketCommentsSearchFilter",
+    "TicketCommentsSearchQuery",
+    "TicketCommentsCondition",
+    "TicketFieldsSearchFilter",
+    "TicketFieldsSearchQuery",
+    "TicketFieldsCondition",
+    "TicketFormsSearchFilter",
+    "TicketFormsSearchQuery",
+    "TicketFormsCondition",
+    "TicketMetricsSearchFilter",
+    "TicketMetricsSearchQuery",
+    "TicketMetricsCondition",
+    "TicketsSearchFilter",
+    "TicketsSearchQuery",
+    "TicketsCondition",
+    "UsersSearchFilter",
+    "UsersSearchQuery",
+    "UsersCondition",
+]

airbyte_agent_zendesk_support/_vendored/connector_sdk/connector_model_loader.py

@@ -519,13 +519,14 @@ def _parse_oauth2_config(scheme: Any) -> dict[str, str]:
                 config["refresh_url"] = refresh_url
 
     # Extract custom refresh configuration from x-airbyte-token-refresh extension
+    # Note: x_token_refresh is a Dict[str, Any], not a Pydantic model, so use .get()
     x_token_refresh = getattr(scheme, "x_token_refresh", None)
     if x_token_refresh:
-        auth_style = getattr(x_token_refresh, "auth_style", None)
+        auth_style = x_token_refresh.get("auth_style")
         if auth_style:
             config["auth_style"] = auth_style
 
-        body_format = getattr(x_token_refresh, "body_format", None)
+        body_format = x_token_refresh.get("body_format")
         if body_format:
             config["body_format"] = body_format
 

airbyte_agent_zendesk_support/_vendored/connector_sdk/executor/local_executor.py

@@ -495,6 +495,14 @@ class LocalExecutor:
                 print(result.data)
         """
         try:
+            # Check for hosted-only actions before converting to Action enum
+            if config.action == "search":
+                raise NotImplementedError(
+                    "search is only available in hosted execution mode. "
+                    "Initialize the connector with external_user_id, airbyte_client_id, "
+                    "and airbyte_client_secret to use this feature."
+                )
+
             # Convert config to internal format
             action = Action(config.action) if isinstance(config.action, str) else config.action
             params = config.params or {}
@@ -979,7 +987,9 @@ class LocalExecutor:
 
         # Substitute variables from params
         if "variables" in graphql_config and graphql_config["variables"]:
-            body["variables"] = self._interpolate_variables(graphql_config["variables"], params, param_defaults)
+            variables = self._interpolate_variables(graphql_config["variables"], params, param_defaults)
+            # Filter out None values (optional fields not provided) - matches REST _extract_body() behavior
+            body["variables"] = {k: v for k, v in variables.items() if v is not None}
 
         # Add operation name if specified
         if "operationName" in graphql_config:
@@ -1098,35 +1108,93 @@ class LocalExecutor:
 
         return interpolate_value(variables)
 
+    def _wrap_primitives(self, data: Any) -> dict[str, Any] | list[dict[str, Any]] | None:
+        """Wrap primitive values in dict format for consistent response structure.
+
+        Transforms primitive API responses into dict format so downstream code
+        can always expect dict-based data structures.
+
+        Args:
+            data: Response data (could be primitive, list, dict, or None)
+
+        Returns:
+            - If data is a primitive (str, int, float, bool): {"value": data}
+            - If data is a list: wraps all non-dict elements as {"value": item}
+            - If data is already a dict or list of dicts: unchanged
+            - If data is None: None
+
+        Examples:
+            >>> executor._wrap_primitives(42)
+            {"value": 42}
+            >>> executor._wrap_primitives([1, 2, 3])
+            [{"value": 1}, {"value": 2}, {"value": 3}]
+            >>> executor._wrap_primitives([1, {"id": 2}, 3])
+            [{"value": 1}, {"id": 2}, {"value": 3}]
+            >>> executor._wrap_primitives([[1, 2], 3])
+            [{"value": [1, 2]}, {"value": 3}]
+            >>> executor._wrap_primitives({"id": 1})
+            {"id": 1}  # unchanged
+        """
+        if data is None:
+            return None
+
+        # Handle primitive scalars
+        if isinstance(data, (bool, str, int, float)):
+            return {"value": data}
+
+        # Handle lists - wrap non-dict elements
+        if isinstance(data, list):
+            if not data:
+                return []  # Empty list unchanged
+
+            wrapped = []
+            for item in data:
+                if isinstance(item, dict):
+                    wrapped.append(item)
+                else:
+                    wrapped.append({"value": item})
+            return wrapped
+
+        # Dict - return unchanged
+        if isinstance(data, dict):
+            return data
+
+        # Unknown type - wrap for safety
+        return {"value": data}
+
     def _extract_records(
         self,
-        response_data: dict[str, Any],
+        response_data: Any,
         endpoint: EndpointDefinition,
-    ) -> dict[str, Any] | list[Any] | None:
+    ) -> dict[str, Any] | list[dict[str, Any]] | None:
         """Extract records from response using record extractor.
 
         Type inference based on action:
         - list, search: Returns array ([] if not found)
         - get, create, update, delete: Returns single record (None if not found)
 
+        Automatically wraps primitive values (int, str, float, bool) in {"value": primitive}
+        format to ensure consistent dict-based responses for downstream code.
+
         Args:
-            response_data: Full API response
+            response_data: Full API response (can be dict, list, primitive, or None)
             endpoint: Endpoint with optional record extractor and action
 
         Returns:
             - Extracted data if extractor configured and path found
             - [] or None if path not found (based on action)
             - Original response if no extractor configured or on error
+            - Primitives are wrapped as {"value": primitive}
         """
         # Check if endpoint has record extractor
         extractor = endpoint.record_extractor
         if not extractor:
-            return response_data
+            return self._wrap_primitives(response_data)
 
         # Determine if this action returns array or single record
         action = endpoint.action
         if not action:
-            return response_data
+            return self._wrap_primitives(response_data)
 
         is_array_action = action in (Action.LIST, Action.API_SEARCH)
 
@@ -1139,30 +1207,39 @@ class LocalExecutor:
                 # Path not found - return empty based on action
                 return [] if is_array_action else None
 
-            # Return extracted data
+            # Return extracted data with primitive wrapping
             if is_array_action:
                 # For array actions, return the array (or list of matches)
-                return matches[0] if len(matches) == 1 else matches
+                result = matches[0] if len(matches) == 1 else matches
             else:
                 # For single record actions, return first match
-                return matches[0]
+                result = matches[0]
+
+            return self._wrap_primitives(result)
 
         except Exception as e:
             logging.warning(f"Failed to apply record extractor '{extractor}': {e}. Returning original response.")
-            return response_data
+            return self._wrap_primitives(response_data)
 
     def _extract_metadata(
         self,
         response_data: dict[str, Any],
+        response_headers: dict[str, str],
         endpoint: EndpointDefinition,
     ) -> dict[str, Any] | None:
         """Extract metadata from response using meta extractor.
 
-        Each field in meta_extractor dict is independently extracted using JSONPath.
+        Each field in meta_extractor dict is independently extracted using JSONPath
+        for body extraction, or special prefixes for header extraction:
+        - @link.{rel}: Extract URL from RFC 5988 Link header by rel type
+        - @header.{name}: Extract raw header value by header name
+        - Otherwise: JSONPath expression for body extraction
+
         Missing or invalid paths result in None for that field (no crash).
 
         Args:
             response_data: Full API response (before record extraction)
+            response_headers: HTTP response headers
             endpoint: Endpoint with optional meta extractor configuration
 
         Returns:
@@ -1173,11 +1250,15 @@ class LocalExecutor:
         Example:
             meta_extractor = {
                 "pagination": "$.records",
-                "request_id": "$.requestId"
+                "request_id": "$.requestId",
+                "next_page_url": "@link.next",
+                "rate_limit": "@header.X-RateLimit-Remaining"
             }
             Returns: {
                 "pagination": {"cursor": "abc", "total": 100},
-                "request_id": "xyz123"
+                "request_id": "xyz123",
+                "next_page_url": "https://api.example.com/data?cursor=abc",
+                "rate_limit": "99"
             }
         """
         # Check if endpoint has meta extractor
@@ -1187,26 +1268,96 @@ class LocalExecutor:
         extracted_meta: dict[str, Any] = {}
 
         # Extract each field independently
-        for field_name, jsonpath_expr_str in endpoint.meta_extractor.items():
+        for field_name, extractor_expr in endpoint.meta_extractor.items():
             try:
-                # Parse and apply JSONPath expression
-                jsonpath_expr = parse_jsonpath(jsonpath_expr_str)
-                matches = [match.value for match in jsonpath_expr.find(response_data)]
-
-                if matches:
-                    # Return first match (most common case)
-                    extracted_meta[field_name] = matches[0]
+                if extractor_expr.startswith("@link."):
+                    # RFC 5988 Link header extraction
+                    rel = extractor_expr[6:]
+                    extracted_meta[field_name] = self._extract_link_url(response_headers, rel)
+                elif extractor_expr.startswith("@header."):
+                    # Raw header value extraction (case-insensitive lookup)
+                    header_name = extractor_expr[8:]
+                    extracted_meta[field_name] = self._get_header_value(response_headers, header_name)
                 else:
-                    # Path not found - set to None
-                    extracted_meta[field_name] = None
+                    # JSONPath body extraction
+                    jsonpath_expr = parse_jsonpath(extractor_expr)
+                    matches = [match.value for match in jsonpath_expr.find(response_data)]
+
+                    if matches:
+                        # Return first match (most common case)
+                        extracted_meta[field_name] = matches[0]
+                    else:
+                        # Path not found - set to None
+                        extracted_meta[field_name] = None
 
             except Exception as e:
                 # Log error but continue with other fields
-                logging.warning(f"Failed to apply meta extractor for field '{field_name}' with path '{jsonpath_expr_str}': {e}. Setting to None.")
+                logging.warning(f"Failed to apply meta extractor for field '{field_name}' with expression '{extractor_expr}': {e}. Setting to None.")
                 extracted_meta[field_name] = None
 
         return extracted_meta
 
+    @staticmethod
+    def _extract_link_url(headers: dict[str, str], rel: str) -> str | None:
+        """Extract URL from RFC 5988 Link header by rel type.
+
+        Parses Link header format: <url>; param1="value1"; rel="next"; param2="value2"
+
+        Supports:
+        - Multiple parameters per link in any order
+        - Both quoted and unquoted rel values
+        - Multiple links separated by commas
+
+        Args:
+            headers: Response headers dict
+            rel: The rel type to extract (e.g., "next", "prev", "first", "last")
+
+        Returns:
+            The URL for the specified rel type, or None if not found
+        """
+        link_header = headers.get("Link") or headers.get("link", "")
+        if not link_header:
+            return None
+
+        for link_segment in re.split(r",(?=\s*<)", link_header):
+            link_segment = link_segment.strip()
+
+            url_match = re.match(r"<([^>]+)>", link_segment)
+            if not url_match:
+                continue
+
+            url = url_match.group(1)
+            params_str = link_segment[url_match.end() :]
+
+            rel_match = re.search(r';\s*rel="?([^";,]+)"?', params_str, re.IGNORECASE)
+            if rel_match and rel_match.group(1).strip() == rel:
+                return url
+
+        return None
+
+    @staticmethod
+    def _get_header_value(headers: dict[str, str], header_name: str) -> str | None:
+        """Get header value with case-insensitive lookup.
+
+        Args:
+            headers: Response headers dict
+            header_name: Header name to look up
+
+        Returns:
+            Header value or None if not found
+        """
+        # Try exact match first
+        if header_name in headers:
+            return headers[header_name]
+
+        # Case-insensitive lookup
+        header_name_lower = header_name.lower()
+        for key, value in headers.items():
+            if key.lower() == header_name_lower:
+                return value
+
+        return None
+
     def _validate_required_body_fields(self, endpoint: Any, params: dict[str, Any], action: Action, entity: str) -> None:
         """Validate that required body fields are present for CREATE/UPDATE operations.
 
@@ -1334,7 +1485,7 @@ class _StandardOperationHandler:
                 request_kwargs = self.ctx.determine_request_format(endpoint, body)
 
                 # Execute async HTTP request
-                response = await self.ctx.http_client.request(
+                response_data, response_headers = await self.ctx.http_client.request(
                     method=endpoint.method,
                     path=path,
                     params=query_params if query_params else None,
@@ -1343,10 +1494,10 @@ class _StandardOperationHandler:
                 )
 
                 # Extract metadata from original response (before record extraction)
-                metadata = self.ctx.executor._extract_metadata(response, endpoint)
+                metadata = self.ctx.executor._extract_metadata(response_data, response_headers, endpoint)
 
                 # Extract records if extractor configured
-                response = self.ctx.extract_records(response, endpoint)
+                response = self.ctx.extract_records(response_data, endpoint)
 
                 # Assume success with 200 status code if no exception raised
                 status_code = 200
@@ -1472,7 +1623,7 @@ class _DownloadOperationHandler:
                     request_format = self.ctx.determine_request_format(operation, request_body)
                     self.ctx.validate_required_body_fields(operation, params, action, entity)
 
-                    metadata_response = await self.ctx.http_client.request(
+                    metadata_response, _ = await self.ctx.http_client.request(
                         method=operation.method,
                         path=path,
                         params=query_params,
@@ -1487,7 +1638,7 @@ class _DownloadOperationHandler:
                     )
 
                     # Step 3: Stream file from extracted URL
-                    file_response = await self.ctx.http_client.request(
+                    file_response, _ = await self.ctx.http_client.request(
                         method="GET",
                         path=file_url,
                         headers=headers,
@@ -1495,7 +1646,7 @@ class _DownloadOperationHandler:
                     )
                 else:
                     # One-step direct download: stream file directly from endpoint
-                    file_response = await self.ctx.http_client.request(
+                    file_response, _ = await self.ctx.http_client.request(
                         method=operation.method,
                         path=path,
                         params=query_params,