Merge remote-tracking branch 'origin/main' into add-python-3.13-support

Author: Andrew Omondi

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-	".": "1.2.0"
+	".": "1.2.1"
 }

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.1](https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/v1.2.0...v1.2.1) (2025-01-30)
+
+
+### Bug Fixes
+
+* issue with national cloud/version enums and base url being set [#818](https://github.com/microsoftgraph/msgraph-sdk-python-core/issues/818) ([4ee7887](https://github.com/microsoftgraph/msgraph-sdk-python-core/commit/4ee78873cfe176c38e84c4f1d7f469c73eb6dff6))
+
 ## [1.2.0](https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/v1.1.8...v1.2.0) (2025-01-14)
 
 

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "msgraph-core"
 # The SDK version
 # x-release-please-start-version
-version = "1.2.0"
+version = "1.2.1"
 # x-release-please-end
 authors = [{name = "Microsoft", email = "[email protected]"}]
 description = "Core component of the Microsoft Graph Python SDK"

requirements-dev.txt

@@ -14,7 +14,7 @@ build==1.2.2.post1
 
 bumpver==2024.1130
 
-certifi==2024.12.14 ; python_version >= '3.6'
+certifi==2025.1.31 ; python_version >= '3.6'
 
 cffi==1.17.1 ; os_name == 'nt' and implementation_name != 'pypy'
 
@@ -135,7 +135,7 @@ frozenlist==1.5.0 ; python_version >= '3.7'
 
 h11==0.14.0 ; python_version >= '3.7'
 
-h2==4.1.0
+h2==4.2.0
 
 hpack==4.1.0 ; python_full_version >= '3.6.1'
 
@@ -145,11 +145,11 @@ httpx[http2]==0.28.1
 
 hyperframe==6.1.0 ; python_full_version >= '3.6.1'
 
-microsoft-kiota-abstractions==1.9.0
+microsoft-kiota-abstractions==1.9.1
 
-microsoft-kiota-authentication-azure==1.9.0
+microsoft-kiota-authentication-azure==1.9.1
 
-microsoft-kiota-http==1.9.0
+microsoft-kiota-http==1.9.1
 
 multidict==6.1.0 ; python_version >= '3.7'
 

src/msgraph_core/_constants.py

@@ -10,6 +10,6 @@
 DEFAULT_CONNECTION_TIMEOUT = 30
 # The SDK version
 # x-release-please-start-version
-SDK_VERSION = '1.2.0'
+SDK_VERSION = '1.2.1'
 # x-release-please-end
 MS_DEFAULT_SCOPE = 'https://graph.microsoft.com/.default'

src/msgraph_core/_enums.py

@@ -12,6 +12,9 @@ class APIVersion(str, Enum):
     beta = 'beta'
     v1 = 'v1.0'
 
+    def __str__(self):
+        return self.value
+
 
 class FeatureUsageFlag(int, Enum):
     """Enumerated list of values used to flag usage of specific middleware"""
@@ -23,6 +26,9 @@ class FeatureUsageFlag(int, Enum):
     DEFAULT_HTTP_PROVIDER_ENABLED = 8
     LOGGING_HANDLER_ENABLED = 16
 
+    def __str__(self):
+        return self.value
+
 
 class NationalClouds(str, Enum):
     """Enumerated list of supported sovereign clouds"""
@@ -32,3 +38,6 @@ class NationalClouds(str, Enum):
     Global = 'https://graph.microsoft.com'
     US_DoD = 'https://dod-graph.microsoft.us'
     US_GOV = 'https://graph.microsoft.us'
+
+    def __str__(self):
+        return self.value

src/msgraph_core/requests/batch_request_item.py

@@ -3,6 +3,7 @@
 import json
 import re
 import urllib.request
+from deprecated import deprecated
 from io import BytesIO
 from typing import Any, Optional, Union
 from urllib.parse import urlparse
@@ -14,6 +15,7 @@
 from kiota_abstractions.serialization import Parsable, ParseNode, SerializationWriter
 
 
+@deprecated("Use BytesIO type instead")
 class StreamInterface(BytesIO):
     pass
 

tests/requests/test_batch_request_content.py

@@ -1,12 +1,13 @@
 import pytest
+from io import BytesIO
 from unittest.mock import Mock
 from urllib.request import Request
 from kiota_abstractions.request_information import RequestInformation
 from kiota_abstractions.serialization import SerializationWriter
 from msgraph_core.requests.batch_request_item import BatchRequestItem
 from msgraph_core.requests.batch_request_content import BatchRequestContent
 from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders
-from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface
+from msgraph_core.requests.batch_request_item import BatchRequestItem
 
 
 @pytest.fixture
@@ -16,7 +17,7 @@ def request_info1():
     request_info.url = "https://graph.microsoft.com/v1.0/me"
     request_info.headers = RequestHeaders()
     request_info.headers.add("Content-Type", "application/json")
-    request_info.content = StreamInterface(b'{"key": "value"}')
+    request_info.content = BytesIO(b'{"key": "value"}')
     return request_info
 
 
@@ -27,7 +28,7 @@ def request_info2():
     request_info.url = "https://graph.microsoft.com/v1.0/users"
     request_info.headers = RequestHeaders()
     request_info.headers.add("Content-Type", "application/json")
-    request_info.content = StreamInterface(b'{"key": "value"}')
+    request_info.content = BytesIO(b'{"key": "value"}')
     return request_info
 
 

tests/requests/test_batch_request_item.py

@@ -1,11 +1,10 @@
 import pytest
-from unittest.mock import Mock
+from io import BytesIO
 from urllib.request import Request
 from kiota_abstractions.request_information import RequestInformation
 from kiota_abstractions.method import Method
 from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders
-from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface
-from kiota_abstractions.serialization import SerializationWriter
+from msgraph_core.requests.batch_request_item import BatchRequestItem
 
 base_url = "https://graph.microsoft.com/v1.0/me"
 
@@ -16,7 +15,7 @@ def request_info():
     request_info.http_method = "GET"
     request_info.url = "f{base_url}/me"
     request_info.headers = RequestHeaders()
-    request_info.content = StreamInterface(b'{"key": "value"}')
+    request_info.content = BytesIO(b'{"key": "value"}')
     return request_info
 
 
@@ -100,7 +99,7 @@ def test_headers_property(batch_request_item):
 
 
 def test_body_property(batch_request_item):
-    new_body = StreamInterface(b'{"new_key": "new_value"}')
+    new_body = BytesIO(b'{"new_key": "new_value"}')
     batch_request_item.body = new_body
     assert batch_request_item.body == b'{"new_key": "new_value"}'
 

tests/requests/test_batch_response_item.py

@@ -4,7 +4,7 @@
 from kiota_abstractions.serialization import ParseNode, SerializationWriter
 from unittest.mock import Mock
 
-from msgraph_core.requests.batch_response_item import BatchResponseItem, StreamInterface
+from msgraph_core.requests.batch_response_item import BatchResponseItem
 
 
 @pytest.fixture
@@ -42,7 +42,7 @@ def test_headers_property(batch_response_item):
 
 
 def test_body_property(batch_response_item):
-    body = StreamInterface(b"response body")
+    body = BytesIO(b"response body")
     batch_response_item.body = body
     assert batch_response_item.body == body
 
@@ -74,7 +74,7 @@ def test_serialize(batch_response_item):
     batch_response_item.atomicity_group = "group1"
     batch_response_item.status = 200
     batch_response_item.headers = {"Content-Type": "application/json"}
-    batch_response_item.body = StreamInterface(b"response body")
+    batch_response_item.body = BytesIO(b"response body")
     batch_response_item.serialize(writer)
     writer.write_str_value.assert_any_call('id', "12345")
     writer.write_str_value.assert_any_call('atomicity_group', "group1")