sera-2 1.26.4__py3-none-any.whl → 1.26.5__py3-none-any.whl

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/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/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,

{sera_2-1.26.4.dist-info → sera_2-1.26.5.dist-info}/METADATA

@@ -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.dist-info → sera_2-1.26.5.dist-info}/RECORD

@@ -33,7 +33,7 @@ sera/make/ts_frontend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 sera/make/ts_frontend/make_class_schema.py,sha256=JrUNBl5yJSbVFrdGcuC7sG0A-HhmXl24VJWCTVkDh8I,14458
 sera/make/ts_frontend/make_draft_model.py,sha256=LY1HP6BuEmtxEevqAWMe-GJyTbK-yDIsUjLjZdd-0Rg,32570
 sera/make/ts_frontend/make_enums.py,sha256=3U6Dt5Y4DM6D_ZiitcVHXtNQyA9cTE046WCDQCDOvSU,2596
-sera/make/ts_frontend/make_query.py,sha256=YnUBwMW_3LRJBoV2dpim6M6ouNhPPloCT2YBEBLgU7M,5731
+sera/make/ts_frontend/make_query.py,sha256=ZpNhVEQn59xk16kMmM6HcwKy_9WpvdeFx0h1xCoCbeA,5703
 sera/make/ts_frontend/misc.py,sha256=A54nMg4dsn1AC_6T1tFRW3rZAJ71d7SHEMrFOdsI3jo,1011
 sera/misc/__init__.py,sha256=ee7OODdWPKP8pCDxsfg1EOdxxKFMJCoNMljgV0NCxBw,767
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
@@ -42,15 +42,15 @@ sera/models/__init__.py,sha256=ZCnwzgUXhmHEcx5a7nYLopsBXJmSnfSkjt4kUH_vPnM,833
 sera/models/_class.py,sha256=495nP6j4pZIX1j0ZElUHNxe9doUX7vzSIwVrp_lAOHE,2922
 sera/models/_collection.py,sha256=5VsjmPMlZW-fYvcoYWOKD7Ch34zBYe4EPsjAn6bX7BY,2962
 sera/models/_constraints.py,sha256=SwUkvV8sESfuO3En6keA_r8GxKiarXYxMb5biml63lU,2021
-sera/models/_datatype.py,sha256=OlCnQlEpB4w9doz0hPhaZk5d4sF664CdGznSBvx0X9g,10293
+sera/models/_datatype.py,sha256=0tut54rLErfzx0--S4Plf_YPsu0jKiFSSXHY1acOgU8,10921
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=FRtEfto2httDB308W8OAuHh2LSazV3v16DHixlz1IZA,2088
 sera/models/_module.py,sha256=0jWfzb5iMF4IazeOKd_m9hWe7-xIsz7xlWF6mbdnHxw,5394
 sera/models/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebskFTjQLA,1186
-sera/models/_parse.py,sha256=nihBEDni-jKwecSBagd6bupDOuCzGviuoD9u6-rT64Q,13203
+sera/models/_parse.py,sha256=ft5RbsBqkxxKcMOU6Bn_70ai0Lpo4FK2Shdmt4BjX-Q,13498
 sera/models/_property.py,sha256=Qo23KZl5OQNbuceygicgC3_Yv5ve1KxiFiMoWq6Ljj0,7758
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=7S6Ah-Yfcl8a0xAJ4lxEcguq3rYVM7SBeOiuxyJhC04,1089
-sera_2-1.26.4.dist-info/METADATA,sha256=9tRFamnahw1dsWTpsIeoBGCkF8pLU2o6rNlQG2PExbA,987
-sera_2-1.26.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-sera_2-1.26.4.dist-info/RECORD,,
+sera_2-1.26.5.dist-info/METADATA,sha256=5gvMEmoiQVFWW9BlLdaDy9YP-gMSAl8DwL02QYGaSI0,987
+sera_2-1.26.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+sera_2-1.26.5.dist-info/RECORD,,