Add option to return none on unknown union variants (#718)

* Upgrade conjure-python-client to 1.10.8 * Add option to return none on unknown union variants * Fix tests --------- Co-authored-by: Mark Greatorex <[email protected]>
palantir · May 23, 2023 · 017e343 · 017e343
1 parent e725c89
commit 017e343
Show file tree

Hide file tree

Showing 13 changed files with 442 additions and 175 deletions.
diff --git a/...-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEndpointDefinition.java b/...-python-core/src/main/java/com/palantir/conjure/python/poet/PythonEndpointDefinition.java
@@ -224,11 +224,12 @@ default void emit(PythonPoetWriter poetWriter) {
                 poetWriter.writeIndentedLine("_decoder = ConjureDecoder()");
                 if (isOptionalReturnType()) {
                     poetWriter.writeIndentedLine(
-                            "return None if _response.status_code == 204 else _decoder.decode(_response.json(), %s)",
+                            "return None if _response.status_code == 204 else _decoder.decode(_response.json()"
+                                    + ", %s, self._return_none_for_unknown_union_types)",
                             pythonReturnType().get());
                 } else {
                     poetWriter.writeIndentedLine(
-                            "return _decoder.decode(_response.json(), %s)",
+                            "return _decoder.decode(_response.json(), %s, self._return_none_for_unknown_union_types)",
                             pythonReturnType().get());
                 }
             } else {

diff --git a/...ure-python-core/src/test/java/com/palantir/conjure/python/ConjurePythonGeneratorTest.java b/...ure-python-core/src/test/java/com/palantir/conjure/python/ConjurePythonGeneratorTest.java
@@ -39,7 +39,7 @@ public final class ConjurePythonGeneratorTest {
             .packageName("package-name")
             .packageVersion("0.0.0")
             .packageDescription("project description")
-            .minConjureClientVersion("1.0.0")
+            .minConjureClientVersion("1.10.8")
             .generatorVersion("0.0.0")
             .shouldWriteCondaRecipe(true)
             .generateRawSource(false)

diff --git a/conjure-python-core/src/test/resources/services/expected/conda_recipe/meta.yaml b/conjure-python-core/src/test/resources/services/expected/conda_recipe/meta.yaml
@@ -16,10 +16,10 @@ requirements:
         - setuptools
         - requests
         - typing
-        - conjure-python-client >=1.0.0,<2
+        - conjure-python-client >=1.10.8,<2
 
     run:
         - python
         - requests
         - typing
-        - conjure-python-client >=1.0.0,<2
+        - conjure-python-client >=1.10.8,<2
diff --git a/conjure-python-core/src/test/resources/services/expected/package_name/_impl.py b/conjure-python-core/src/test/resources/services/expected/package_name/_impl.py
diff --git a/conjure-python-core/src/test/resources/services/expected/setup.py b/conjure-python-core/src/test/resources/services/expected/setup.py
diff --git a/conjure-python-core/src/test/resources/types/expected/conda_recipe/meta.yaml b/conjure-python-core/src/test/resources/types/expected/conda_recipe/meta.yaml
@@ -16,10 +16,10 @@ requirements:
         - setuptools
         - requests
         - typing
-        - conjure-python-client >=1.0.0,<2
+        - conjure-python-client >=1.10.8,<2
 
     run:
         - python
         - requests
         - typing
-        - conjure-python-client >=1.0.0,<2
+        - conjure-python-client >=1.10.8,<2
diff --git a/conjure-python-core/src/test/resources/types/expected/package_name/_impl.py b/conjure-python-core/src/test/resources/types/expected/package_name/_impl.py
diff --git a/conjure-python-core/src/test/resources/types/expected/setup.py b/conjure-python-core/src/test/resources/types/expected/setup.py
diff --git a/conjure-python-verifier/python/Pipfile b/conjure-python-verifier/python/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-conjure-python-client = "==1.4.0"
+conjure-python-client = "==1.10.8"
 
 [dev-packages]
 setuptools = "*"