[cdd/sqlalchemy/utils/emit_utils.py] Use ARRAY for list and `tupl…

…e` out of SQLalchemy
offscale · Feb 17, 2024 · c2c8ade · c2c8ade
1 parent 467949e
commit c2c8ade
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/cdd/__init__.py b/cdd/__init__.py
@@ -9,7 +9,7 @@
 from logging import getLogger as get_logger
 
 __author__ = "Samuel Marks"  # type: str
-__version__ = "0.0.99rc33"  # type: str
+__version__ = "0.0.99rc34"  # type: str
 __description__ = (
     "Open API to/fro routes, models, and tests. "
     "Convert between docstrings, classes, methods, argparse, pydantic, and SQLalchemy."

diff --git a/cdd/shared/types.py b/cdd/shared/types.py
@@ -57,4 +57,4 @@
     total=False,
 )
 
-__all__ = ["IntermediateRepr", "Internal"]  # type: list[str]
+__all__ = ["IntermediateRepr", "Internal", "ParamVal"]  # type: list[str]
diff --git a/cdd/sqlalchemy/utils/emit_utils.py b/cdd/sqlalchemy/utils/emit_utils.py
@@ -1429,6 +1429,9 @@ def sqlalchemy_table_to_class(table_expr_ass):
         "string": "String",
         "int64": "BigInteger",
         "Optional[dict]": "JSON",
+        # TODO: Infer type from default fallback to LargeBinary,
+        "list": "ARRAY({})".format("LargeBinary"),
+        "Tuple": "ARRAY({}, as_tuple=True)".format("LargeBinary"),
     }
 )
 

diff --git a/cdd/sqlalchemy/utils/shared_utils.py b/cdd/sqlalchemy/utils/shared_utils.py
@@ -199,8 +199,8 @@ def update_args_infer_typ_sqlalchemy(_param, args, name, nullable, x_typ_sql):
         args.append(
             Name(
                 (
-                    cdd.sqlalchemy.utils.emit_utils.typ2column_type.get(right, right)
-                    if left in cdd.sqlalchemy.utils.emit_utils.typ2column_type
+                    cdd.sqlalchemy.utils.emit_utils.typ2column_type[right]
+                    if right in cdd.sqlalchemy.utils.emit_utils.typ2column_type
                     else cdd.sqlalchemy.utils.emit_utils.typ2column_type.get(left, left)
                 ),
                 Load(),

diff --git a/cdd/tests/test_docstring/test_parse_docstring_utils.py b/cdd/tests/test_docstring/test_parse_docstring_utils.py
@@ -7,6 +7,7 @@
 
 import cdd.shared.docstring_parsers
 from cdd.docstring.utils.parse_utils import parse_adhoc_doc_for_typ
+from cdd.shared.pure_utils import pp
 from cdd.tests.mocks.docstrings import docstring_google_keras_tensorboard_return_str
 from cdd.tests.mocks.ir import class_google_keras_tensorboard_ir
 from cdd.tests.utils_for_tests import unittest_main
@@ -31,6 +32,13 @@ def test_parse_adhoc_doc_for_typ(self) -> None:
         """
         Test that `parse_adhoc_doc_for_typ` works for various found-in-wild Keras variants
         """
+        pp(
+            parse_adhoc_doc_for_typ(
+                "Dictionary of `{str: object}` pairs, where the `str` key is the object name.",
+                name="",
+                default_is_none=False,
+            )
+        )
         deque(
             map(
                 lambda output_input: self.assertEqual(