ormlambda 3.35.1__tar.gz → 3.35.3__tar.gz

{ormlambda-3.35.1 → ormlambda-3.35.3}/PKG-INFO

@@ -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 → ormlambda-3.35.3}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 320
 
 [tool.poetry]
 name = "ormlambda"
-version = "3.35.1"
+version = "3.35.3"
 description = "ORM designed to interact with the database (currently with MySQL) using lambda functions and nested functions"
 authors = ["p-hzamora <p.hzamora@icloud.com>"]
 readme = "README.md"

{ormlambda-3.35.1 → ormlambda-3.35.3}/src/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-3.35.1 → ormlambda-3.35.3}/src/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-3.35.1 → ormlambda-3.35.3}/src/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