Skip to content

fix(http): pass mypy --strict in the request adapter and end its spans on every path #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vincent Biret (baywet) merged 4 commits into from
Oct 20, 2026
Merged

fix(http): pass mypy --strict in the request adapter and end its spans on every path #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f507de
fix(http): pass mypy --strict in the request adapter and end its span…
HardMax71 Oct 19, 2026
c654d2d
fix(http): scope the adapter's deserialization spans with a with block
HardMax71 Oct 19, 2026
f813ad8
fix(http): end the deserialization spans in a finally instead of a wi…
HardMax71 Oct 19, 2026
f74333b
Merge branch 'main' into fix/strict-typing-request-adapter
baywet Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 134 additions & 106 deletions packages/http/httpx/kiota_http/httpx_request_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ async def send_async(
response_handler = self.get_response_handler(request_info)
if response_handler:
parent_span.add_event(RESPONSE_HANDLER_EVENT_INVOKED_KEY)
return await response_handler.handle_response_async(response, error_map)
handled: Optional[ModelType] = await response_handler.handle_response_async(
response, error_map
)
return handled

await self.throw_failed_responses(response, error_map, parent_span, parent_span)
if self._should_return_none(response):
Expand All @@ -205,10 +208,12 @@ async def send_async(
if root_node is None:
return None
_deserialized_span = self._start_local_tracing_span("get_object_value", parent_span)
value = root_node.get_object_value(parsable_factory)
parent_span.set_attribute(DESERIALIZED_MODEL_NAME_KEY, value.__class__.__name__)
_deserialized_span.end()
return value #type: ignore
try:
value = root_node.get_object_value(parsable_factory)
parent_span.set_attribute(DESERIALIZED_MODEL_NAME_KEY, value.__class__.__name__)
finally:
_deserialized_span.end()
return value
finally:
parent_span.end()

Expand Down Expand Up @@ -239,7 +244,10 @@ async def send_collection_async(
response_handler = self.get_response_handler(request_info)
if response_handler:
parent_span.add_event(RESPONSE_HANDLER_EVENT_INVOKED_KEY)
return await response_handler.handle_response_async(response, error_map)
handled: Optional[
list[ModelType]
] = await response_handler.handle_response_async(response, error_map)
return handled

await self.throw_failed_responses(response, error_map, parent_span, parent_span)
if self._should_return_none(response):
Expand All @@ -248,14 +256,19 @@ async def send_collection_async(
_deserialized_span = self._start_local_tracing_span(
"get_collection_of_object_values", parent_span
)
root_node = await self.get_root_parse_node(response, parent_span, parent_span)
if root_node:
result: Optional[list[ModelType]
] = root_node.get_collection_of_object_values(parsable_factory)
parent_span.set_attribute(DESERIALIZED_MODEL_NAME_KEY, result.__class__.__name__)
try:
root_node = await self.get_root_parse_node(response, parent_span, parent_span)
if root_node:
result: Optional[
list[ModelType]
] = root_node.get_collection_of_object_values(parsable_factory)
parent_span.set_attribute(
DESERIALIZED_MODEL_NAME_KEY, result.__class__.__name__
)
return result
return None
finally:
_deserialized_span.end()
return result
return None
finally:
parent_span.end()

Expand Down Expand Up @@ -287,7 +300,10 @@ async def send_collection_of_primitive_async(
response_handler = self.get_response_handler(request_info)
if response_handler:
parent_span.add_event(RESPONSE_HANDLER_EVENT_INVOKED_KEY)
return await response_handler.handle_response_async(response, error_map)
handled: Optional[
list[PrimitiveType]
] = await response_handler.handle_response_async(response, error_map)
return handled

await self.throw_failed_responses(response, error_map, parent_span, parent_span)
if self._should_return_none(response):
Expand All @@ -296,17 +312,21 @@ async def send_collection_of_primitive_async(
_deserialized_span = self._start_local_tracing_span(
"get_collection_of_primitive_values", parent_span
)
root_node = await self.get_root_parse_node(response, parent_span, parent_span)
if root_node:
values = root_node.get_collection_of_primitive_values(response_type)
parent_span.set_attribute(DESERIALIZED_MODEL_NAME_KEY, values.__class__.__name__)
try:
root_node = await self.get_root_parse_node(response, parent_span, parent_span)
if root_node:
values = root_node.get_collection_of_primitive_values(response_type)
parent_span.set_attribute(
DESERIALIZED_MODEL_NAME_KEY, values.__class__.__name__
)
return values
return None
finally:
_deserialized_span.end()
return values # type: ignore
return None
finally:
parent_span.end()

async def send_primitive_async(
async def send_primitive_async( # pylint: disable=too-many-branches
self,
request_info: RequestInformation,
response_type: str,
Expand Down Expand Up @@ -335,7 +355,10 @@ async def send_primitive_async(
response_handler = self.get_response_handler(request_info)
if response_handler:
parent_span.add_event(RESPONSE_HANDLER_EVENT_INVOKED_KEY)
return await response_handler.handle_response_async(response, error_map)
handled: Optional[ResponseType] = await response_handler.handle_response_async(
response, error_map
)
return handled

await self.throw_failed_responses(response, error_map, parent_span, parent_span)
if self._should_return_none(response):
Expand All @@ -344,28 +367,29 @@ async def send_primitive_async(
if response_type == "bytes":
return response.content # type: ignore
_deserialized_span = self._start_local_tracing_span("get_root_parse_node", parent_span)
root_node = await self.get_root_parse_node(response, parent_span, parent_span)
if not root_node:
return None
value: Optional[Union[str, int, float, bool, datetime, bytes]] = None
if response_type == "str":
value = root_node.get_str_value()
if response_type == "int":
value = root_node.get_int_value()
if response_type == "float":
value = root_node.get_float_value()
if response_type == "bool":
value = root_node.get_bool_value()
if response_type == "datetime":
value = root_node.get_datetime_value()
if value is not None:
parent_span.set_attribute(DESERIALIZED_MODEL_NAME_KEY, value.__class__.__name__)
try:
root_node = await self.get_root_parse_node(response, parent_span, parent_span)
if not root_node:
return None
value: Optional[Union[str, int, float, bool, datetime, bytes]] = None
if response_type == "str":
value = root_node.get_str_value()
if response_type == "int":
value = root_node.get_int_value()
if response_type == "float":
value = root_node.get_float_value()
if response_type == "bool":
value = root_node.get_bool_value()
if response_type == "datetime":
value = root_node.get_datetime_value()
if value is not None:
parent_span.set_attribute(DESERIALIZED_MODEL_NAME_KEY, value.__class__.__name__)
return value # type: ignore
finally:
_deserialized_span.end()
return value # type: ignore

exc = TypeError(f"Error handling the response, unexpected type {response_type!r}")
parent_span.record_exception(exc)
_deserialized_span.end()
raise exc

finally:
Expand All @@ -392,7 +416,9 @@ async def send_no_response_content_async(
response_handler = self.get_response_handler(request_info)
if response_handler:
parent_span.add_event(RESPONSE_HANDLER_EVENT_INVOKED_KEY)
return await response_handler.handle_response_async(response, error_map)
# NativeResponseHandler hands the native response back through this return
handled: None = await response_handler.handle_response_async(response, error_map)
return handled

await self.throw_failed_responses(response, error_map, parent_span, parent_span)
finally:
Expand Down Expand Up @@ -601,33 +627,34 @@ async def get_http_response_message(
_get_http_resp_span = self._start_local_tracing_span(
"get_http_response_message", parent_span
)
try:
self.set_base_url_for_request_information(request_info)

self.set_base_url_for_request_information(request_info)

additional_authentication_context = {}
if claims:
additional_authentication_context[self.CLAIMS_KEY] = claims
additional_authentication_context = {}
if claims:
additional_authentication_context[self.CLAIMS_KEY] = claims

await self._authentication_provider.authenticate_request(
request_info, additional_authentication_context
)
await self._authentication_provider.authenticate_request(
request_info, additional_authentication_context
)

request = self.get_request_from_request_information(
request_info, _get_http_resp_span, parent_span
)
resp = await self._http_client.send(request)
if not resp:
raise ResponseError("Unable to get response from request")
parent_span.set_attribute(HTTP_RESPONSE_STATUS_CODE, resp.status_code)
if http_version := resp.http_version:
parent_span.set_attribute(NETWORK_PROTOCOL_NAME, http_version)

if content_length := resp.headers.get("Content-Length", None):
parent_span.set_attribute("http.response.body.size", content_length)

if content_type := resp.headers.get("Content-Type", None):
parent_span.set_attribute("http.response.header.content-type", content_type)
_get_http_resp_span.end()
request = self.get_request_from_request_information(
request_info, _get_http_resp_span, parent_span
)
resp = await self._http_client.send(request)
if not resp:
raise ResponseError("Unable to get response from request")
parent_span.set_attribute(HTTP_RESPONSE_STATUS_CODE, resp.status_code)
if http_version := resp.http_version:
parent_span.set_attribute(NETWORK_PROTOCOL_NAME, http_version)

if content_length := resp.headers.get("Content-Length", None):
parent_span.set_attribute("http.response.body.size", content_length)

if content_type := resp.headers.get("Content-Type", None):
parent_span.set_attribute("http.response.header.content-type", content_type)
finally:
_get_http_resp_span.end()
return await self.retry_cae_response_if_required(resp, request_info, claims)

async def retry_cae_response_if_required(
Expand Down Expand Up @@ -676,49 +703,50 @@ def get_request_from_request_information(
_get_request_span = self._start_local_tracing_span(
"get_request_from_request_information", parent_span
)
url = parse.urlparse(request_info.url)
method = request_info.http_method
if not method:
raise RequestError("HTTP method must be provided")

otel_attributes = {
HTTP_REQUEST_METHOD: method.value,
SERVER_ADDRESS: url.hostname,
URL_SCHEME: url.scheme,
}

# A request whose URL was set directly (PageIterator, LargeFileUploadTask) has no template
if request_info.url_template is not None:
otel_attributes["url.uri_template"] = request_info.url_template
if url.port is not None:
otel_attributes["http.port"] = str(url.port)

if self.observability_options.include_euii_attributes:
otel_attributes.update({URL_FULL: url.geturl()})

request_options = {
self.observability_options.get_key(): self.observability_options,
"parent_span": parent_span,
**request_info.request_options,
}
request = self._http_client.build_request(
method=method.value,
url=request_info.url,
headers=request_info.request_headers,
content=request_info.content,
extensions={REQUEST_OPTIONS_KEY: request_options},
)

if content_length := request.headers.get("Content-Length", None):
otel_attributes.update({"http.request.body.size": content_length})
try:
url = parse.urlparse(request_info.url)
method = request_info.http_method
if not method:
raise RequestError("HTTP method must be provided")

otel_attributes = {
HTTP_REQUEST_METHOD: method.value,
SERVER_ADDRESS: url.hostname,
URL_SCHEME: url.scheme,
}

# A URL set directly (PageIterator, LargeFileUploadTask) has no template
if request_info.url_template is not None:
otel_attributes["url.uri_template"] = request_info.url_template
if url.port is not None:
otel_attributes["http.port"] = str(url.port)

if self.observability_options.include_euii_attributes:
otel_attributes.update({URL_FULL: url.geturl()})

request_options = {
self.observability_options.get_key(): self.observability_options,
"parent_span": parent_span,
**request_info.request_options,
}
request = self._http_client.build_request(
method=method.value,
url=request_info.url,
headers=request_info.request_headers,
content=request_info.content,
extensions={REQUEST_OPTIONS_KEY: request_options},
)

if content_type := request.headers.get("Content-Type", None):
otel_attributes.update({"http.request.header.content-type": content_type})
attribute_span.set_attributes(otel_attributes) # type: ignore
_get_request_span.set_attributes(otel_attributes) # type: ignore
_get_request_span.end()
if content_length := request.headers.get("Content-Length", None):
otel_attributes.update({"http.request.body.size": content_length})

return request
if content_type := request.headers.get("Content-Type", None):
otel_attributes.update({"http.request.header.content-type": content_type})
attribute_span.set_attributes(otel_attributes)
_get_request_span.set_attributes(otel_attributes)
return request
finally:
_get_request_span.end()

async def convert_to_native_async(self, request_info: RequestInformation) -> httpx.Request:
parent_span = self.start_tracing_span(request_info, "convert_to_native_async")
Expand Down
6 changes: 2 additions & 4 deletions packages/http/httpx/kiota_http/kiota_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,9 @@ def _load_middleware_to_client(
current_transport, middleware
)
if client._mounts:
mounts: dict = {}
mounts = dict(client._mounts)
for pattern, transport in client._mounts.items():
if transport is None:
mounts[pattern] = None
else:
if transport is not None:
mounts[pattern
] = KiotaClientFactory._replace_transport_with_custom_kiota_transport(
transport, middleware
Expand Down
2 changes: 1 addition & 1 deletion packages/http/httpx/kiota_http/observability_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def enabled(self) -> bool:
return self._enabled

@enabled.setter
def enabled(self, value: bool):
def enabled(self, value: bool) -> None:
"""sets whether to enable ObservabilityOptions in the middleware chain."""
self._enabled = value

Expand Down
1 change: 1 addition & 0 deletions packages/http/httpx/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ name = "kiota_http"

[tool.mypy]
warn_unused_configs = true
strict = true
files = "kiota_http"

[tool.yapf]
Expand Down
Loading
Loading