reformat

Author: eran-av

kiota_serialization_json/json_serialization_writer.py

@@ -23,7 +23,7 @@ def __init__(self) -> None:
         self.value: Any = None
 
         self._on_start_object_serialization: Optional[Callable[[Parsable, SerializationWriter],
-        None]] = None
+                                                               None]] = None
         self._on_before_object_serialization: Optional[Callable[[Parsable], None]] = None
         self._on_after_object_serialization: Optional[Callable[[Parsable], None]] = None
 
@@ -79,7 +79,7 @@ def write_uuid_value(self, key: Optional[str], value: Optional[UUID]) -> None:
         """Writes the specified uuid value to the stream with an optional given key.
         Args:
             key (Optional[str]): The key to be used for the written value. May be null.
-            value (Optional[UUId]): The uuid value to be written.
+            value (Optional[UUID]): The uuid value to be written.
         """
         if isinstance(value, UUID):
             if key:
@@ -106,9 +106,9 @@ def write_datetime_value(self, key: Optional[str], value: Optional[datetime]) ->
         """
         if isinstance(value, datetime):
             if key:
-                self.writer[key] = str(value.isoformat())
+                self.writer[key] = value.isoformat()
             else:
-                self.value = str(value.isoformat())
+                self.value = value.isoformat()
         elif isinstance(value, str):
             try:
                 pendulum.parse(value)
@@ -238,7 +238,7 @@ def write_collection_of_enum_values(
         """Writes the specified collection of enum values to the stream with an optional given key.
         Args:
             key (Optional[str]): The key to be used for the written value. May be null.
-            values Optional[List[Enum]): The enum values to be written.
+            values (Optional[List[Enum]]): The enum values to be written.
         """
         if isinstance(values, list):
             result = []
@@ -359,7 +359,7 @@ def __write_dict_value(self, key: Optional[str], value: Dict[str, Any]) -> None:
     def write_additional_data_value(self, value: Dict[str, Any]) -> None:
         """Writes the specified additional data to the stream.
         Args:
-            value (Dict[str, Any]): he additional data to be written.
+            value (Dict[str, Any]): The additional data to be written.
         """
         if isinstance(value, dict):
             for key, val in value.items():
@@ -389,35 +389,35 @@ def get_serialized_content(self) -> bytes:
     def on_before_object_serialization(self) -> Optional[Callable[[Parsable], None]]:
         """Gets the callback called before the object gets serialized.
         Returns:
-            Optional[Callable[[Parsable], None]]:the callback called before the object
+            Optional[Callable[[Parsable], None]]: The callback called before the object
             gets serialized.
         """
         return self._on_before_object_serialization
 
     @on_before_object_serialization.setter
     def on_before_object_serialization(self, value: Optional[Callable[[Parsable], None]]) -> None:
-        """Sets the callback called before the objects gets serialized.
+        """Sets the callback called before the objects get serialized.
         Args:
-            value (Optional[Callable[[Parsable], None]]): the callback called before the objects
-            gets serialized.
+            value (Optional[Callable[[Parsable], None]]): The callback called before the objects
+            get serialized.
         """
         self._on_before_object_serialization = value
 
     @property
     def on_after_object_serialization(self) -> Optional[Callable[[Parsable], None]]:
         """Gets the callback called after the object gets serialized.
         Returns:
-            Optional[Optional[Callable[[Parsable], None]]]: the callback called after the object
+            Optional[Callable[[Parsable], None]]: The callback called after the object
             gets serialized.
         """
         return self._on_after_object_serialization
 
     @on_after_object_serialization.setter
     def on_after_object_serialization(self, value: Optional[Callable[[Parsable], None]]) -> None:
-        """Sets the callback called after the objects gets serialized.
+        """Sets the callback called after the objects get serialized.
         Args:
-            value (Optional[Callable[[Parsable], None]]): the callback called after the objects
-            gets serialized.
+            value (Optional[Callable[[Parsable], None]]): The callback called after the objects
+            get serialized.
         """
         self._on_after_object_serialization = value
 
@@ -427,7 +427,7 @@ def on_start_object_serialization(
     ) -> Optional[Callable[[Parsable, SerializationWriter], None]]:
         """Gets the callback called right after the serialization process starts.
         Returns:
-            Optional[Callable[[Parsable, SerializationWriter], None]]: the callback called
+            Optional[Callable[[Parsable, SerializationWriter], None]]: The callback called
             right after the serialization process starts.
         """
         return self._on_start_object_serialization
@@ -438,7 +438,7 @@ def on_start_object_serialization(
     ) -> None:
         """Sets the callback called right after the serialization process starts.
         Args:
-            value (Optional[Callable[[Parsable, SerializationWriter], None]]): the callback
+            value (Optional[Callable[[Parsable, SerializationWriter], None]]): The callback
             called right after the serialization process starts.
         """
         self._on_start_object_serialization = value
@@ -471,7 +471,10 @@ def write_any_value(self, key: Optional[str], value: Any) -> Any:
                 self.write_collection_of_object_values(key, value)
             elif all(isinstance(x, Enum) for x in value):
                 self.write_collection_of_enum_values(key, value)
-            elif all(any(isinstance(x, primitive_type) for primitive_type in PRIMITIVE_TYPES) for x in value):
+            elif all(
+                any(isinstance(x, primitive_type) for primitive_type in PRIMITIVE_TYPES)
+                for x in value
+            ):
                 self.write_collection_of_primitive_values(key, value)
             elif all(isinstance(x, dict) for x in value):
                 self.__write_collection_of_dict_values(key, value)

tests/unit/test_json_serialization_writer.py

@@ -2,7 +2,6 @@
 from uuid import UUID
 
 import pytest
-
 import pendulum
 from kiota_serialization_json.json_serialization_writer import JsonSerializationWriter
 
@@ -72,20 +71,23 @@ def test_write_uuid_value():
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"id": "8f841f30-e6e3-439a-a812-ebd369559c36"}'
-    
+
+
 def test_write_uuid_value_with_valid_string():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_uuid_value("id", "8f841f30-e6e3-439a-a812-ebd369559c36")
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"id": "8f841f30-e6e3-439a-a812-ebd369559c36"}'
-    
+
+
 def test_write_uuid_value_with_invalid_string():
     with pytest.raises(ValueError) as excinfo:
         json_serialization_writer = JsonSerializationWriter()
         json_serialization_writer.write_uuid_value("id", "invalid-uuid-string")
     assert "Invalid UUID string value found for property id" in str(excinfo.value)
-    
+
+
 def test_write_datetime_value():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_datetime_value(
@@ -94,7 +96,8 @@ def test_write_datetime_value():
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"updatedAt": "2022-01-27T12:59:45.596117+00:00"}'
-    
+
+
 def test_write_datetime_value_valid_string():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_datetime_value(
@@ -103,25 +106,31 @@ def test_write_datetime_value_valid_string():
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"updatedAt": "2022-01-27T12:59:45.596117+00:00"}'
-    
-def test_write_datetime_value_valid_string():
+
+
+def test_write_datetime_value_invalid_string():
     with pytest.raises(ValueError) as excinfo:
         json_serialization_writer = JsonSerializationWriter()
         json_serialization_writer.write_datetime_value(
             "updatedAt", "invalid-datetime-string"
         )
     assert "Invalid datetime string value found for property updatedAt" in str(excinfo.value)
 
+
 def test_write_timedelta_value():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_timedelta_value(
         "diff",
-        (pendulum.parse('2022-01-27T12:59:45.596117') - pendulum.parse('2022-01-27T10:59:45.596117')).as_timedelta()
+        (
+            pendulum.parse('2022-01-27T12:59:45.596117') -
+            pendulum.parse('2022-01-27T10:59:45.596117')
+        ).as_timedelta()
     )
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"diff": "2:00:00"}'
-    
+
+
 def test_write_timedelta_value_valid_string():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_timedelta_value(
@@ -131,7 +140,8 @@ def test_write_timedelta_value_valid_string():
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"diff": "2:00:00"}'
-    
+
+
 def test_write_timedelta_value_invalid_string():
     with pytest.raises(ValueError) as excinfo:
         json_serialization_writer = JsonSerializationWriter()
@@ -140,7 +150,7 @@ def test_write_timedelta_value_invalid_string():
             "invalid-timedelta-string"
         )
     assert "Invalid timedelta string value found for property diff" in str(excinfo.value)
-    
+
 
 def test_write_date_value():
     json_serialization_writer = JsonSerializationWriter()
@@ -149,19 +159,22 @@ def test_write_date_value():
     content_string = content.decode('utf-8')
     assert content_string == '{"birthday": "2000-09-04"}'
 
+
 def test_write_date_value_valid_string():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_date_value("birthday", "2000-09-04")
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"birthday": "2000-09-04"}'
-    
+
+
 def test_write_date_value_invalid_string():
     with pytest.raises(ValueError) as excinfo:
         json_serialization_writer = JsonSerializationWriter()
         json_serialization_writer.write_date_value("birthday", "invalid-date-string")
     assert "Invalid date string value found for property birthday" in str(excinfo.value)
 
+
 def test_write_time_value():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_time_value(
@@ -172,6 +185,7 @@ def test_write_time_value():
     content_string = content.decode('utf-8')
     assert content_string == '{"time": "12:59:45.596117"}'
 
+
 def test_write_time_value_valid_string():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_time_value(
@@ -181,7 +195,8 @@ def test_write_time_value_valid_string():
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
     assert content_string == '{"time": "12:59:45.596117"}'
-    
+
+
 def test_write_time_value_invalid_string():
     with pytest.raises(ValueError) as excinfo:
         json_serialization_writer = JsonSerializationWriter()
@@ -191,6 +206,7 @@ def test_write_time_value_invalid_string():
         )
     assert "Invalid time string value found for property time" in str(excinfo.value)
 
+
 def test_write_collection_of_primitive_values():
     json_serialization_writer = JsonSerializationWriter()
     json_serialization_writer.write_collection_of_primitive_values(
@@ -206,9 +222,14 @@ def test_write_collection_of_object_values(user_1, user_2):
     json_serialization_writer.write_collection_of_object_values("users", [user_1, user_2])
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
-    assert content_string == '{"users": [{"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '\
-        '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}, '\
-        '{"display_name": "John Doe", "age": 32}]}'
+    expected = (
+        '{"users": ['
+        '{"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '
+        '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}, '
+        '{"display_name": "John Doe", "age": 32}'
+        ']}'
+    )
+    assert content_string == expected
 
 
 def test_write_collection_of_enum_values():
@@ -226,8 +247,13 @@ def test_write_object_value(user_1):
     json_serialization_writer.write_object_value("user1", user_1)
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
-    assert content_string == '{"user1": {"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '\
-        '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}}'
+    expected = (
+        '{"user1": {'
+        '"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '
+        '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true'
+        '}}'
+    )
+    assert content_string == expected
 
 
 def test_write_enum_value():
@@ -265,14 +291,18 @@ def test_write_additional_data_value(user_1, user_2):
     )
     content = json_serialization_writer.get_serialized_content()
     content_string = content.decode('utf-8')
-    assert content_string == '{"@odata.context": '\
-        '"https://graph.microsoft.com/v1.0/$metadata#users/$entity", '\
-            '"businessPhones": ["+1 205 555 0108"], '\
-            '"manager": {"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '\
-                '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}, '\
-            '"approvers": [{"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '\
-                '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}, '\
-                '{"display_name": "John Doe", "age": 32}], '\
-            '"created_at": "2022-01-27", '\
-            '"updated_at": "2024-09-24T00:00:00", '\
-            '"data": {"groups": [{"friends": [{"display_name": "John Doe", "age": 32}]}]}}'
+    expected = (
+        '{"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users/$entity", '
+        '"businessPhones": ["+1 205 555 0108"], '
+        '"manager": {"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '
+        '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}, '
+        '"approvers": ['
+        '{"id": "8f841f30-e6e3-439a-a812-ebd369559c36", '
+        '"updated_at": "2022-01-27T12:59:45.596117+00:00", "is_active": true}, '
+        '{"display_name": "John Doe", "age": 32}'
+        '], '
+        '"created_at": "2022-01-27", '
+        '"updated_at": "2024-09-24T00:00:00", '
+        '"data": {"groups": [{"friends": [{"display_name": "John Doe", "age": 32}]}]}}'
+    )
+    assert content_string == expected