diff --git a/providers/microsoft/azure/pyproject.toml b/providers/microsoft/azure/pyproject.toml index 68e64242e8dee..bb62f0052c3b1 100644 --- a/providers/microsoft/azure/pyproject.toml +++ b/providers/microsoft/azure/pyproject.toml @@ -81,11 +81,11 @@ dependencies = [ "azure-mgmt-containerinstance>=10.1.0", "flask-appbuilder>=4.0.0", "msgraph-core>=1.3.3", - "microsoft-kiota-http>=1.9.0,<2.0.0", - "microsoft-kiota-serialization-json>=1.9.0", - "microsoft-kiota-serialization-text>=1.9.0", - "microsoft-kiota-abstractions>=1.9.0,<2.0.0", - "microsoft-kiota-authentication-azure>=1.9.0,<2.0.0", + "microsoft-kiota-http>=1.9.4,<2.0.0", + "microsoft-kiota-serialization-json>=1.9.4", + "microsoft-kiota-serialization-text>=1.9.4", + "microsoft-kiota-abstractions>=1.9.4,<2.0.0", + "microsoft-kiota-authentication-azure>=1.9.4,<2.0.0", "msal-extensions>=1.1.0", "portalocker>=2.8.1", ] diff --git a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/msgraph.py b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/msgraph.py index 94ee15847f8ff..be1725836a3c5 100644 --- a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/msgraph.py +++ b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/msgraph.py @@ -299,6 +299,7 @@ def get_conn(self) -> RequestAdapter: timeout=Timeout(timeout=self.timeout), verify=verify, trust_env=trust_env, + base_url=base_url, ), host=host, # type: ignore ) @@ -446,9 +447,9 @@ def request_information( request_information.url = url elif request_information.query_parameters.keys(): query = ",".join(request_information.query_parameters.keys()) - request_information.url_template = f"{{+baseurl}}/{self.normalize_url(url)}{{?{query}}}" + request_information.url_template = f"{{+baseurl}}{self.normalize_url(url)}{{?{query}}}" else: - request_information.url_template = f"{{+baseurl}}/{self.normalize_url(url)}" + request_information.url_template = f"{{+baseurl}}{self.normalize_url(url)}" if not response_type: request_information.request_options[ResponseHandlerOption.get_key()] = ResponseHandlerOption( response_handler=DefaultResponseHandler() @@ -467,6 +468,7 @@ def request_information( header_name=RequestInformation.CONTENT_TYPE_HEADER, header_value="application/json" ) request_information.content = json.dumps(data).encode("utf-8") + print("Request Information:", request_information.url) return request_information @staticmethod diff --git a/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_msgraph.py b/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_msgraph.py index a81e4df2e5a95..e01ab8de6a20d 100644 --- a/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_msgraph.py +++ b/providers/microsoft/azure/tests/unit/microsoft/azure/hooks/test_msgraph.py @@ -88,7 +88,7 @@ def test_get_conn(self): actual = hook.get_conn() assert isinstance(actual, HttpxRequestAdapter) - assert actual.base_url == "https://graph.microsoft.com/v1.0" + assert actual.base_url == "https://graph.microsoft.com/v1.0/" def test_get_conn_with_custom_base_url(self): connection = lambda conn_id: get_airflow_connection( @@ -105,7 +105,7 @@ def test_get_conn_with_custom_base_url(self): actual = hook.get_conn() assert isinstance(actual, HttpxRequestAdapter) - assert actual.base_url == "https://api.fabric.microsoft.com/v1" + assert actual.base_url == "https://api.fabric.microsoft.com/v1/" def test_get_conn_with_proxies_as_string(self): connection = lambda conn_id: get_airflow_connection(