chore: small improvements

graphql-python · Jun 20, 2022 · aba1c77 · aba1c77
1 parent 294eb25
commit aba1c77
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 48 deletions.
diff --git a/graphene_federation/entity.py b/graphene_federation/entity.py
@@ -2,7 +2,7 @@
 
 from typing import Any, Callable
 
-from graphene import List, Union
+from graphene import List, NonNull, Union
 
 from graphene.types.schema import Schema
 from graphene.types.schema import TypeMap
@@ -50,7 +50,12 @@ def get_entity_query(schema: Schema):
     entity_type = get_entity_cls(entities_dict)
 
     class EntityQuery:
-        entities = List(entity_type, name="_entities", representations=List(_Any))
+        entities = List(
+            entity_type,
+            name="_entities",
+            representations=NonNull(List(NonNull(_Any))),
+            required=True,
+        )
 
         def resolve_entities(self, info, representations):
             entities = []

diff --git a/graphene_federation/service.py b/graphene_federation/service.py
@@ -127,7 +127,7 @@ def resolve_sdl(parent, _):
             return sdl_str
 
     class ServiceQuery(ObjectType):
-        _service = Field(_Service, name="_service")
+        _service = Field(_Service, name="_service", required=True)
 
         def resolve__service(parent, info):
             return _Service()

diff --git a/graphene_federation/tests/test_annotation_corner_cases.py b/graphene_federation/tests/test_annotation_corner_cases.py
@@ -31,15 +31,15 @@ class ChatQuery(ObjectType):
 
     chat_schema = build_schema(query=ChatQuery)
     assert (
-        str(chat_schema).strip().strip()
+        str(chat_schema).strip()
         == """schema {
   query: ChatQuery
 }
 
 type ChatQuery {
   message(id: ID!): ChatMessage
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type ChatMessage {
@@ -57,7 +57,6 @@ class ChatQuery(ObjectType):
 
 union _Entity = ChatUser
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -117,8 +116,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   camel: Camel
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type Camel {
@@ -130,7 +129,6 @@ class Query(ObjectType):
 
 union _Entity = Camel
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -184,8 +182,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   camel: Camel
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type Camel {
@@ -197,7 +195,6 @@ class Query(ObjectType):
 
 union _Entity = Camel
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -254,8 +251,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   a: A
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type A {
@@ -269,7 +266,6 @@ class Query(ObjectType):
 
 union _Entity = A | B
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -329,8 +325,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   a: Banana
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type Banana {
@@ -344,7 +340,6 @@ class Query(ObjectType):
 
 union _Entity = Banana | Potato
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {

diff --git a/graphene_federation/tests/test_key.py b/graphene_federation/tests/test_key.py
@@ -23,8 +23,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   user: User
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type User {
@@ -34,7 +34,6 @@ class Query(ObjectType):
 
 union _Entity = User
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {

diff --git a/graphene_federation/tests/test_provides.py b/graphene_federation/tests/test_provides.py
@@ -31,8 +31,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   inStockCount: InStockCount
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type InStockCount {
@@ -48,7 +48,6 @@ class Query(ObjectType):
 
 union _Entity = Product
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -110,8 +109,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   inStockCount: InStockCount
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type InStockCount {
@@ -127,7 +126,6 @@ class Query(ObjectType):
 
 union _Entity = Product
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -189,8 +187,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   inStockCount: InStockCount
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type InStockCount {
@@ -206,7 +204,6 @@ class Query(ObjectType):
 
 union _Entity = Product
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {

diff --git a/graphene_federation/tests/test_requires.py b/graphene_federation/tests/test_requires.py
@@ -42,8 +42,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   product: Product
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type Product {
@@ -55,7 +55,6 @@ class Query(ObjectType):
 
 union _Entity = Product
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -109,8 +108,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   product: Product
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type Product {
@@ -122,7 +121,6 @@ class Query(ObjectType):
 
 union _Entity = Product
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -175,8 +173,8 @@ class Query(ObjectType):
         str(schema).strip()
         == """type Query {
   acme: Acme
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type Acme {
@@ -187,7 +185,6 @@ class Query(ObjectType):
 
 union _Entity = Acme
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {

diff --git a/graphene_federation/tests/test_schema_annotation.py b/graphene_federation/tests/test_schema_annotation.py
@@ -95,8 +95,8 @@ def test_user_schema():
 
 type UserQuery {
   user(userId: ID!): User
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type User {
@@ -107,7 +107,6 @@ def test_user_schema():
 
 union _Entity = User
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {
@@ -163,8 +162,8 @@ def test_chat_schema():
 
 type ChatQuery {
   message(id: ID!): ChatMessage
-  _entities(representations: [_Any]): [_Entity]
-  _service: _Service
+  _entities(representations: [_Any!]!): [_Entity]!
+  _service: _Service!
 }
 
 type ChatMessage {
@@ -180,7 +179,6 @@ def test_chat_schema():
 
 union _Entity = ChatUser
 
-\"\"\"Anything\"\"\"
 scalar _Any
 
 type _Service {

diff --git a/graphene_federation/types.py b/graphene_federation/types.py
@@ -2,7 +2,6 @@
 
 
 class _Any(Scalar):
-    """Anything"""
 
     __typename = String(required=True)
 

diff --git a/integration_tests/tests/Dockerfile b/integration_tests/tests/Dockerfile
@@ -8,4 +8,4 @@ WORKDIR project
 COPY requirements.txt ./
 RUN pip install -r requirements.txt
 
-CMD [ "pytest", "-s"]
+CMD [ "pytest", "-svv"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@


		class _Any(Scalar):
		"""Anything"""

		__typename = String(required=True)

Expand Down