Fix to_dict() / to_json() export for field $schema (#25)

* [refactor] Remove unused loc * [fix] Set alternative field_name in config() function
dennis6p · Nov 21, 2024 · f8fc4bd · f8fc4bd
1 parent c09bd89
commit f8fc4bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/adaptive_cards/card.py b/adaptive_cards/card.py
@@ -322,7 +322,7 @@ class AdaptiveCard:
     type: str = field(default=TYPE, metadata=utils.get_metadata("1.0"))
     version: str = field(default=VERSION, metadata=utils.get_metadata("1.0"))
     schema: str = field(
-        default=SCHEMA, metadata=utils.get_metadata("1.0") | {"field_name": "$schema"}
+        default=SCHEMA, metadata=utils.get_metadata("1.0", field_name="$schema")
     )
     refresh: Optional[ct.Refresh] = field(
         default=None, metadata=utils.get_metadata("1.4")

diff --git a/adaptive_cards/utils.py b/adaptive_cards/utils.py
@@ -8,7 +8,7 @@
 is_none: Any = lambda f: f is None
 
 
-def get_metadata(min_version: str) -> dict[str, Any]:
+def get_metadata(min_version: str, field_name: str | None = None) -> dict[str, Any]:
     """
     Get default metadata information for dataclass field
 
@@ -19,4 +19,4 @@ def get_metadata(min_version: str) -> dict[str, Any]:
     Returns:
         dict[str, Any]: Metadata information
     """
-    return config(exclude=is_none) | {"min_version": min_version}
+    return config(exclude=is_none, field_name=field_name) | {"min_version": min_version}
diff --git a/adaptive_cards/validation.py b/adaptive_cards/validation.py
@@ -101,11 +101,9 @@ def __validate_elements(self, items: Any):
 
                 if isinstance(value, list):
                     iterables.append(value)
-                    # self.__validate_elements(value)
 
                 elif dataclasses.is_dataclass(value):
                     custom_types.append(value)
-                    # self.__validate_elements(value)
 
                 else:
                     self.__validate_field_version(