Release 0.2.1

Author: Maxim Avanov

README.rst

@@ -88,10 +88,7 @@ servers with GraphQL API
     def call_server(droid_id: ID) -> HeroAndDroid:
         response = requests.post(
             url='https://<graphql-server-url>/',
-            json={ "operationName": q.name
-                 , "variables":     q.get_input_vars(Input(droid_id=droid_id))
-                 , "query":         q.query
-                 },
+            json=q.request_payload(Input(droid_id=droid_id)),
             headers={ 'Content-Type': 'application/json'
                     , 'Accept': 'application/json'
                     }

graphql_dsl/dsl.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from enum import Enum
-from typing import NamedTuple, Type, Any, Union, Callable, Mapping, Tuple, get_type_hints, Iterable, Optional
+from typing import NamedTuple, Type, Any, Union, Callable, Mapping, Tuple, get_type_hints, Iterable, Optional, TypeVar
 
 import inflection
 from pyrsistent import pmap, pvector
@@ -104,12 +104,22 @@ class ResolvedBinding(NamedTuple):
     is_optional: bool
 
 
+T = TypeVar('T')
+
+
 class GraphQLQuery(NamedTuple):
     query: str
     name: str
-    get_input_vars: Callable[..., Mapping[str, Any]]
+    get_input_vars: Callable[[T], Mapping[str, Any]]
     get_result: Callable[[Mapping[str, Any]], Any]
 
+    def request_payload(self, query_input: Optional[T] = None) -> Mapping[str, Any]:
+        in_ = self.get_input_vars(query_input) if query_input else {}
+        return { "operationName": self.name
+               , "variables":     in_
+               , "query":         self.query
+               }
+
 
 class GraphQLQueryConstructor(NamedTuple):
     query_types: PMap[Type[Any], Any] = pmap()

setup.py

@@ -21,7 +21,7 @@
 # ----------------------------
 
 setup(name='graphql-dsl',
-      version='0.2.0',
+      version='0.2.1',
       description='Compose GraphQL queries by composing Python types!',
       long_description=README,
       classifiers=[

tests/examples/test_github_example.py

@@ -48,9 +48,10 @@ class Input(NamedTuple):
 
     q = GQL( QUERY | ListIssues
              | WITH  | Input
-             | PASS  | Input.owner          * TO * ListIssues.repository
+             | PASS  | Input.owner  * TO * ListIssues.repository
              & Input.name           * TO * ListIssues.repository
              & Input.numFirstIssues * TO * Repository.issues * AS * 'first'
              )
 
-    assert q.query == result.strip()
+    assert q.query == result.strip()
+    assert isinstance(q.request_payload(Input('avanov', 'graphql-dsl', 5)), dict)

tests/test_tokenizer.py

@@ -32,11 +32,7 @@ class CountriesQuery(NamedTuple):
     with vcr.use_cassette(str(VCR_FIXTURES_PATH / 'countries.yaml')):
         response = requests.post(
             url='https://countries.trevorblades.com/',
-            json={
-                "operationName": graphql_query.name,
-                "variables": {},
-                "query": graphql_query.query,
-            },
+            json=graphql_query.request_payload(),
             headers={
                 'Content-Type': 'application/json',
                 'Accept': 'application/json',