pydantic-avro 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

pydantic_avro/from_avro/types.py

@@ -132,7 +132,7 @@ def generate_field_string(field: dict) -> str:
 
 def get_pydantic_type(t: Union[str, dict]) -> str:
     """Get the Pydantic type for a given Avro type"""
-    if isinstance(t, str):
+    if isinstance(t, str) or isinstance(t, list):
         t = {"type": t}
 
     if isinstance(t.get("type"), str):

pydantic_avro/to_avro/types.py

@@ -137,11 +137,14 @@ class AvroTypeConverter:
             r = field_props["allOf"][0]["$ref"]
         if ("prefixItems" in field_props or ("minItems" in field_props and "maxItems" in field_props)) and t == "array":
             t = "tuple"
-
         u = field_props.get("anyOf")
+        o = field_props.get("oneOf")
+        discriminator = field_props.get("discriminator")
 
         if u is not None:
-            return self._union_to_avro(u, avro_type_dict)
+            return self._union_to_avro(u, avro_type_dict, discriminator)
+        elif o is not None:
+            return self._union_to_avro(o, avro_type_dict, discriminator)
         elif r is not None:
             return self._handle_references(r, avro_type_dict)
         elif t is None:
@@ -229,8 +232,13 @@ 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) -> dict:
-        """Returns a type of a union field"""
+    def _union_to_avro(self, field_props: list, avro_type_dict: dict, discriminator: Optional[dict] = 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)
         avro_type_dict["type"] = []
         for union_element in field_props:
             t = self._get_avro_type_dict(union_element)
@@ -277,3 +285,39 @@ class AvroTypeConverter:
             tn = tn["type"]
         avro_type_dict["type"] = {"type": "array", "items": tn}
         return avro_type_dict
+
+    def _discriminated_union_to_avro(self, variants: list, avro_type_dict: dict, discriminator: dict) -> dict:
+        """Handles discriminated unions with a discriminator field"""
+        discriminator_property = discriminator.get("propertyName", "type")
+        variant_types = []
+
+        # Process each variant in the union
+        for variant in variants:
+            # Get the discriminator value for this variant
+            disc_value = None
+            if "properties" in variant and discriminator_property in variant.get("properties", {}):
+                prop = variant["properties"][discriminator_property]
+                if "const" in prop:
+                    disc_value = prop["const"]
+                elif "enum" in prop and len(prop["enum"]) == 1:
+                    disc_value = prop["enum"][0]
+
+            # If we can't determine the discriminator value, generate a regular record
+            if disc_value is None:
+                variant_type = self._get_avro_type_dict(variant)
+            else:
+                # Create a named record for this variant
+                variant_name = f"{disc_value}Variant"
+                if "$ref" in variant:
+                    ref_schema = get_definition(variant["$ref"], self.root_schema)
+                    variant_fields = self.fields_to_avro_dicts(ref_schema)
+                else:
+                    variant_fields = self.fields_to_avro_dicts(variant)
+
+                variant_type = {"type": {"type": "record", "name": variant_name, "fields": variant_fields}}
+
+            variant_types.append(variant_type["type"])
+
+        # Set the union of all variant types
+        avro_type_dict["type"] = variant_types
+        return avro_type_dict

{pydantic_avro-0.9.0.dist-info → pydantic_avro-0.9.2.dist-info}/METADATA

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

{pydantic_avro-0.9.0.dist-info → pydantic_avro-0.9.2.dist-info}/RECORD

@@ -4,14 +4,14 @@ pydantic_avro/base.py,sha256=i1wco_T6FXFdtlxzbzXt3Jv93TmTzTfJ493KCfZh1dc,78
 pydantic_avro/from_avro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pydantic_avro/from_avro/avro_to_pydantic.py,sha256=FOEd_6TqoHSlLALgyveb456B3f7TEPGw2ByRgRcigqc,1356
 pydantic_avro/from_avro/class_registery.py,sha256=n_8yELp-Eux9bAs4CJOV78bQ061VV_-2FuvowOQpWCg,864
-pydantic_avro/from_avro/types.py,sha256=lt-L0mVAflSrpFxQKtjxx1lUCWICdSaXlwGfeJkfXgI,5167
+pydantic_avro/from_avro/types.py,sha256=--aWUMKtR5DUaYXXJ1RrDonLZ7AADcdGGAARopLZexA,5190
 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=Y8QOGTpXO3BwJ6arrRK-k2JniK5kLTvlDpQ0PyZojmg,1409
 pydantic_avro/to_avro/config.py,sha256=R9HLkWiXs7YZ02te8CQt5Kf2rbsE8Fx-hjqv3tBSFJU,152
-pydantic_avro/to_avro/types.py,sha256=pnDRg8ar9a5f57AeEsQr-wyeFJzR2_9fmrRcNkjWT4c,10521
-pydantic_avro-0.9.0.dist-info/entry_points.txt,sha256=gwHiQfbGLO8Np2sa1bZ_bpxU7sEufx6IachViBE_Fnw,66
-pydantic_avro-0.9.0.dist-info/LICENSE,sha256=gBlYCG1yxb0vGlsmek0lMPVOK5YDxQope4F54jzeqoY,1069
-pydantic_avro-0.9.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-pydantic_avro-0.9.0.dist-info/METADATA,sha256=ugz_U6wYoXrHR5DitsZNo15iWixeTPEbTOyaNvlL_ko,2945
-pydantic_avro-0.9.0.dist-info/RECORD,,
+pydantic_avro/to_avro/types.py,sha256=-qemQC_vs-xy7VJDTQ1y1k7K1J6Qv3pTLILqp17MO2A,12731
+pydantic_avro-0.9.2.dist-info/entry_points.txt,sha256=gwHiQfbGLO8Np2sa1bZ_bpxU7sEufx6IachViBE_Fnw,66
+pydantic_avro-0.9.2.dist-info/LICENSE,sha256=gBlYCG1yxb0vGlsmek0lMPVOK5YDxQope4F54jzeqoY,1069
+pydantic_avro-0.9.2.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+pydantic_avro-0.9.2.dist-info/METADATA,sha256=cSYqoXQORSErCOuZMd_T30e-bHrbRRN0bgHMLM5TXq8,2945
+pydantic_avro-0.9.2.dist-info/RECORD,,