pydantic-avro 0.7.1__tar.gz → 0.7.3__tar.gz

{pydantic_avro-0.7.1 → pydantic_avro-0.7.3}/PKG-INFO

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

{pydantic_avro-0.7.1 → pydantic_avro-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydantic-avro"
-version = "0.7.1"
+version = "0.7.3"
 description = "Converting pydantic classes to avro schemas"
 authors = ["Peter van 't Hof' <peter.vanthof@godatadriven.com>"]
 
@@ -20,7 +20,7 @@ pydantic = ">=1.4,<3.0"
 
 [tool.poetry.dev-dependencies]
 coverage = { version = "^7.2.2", extras = ["toml"] }
-pytest = "^7.4.4"
+pytest = "^8.3.5"
 pytest-mock = "^3.10.0"
 pyproject-flake8 = "^7.0.0"
 isort = "^5.10.0"

{pydantic_avro-0.7.1 → pydantic_avro-0.7.3}/setup.py

@@ -18,7 +18,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'pydantic-avro',
-    'version': '0.7.1',
+    'version': '0.7.3',
     'description': 'Converting pydantic classes to avro schemas',
     'long_description': '[![Python package](https://github.com/godatadriven/pydantic-avro/actions/workflows/python-package.yml/badge.svg)](https://github.com/godatadriven/pydantic-avro/actions/workflows/python-package.yml)\n[![codecov](https://codecov.io/gh/godatadriven/pydantic-avro/branch/main/graph/badge.svg?token=5L08GOERAW)](https://codecov.io/gh/godatadriven/pydantic-avro)\n[![PyPI version](https://badge.fury.io/py/pydantic-avro.svg)](https://badge.fury.io/py/pydantic-avro)\n[![CodeQL](https://github.com/godatadriven/pydantic-avro/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/godatadriven/pydantic-avro/actions/workflows/codeql-analysis.yml)\n\n# pydantic-avro\n\nThis library can convert a pydantic class to a avro schema or generate python code from a avro schema.\n\n### Install\n\n```bash\npip install pydantic-avro\n```\n\n### Pydantic class to avro schema\n\n```python\nimport json\nfrom typing import Optional\n\nfrom pydantic_avro.base import AvroBase\n\n\nclass TestModel(AvroBase):\n    key1: str\n    key2: int\n    key2: Optional[str]\n\n\nschema_dict: dict = TestModel.avro_schema()\nprint(json.dumps(schema_dict))\n\n```\n\n### Avro schema to pydantic\n\n```shell\n# Print to stdout\npydantic-avro avro_to_pydantic --asvc /path/to/schema.asvc\n\n# Save it to a file\npydantic-avro avro_to_pydantic --asvc /path/to/schema.asvc --output /path/to/output.py\n```\n\n\n### Install for developers\n\n###### Install package\n\n- Requirement: Poetry 1.*\n\n```shell\npoetry install\n```\n\n###### Run unit tests\n```shell\npytest\ncoverage run -m pytest  # with coverage\n# or (depends on your local env) \npoetry run pytest\npoetry run coverage run -m pytest  # with coverage\n```\n\n##### Run linting\n\nThe linting is checked in the github workflow. To fix and review issues run this:\n```shell\nblack .   # Auto fix all issues\nisort .   # Auto fix all issues\npflake .  # Only display issues, fixing is manual\n```\n',
     'author': "Peter van 't Hof'",

{pydantic_avro-0.7.1 → pydantic_avro-0.7.3}/src/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}]"
 
 
@@ -56,10 +62,19 @@ def logical_type_handler(t: dict) -> str:
 
 def enum_type_handler(t: dict) -> str:
     """Gets the enum type of a given Avro enum type and adds it to the class registry"""
-    name = t["type"].get("name")
+    if t["type"] == "enum":
+        # comes from a unioned enum (e.g. ["null", "enum"])
+        type_info = t
+    else:
+        # comes from a direct enum
+        type_info = t["type"]
+
+    name = type_info["name"]
+    symbols = type_info["symbols"]
+
     if not ClassRegistry().has_class(name):
         enum_class = f"class {name}(str, Enum):\n"
-        for s in t["type"].get("symbols"):
+        for s in symbols:
             enum_class += f'    {s} = "{s}"\n'
         ClassRegistry().add_class(name, enum_class)
     return name
@@ -120,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"]