ul-api-utils 8.1.21__py3-none-any.whl → 8.1.22__py3-none-any.whl

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.dist-info → ul_api_utils-8.1.22.dist-info}/METADATA

@@ -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.dist-info → ul_api_utils-8.1.22.dist-info}/RECORD

@@ -126,7 +126,7 @@ ul_api_utils/utils/flask_swagger_generator/exceptions.py,sha256=yA4IsUyxh5puyoYz
 ul_api_utils/utils/flask_swagger_generator/specifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_models.py,sha256=P52azB25Ncpp6I5j5bq4LLAJHDLSORFVJp9bHoXvpQk,1698
 ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_specifier.py,sha256=9Cf1ijk90IDYUDG8kTjK4cxjdxpYjWZz1tKJHPCeDAA,1513
-ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py,sha256=jPdy2zHAg9BjRzU0rrqiosfMir0pjdrPfrp1rEQHVj0,30819
+ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py,sha256=XxQ0IdC-WRs_qgS0tFcD_yqApdH_gLR--CB-uvB29JA,32355
 ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_version.py,sha256=A14IRG-e2KL2SlFbHep2FH0uMRIHPhfd7KLkYdtWrfA,1312
 ul_api_utils/utils/flask_swagger_generator/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/utils/flask_swagger_generator/utils/input_type.py,sha256=Ynp3zI5q1F0Tl_eTdNbWoCxRKPwBCJkwJOoeHE2pTRE,2533
@@ -148,9 +148,9 @@ ul_api_utils/validators/validate_empty_object.py,sha256=3Ck_iwyJE_M5e7l6s1i88aqb
 ul_api_utils/validators/validate_uuid.py,sha256=EfvlRirv2EW0Z6w3s8E8rUa9GaI8qXZkBWhnPs8NFrA,257
 ul_api_utils/validators/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/validators/__tests__/test_custom_fields.py,sha256=omXI_PPefDfCehEVJxEevep8phY6aySjLnpW_usT85U,1385
-ul_api_utils-8.1.21.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-8.1.21.dist-info/METADATA,sha256=dvWXhY1fsuIeO5nNOuMcjrsAx8g0ySsgNhnN-j-CJmk,14748
-ul_api_utils-8.1.21.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-8.1.21.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-8.1.21.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-8.1.21.dist-info/RECORD,,
+ul_api_utils-8.1.22.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-8.1.22.dist-info/METADATA,sha256=EsNMXpIyQI_WuRini8K8R06K6E6BmOXc6Far1yVxlrk,14748
+ul_api_utils-8.1.22.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-8.1.22.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-8.1.22.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-8.1.22.dist-info/RECORD,,