ul-api-utils 8.1.21__tar.gz → 8.1.22__tar.gz

{ul-api-utils-8.1.21 → ul-api-utils-8.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 8.1.21
+Version: 8.1.22
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 

{ul-api-utils-8.1.21 → ul-api-utils-8.1.22}/setup.py

@@ -9,7 +9,7 @@ with open(path.join(HERE, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='ul-api-utils',
-    version='8.1.21',
+    version='8.1.22',
     description='Python api utils',
     author='Unic-lab',
     long_description=long_description,

{ul-api-utils-8.1.21 → ul-api-utils-8.1.22}/ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py

@@ -510,15 +510,27 @@ class SwaggerPath(SwaggerModel):
                 query_required_fields = set(query_schema.get('required')) if query_schema.get('required') is not None else set()
                 query_definitions = query_schema.get('$defs')
                 for parameter_name, parameter_spec in query_schema.get('properties').items():
-                    if parameter_spec.get('type') is not None:
-                        parameter_models.add(SwaggerQueryParameter(
-                            input_type=parameter_spec.get('type'),
-                            input_format=parameter_spec.get('format'),
-                            default_value=parameter_spec.get('default'),
-                            name=parameter_name,
-                            description=parameter_spec.get('description'),
-                            required=parameter_name in query_required_fields,
-                        ))
+                    if 'anyOf' in parameter_spec.keys():
+                        if parameter_spec.get('anyOf')[0].get('$ref') is not None:
+                            definition = query_definitions.get(parameter_spec.get('$ref', '').split('/')[-1], {})
+                            parameter_models.add(SwaggerQueryParameter(
+                                input_type=definition.get('type', 'string'),
+                                input_format=definition.get('format'),
+                                default_value=definition.get('default'),
+                                name=parameter_name,
+                                description=definition.get('description'),
+                                enum=definition.get('enum'),
+                                required=parameter_name in query_required_fields,
+                            ))
+                        if parameter_spec.get('anyOf')[0].get('type') is not None:
+                            parameter_models.add(SwaggerQueryParameter(
+                                input_type=parameter_spec.get('anyOf')[0].get('type'),
+                                input_format=parameter_spec.get('format'),
+                                default_value=parameter_spec.get('default'),
+                                name=parameter_name,
+                                description=parameter_spec.get('description'),
+                                required=parameter_name in query_required_fields,
+                            ))
                     elif parameter_spec.get('$ref') is not None:
                         definition = query_definitions.get(parameter_spec.get('$ref', '').split('/')[-1], {})
                         parameter_models.add(SwaggerQueryParameter(
@@ -530,6 +542,15 @@ class SwaggerPath(SwaggerModel):
                             enum=definition.get('enum'),
                             required=parameter_name in query_required_fields,
                         ))
+                    elif parameter_spec.get('type') is not None:
+                        parameter_models.add(SwaggerQueryParameter(
+                            input_type=parameter_spec.get('type') or parameter_spec.get('anyOf')[0].get('type'),
+                            input_format=parameter_spec.get('format'),
+                            default_value=parameter_spec.get('default'),
+                            name=parameter_name,
+                            description=parameter_spec.get('description'),
+                            required=parameter_name in query_required_fields,
+                        ))
                 if isinstance(parameters, SwaggerModel):
                     parameters.add_swagger_models(parameter_models)
                 elif isinstance(parameters, list):

{ul-api-utils-8.1.21 → ul-api-utils-8.1.22}/ul_api_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 8.1.21
+Version: 8.1.22
 Summary: Python api utils
 Author: Unic-lab
 Author-email: