ormlambda 3.35.1__py3-none-any.whl → 3.35.3__py3-none-any.whl

ormlambda/databases/my_sql/caster/types/iterable.py

@@ -1,8 +1,9 @@
 from typing import Optional
 from ormlambda.caster import BaseCaster, Caster
+from .json import JsonCaster
 
 
-class IterableCaster[TType](BaseCaster[bytes, TType]):
+class IterableCaster[TType](JsonCaster[TType]):
     def __init__(self, value: bytes, type_value: TType):
         super().__init__(value, type_value)
 
@@ -18,12 +19,12 @@ class IterableCaster[TType](BaseCaster[bytes, TType]):
     @property
     @BaseCaster.return_value_if_exists
     def to_database(self) -> Optional[bytes]:
-        return tuple(self.value)
+        return super().to_database
 
     @property
     @BaseCaster.return_value_if_exists
     def from_database(self) -> Optional[bytes]:
-        return tuple(self.value)
+        return super().from_database
 
     @property
     @BaseCaster.return_value_if_exists

ormlambda/sql/table/table.py

@@ -6,6 +6,7 @@ from ormlambda.sql import Column
 from ormlambda.sql import ForeignKey
 from ormlambda.util.module_tree.dfs_traversal import DFSTraversal
 from ormlambda.sql.ddl import CreateTable
+from ormlambda.util import make_hashable 
 
 if TYPE_CHECKING:
     from ormlambda.statements import BaseStatement
@@ -96,11 +97,7 @@ class Table(metaclass=TableMeta):
         dicc: dict[str, Any] = {}
         for x in self.__annotations__:
             value = getattr(self, x)
-            if isinstance(value, dict):
-                value = tuple(sorted(value.items()))
-            if isinstance(value, list | set):
-                value = tuple(value)
-            dicc[x] = value
+            dicc[x] = make_hashable(value)
         return dicc
 
     @classmethod

ormlambda/util/__init__.py

@@ -2,7 +2,7 @@ from .module_tree import ModuleTree  # noqa: F401
 from .load_module import __load_module__  # noqa: F401
 import types
 import inspect
-from typing import Any, Literal, Optional, Sequence, overload, get_origin, TypeGuard, TypeAliasType
+from typing import Any, Literal, Optional, overload, get_origin, TypeGuard, TypeAliasType
 from ormlambda.util.typing import LITERAL_TYPES, _AnnotationScanType
 from .plugin_loader import PluginLoader  # noqa: F401
 
@@ -86,3 +86,17 @@ def is_literal(type_: Any) -> bool:
 
 def is_pep695(type_: _AnnotationScanType) -> TypeGuard[TypeAliasType]:
     return isinstance(type_, TypeAliasType)
+
+
+def make_hashable(item: Any) -> Any:
+    if isinstance(item, dict):
+        return tuple(sorted((k, make_hashable(x)) for k, x in item.items()))
+
+    if isinstance(item, (list | set)):
+        return tuple(make_hashable(x) for x in item)
+    if hasattr(item, "__iter__") and not isinstance(item, str | bytes):
+        try:
+            return tuple(make_hashable(x) for x in item)
+        except TypeError:
+            return item  # if it fails, it's already hashable
+    return item

{ormlambda-3.35.1.dist-info → ormlambda-3.35.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ormlambda
-Version: 3.35.1
+Version: 3.35.3
 Summary: ORM designed to interact with the database (currently with MySQL) using lambda functions and nested functions
 Author: p-hzamora
 Author-email: p.hzamora@icloud.com

{ormlambda-3.35.1.dist-info → ormlambda-3.35.3.dist-info}/RECORD

@@ -33,7 +33,7 @@ ormlambda/databases/my_sql/caster/types/datetime.py,sha256=ISzcsbwijTa2wC9ZD8zy5
 ormlambda/databases/my_sql/caster/types/decimal.py,sha256=ycQnSqO-aFkrcsa8JKVPdnfjotNL_BUFeScYRcueOWM,1068
 ormlambda/databases/my_sql/caster/types/float.py,sha256=EbU6J3yoL5_naLowfibkfUC9Bk9WzDaWks7lJ2pNhyA,1026
 ormlambda/databases/my_sql/caster/types/int.py,sha256=a30xbe0LNj2BvbtLNZhUXFvT3WJ115MFsHC19Y3NLTk,1016
-ormlambda/databases/my_sql/caster/types/iterable.py,sha256=nFPMOiaahzw_HWSdMZLRDQVim0aWUMoP-OLvp7vONC4,1029
+ormlambda/databases/my_sql/caster/types/iterable.py,sha256=S7pEAJ_NaxZqYhJAXwaJBS_zrbSz9J2yiYPpmDHATso,1057
 ormlambda/databases/my_sql/caster/types/json.py,sha256=AR7D6CEgyK3zAEijyNO1AuWtLBgC7KTj-YNEWkyilkg,1042
 ormlambda/databases/my_sql/caster/types/none.py,sha256=Bl4jpVVyoLG7ehoCAYj9lFBZbRWbyDN8QsQeWmIb84I,948
 ormlambda/databases/my_sql/caster/types/point.py,sha256=GHAf51kE0AS7wOlCYM9YW-z2ZbmY8hXwcHs979ZCeaY,1442
@@ -131,7 +131,7 @@ ormlambda/sql/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 ormlambda/sql/sqltypes.py,sha256=mvFn_YM0RTpQWj_ggE4SfbD_LxQhjJX4Kz2M3XUsuBk,14442
 ormlambda/sql/table/__init__.py,sha256=LLZcMLjwFxgBCPhdm5UQYYZDIbtYWCKPO9CbcXsy5zI,50
 ormlambda/sql/table/fields.py,sha256=ovNR3bJ473aKW-2NhbKr0iJlVpgW06jurHLob2IyZU8,2116
-ormlambda/sql/table/table.py,sha256=Po6mWk6-ES8URSO6sdoFnnCIACrdce03y0LCcvgXAGk,6686
+ormlambda/sql/table/table.py,sha256=3p7JPdYu3tGEw3jfNk2Qm36NrBFvyGQXcdBNI2p-pkk,6567
 ormlambda/sql/table/table_constructor.py,sha256=c3Z-1El0onSClYBmAatoUBYUOT70tITVqtsDJMxZ9QU,1092
 ormlambda/sql/type_api.py,sha256=vepqMw6hR4zVhhNIYbtX491iVsxAfwHiSiD3uYQUGTE,1067
 ormlambda/sql/types.py,sha256=lQxC5gbhDPRckGSRJZ4rYSZr-XUvIMMH8WfkN1wtM1g,844
@@ -145,15 +145,15 @@ ormlambda/statements/statements.py,sha256=ZgZdrwXwj4QBpY_ogTy4S-8i3uH42LHEuGOMcI
 ormlambda/statements/types.py,sha256=wNxgXOlL8zBT9PtVgDSnEZFmZdNAJhSzxsR9QLMzO0A,1873
 ormlambda/types/__init__.py,sha256=xVFaIMcfJvbbXs8BAvmBh8FwSiLn2R6yjZs9o-h08XM,323
 ormlambda/types/metadata.py,sha256=93eJItdVDOItf7YRJUVmN_m79WLa3Ge6I414ewYnKeM,624
-ormlambda/util/__init__.py,sha256=DZWwtrD8tNJxJcK7vdAuTdZeDJC6jBtqIDPv-i8GJFY,2910
+ormlambda/util/__init__.py,sha256=k0lT-9VrU5jkYV2IANr-lcANP8JlSqO0z-9zJ-pjDpw,3386
 ormlambda/util/load_module.py,sha256=W9NeCuwditS0UuQU0TlVHA65E74NYggEEfdWy1ap9ZI,648
 ormlambda/util/module_tree/__init__.py,sha256=LNQtqkwO1ul49Th3aHAIiyt0Wt899GmXCc44Uz1eDyY,53
 ormlambda/util/module_tree/dfs_traversal.py,sha256=lSF03G63XtJFLp03ueAmsHMBvhUkjptDbK3IugXm8iU,1425
 ormlambda/util/module_tree/dynamic_module.py,sha256=vJOqvm5-WKksudXBK1IcTn4WsuLxt1qXNISq-_21sy4,8705
 ormlambda/util/plugin_loader.py,sha256=p6WLn-MF1bQd2i2GHy98WQjNKmbQdqIUyTFIcBIHC5M,1034
 ormlambda/util/typing.py,sha256=Z7irz53ui0hoFnJTe06NX4JPl60_thgdjJIxh5gjGGk,169
-ormlambda-3.35.1.dist-info/AUTHORS,sha256=uWpOHaCPTOLbVkk5x9McoLwbgzSeCg7yILeDRyMGWGM,606
-ormlambda-3.35.1.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
-ormlambda-3.35.1.dist-info/METADATA,sha256=gKPn-L5OzZCu7iBTRK6I7A0cR50prBpLQwXaJA27MuA,13326
-ormlambda-3.35.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ormlambda-3.35.1.dist-info/RECORD,,
+ormlambda-3.35.3.dist-info/AUTHORS,sha256=uWpOHaCPTOLbVkk5x9McoLwbgzSeCg7yILeDRyMGWGM,606
+ormlambda-3.35.3.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
+ormlambda-3.35.3.dist-info/METADATA,sha256=M6Hi8T3ZDQYc_jagfS5fpMa7HPtwOnerYUw5DPOCXTU,13326
+ormlambda-3.35.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ormlambda-3.35.3.dist-info/RECORD,,