pydantic-avro 0.9.3__py3-none-any.whl → 0.10.0__py3-none-any.whl

pydantic_avro/__init__.py

@@ -1 +1,3 @@
-from pydantic_avro.to_avro.base import AvroBase
+from pydantic_avro.to_avro.base import AvroBase as AvroBase
+
+__all__ = ["AvroBase"]

pydantic_avro/to_avro/types.py

@@ -1,3 +1,4 @@
+from copy import deepcopy
 from typing import Any, Dict, List, Optional, Set
 
 from pydantic_avro.to_avro.config import DEFS_NAME
@@ -133,6 +134,13 @@ class AvroTypeConverter:
         f = field_props.get("format")
         r = field_props.get("$ref")
         at = field_props.get("avro_type")
+        
+        # For Pydantic v1, check json_schema_extra for avro_type
+        if at is None and "json_schema_extra" in field_props:
+            json_schema_extra = field_props.get("json_schema_extra")
+            if isinstance(json_schema_extra, dict):
+                at = json_schema_extra.get("avro_type")
+        
         if "allOf" in field_props and len(field_props["allOf"]) == 1:
             r = field_props["allOf"][0]["$ref"]
         if ("prefixItems" in field_props or ("minItems" in field_props and "maxItems" in field_props)) and t == "array":
@@ -142,9 +150,9 @@ class AvroTypeConverter:
         discriminator = field_props.get("discriminator")
 
         if u is not None:
-            return self._union_to_avro(u, avro_type_dict, discriminator)
+            return self._union_to_avro(u, avro_type_dict, discriminator, parent_avro_type=at)
         elif o is not None:
-            return self._union_to_avro(o, avro_type_dict, discriminator)
+            return self._union_to_avro(o, avro_type_dict, discriminator, parent_avro_type=at)
         elif r is not None:
             return self._handle_references(r, avro_type_dict)
         elif t is None:
@@ -232,15 +240,37 @@ class AvroTypeConverter:
             value_type = self._get_avro_type_dict(a)["type"]
         return {"type": "map", "values": value_type}
 
-    def _union_to_avro(self, field_props: list, avro_type_dict: dict, discriminator: Optional[dict] = None) -> dict:
+    def _should_propagate_avro_type(self, union_element: dict, parent_avro_type: str) -> bool:
+        """Determine if parent avro_type should be propagated to this union element"""
+        # Don't propagate to null types or elements that already have avro_type
+        if union_element.get("type") == "null" or "avro_type" in union_element:
+            return False
+        
+        element_format = union_element.get("format")
+        
+        # Only propagate temporal avro_types to date-time formatted elements
+        temporal_avro_types = {"timestamp-millis", "timestamp-micros", "time-millis", "time-micros", "date"}
+        if parent_avro_type in temporal_avro_types:
+            return element_format in {"date-time", "date", "time"}
+        
+        # For other avro_types, only propagate if there's no format (meaning it's not already specialized)
+        return element_format is None
+
+    def _union_to_avro(self, field_props: list, avro_type_dict: dict, discriminator: Optional[dict] = None, parent_avro_type: Optional[str] = None) -> dict:
         """Returns a type of a union field, including discriminated unions"""
         # Handle discriminated unions
         if discriminator is not None:
             return self._discriminated_union_to_avro(field_props, avro_type_dict, discriminator)
 
-        # Standard union handling (unchanged)
+        # Standard union handling
         avro_type_dict["type"] = []
         for union_element in field_props:
+            # Propagate parent avro_type to compatible union elements
+            if parent_avro_type is not None and self._should_propagate_avro_type(union_element, parent_avro_type):
+                # Create a deep copy to avoid modifying the original
+                union_element = deepcopy(union_element)
+                union_element["avro_type"] = parent_avro_type
+            
             t = self._get_avro_type_dict(union_element)
             avro_type_dict["type"].append(t["type"])
         return avro_type_dict

{pydantic_avro-0.9.3.dist-info → pydantic_avro-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydantic-avro
-Version: 0.9.3
+Version: 0.10.0
 Summary: Converting pydantic classes to avro schemas
 Home-page: https://github.com/godatadriven/pydantic-avro
 License: MIT

{pydantic_avro-0.9.3.dist-info → pydantic_avro-0.10.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pydantic_avro/__init__.py,sha256=P4vaozEL8Rea7xWdB6ENj3DNF2RPPOWascfwbtQS7gE,48
+pydantic_avro/__init__.py,sha256=BhoChBv6KWCDjep-S3cAT7YELqnVp33gYYAoGA8r42o,84
 pydantic_avro/__main__.py,sha256=-AL9FNYsAdFmilm-96MbbxymTW6QminXPCBZJ1nkqBE,695
 pydantic_avro/base.py,sha256=i1wco_T6FXFdtlxzbzXt3Jv93TmTzTfJ493KCfZh1dc,78
 pydantic_avro/from_avro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,9 +9,9 @@ pydantic_avro/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pydantic_avro/to_avro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pydantic_avro/to_avro/base.py,sha256=QtCgXnqhcQAxgWVihz5idwoY4slmkJ2WDKcGqLld9Ig,2066
 pydantic_avro/to_avro/config.py,sha256=R9HLkWiXs7YZ02te8CQt5Kf2rbsE8Fx-hjqv3tBSFJU,152
-pydantic_avro/to_avro/types.py,sha256=-qemQC_vs-xy7VJDTQ1y1k7K1J6Qv3pTLILqp17MO2A,12731
-pydantic_avro-0.9.3.dist-info/entry_points.txt,sha256=gwHiQfbGLO8Np2sa1bZ_bpxU7sEufx6IachViBE_Fnw,66
-pydantic_avro-0.9.3.dist-info/LICENSE,sha256=gBlYCG1yxb0vGlsmek0lMPVOK5YDxQope4F54jzeqoY,1069
-pydantic_avro-0.9.3.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-pydantic_avro-0.9.3.dist-info/METADATA,sha256=r_czdRovj5dhYm8sfsLTm16EY7HD5LAGEsOSMJnUZ7g,2945
-pydantic_avro-0.9.3.dist-info/RECORD,,
+pydantic_avro/to_avro/types.py,sha256=qLzIjsjC993Y15Q-haALkVmjeXg8cDSho9-uWQzKTa4,14432
+pydantic_avro-0.10.0.dist-info/entry_points.txt,sha256=gwHiQfbGLO8Np2sa1bZ_bpxU7sEufx6IachViBE_Fnw,66
+pydantic_avro-0.10.0.dist-info/LICENSE,sha256=gBlYCG1yxb0vGlsmek0lMPVOK5YDxQope4F54jzeqoY,1069
+pydantic_avro-0.10.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+pydantic_avro-0.10.0.dist-info/METADATA,sha256=wTZ2dMxMbY9UcsDpS4ZqavFrgUYk0XX88--098JHk_s,2946
+pydantic_avro-0.10.0.dist-info/RECORD,,