ul-api-utils 7.10.6__py3-none-any.whl → 7.10.8__py3-none-any.whl

example/routes/api_some.py

@@ -1,4 +1,5 @@
 import logging
+from enum import IntEnum, Enum
 from time import sleep
 from datetime import datetime, timedelta
 from typing import List, Optional, Tuple
@@ -43,14 +44,18 @@ class RespObject(JsonApiResponsePayload):
     notes: str = ''
 
 
+class Eeenum(IntEnum):
+    one = 1
+    two = 2
+
 class SomeBody(BaseModel):
     seconds: float
-
+    eenum: Optional[Eeenum]
 
 class Some2Query(ApiRequestQuery):
     sleep: float = 0.4
     some: QueryParamsSeparatedList[str] = ''        # type: ignore
-
+    eenum: Optional[Eeenum]
 
 logger = logging.getLogger(__name__)
 
@@ -78,9 +83,14 @@ def some5(api_resource: ApiResource, body: SomeBody) -> JsonApiResponse[List[Res
         RespObject(now=datetime.now() + timedelta(seconds=body.seconds * 2)),
     ], 2)
 
+class Eennum(Enum):
+    one = 'one'
+    two = 'two'
 
 class Some7Query(ApiRequestQuery):
     need_redirect: int
+    eenum: Optional[Eeenum]
+    eennum: Optional[Eennum]
 
 
 @sdk.rest_api('POST', '/example-resource-simple-any', access=sdk.ACCESS_PUBLIC)

ul_api_utils/resources/socketio.py

@@ -48,9 +48,7 @@ def init_socket_io(config: SocketIOConfig | None) -> SocketIO | None:
     if config.app_type is SocketIOConfigType.EXTERNAL_PROCESS:
         socket_io = SocketIO(
             message_queue=config.message_queue,
-            async_mode=SocketAsyncModesEnum.GEVENT.value,
             channel=config.channel,
-            cors_allowed_origins=config.cors_allowed_origins,
             logger=config.logs_enabled,
             engineio_logger=config.engineio_logs_enabled,
         )

ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py

@@ -378,6 +378,7 @@ class SwaggerQueryParameter(SwaggerModel):
         name: Optional[str] = None,
         description: Optional[str] = None,
         required: bool = True,
+        enum: Optional[list] = None,
     ) -> None:
         super(SwaggerQueryParameter, self).__init__()
         self.input_type = InputType.from_string(input_type)  # type: ignore
@@ -386,6 +387,7 @@ class SwaggerQueryParameter(SwaggerModel):
         self.name = name
         self.description = f'description: {description}' if description else ''
         self.required = required
+        self.enum = enum
 
     def perform_write(self, file) -> None:  # type: ignore
         if self.input_type.value == InputType.UUID:
@@ -407,25 +409,48 @@ class SwaggerQueryParameter(SwaggerModel):
                 ),
             )
         else:
-            parameter_entry = inspect.cleandoc(
-                """
-                    - in: query
-                      name: {name}
-                      schema:
-                        type: {input_type}
-                        {input_format}
-                      {default_value}
-                      {description}
-                      required: {required}
-                """.format(
-                    name=self.name,
-                    required=self.required,
-                    description=self.description,
-                    input_type=self.input_type.value,
-                    input_format=self.input_format,
-                    default_value=self.default_value,
-                ),
-            )
+            if self.enum is not None:
+                parameter_entry = inspect.cleandoc(
+                    """
+                        - in: query
+                          name: {name}
+                          schema:
+                            type: {input_type}
+                            {input_format}
+                            enum: {enum}
+                          {default_value}
+                          {description}
+                          required: {required}
+                    """.format(
+                        name=self.name,
+                        required=self.required,
+                        description=self.description,
+                        input_type=self.input_type.value,
+                        input_format=self.input_format,
+                        default_value=self.default_value,
+                        enum=self.enum,
+                    ),
+                )
+            else:
+                parameter_entry = inspect.cleandoc(
+                    """
+                        - in: query
+                          name: {name}
+                          schema:
+                            type: {input_type}
+                            {input_format}
+                          {default_value}
+                          {description}
+                          required: {required}
+                    """.format(
+                        name=self.name,
+                        required=self.required,
+                        description=self.description,
+                        input_type=self.input_type.value,
+                        input_format=self.input_format,
+                        default_value=self.default_value,
+                    ),
+                )
 
         param = self.indent(parameter_entry, 3 * self.TAB)
         file.write(param)
@@ -484,6 +509,7 @@ class SwaggerPath(SwaggerModel):
                     swagger_request_type.add_swagger_model(parameters)
                 query_schema = query_model.schema()
                 query_required_fields = set(query_schema.get('required')) if query_schema.get('required') is not None else set()
+                query_definitions = query_schema.get('definitions')
                 for parameter_name, parameter_spec in query_schema.get('properties').items():
                     if parameter_spec.get('type') is not None:
                         parameter_models.add(SwaggerQueryParameter(
@@ -494,6 +520,17 @@ class SwaggerPath(SwaggerModel):
                             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(
+                            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 isinstance(parameters, SwaggerModel):
                     parameters.add_swagger_models(parameter_models)
                 elif isinstance(parameters, list):

ul_api_utils/utils/memory_db/repository.py

@@ -3,13 +3,12 @@ import redis
 import ormsgpack
 import collections
 
-from pydantic import BaseModel, ValidationError
+from pydantic import ValidationError, parse_obj_as, BaseModel
 from typing import Any, Type, overload, Iterator, KeysView, cast
 
 from ul_api_utils.utils.instance_checks import isinstance_namedtuple
 from ul_api_utils.utils.memory_db.errors import CompositeKeyError, UnsupportedParsingType
 
-
 CompositeKeyT = tuple[str, Type[BaseModel]]
 AnyKeyT = str | CompositeKeyT
 AnyT = Any
@@ -59,10 +58,9 @@ class BaseMemoryDbRepository(collections.abc.MutableMapping[str, AnyT]):
             raise UnsupportedParsingType(f"Unsupported parsing type {_parse_as_type}.")
         value = ormsgpack.unpackb(self._db[composite_key_name])
         try:
-            model_fields = _parse_as_type.__fields_set__
             if isinstance(value, list):
-                return [_parse_as_type.construct(_fields_set=model_fields, **obj) for obj in value]
-            return _parse_as_type.construct(_fields_set=model_fields, **value)
+                return parse_obj_as(list[_parse_as_type], value)  # type: ignore
+            return parse_obj_as(_parse_as_type, value)
         except ValidationError:
             raise UnsupportedParsingType(f"Could not parse the value of key '{composite_key_name}' with type {_parse_as_type}") from None
 

{ul_api_utils-7.10.6.dist-info → ul_api_utils-7.10.8.dist-info}/METADATA

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

{ul_api_utils-7.10.6.dist-info → ul_api_utils-7.10.8.dist-info}/RECORD

@@ -6,7 +6,7 @@ example/pure_flask_example.py,sha256=A7cbcjTr28FS1sVNAsQbj1N9EgEFIXDB4aRwOV6_tbU
 example/rate_limit_load.py,sha256=U2Bgp8UztT4TNKdv9NVioxWfE68aCsC7uKz7xPCy6XM,225
 example/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-example/routes/api_some.py,sha256=fnFO1uFQx-oypCqPNkUfueABrTsAWLdB5spRnhWSZ58,12790
+example/routes/api_some.py,sha256=JN7_MT4zDlXTsPLDJiYUQayjezZ-ti0HVY-OBCDt2gI,13032
 example/sockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example/sockets/on_connect.py,sha256=3sluHnVT_-e2Oa4YsRZUJIc2L4VnMSJu5rgI_mkg8BQ,411
 example/sockets/on_disconnect.py,sha256=ev0uJutqmTSsbrBcQIRudBX-6g7uSmZj8Imuf6pVIMU,277
@@ -78,7 +78,7 @@ ul_api_utils/resources/debugger_scripts.py,sha256=qqf6zeJ1aE_STNYX1j9-ZfBgB_jcQo
 ul_api_utils/resources/not_implemented.py,sha256=OQE5LGA4KqZDwP5Wtub3Aw-icwzbqCSKcEFoFp4w7_k,973
 ul_api_utils/resources/permissions.py,sha256=8c8cEPkm69zxgXbDiwUkW6Mi_496-MZXbPOxHITetKs,1436
 ul_api_utils/resources/rate_limitter.py,sha256=QMpaLu1LoFbvtIEhxF8HbAZIAW4oGKTClt7XEUsqx98,3358
-ul_api_utils/resources/socketio.py,sha256=OzPmHITp3YF5KGVHAwY8DEcKx0PldvXrUhzfkortT64,1979
+ul_api_utils/resources/socketio.py,sha256=oeQdULtBnslyMJkeqfZMWxtK6efLFX1LrfA2cBPhOUo,1859
 ul_api_utils/resources/swagger.py,sha256=fK8S9X4YCSqe_weCzV_BcMPoL_NR073BsGUzn2ImbHI,5391
 ul_api_utils/resources/health_check/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/resources/health_check/const.py,sha256=QzVZP_ZKmVKleUACiOGjzP-v54FD7tEN6NEF4Jb50Ow,78
@@ -124,7 +124,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=eMRDP60GUbIuBGinFPfjp7VsnbgmzockTsIT-KadchA,1690
 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=n_eZkIu-n73ZH7lHErpnq7oGw7C7POf38OgXwWxlBJE,28944
+ul_api_utils/utils/flask_swagger_generator/specifiers/swagger_three_specifier.py,sha256=ofFePEc7wXu1H5_Q5L12JM2HXvqG2HjaKvDj0bhlG6k,30812
 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
@@ -138,7 +138,7 @@ ul_api_utils/utils/jinja/t_url_for.py,sha256=PG9W4UbkWv2pLXNMQiCt22vp4sDi-Uz5w2u
 ul_api_utils/utils/jinja/to_pretty_json.py,sha256=wcc_EJ6yM4lipE0Vr6cgYOB-rBk7_j_Wa7bijjI_bCs,302
 ul_api_utils/utils/memory_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/utils/memory_db/errors.py,sha256=Bw1O1Y_WTCeCRNgb9iwrGT1fst6iHORhrNstwxiaUu8,267
-ul_api_utils/utils/memory_db/repository.py,sha256=dLg8vyYLxWwTFrCo0Mv0fxJGYJOWV4y-U65tG_wK1Uk,3482
+ul_api_utils/utils/memory_db/repository.py,sha256=c_4BJuakhAtf0X3nlIKeWI4bsb1Wf2CK0xjKdY4_o-I,3395
 ul_api_utils/utils/memory_db/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/validators/custom_fields.py,sha256=iqDnAvO-Bs13ZtLtccAG8SdJ8jWDlVcW6_ckChrTdXQ,4023
@@ -146,9 +146,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=QLZ7DFta01Z7DOK9Z5Iq4uf_CmvDkVReis-GAl_QN48,1447
-ul_api_utils-7.10.6.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-7.10.6.dist-info/METADATA,sha256=ewir03FvSTWnMH-6ZbqpAReZPjMva5hmV-3ifoBoGc4,14715
-ul_api_utils-7.10.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-7.10.6.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-7.10.6.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-7.10.6.dist-info/RECORD,,
+ul_api_utils-7.10.8.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-7.10.8.dist-info/METADATA,sha256=hfUgEuBg6yRPvKqT6czDB8u-C0Bz-CEAhg23mw1JDeY,14715
+ul_api_utils-7.10.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-7.10.8.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-7.10.8.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-7.10.8.dist-info/RECORD,,