pydantic-avro 0.7.2__py3-none-any.whl → 0.8.0__py3-none-any.whl

pydantic_avro/from_avro/types.py

@@ -39,13 +39,19 @@ def list_type_handler(t: dict) -> str:
 
 def map_type_handler(t: dict) -> str:
     """Get the Python type of a given Avro map type"""
+    type_field = t["type"]
+    value_type = None
+    if isinstance(type_field, dict):
+        avro_value_type = type_field.get("values")
+        if avro_value_type is None:
+            raise AttributeError(f"Values are required for map type. Received: {t}")
+        value_type = get_pydantic_type(avro_value_type)
+    if isinstance(type_field, str):
+        value_type = t.get("values")
+
+    if value_type is None:
+        raise AttributeError(f"Values are required for map type. Received: {t}")
 
-    avro_value_type = t["type"].get("values")
-
-    if avro_value_type is None:
-        raise AttributeError("Values are required for map type")
-
-    value_type = get_pydantic_type(avro_value_type)
     return f"Dict[str, {value_type}]"
 
 
@@ -129,7 +135,7 @@ def get_pydantic_type(t: Union[str, dict]) -> str:
     if isinstance(t, str):
         t = {"type": t}
 
-    if isinstance(t["type"], str):
+    if isinstance(t.get("type"), str):
         if ClassRegistry().has_class(t["type"]):
             return t["type"]
 

pydantic_avro/to_avro/types.py

@@ -22,6 +22,45 @@ STRING_TYPE_MAPPING = {
     "binary": "bytes",
 }
 
+AVRO_TYPE_MAPPING = {
+    "timestamp-millis": {
+        "type": "long",
+        "logicalType": "timestamp-millis",
+    },
+    "timestamp-micros": {
+        "type": "long",
+        "logicalType": "timestamp-micros",
+    },
+    "time-millis": {
+        "type": "int",
+        "logicalType": "time-millis",
+    },
+    "time-micros": {
+        "type": "long",
+        "logicalType": "time-micros",
+    },
+    "decimal": {
+        "type": "bytes",
+        "logicalType": "decimal",
+    },
+    "uuid": {
+        "type": "string",
+        "logicalType": "uuid",
+    },
+    "int": "int",
+    "long": "long",
+    "float": "float",
+    "double": "double",
+    "boolean": "boolean",
+    "bytes": "bytes",
+    "string": "string",
+    "null": "null",
+    "date": {
+        "type": "int",
+        "logicalType": "date",
+    },
+}
+
 
 def get_definition(ref: str, schema: dict):
     """Reading definition of base schema for nested structs"""
@@ -91,6 +130,7 @@ class AvroTypeConverter:
         t = field_props.get("type")
         f = field_props.get("format")
         r = field_props.get("$ref")
+        at = field_props.get("avro_type")
         if "allOf" in field_props and len(field_props["allOf"]) == 1:
             r = field_props["allOf"][0]["$ref"]
         u = field_props.get("anyOf")
@@ -101,6 +141,13 @@ class AvroTypeConverter:
             return self._handle_references(r, avro_type_dict)
         elif t is None:
             raise ValueError(f"Field '{field_props}' does not have a defined type.")
+        elif at is not None:
+            if not isinstance(at, str) or at not in AVRO_TYPE_MAPPING:
+                raise ValueError(
+                    f"Field '{field_props}' does not have a supported avro_type. Type should be one of "
+                    f" {AVRO_TYPE_MAPPING.keys()}"
+                )
+            avro_type_dict["type"] = AVRO_TYPE_MAPPING[at]
         elif t == "array":
             return self._array_to_avro(field_props, avro_type_dict)
         elif t == "string":

{pydantic_avro-0.7.2.dist-info → pydantic_avro-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydantic-avro
-Version: 0.7.2
+Version: 0.8.0
 Summary: Converting pydantic classes to avro schemas
 Home-page: https://github.com/godatadriven/pydantic-avro
 License: MIT
@@ -62,6 +62,17 @@ pydantic-avro avro_to_pydantic --asvc /path/to/schema.asvc
 pydantic-avro avro_to_pydantic --asvc /path/to/schema.asvc --output /path/to/output.py
 ```
 
+### Specify expected Avro type
+
+```python
+from datetime import datetime
+from pydantic import Field
+from pydantic_avro.base import AvroBase 
+
+class ExampleModel(AvroBase):
+    field1: int = Field(..., avro_type="long")  # Explicitly set Avro type to "long"
+    field2: datetime = Field(..., avro_type="timestamp-millis")  # Explicitly set Avro type to "timestamp-millis"
+```
 
 ### Install for developers
 

{pydantic_avro-0.7.2.dist-info → pydantic_avro-0.8.0.dist-info}/RECORD

@@ -5,14 +5,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=OIvadvTZJEbUDbTn2To6CqRpJhV8Un_jNqG5NKhqnkY,4864
+pydantic_avro/from_avro/types.py,sha256=lt-L0mVAflSrpFxQKtjxx1lUCWICdSaXlwGfeJkfXgI,5167
 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=gY-4ay0IF1dDIxtVsLyzH-AkzcE_dHpnyCrd00cj3TE,7755
-pydantic_avro-0.7.2.dist-info/entry_points.txt,sha256=gwHiQfbGLO8Np2sa1bZ_bpxU7sEufx6IachViBE_Fnw,66
-pydantic_avro-0.7.2.dist-info/LICENSE,sha256=gBlYCG1yxb0vGlsmek0lMPVOK5YDxQope4F54jzeqoY,1069
-pydantic_avro-0.7.2.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-pydantic_avro-0.7.2.dist-info/METADATA,sha256=uy2VasYG9obxrtyy8AEyDuv_rMOiKQ64oRsiue3bt4g,2571
-pydantic_avro-0.7.2.dist-info/RECORD,,
+pydantic_avro/to_avro/types.py,sha256=9bGoTDxejaHUsKRvQxwqF3-k7NGHU-vjTnhzR3o8m8o,8980
+pydantic_avro-0.8.0.dist-info/entry_points.txt,sha256=gwHiQfbGLO8Np2sa1bZ_bpxU7sEufx6IachViBE_Fnw,66
+pydantic_avro-0.8.0.dist-info/LICENSE,sha256=gBlYCG1yxb0vGlsmek0lMPVOK5YDxQope4F54jzeqoY,1069
+pydantic_avro-0.8.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+pydantic_avro-0.8.0.dist-info/METADATA,sha256=eqI3PQnW1t_AXqyV5gFFlV62w1czrR5m1IaTzY4DLzk,2945
+pydantic_avro-0.8.0.dist-info/RECORD,,