diff --git a/packages/abstractions/kiota_abstractions/date_utils.py b/packages/abstractions/kiota_abstractions/date_utils.py index eb0877fd..5ffbadec 100644 --- a/packages/abstractions/kiota_abstractions/date_utils.py +++ b/packages/abstractions/kiota_abstractions/date_utils.py @@ -42,9 +42,13 @@ def parse_timedelta_from_iso_format(text: str) -> timedelta: ) if m.group("minutes") else 0 seconds = float(m.group("seconds").replace(",", ".").replace("S", "") ) if m.group("seconds") else 0 - _have_date = years or months or days - _have_time = hours or minutes or seconds - if weeks and (_have_date or _have_time): + _have_weeks = bool(m.group("weeks")) + _have_date = bool(m.group("years") or m.group("months") or m.group("days")) + _have_time = bool(m.group("hours") or m.group("minutes") or m.group("seconds")) + if not (_have_weeks or _have_date or _have_time): + raise ValueError(f"Invalid ISO8601 duration string: {text}") + + if _have_weeks and (_have_date or _have_time): raise ValueError("Combining weeks with other date/time parts is not supported") _total_days = (years * 365) + (months * 30) + days diff --git a/packages/abstractions/kiota_abstractions/request_information.py b/packages/abstractions/kiota_abstractions/request_information.py index 67dfdddf..1c1123c0 100644 --- a/packages/abstractions/kiota_abstractions/request_information.py +++ b/packages/abstractions/kiota_abstractions/request_information.py @@ -305,9 +305,12 @@ def _get_sanitized_value(self, value: Any) -> Any: if isinstance(value, (list, tuple, set)): if not value: return [] - if all(isinstance(x, Enum) for x in value): - return ','.join([str(x.value) for x in value]) - return [self._get_sanitized_value(x) for x in value] + non_null = [x for x in value if x is not None] + if not non_null: + return [] + if all(isinstance(x, Enum) for x in non_null): + return ','.join([str(x.value) for x in non_null]) + return [self._get_sanitized_value(x) for x in non_null] sanitized_value = value if isinstance(value, datetime): diff --git a/packages/abstractions/tests/test_date_utils.py b/packages/abstractions/tests/test_date_utils.py index df9fc495..ee7b7d70 100644 --- a/packages/abstractions/tests/test_date_utils.py +++ b/packages/abstractions/tests/test_date_utils.py @@ -1,26 +1,33 @@ import pytest from kiota_abstractions.date_utils import ( - parse_timedelta_from_iso_format, - parse_timedelta_string, - time_from_iso_format_compat, + parse_timedelta_from_iso_format, parse_timedelta_string, time_from_iso_format_compat, datetime_from_iso_format_compat ) -@pytest.mark.parametrize("text", ["08:00:00", "08:00:00.0", "08:00:00.00","08:00:00.000", - "08:00:00.0000","08:00:00.00000","08:00:00.000000", "08:00:00.0000000", "08:00:00,0000000", - "08:00:00,0000000Z", "08:00:00.00Z", "08:00:00.00+00:00" ]) +@pytest.mark.parametrize( + "text", [ + "08:00:00", "08:00:00.0", "08:00:00.00", "08:00:00.000", "08:00:00.0000", "08:00:00.00000", + "08:00:00.000000", "08:00:00.0000000", "08:00:00,0000000", "08:00:00,0000000Z", + "08:00:00.00Z", "08:00:00.00+00:00" + ] +) def test_time_from_iso_format_compat(text: str): result = time_from_iso_format_compat(text) assert result.hour == 8 assert result.minute == 0 assert result.second == 0 -@pytest.mark.parametrize("text", ["1986-07-28T08:00:00", "1986-07-28T08:00:00.0", "1986-07-28T08:00:00.00", - "1986-07-28T08:00:00.000", "1986-07-28T08:00:00.0000", "1986-07-28T08:00:00.00000", - "1986-07-28T08:00:00.000000", "1986-07-28T08:00:00.0000000", "1986-07-28T08:00:00,0000000", - "1986-07-28T08:00:00.0000000Z", "1986-07-28T08:00:00.00Z", "1986-07-28T08:00:00.00+00:00" ]) + +@pytest.mark.parametrize( + "text", [ + "1986-07-28T08:00:00", "1986-07-28T08:00:00.0", "1986-07-28T08:00:00.00", + "1986-07-28T08:00:00.000", "1986-07-28T08:00:00.0000", "1986-07-28T08:00:00.00000", + "1986-07-28T08:00:00.000000", "1986-07-28T08:00:00.0000000", "1986-07-28T08:00:00,0000000", + "1986-07-28T08:00:00.0000000Z", "1986-07-28T08:00:00.00Z", "1986-07-28T08:00:00.00+00:00" + ] +) def test_datetime_from_iso_format_compat(text: str): result = datetime_from_iso_format_compat(text) assert result.hour == 8 @@ -68,10 +75,12 @@ def test_parse_timedelta_from_iso_format_days_and_time(): assert result.days == 3 assert result.seconds == 10983 + def test_parse_timedelta_from_iso_format_time_without_p(): with pytest.raises(ValueError): parse_timedelta_from_iso_format("T3H3M3S") + @pytest.mark.parametrize("text", ["P3W3Y", "P3W3Y3D", "P3W3Y3DT3H3M3S"]) def test_parse_timedelta_from_iso_format_must_raise(text: str): # assert this raises a ValueError @@ -80,7 +89,7 @@ def test_parse_timedelta_from_iso_format_must_raise(text: str): @pytest.mark.parametrize("text, expected_hours", [("PT3H", 3), ("2:00:00", 2)]) -def test_parse_timedelta_string_valid(text:str, expected_hours:int): +def test_parse_timedelta_string_valid(text: str, expected_hours: int): result = parse_timedelta_string(text) assert result.days == 0 assert result.seconds == expected_hours * 3600 @@ -96,3 +105,15 @@ def test_parse_timedelta_from_iso_format_out_of_range(text: str): def test_parse_timedelta_string_out_of_range(text: str): with pytest.raises(ValueError): parse_timedelta_string(text) + + +@pytest.mark.parametrize("text", ["P", "PT", "P1WT0S", "P1WT0H", "P1W0D"]) +def test_parse_timedelta_from_iso_format_invalid_components_raises(text: str): + with pytest.raises(ValueError): + parse_timedelta_from_iso_format(text) + + +@pytest.mark.parametrize("text", ["PT0S", "P0D"]) +def test_parse_timedelta_from_iso_format_zero_durations(text: str): + result = parse_timedelta_from_iso_format(text) + assert result.total_seconds() == 0 diff --git a/packages/abstractions/tests/test_request_information.py b/packages/abstractions/tests/test_request_information.py index c896d3d5..3f5a6777 100644 --- a/packages/abstractions/tests/test_request_information.py +++ b/packages/abstractions/tests/test_request_information.py @@ -73,6 +73,7 @@ def test_request_headers(mock_request_information): assert "value3" in mock_request_information.request_headers["header2"] assert "value4" in mock_request_information.request_headers["header2"] + def test_remove_request_headers(mock_request_information): """Tests removing a request header """ @@ -94,7 +95,8 @@ def test_set_stream_content(mock_request_information): mock_request_information.set_stream_content(b'stream') assert mock_request_information.content == b'stream' assert mock_request_information.headers.get("content-type") == {"application/octet-stream"} - + + def test_configure_empty_configuration(mock_request_information): """Tests configuring the request information """ @@ -103,16 +105,17 @@ def test_configure_empty_configuration(mock_request_information): assert not mock_request_information.headers.get_all() assert not mock_request_information.request_options assert not mock_request_information.query_parameters - + + def test_configure_request_configuration(mock_request_information): """Tests configuring the request information """ - + @dataclass class CustomParams: filter: Optional[str] = None - - def get_query_parameter(self,original_name: Optional[str] = None) -> str: + + def get_query_parameter(self, original_name: Optional[str] = None) -> str: """ Maps the query parameters names to their encoded names for the URI template parsing. param original_name: The original query parameter name in the class. @@ -122,12 +125,12 @@ def get_query_parameter(self,original_name: Optional[str] = None) -> str: raise TypeError("original_name cannot be null.") if original_name == "filter": return "%24filter" - + query_params = CustomParams(filter="query1") headers = HeadersCollection() headers.add("header1", "value1") headers.add("header2", "value2") - + request_config = RequestConfiguration(headers=headers, query_parameters=query_params) mock_request_information.configure(request_config) @@ -135,23 +138,29 @@ def get_query_parameter(self,original_name: Optional[str] = None) -> str: assert mock_request_information.headers.get("header2") == {"value2"} assert mock_request_information.query_parameters == {"%24filter": "query1"} assert not mock_request_information.request_options - + + def test_sets_boundary_on_multipart_request_body( - mock_request_information, - mock_request_adapter, - mock_multipart_body, - mock_serialization_writer, + mock_request_information, mock_request_adapter, mock_multipart_body, mock_serialization_writer, mock_serialization_writer_factory - ): +): """Tests setting the boundary on a multipart request """ mock_request_information.http_method = Method.POST - mock_serialization_writer_factory.get_serialization_writer = Mock(return_value=mock_serialization_writer) - mock_request_adapter.get_serialization_writer_factory = Mock(return_value=mock_serialization_writer_factory) + mock_serialization_writer_factory.get_serialization_writer = Mock( + return_value=mock_serialization_writer + ) + mock_request_adapter.get_serialization_writer_factory = Mock( + return_value=mock_serialization_writer_factory + ) mock_multipart_body.request_adapter = mock_request_adapter - mock_request_information.set_content_from_parsable(mock_request_adapter, "multipart/form-data", mock_multipart_body) + mock_request_information.set_content_from_parsable( + mock_request_adapter, "multipart/form-data", mock_multipart_body + ) assert mock_multipart_body.boundary - assert mock_request_information.headers.get("content-type") == {"multipart/form-data; boundary=" + mock_multipart_body.boundary} + assert mock_request_information.headers.get("content-type") == { + "multipart/form-data; boundary=" + mock_multipart_body.boundary + } def test_sets_content_from_a_list_of_scalars( @@ -160,8 +169,12 @@ def test_sets_content_from_a_list_of_scalars( writer = Mock(spec_set=SerializationWriter) writer.get_serialized_content.return_value = b"[1,2]" mock_serialization_writer_factory.get_serialization_writer = Mock(return_value=writer) - mock_request_adapter.get_serialization_writer_factory = Mock(return_value=mock_serialization_writer_factory) - mock_request_information.set_content_from_scalar(mock_request_adapter, "application/json", [1, 2]) + mock_request_adapter.get_serialization_writer_factory = Mock( + return_value=mock_serialization_writer_factory + ) + mock_request_information.set_content_from_scalar( + mock_request_adapter, "application/json", [1, 2] + ) writer.write_collection_of_primitive_values.assert_called_once_with(None, [1, 2]) assert mock_request_information.content == b"[1,2]" @@ -169,26 +182,52 @@ def test_sets_content_from_a_list_of_scalars( def test_sets_enum_value_in_query_parameters(): """Tests setting enum values in query parameters """ - + request_info = RequestInformation(Method.GET, "https://example.com/me{?dataset}") request_info.set_query_string_parameters_from_raw_object(QueryParams(TestEnum.VALUE1)) assert request_info.url == "https://example.com/me?dataset=value1" - + + def test_sets_enum_values_in_query_parameters(): """Tests setting enum values in query parameters """ - + + request_info = RequestInformation(Method.GET, "https://example.com/me{?dataset}") + request_info.set_query_string_parameters_from_raw_object( + QueryParams([TestEnum.VALUE1, TestEnum.VALUE2]) + ) + assert request_info.url == "https://example.com/me?dataset=value1%2Cvalue2" + + +def test_sets_enum_values_with_leading_none_in_query_parameters(): + """Tests that enum collections with leading None entries normalize to comma-joined enum values.""" request_info = RequestInformation(Method.GET, "https://example.com/me{?dataset}") - request_info.set_query_string_parameters_from_raw_object(QueryParams([TestEnum.VALUE1, TestEnum.VALUE2])) + request_info.query_parameters["dataset"] = [None, TestEnum.VALUE1, TestEnum.VALUE2] assert request_info.url == "https://example.com/me?dataset=value1%2Cvalue2" - + + +def test_sets_enum_values_with_trailing_none_in_query_parameters(): + """Tests that enum collections with trailing None entries normalize cleanly.""" + request_info = RequestInformation(Method.GET, "https://example.com/me{?dataset}") + request_info.query_parameters["dataset"] = [TestEnum.VALUE1, None] + assert request_info.url == "https://example.com/me?dataset=value1" + + +def test_sets_enum_values_with_interleaved_none_in_path_parameters(): + """Tests that path parameter enum collections with interleaved None normalize consistently.""" + request_info = RequestInformation(Method.GET, "https://example.com/{dataset}") + request_info.path_parameters["dataset"] = [None, TestEnum.VALUE1, None, TestEnum.VALUE2] + assert request_info.url == "https://example.com/value1%2Cvalue2" + + def test_sets_enum_value_in_path_parameters(): """Tests setting enum values in path parameters """ request_info = RequestInformation(Method.GET, "https://example.com/{dataset}") request_info.path_parameters["dataset"] = TestEnum.VALUE1 assert request_info.url == "https://example.com/value1" - + + def test_sets_enum_values_in_path_parameters(): """Tests setting enum values in path parameters """ @@ -196,6 +235,7 @@ def test_sets_enum_values_in_path_parameters(): request_info.path_parameters["dataset"] = [TestEnum.VALUE1, TestEnum.VALUE2] assert request_info.url == "https://example.com/value1%2Cvalue2" + def test_sets_uuid_values_in_path_parameters(): """Tests setting uuid values in path parameters """ @@ -203,6 +243,7 @@ def test_sets_uuid_values_in_path_parameters(): request_info.path_parameters["id"] = uuid.UUID("123e4567-e89b-12d3-a456-426614174000") assert request_info.url == "https://example.com/values/123e4567-e89b-12d3-a456-426614174000" + def test_sets_bool_values_in_path_parameters(): """Tests setting uuid values in path parameters """ @@ -210,13 +251,17 @@ def test_sets_bool_values_in_path_parameters(): request_info.path_parameters["bool"] = True assert request_info.url == "https://example.com/isTrue/true" + def test_sets_datetime_values_in_path_parameters(): """Tests setting datetime values in path parameters """ request_info = RequestInformation(Method.GET, "https://example.com/daysFrom/{startDate}") - request_info.path_parameters["startDate"] = datetime(year=2020, month=8, day=1, hour=0, minute=20, second=0, microsecond=0) + request_info.path_parameters["startDate"] = datetime( + year=2020, month=8, day=1, hour=0, minute=20, second=0, microsecond=0 + ) assert request_info.url == "https://example.com/daysFrom/2020-08-01T00%3A20%3A00%2B00%3A00" + def test_sets_int_values_in_path_parameters(): """Tests setting int values values in path parameters """ @@ -224,22 +269,26 @@ def test_sets_int_values_in_path_parameters(): request_info.path_parameters["number"] = 7 assert request_info.url == "https://example.com/valuesFromZero/7" + def test_sets_date_only_values_in_path_parameters(): """Tests setting date only values in path parameters """ request_info = RequestInformation(Method.GET, "https://example.com/daysFrom/{startDate}") - request_info.path_parameters["startDate"] = datetime(year=2020, month=8, day=1, hour=0, minute=20, second=0, microsecond=0).date() + request_info.path_parameters["startDate"] = datetime( + year=2020, month=8, day=1, hour=0, minute=20, second=0, microsecond=0 + ).date() assert request_info.url == "https://example.com/daysFrom/2020-08-01" + def test_sets_time_only_values_in_path_parameters(): """Tests setting time only values in path parameters """ request_info = RequestInformation(Method.GET, "https://example.com/daysFrom/{startDate}") - request_info.path_parameters["startDate"] = datetime(year=2020, month=8, day=1, hour=0, minute=20, second=0, microsecond=0).time() + request_info.path_parameters["startDate"] = datetime( + year=2020, month=8, day=1, hour=0, minute=20, second=0, microsecond=0 + ).time() assert request_info.url == "https://example.com/daysFrom/00%3A20%3A00" - - def test_each_request_information_gets_its_own_path_parameters(): first = RequestInformation(Method.GET, "{+baseurl}/users/{user%2Did}/messages") @@ -253,7 +302,12 @@ def test_each_request_information_gets_its_own_path_parameters(): def test_a_path_parameter_set_on_one_request_does_not_reach_another_url(): first = RequestInformation(Method.GET, "{+baseurl}/users/{user%2Did}/messages") - first.path_parameters.update({"baseurl": "https://graph.microsoft.com/v1.0", "user%2Did": "alice"}) + first.path_parameters.update( + { + "baseurl": "https://graph.microsoft.com/v1.0", + "user%2Did": "alice" + } + ) second = RequestInformation(Method.GET, "{+baseurl}/me/calendar") second.path_parameters["baseurl"] = "https://graph.microsoft.com/v1.0" @@ -271,7 +325,12 @@ def test_passed_path_parameters_are_used_as_given(): def test_setting_a_raw_url_does_not_clear_another_requests_path_parameters(): templated = RequestInformation(Method.GET, "{+baseurl}/users/{user%2Did}/messages") - templated.path_parameters.update({"baseurl": "https://graph.microsoft.com/v1.0", "user%2Did": "bob"}) + templated.path_parameters.update( + { + "baseurl": "https://graph.microsoft.com/v1.0", + "user%2Did": "bob" + } + ) raw = RequestInformation(Method.GET) raw.url = "https://graph.microsoft.com/v1.0/me/messages?$skiptoken=abc" @@ -305,6 +364,27 @@ def test_sets_tuple_and_set_in_query_parameters(): assert request_info.url == "https://example.com/values?ids=1&ids=2" +def test_sets_collection_with_none_elements_in_query_parameters(): + """Tests that collections containing None elements are sanitized without raising substitution errors.""" + request_info = RequestInformation(Method.GET, "https://example.com/values{?filter*}") + request_info.query_parameters["filter"] = [None, "active", None, "pending"] + assert request_info.url == "https://example.com/values?filter=active&filter=pending" + + +def test_sets_all_none_collection_in_query_parameters(): + """Tests that a collection with only None elements behaves like an empty collection and does not crash.""" + request_info = RequestInformation(Method.GET, "https://example.com/values{?filter*}") + request_info.query_parameters["filter"] = [None, None] + assert request_info.url == "https://example.com/values" + + +def test_sets_collection_with_none_elements_in_path_parameters(): + """Tests that path parameter collections filter None elements cleanly.""" + request_info = RequestInformation(Method.GET, "https://example.com/{segments}") + request_info.path_parameters["segments"] = [None, "items", None] + assert request_info.url == "https://example.com/items" + + def test_set_content_from_scalar_bytes( mock_request_information, mock_request_adapter, mock_serialization_writer_factory ):