fix: types converting corner cases (#2)

* Fixed types corner cases
* Bump version for release
* Fixed linters

Author: svdimchenko

README.md

@@ -58,7 +58,7 @@ you get this JSON
 
 ```json
 {
-  "//": "Generated by j2g at 2022-05-25 12:35:55.333570. DO NOT EDIT",
+  "//": "Generated by pydantic-glue at 2022-05-25 12:35:55.333570. DO NOT EDIT",
   "columns": {
     "nums": "array<int>",
     "bars": "array<struct<name:string,age:int>>",

pydantic_glue/cli.py

@@ -18,12 +18,11 @@ def cli() -> None:
 
     imported = __import__(os.path.basename(module_file))
     imported = getattr(imported, class_name)
-    schema = imported.model_json_schema()
-    schema = convert(schema)
-    schema = {k: v for (k, v) in schema}
-    schema = {
+    input_schema = json.dumps(imported.model_json_schema())
+    converted = convert(input_schema)
+    output = {
         "//": f"Generated by pydantic-glue at {datetime.now()}. DO NOT EDIT",
-        "columns": schema,
+        "columns": {k: v for (k, v) in converted},
     }
 
-    print(json.dumps(schema, indent=2))
+    print(json.dumps(output, indent=2))

pydantic_glue/handler.py

@@ -39,8 +39,11 @@ def handle_map(o: dict[str, Any]) -> str:
 
 
 def handle_union(o: dict[str, Any]) -> str:
-    res = [dispatch(v) for v in o["anyOf"]]
-    return f"union<{','.join(res)}>"
+    types = [i for i in o["anyOf"] if i["type"] != "null"]
+    if len(types) > 1:
+        res = [dispatch(v) for v in types]
+        return f"union<{','.join(res)}>"
+    return dispatch(types[0])
 
 
 def map_dispatch(o: dict[str, Any]) -> list[tuple[str, str]]:
@@ -61,9 +64,7 @@ def handle_root(o: dict[str, Any]) -> list[tuple[str, str]]:
     return map_dispatch(o)
 
 
-def convert(schema: dict[str, Any]) -> Union[list[Any], list[tuple[str, str]]]:
+def convert(schema: str) -> Union[list[Any], list[tuple[str, str]]]:
     if not schema:
         return []
-
-    schema = jsonref.loads(schema)
-    return handle_root(schema)
+    return handle_root(jsonref.loads(schema))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydantic-glue"
-version = "0.1.0"
+version = "0.2.0"
 description = "Convert pydantic model to aws glue schema for terraform"
 authors = ["Serhii Dimchenko <svdimchenko@gmail.com>"]
 readme = "README.md"

tests/unit/test_j2g.py tests/unit/test_convert.pytests/unit/test_j2g.py renamed to tests/unit/test_convert.py

@@ -1,5 +1,5 @@
 import json
-from typing import Union
+from typing import Optional, Union
 
 from pydantic import BaseModel
 from pydantic_glue import convert
@@ -163,3 +163,12 @@ class A(BaseModel):
 
     expected = [("stuff", "union<struct<hey:string,ho:string>,struct<lets:int,go:int>>")]
     assert convert(json.dumps(A.model_json_schema())) == expected
+
+
+def test_single_optional_column():
+    class A(BaseModel):
+        name: Optional[str] = None
+
+    expected = [("name", "string")]
+    actual = json.dumps(A.model_json_schema())
+    assert convert(actual) == expected