Merge branch 'master' into doc_update_readme

Author: leszekhanusz

gql/__init__.py

@@ -1,4 +1,13 @@
 from .client import Client
 from .gql import gql
+from .transport.aiohttp import AIOHTTPTransport
+from .transport.requests import RequestsHTTPTransport
+from .transport.websockets import WebsocketsTransport
 
-__all__ = ["gql", "Client"]
+__all__ = [
+    "gql",
+    "AIOHTTPTransport",
+    "Client",
+    "RequestsHTTPTransport",
+    "WebsocketsTransport",
+]

gql/client.py

@@ -1,4 +1,5 @@
 import asyncio
+import warnings
 from typing import Any, AsyncGenerator, Dict, Generator, Optional, Union
 
 from graphql import (
@@ -21,7 +22,7 @@
 class Client:
     def __init__(
         self,
-        schema: Optional[GraphQLSchema] = None,
+        schema: Optional[Union[str, GraphQLSchema]] = None,
         introspection=None,
         type_def: Optional[str] = None,
         transport: Optional[Union[Transport, AsyncTransport]] = None,
@@ -30,23 +31,34 @@ def __init__(
     ):
         assert not (
             type_def and introspection
-        ), "Cannot provide introspection type definition at the same time."
-        if transport and fetch_schema_from_transport:
+        ), "Cannot provide introspection and type definition at the same time."
+
+        if type_def:
             assert (
                 not schema
-            ), "Cannot fetch the schema from transport if is already provided."
+            ), "Cannot provide type definition and schema at the same time."
+            warnings.warn(
+                "type_def is deprecated; use schema instead",
+                category=DeprecationWarning,
+            )
+            schema = type_def
+
         if introspection:
             assert (
                 not schema
             ), "Cannot provide introspection and schema at the same time."
             schema = build_client_schema(introspection)
-        elif type_def:
+
+        if isinstance(schema, str):
+            type_def_ast = parse(schema)
+            schema = build_ast_schema(type_def_ast)
+
+        if transport and fetch_schema_from_transport:
             assert (
                 not schema
-            ), "Cannot provide type definition and schema at the same time."
-            type_def_ast = parse(type_def)
-            schema = build_ast_schema(type_def_ast)
-        elif schema and not transport:
+            ), "Cannot fetch the schema from transport if is already provided."
+
+        if schema and not transport:
             transport = LocalSchemaTransport(schema)
 
         # GraphQL schema

tests/starwars/test_validation.py

@@ -13,7 +13,7 @@ def local_schema():
 @pytest.fixture
 def typedef_schema():
     return Client(
-        type_def="""
+        schema="""
 schema {
   query: Query
 }

tests/test_async_client_validation.py

@@ -82,6 +82,7 @@ async def server_starwars(ws, path):
         {"schema": StarWarsSchema},
         {"introspection": StarWarsIntrospection},
         {"type_def": StarWarsTypeDef},
+        {"schema": StarWarsTypeDef},
     ],
 )
 async def test_async_client_validation(
@@ -124,6 +125,7 @@ async def test_async_client_validation(
         {"schema": StarWarsSchema},
         {"introspection": StarWarsIntrospection},
         {"type_def": StarWarsTypeDef},
+        {"schema": StarWarsTypeDef},
     ],
 )
 async def test_async_client_validation_invalid_query(

tests/test_transport.py

@@ -119,3 +119,11 @@ def test_named_query(client):
     with use_cassette("queries"):
         result = client.execute(query, operation_name="Planet2")
     assert result == expected
+
+
+def test_import_transports_directly_from_gql():
+    from gql import AIOHTTPTransport, RequestsHTTPTransport, WebsocketsTransport
+
+    assert AIOHTTPTransport
+    assert RequestsHTTPTransport
+    assert WebsocketsTransport