Merge pull request #116 from strue36/handle-top-level-lists

Handle top level lists

Author: mat-sop

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Changed logic how custom scalar imports are generated. Deprecated `import_` key.
 - Added escaping of GraphQL names which are Python keywords by appending `_` to them.
+- Fixed parsing of list variables.
 
 
 ## 0.5.0 (2023-04-05)

ariadne_codegen/client_generators/dependencies/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

ariadne_codegen/client_generators/dependencies/base_client.py

@@ -67,12 +67,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/client_generators/dependencies/test_async_base_client.py

@@ -67,6 +67,41 @@ class TestModel2(BaseModel):
     }
 
 
+@pytest.mark.asyncio
+async def test_execute_correctly_parses_top_level_list_variables(mocker):
+    class TestModel1(BaseModel):
+        a: int
+
+    fake_client = mocker.AsyncMock()
+    client = AsyncBaseClient(url="base_url", http_client=fake_client)
+    query_str = """
+    query Abc($v1: [[TestModel1!]!]!) {
+        abc(v1: $v1){
+            field1
+        }
+    }
+    """
+
+    await client.execute(
+        query_str,
+        {
+            "v1": [[TestModel1(a=1), TestModel1(a=2)]],
+        },
+    )
+
+    assert fake_client.post.called
+    assert len(fake_client.post.mock_calls) == 1
+    call_kwargs = fake_client.post.mock_calls[0].kwargs
+    assert call_kwargs["url"] == "base_url"
+    assert call_kwargs["json"] == {
+        "query": query_str,
+        "variables": {"v1": [[{"a": 1}, {"a": 2}]]},
+    }
+    assert not any(
+        isinstance(x, BaseModel) for x in call_kwargs["json"]["variables"]["v1"][0]
+    )
+
+
 @pytest.mark.parametrize(
     "status_code, response_content",
     [

tests/client_generators/dependencies/test_base_client.py

@@ -63,6 +63,40 @@ class TestModel2(BaseModel):
     }
 
 
+def test_execute_correctly_parses_top_level_list_variables(mocker):
+    class TestModel1(BaseModel):
+        a: int
+
+    fake_client = mocker.MagicMock()
+    client = BaseClient(url="base_url", http_client=fake_client)
+    query_str = """
+    query Abc($v1: [[TestModel1!]!]!) {
+        abc(v1: $v1){
+            field1
+        }
+    }
+    """
+
+    client.execute(
+        query_str,
+        {
+            "v1": [[TestModel1(a=1), TestModel1(a=2)]],
+        },
+    )
+
+    assert fake_client.post.called
+    assert len(fake_client.post.mock_calls) == 1
+    call_kwargs = fake_client.post.mock_calls[0].kwargs
+    assert call_kwargs["url"] == "base_url"
+    assert call_kwargs["json"] == {
+        "query": query_str,
+        "variables": {"v1": [[{"a": 1}, {"a": 2}]]},
+    }
+    assert not any(
+        isinstance(x, BaseModel) for x in call_kwargs["json"]["variables"]["v1"][0]
+    )
+
+
 @pytest.mark.parametrize(
     "status_code, response_content",
     [

tests/main/clients/custom_config_file/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/main/clients/custom_files_names/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/main/clients/custom_scalars/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/main/clients/example/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/main/clients/extended_models/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/main/clients/inline_fragments/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}

tests/main/clients/remote_schema/expected_client/async_base_client.py

@@ -69,12 +69,14 @@ def get_data(self, response: httpx.Response) -> dict[str, Any]:
 
         return cast(dict[str, Any], data)
 
+    def _convert_value(self, value: Any) -> Any:
+        if isinstance(value, BaseModel):
+            return value.dict(by_alias=True)
+        if isinstance(value, list):
+            return [self._convert_value(item) for item in value]
+        return value
+
     def _convert_dict_to_json_serializable(
         self, dict_: Dict[str, Any]
     ) -> Dict[str, Any]:
-        return {
-            key: value
-            if not isinstance(value, BaseModel)
-            else value.dict(by_alias=True)
-            for key, value in dict_.items()
-        }
+        return {key: self._convert_value(value) for key, value in dict_.items()}