sera-2 1.26.4__tar.gz → 1.26.5__tar.gz

{sera_2-1.26.4 → sera_2-1.26.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sera-2
-Version: 1.26.4
+Version: 1.26.5
 Summary: 
 Author: Binh Vu
 Author-email: bvu687@gmail.com

{sera_2-1.26.4 → sera_2-1.26.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sera-2"
-version = "1.26.4"
+version = "1.26.5"
 description = ""
 authors = ["Binh Vu <bvu687@gmail.com>"]
 readme = "README.md"

{sera_2-1.26.4 → sera_2-1.26.5}/sera/make/ts_frontend/make_query.py

@@ -117,7 +117,7 @@ def make_query(schema: Schema, cls: Class, pkg: Package):
             query_ops.append(('"eq" | "ne"', tstype.type))
         elif tstype.type == "Date":
             # for date type, we use iso string as the value
-            query_ops.append(('"eq" | "ne" | "lt" | "lte" | "gt" | "gte"', "string"))
+            query_ops.append(('"lte" | "gte"', "string"))
             query_ops.append(('"bti"', "[string, string]"))
         else:
             raise NotImplementedError(tstype.type)

{sera_2-1.26.4 → sera_2-1.26.5}/sera/models/_datatype.py

@@ -287,6 +287,22 @@ predefined_datatypes = {
         tstype=TsTypeWithDep(type="string", spectype="dict"),
         is_list=False,
     ),
+    "str2str": DataType(
+        pytype=PyTypeWithDep(type="dict[str, str]"),
+        sqltype=SQLTypeWithDep(
+            type="JSON", mapped_pytype="dict[str, str]", deps=["sqlalchemy.JSON"]
+        ),
+        tstype=TsTypeWithDep(type="Record<string, string>", spectype="str2str"),
+        is_list=False,
+    ),
+    "str2int": DataType(
+        pytype=PyTypeWithDep(type="dict[str, int]"),
+        sqltype=SQLTypeWithDep(
+            type="JSON", mapped_pytype="dict[str, int]", deps=["sqlalchemy.JSON"]
+        ),
+        tstype=TsTypeWithDep(type="Record<string, number>", spectype="str2int"),
+        is_list=False,
+    ),
 }
 
 predefined_py_datatypes = {"bytes": PyTypeWithDep(type="bytes")}

{sera_2-1.26.4 → sera_2-1.26.5}/sera/models/_parse.py

@@ -275,6 +275,14 @@ def _parse_datatype(schema: Schema, datatype: dict | str) -> DataType:
     if isinstance(datatype, dict):
         is_list = datatype.get("is_list", False)
 
+        # Parse Python type and argument if present
+        if datatype["pytype"] in predefined_py_datatypes:
+            py_type = predefined_py_datatypes[datatype["pytype"]]
+        else:
+            py_type = PyTypeWithDep(
+                type=datatype["pytype"]["type"], deps=datatype["pytype"].get("deps", [])
+            )
+
         # Parse SQL type and argument if present
         m = re.match(r"^([a-zA-Z0-9_]+)(\([^)]+\))?$", datatype["sqltype"])
         if m is not None:
@@ -291,7 +299,7 @@ def _parse_datatype(schema: Schema, datatype: dict | str) -> DataType:
             raise ValueError(f"Invalid SQL type format: {datatype['sqltype']}")
 
         return DataType(
-            pytype=predefined_py_datatypes[datatype["pytype"]],
+            pytype=py_type,
             sqltype=sql_type,
             tstype=predefined_ts_datatypes[datatype["tstype"]],
             is_list=is_list,