Merge branch 'master' into fix_graphql_core_3_2_0_compatibility

Author: leszekhanusz

gql/client.py

@@ -1,6 +1,7 @@
 import asyncio
+import sys
 import warnings
-from typing import Any, AsyncGenerator, Dict, Generator, Optional, Union
+from typing import Any, AsyncGenerator, Dict, Generator, Optional, Union, overload
 
 from graphql import (
     DocumentNode,
@@ -20,6 +21,16 @@
 from .utilities import parse_result as parse_result_fn
 from .utilities import serialize_variable_values
 
+"""
+Load the appropriate instance of the Literal type
+Note: we cannot use try: except ImportError because of the following mypy issue:
+https://github.com/python/mypy/issues/8520
+"""
+if sys.version_info[:2] >= (3, 8):
+    from typing import Literal
+else:
+    from typing_extensions import Literal  # pragma: no cover
+
 
 class Client:
     """The Client class is the main entrypoint to execute GraphQL requests
@@ -362,6 +373,34 @@ def _execute(
 
         return result
 
+    @overload
+    def execute(
+        self,
+        document: DocumentNode,
+        *args,
+        variable_values: Optional[Dict[str, Any]] = ...,
+        operation_name: Optional[str] = ...,
+        serialize_variables: Optional[bool] = ...,
+        parse_result: Optional[bool] = ...,
+        get_execution_result: Literal[False] = ...,
+        **kwargs,
+    ) -> Dict[str, Any]:
+        ...  # pragma: no cover
+
+    @overload
+    def execute(
+        self,
+        document: DocumentNode,
+        *args,
+        variable_values: Optional[Dict[str, Any]] = ...,
+        operation_name: Optional[str] = ...,
+        serialize_variables: Optional[bool] = ...,
+        parse_result: Optional[bool] = ...,
+        get_execution_result: Literal[True],
+        **kwargs,
+    ) -> ExecutionResult:
+        ...  # pragma: no cover
+
     def execute(
         self,
         document: DocumentNode,
@@ -525,6 +564,34 @@ async def _subscribe(
         finally:
             await inner_generator.aclose()
 
+    @overload
+    def subscribe(
+        self,
+        document: DocumentNode,
+        *args,
+        variable_values: Optional[Dict[str, Any]] = ...,
+        operation_name: Optional[str] = ...,
+        serialize_variables: Optional[bool] = ...,
+        parse_result: Optional[bool] = ...,
+        get_execution_result: Literal[False] = ...,
+        **kwargs,
+    ) -> AsyncGenerator[Dict[str, Any], None]:
+        ...  # pragma: no cover
+
+    @overload
+    def subscribe(
+        self,
+        document: DocumentNode,
+        *args,
+        variable_values: Optional[Dict[str, Any]] = ...,
+        operation_name: Optional[str] = ...,
+        serialize_variables: Optional[bool] = ...,
+        parse_result: Optional[bool] = ...,
+        get_execution_result: Literal[True],
+        **kwargs,
+    ) -> AsyncGenerator[ExecutionResult, None]:
+        ...  # pragma: no cover
+
     async def subscribe(
         self,
         document: DocumentNode,
@@ -535,7 +602,9 @@ async def subscribe(
         parse_result: Optional[bool] = None,
         get_execution_result: bool = False,
         **kwargs,
-    ) -> AsyncGenerator[Union[Dict[str, Any], ExecutionResult], None]:
+    ) -> Union[
+        AsyncGenerator[Dict[str, Any], None], AsyncGenerator[ExecutionResult, None]
+    ]:
         """Coroutine to subscribe asynchronously to the provided document AST
         asynchronously using the async transport.
 
@@ -653,6 +722,34 @@ async def _execute(
 
         return result
 
+    @overload
+    async def execute(
+        self,
+        document: DocumentNode,
+        *args,
+        variable_values: Optional[Dict[str, Any]] = ...,
+        operation_name: Optional[str] = ...,
+        serialize_variables: Optional[bool] = ...,
+        parse_result: Optional[bool] = ...,
+        get_execution_result: Literal[False] = ...,
+        **kwargs,
+    ) -> Dict[str, Any]:
+        ...  # pragma: no cover
+
+    @overload
+    async def execute(
+        self,
+        document: DocumentNode,
+        *args,
+        variable_values: Optional[Dict[str, Any]] = ...,
+        operation_name: Optional[str] = ...,
+        serialize_variables: Optional[bool] = ...,
+        parse_result: Optional[bool] = ...,
+        get_execution_result: Literal[True],
+        **kwargs,
+    ) -> ExecutionResult:
+        ...  # pragma: no cover
+
     async def execute(
         self,
         document: DocumentNode,

tests/test_client.py

@@ -85,6 +85,7 @@ def test_no_schema_exception():
     )
 
 
+@pytest.mark.online
 @pytest.mark.requests
 def test_execute_result_error():
 
@@ -111,6 +112,7 @@ def test_execute_result_error():
     assert 'Cannot query field "id" on type "Continent".' in str(exc_info.value)
 
 
+@pytest.mark.online
 @pytest.mark.requests
 def test_http_transport_raise_for_status_error(http_transport_query):
     from gql.transport.requests import RequestsHTTPTransport
@@ -127,6 +129,7 @@ def test_http_transport_raise_for_status_error(http_transport_query):
     assert "400 Client Error: Bad Request for url" in str(exc_info.value)
 
 
+@pytest.mark.online
 @pytest.mark.requests
 def test_http_transport_verify_error(http_transport_query):
     from gql.transport.requests import RequestsHTTPTransport
@@ -142,6 +145,7 @@ def test_http_transport_verify_error(http_transport_query):
     assert "Unverified HTTPS request is being made to host" in str(record[0].message)
 
 
+@pytest.mark.online
 @pytest.mark.requests
 def test_http_transport_specify_method_valid(http_transport_query):
     from gql.transport.requests import RequestsHTTPTransport
@@ -155,6 +159,7 @@ def test_http_transport_specify_method_valid(http_transport_query):
     assert result is not None
 
 
+@pytest.mark.online
 @pytest.mark.requests
 def test_http_transport_specify_method_invalid(http_transport_query):
     from gql.transport.requests import RequestsHTTPTransport