fix hashable field.

Author: flask-pro

CHANGES.md

@@ -1,8 +1,16 @@
+## Version 0.13.1
+
+* Fix hashable field.
+
+## Version 0.13.0
+
+* Fix exceptions structure.
+
 ## Version 0.12.1
 
 * Fix arguments validation.
 
-* ## Version 0.12.0
+## Version 0.12.0
 
 * Validating and serializing arguments from `request.view_args` to `request.first_view_args`.
 * Validating and serializing arguments from `request.args` to `request.first_args`.

src/flask_first/__init__.py

@@ -29,7 +29,7 @@
 from .schema.tools import convert_schemas
 from .schema.tools import resolving_refs
 
-__version__ = '0.13.0'
+__version__ = '0.13.1'
 
 
 class First:

src/flask_first/schema/schema_maker.py

@@ -1,8 +1,13 @@
+from typing import Any
+
 from marshmallow import fields
 from marshmallow import INCLUDE
 from marshmallow import Schema
 from marshmallow import validate
 from marshmallow import ValidationError
+from marshmallow.fields import Boolean
+from marshmallow.fields import Field
+from marshmallow.fields import Nested
 
 from .custom_fields import AllOf
 from .custom_fields import AnyOf
@@ -20,6 +25,10 @@ def _validate(self, value):
             raise ValidationError('Invalid value')
 
 
+class HashmapField(fields.Field):
+    pass
+
+
 FIELDS_VIA_TYPES = {
     'boolean': fields.Boolean,
     'number': fields.Float,
@@ -47,12 +56,16 @@ class Meta:
 
 
 def _make_object_field(schema: dict, as_nested: bool = True) -> fields.Nested | type:
-    if schema.get('properties') is None and schema['additionalProperties'].get('oneOf'):
-        return HashmapSchema
 
     fields_obj = {}
     for field_name, field_schema in schema['properties'].items():
-        if field_schema['type'] == 'object':
+        if (
+            field_schema.get('additionalProperties')
+            and isinstance(field_schema['additionalProperties'], dict)
+            and field_schema['additionalProperties'].get('oneOf')
+        ):
+            field = HashmapField()
+        elif field_schema['type'] == 'object':
             field = make_marshmallow_schema(field_schema, as_nested=True)
         else:
             field = make_marshmallow_schema(field_schema)
@@ -107,7 +120,9 @@ def _make_field_validators(schema: dict) -> list[validate.Validator]:
     return validators
 
 
-def make_marshmallow_schema(schema: dict, as_nested: bool = False) -> fields.Field:
+def make_marshmallow_schema(
+    schema: dict, as_nested: bool = False
+) -> type[HashmapSchema] | Field | Nested | type | Boolean | Any:
     if 'nullable' in schema and schema.get('type', ...) is ...:
         field = FIELDS_VIA_TYPES['boolean']()
     elif 'allOf' in schema:
@@ -118,6 +133,12 @@ def make_marshmallow_schema(schema: dict, as_nested: bool = False) -> fields.Fie
         field = _make_multiple_field(schema['oneOf'], 'oneOf')
     elif schema.get('format'):
         field = FIELDS_VIA_FORMATS[schema['format']]()
+    elif (
+        schema.get('properties') is None
+        and schema['type'] == 'object'
+        and schema['additionalProperties'].get('oneOf')
+    ):
+        field = HashmapSchema
     elif schema['type'] == 'object':
         field = _make_object_field(schema, as_nested=as_nested)
     elif schema['type'] == 'array':

tests/specs/v3.0/not_defined_name_key.openapi.yaml

@@ -13,6 +13,16 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ObjectSchema"
+  /sub_hashable_obj:
+    get:
+      operationId: sub_hashable_obj
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/SubObjectSchema"
 components:
   schemas:
     ObjectSchema:
@@ -22,3 +32,11 @@ components:
         oneOf:
           - type: string
       example: "{'unknown_name': 'Value'}"
+    SubObjectSchema:
+      type: object
+      nullable: true
+      additionalProperties: false
+      properties:
+          any_field:
+              $ref: "#/components/schemas/ObjectSchema"
+      example: "{'unknown_name': 'Nested hashmap'}"

tests/test_flask_first.py

@@ -399,7 +399,12 @@ def test_specification__not_defined_name_key():
     def one_of_endpoint() -> dict:
         return {'name': 'Test_name'}
 
+    def sub_hashable_obj() -> dict:
+        return {'any_field': 'Test_name'}
+
     first.add_view_func(one_of_endpoint)
+    first.add_view_func(sub_hashable_obj)
 
     with app.test_client() as test_client:
         assert test_client.get('/one_of_endpoint').status_code == 200
+        assert test_client.get('/sub_hashable_obj').status_code == 200