v3 upgrades immutabledict (#196)

spacether · spacether · commit 327b29f9e8d1 · 2023-08-16T09:54:41.000-07:00
* Uses 3.0.0 version of immutabledict

* Samples regen

* Fixes some types
diff --git a/samples/client/3_0_3_unit_test/python/.openapi-generator/FILES b/samples/client/3_0_3_unit_test/python/.openapi-generator/FILES
@@ -2084,7 +2084,6 @@ src/unit_test_api/py.typed
 src/unit_test_api/rest.py
 src/unit_test_api/schemas/__init__.py
 src/unit_test_api/schemas/format.py
-src/unit_test_api/schemas/original_immutabledict.py
 src/unit_test_api/schemas/schema.py
 src/unit_test_api/schemas/schemas.py
 src/unit_test_api/schemas/validation.py
diff --git a/samples/client/3_0_3_unit_test/python/pyproject.toml b/samples/client/3_0_3_unit_test/python/pyproject.toml
@@ -21,7 +21,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "certifi >= 14.5.14",
-    "immutabledict ~= 2.2.4",
+    "immutabledict ~= 3.0.0",
     "python-dateutil ~= 2.7.0",
     "setuptools >= 61.0",
     "types-python-dateutil",
diff --git a/samples/client/3_0_3_unit_test/python/src/unit_test_api/api_client.py b/samples/client/3_0_3_unit_test/python/src/unit_test_api/api_client.py
@@ -34,7 +34,7 @@
 class JSONEncoder(json.JSONEncoder):
     compact_separators = (',', ':')
 
-    def default(self, obj):
+    def default(self, obj: typing.Any):
         if isinstance(obj, str):
             return str(obj)
         elif isinstance(obj, float):
@@ -44,7 +44,7 @@ def default(self, obj):
             return obj
         elif isinstance(obj, int):
             return obj
-        elif isinstance(obj, schemas.none_type_):
+        elif obj is None:
             return None
         elif isinstance(obj, (dict, schemas.immutabledict)):
             return {key: self.default(val) for key, val in obj.items()}
@@ -391,7 +391,7 @@ def _serialize_json(
     str,
     None,
     bool,
-    typing.Tuple['_JSON_TYPES'],
+    typing.Tuple['_JSON_TYPES', ...],
     schemas.immutabledict[str, '_JSON_TYPES'],
 ]
 
diff --git a/samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/validation.py b/samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/validation.py
@@ -17,12 +17,13 @@
 import typing
 import uuid
 
+import immutabledict as original_immutabledict
 import typing_extensions
 
 from unit_test_api import exceptions
 from unit_test_api.configurations import schema_configuration
 
-from . import format, original_immutabledict
+from . import format
 
 _K = typing.TypeVar('_K')
 _V = typing.TypeVar('_V', covariant=True)
diff --git a/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/.openapi-generator/FILES b/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/.openapi-generator/FILES
@@ -46,7 +46,6 @@ src/this_package/py.typed
 src/this_package/rest.py
 src/this_package/schemas/__init__.py
 src/this_package/schemas/format.py
-src/this_package/schemas/original_immutabledict.py
 src/this_package/schemas/schema.py
 src/this_package/schemas/schemas.py
 src/this_package/schemas/validation.py
diff --git a/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/pyproject.toml b/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/pyproject.toml
@@ -21,7 +21,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "certifi >= 14.5.14",
-    "immutabledict ~= 2.2.4",
+    "immutabledict ~= 3.0.0",
     "python-dateutil ~= 2.7.0",
     "setuptools >= 61.0",
     "types-python-dateutil",
diff --git a/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/src/this_package/api_client.py b/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/src/this_package/api_client.py
@@ -34,7 +34,7 @@
 class JSONEncoder(json.JSONEncoder):
     compact_separators = (',', ':')
 
-    def default(self, obj):
+    def default(self, obj: typing.Any):
         if isinstance(obj, str):
             return str(obj)
         elif isinstance(obj, float):
@@ -44,7 +44,7 @@ def default(self, obj):
             return obj
         elif isinstance(obj, int):
             return obj
-        elif isinstance(obj, schemas.none_type_):
+        elif obj is None:
             return None
         elif isinstance(obj, (dict, schemas.immutabledict)):
             return {key: self.default(val) for key, val in obj.items()}
@@ -391,7 +391,7 @@ def _serialize_json(
     str,
     None,
     bool,
-    typing.Tuple['_JSON_TYPES'],
+    typing.Tuple['_JSON_TYPES', ...],
     schemas.immutabledict[str, '_JSON_TYPES'],
 ]
 
diff --git a/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/src/this_package/schemas/validation.py b/samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python/src/this_package/schemas/validation.py
@@ -17,12 +17,13 @@
 import typing
 import uuid
 
+import immutabledict as original_immutabledict
 import typing_extensions
 
 from this_package import exceptions
 from this_package.configurations import schema_configuration
 
-from . import format, original_immutabledict
+from . import format
 
 _K = typing.TypeVar('_K')
 _V = typing.TypeVar('_V', covariant=True)
diff --git a/samples/client/openapi_features/security/python/.openapi-generator/FILES b/samples/client/openapi_features/security/python/.openapi-generator/FILES
@@ -67,7 +67,6 @@ src/this_package/py.typed
 src/this_package/rest.py
 src/this_package/schemas/__init__.py
 src/this_package/schemas/format.py
-src/this_package/schemas/original_immutabledict.py
 src/this_package/schemas/schema.py
 src/this_package/schemas/schemas.py
 src/this_package/schemas/validation.py
diff --git a/samples/client/openapi_features/security/python/pyproject.toml b/samples/client/openapi_features/security/python/pyproject.toml
@@ -21,7 +21,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "certifi >= 14.5.14",
-    "immutabledict ~= 2.2.4",
+    "immutabledict ~= 3.0.0",
     "python-dateutil ~= 2.7.0",
     "setuptools >= 61.0",
     "types-python-dateutil",
diff --git a/samples/client/openapi_features/security/python/src/this_package/api_client.py b/samples/client/openapi_features/security/python/src/this_package/api_client.py
@@ -34,7 +34,7 @@
 class JSONEncoder(json.JSONEncoder):
     compact_separators = (',', ':')
 
-    def default(self, obj):
+    def default(self, obj: typing.Any):
         if isinstance(obj, str):
             return str(obj)
         elif isinstance(obj, float):
@@ -44,7 +44,7 @@ def default(self, obj):
             return obj
         elif isinstance(obj, int):
             return obj
-        elif isinstance(obj, schemas.none_type_):
+        elif obj is None:
             return None
         elif isinstance(obj, (dict, schemas.immutabledict)):
             return {key: self.default(val) for key, val in obj.items()}
@@ -391,7 +391,7 @@ def _serialize_json(
     str,
     None,
     bool,
-    typing.Tuple['_JSON_TYPES'],
+    typing.Tuple['_JSON_TYPES', ...],
     schemas.immutabledict[str, '_JSON_TYPES'],
 ]
 
diff --git a/samples/client/openapi_features/security/python/src/this_package/schemas/validation.py b/samples/client/openapi_features/security/python/src/this_package/schemas/validation.py
@@ -17,12 +17,13 @@
 import typing
 import uuid
 
+import immutabledict as original_immutabledict
 import typing_extensions
 
 from this_package import exceptions
 from this_package.configurations import schema_configuration
 
-from . import format, original_immutabledict
+from . import format
 
 _K = typing.TypeVar('_K')
 _V = typing.TypeVar('_V', covariant=True)
diff --git a/samples/client/petstore/python/.openapi-generator/FILES b/samples/client/petstore/python/.openapi-generator/FILES
@@ -1344,7 +1344,6 @@ src/petstore_api/py.typed
 src/petstore_api/rest.py
 src/petstore_api/schemas/__init__.py
 src/petstore_api/schemas/format.py
-src/petstore_api/schemas/original_immutabledict.py
 src/petstore_api/schemas/schema.py
 src/petstore_api/schemas/schemas.py
 src/petstore_api/schemas/validation.py
diff --git a/samples/client/petstore/python/pyproject.toml b/samples/client/petstore/python/pyproject.toml
@@ -21,7 +21,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "certifi >= 14.5.14",
-    "immutabledict ~= 2.2.4",
+    "immutabledict ~= 3.0.0",
     "pem >= 19.3.0",
     "pycryptodome >= 3.9.0",
     "python-dateutil ~= 2.7.0",
diff --git a/samples/client/petstore/python/src/petstore_api/api_client.py b/samples/client/petstore/python/src/petstore_api/api_client.py
@@ -34,7 +34,7 @@
 class JSONEncoder(json.JSONEncoder):
     compact_separators = (',', ':')
 
-    def default(self, obj):
+    def default(self, obj: typing.Any):
         if isinstance(obj, str):
             return str(obj)
         elif isinstance(obj, float):
@@ -44,7 +44,7 @@ def default(self, obj):
             return obj
         elif isinstance(obj, int):
             return obj
-        elif isinstance(obj, schemas.none_type_):
+        elif obj is None:
             return None
         elif isinstance(obj, (dict, schemas.immutabledict)):
             return {key: self.default(val) for key, val in obj.items()}
@@ -391,7 +391,7 @@ def _serialize_json(
     str,
     None,
     bool,
-    typing.Tuple['_JSON_TYPES'],
+    typing.Tuple['_JSON_TYPES', ...],
     schemas.immutabledict[str, '_JSON_TYPES'],
 ]
 
diff --git a/samples/client/petstore/python/src/petstore_api/schemas/validation.py b/samples/client/petstore/python/src/petstore_api/schemas/validation.py
@@ -17,12 +17,13 @@
 import typing
 import uuid
 
+import immutabledict as original_immutabledict
 import typing_extensions
 
 from petstore_api import exceptions
 from petstore_api.configurations import schema_configuration
 
-from . import format, original_immutabledict
+from . import format
 
 _K = typing.TypeVar('_K')
 _V = typing.TypeVar('_V', covariant=True)
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java
@@ -707,7 +707,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("schemas/schema.hbs", packagePath() + File.separator + "schemas", "schema.py"));
         supportingFiles.add(new SupportingFile("schemas/schemas.hbs", packagePath() + File.separator + "schemas", "schemas.py"));
         supportingFiles.add(new SupportingFile("schemas/format.hbs", packagePath() + File.separator + "schemas", "format.py"));
-        supportingFiles.add(new SupportingFile("schemas/original_immutabledict.hbs", packagePath() + File.separator + "schemas", "original_immutabledict.py"));
         supportingFiles.add(new SupportingFile("security_schemes.hbs", packagePath(), "security_schemes.py"));
         supportingFiles.add(new SupportingFile("server.hbs", packagePath(), "server.py"));
 
diff --git a/src/main/resources/python/_helper_required_libraries.hbs b/src/main/resources/python/_helper_required_libraries.hbs
@@ -2,7 +2,7 @@
 {{#if quoted}}"{{/if}}aiohttp >= 3.0.0{{#if quoted}}",{{/if}}
 {{/if}}
 {{#if quoted}}"{{/if}}certifi >= 14.5.14{{#if quoted}}",{{/if}}
-{{#if quoted}}"{{/if}}immutabledict ~= 2.2.4{{#if quoted}}",{{/if}}
+{{#if quoted}}"{{/if}}immutabledict ~= 3.0.0{{#if quoted}}",{{/if}}
 {{#if hasHttpSignatureSecurityScheme}}
 {{#if quoted}}"{{/if}}pem >= 19.3.0{{#if quoted}}",{{/if}}
 {{#if quoted}}"{{/if}}pycryptodome >= 3.9.0{{#if quoted}}",{{/if}}
diff --git a/src/main/resources/python/api_client.hbs b/src/main/resources/python/api_client.hbs
@@ -32,7 +32,7 @@ from {{packageName}}.configurations import api_configuration, schema_configurati
 class JSONEncoder(json.JSONEncoder):
     compact_separators = (',', ':')
 
-    def default(self, obj):
+    def default(self, obj: typing.Any):
         if isinstance(obj, str):
             return str(obj)
         elif isinstance(obj, float):
@@ -42,7 +42,7 @@ class JSONEncoder(json.JSONEncoder):
             return obj
         elif isinstance(obj, int):
             return obj
-        elif isinstance(obj, schemas.none_type_):
+        elif obj is None:
             return None
         elif isinstance(obj, (dict, schemas.immutabledict)):
             return {key: self.default(val) for key, val in obj.items()}
@@ -389,7 +389,7 @@ _JSON_TYPES = typing.Union[
     str,
     None,
     bool,
-    typing.Tuple['_JSON_TYPES'],
+    typing.Tuple['_JSON_TYPES', ...],
     schemas.immutabledict[str, '_JSON_TYPES'],
 ]
 
diff --git a/src/main/resources/python/schemas/original_immutabledict.hbs b/src/main/resources/python/schemas/original_immutabledict.hbs
diff --git a/src/main/resources/python/schemas/validation.hbs b/src/main/resources/python/schemas/validation.hbs
@@ -12,12 +12,13 @@ import types
 import typing
 import uuid
 
+import immutabledict as original_immutabledict
 import typing_extensions
 
 from {{packageName}} import exceptions
 from {{packageName}}.configurations import schema_configuration
 
-from . import format, original_immutabledict
+from . import format
 
 _K = typing.TypeVar('_K')
 _V = typing.TypeVar('_V', covariant=True)
