ormlambda 2.8.0__py3-none-any.whl → 2.9.4__py3-none-any.whl

ormlambda/utils/table_constructor.py

@@ -1,75 +1,21 @@
+from __future__ import annotations
+from decimal import Decimal
+from typing import Any, Optional, Type, dataclass_transform, overload, TYPE_CHECKING
 import base64
 import datetime
-from decimal import Decimal
-from typing import Any, Iterable, Optional, Type, dataclass_transform, get_type_hints
 import json
 
-from .dtypes import get_query_clausule
-from .module_tree.dfs_traversal import DFSTraversal
-from .column import Column
-
-from .foreign_key import ForeignKey, TableInfo
-
-MISSING = Column()
-
-
-class Field:
-    def __init__(self, name: str, type_: Type, default: object) -> None:
-        self.name: str = name
-        self.type_: Type = type_
-        self.default: Column = default
-
-    def __repr__(self) -> str:
-        return f"{Field.__name__}(name = {self.name}, type_ = {self.type_}, default = {self.default})"
-
-    @property
-    def has_default(self) -> bool:
-        return self.default is not MISSING
+import shapely as sph
 
-    @property
-    def init_arg(self) -> str:
-        # default = f"={self.default_name if self.has_default else None}"
-        default = f"={None}"
 
-        return f"{self.name}: {self.type_name}{default}"
-
-    @property
-    def default_name(self) -> str:
-        return f"_dflt_{self.name}"
-
-    @property
-    def type_name(self) -> str:
-        return f"_type_{self.name}"
-
-    @property
-    def assginment(self) -> str:
-        return f"self._{self.name} = {self.default.__to_string__(self.name,self.name,self.type_name)}"
-
-
-def delete_special_variables(dicc: dict[str, object]) -> None:
-    keys = tuple(dicc.keys())
-    for key in keys:
-        if key.startswith("__"):
-            del dicc[key]
-
-
-def get_fields[T](cls: Type[T]) -> Iterable[Field]:
-    # COMMENT: Used the 'get_type_hints' method to resolve typing when 'from __future__ import annotations' is in use
-    annotations = {key: val for key, val in get_type_hints(cls).items() if not key.startswith("_")}
-
-    # delete_special_variables(annotations)
-    fields = []
-    for name, type_ in annotations.items():
-        # type_ must by Column object
-        field_type = type_
-        if hasattr(type_, "__origin__") and type_.__origin__ is Column:  # __origin__ to get type of Generic value
-            field_type = type_.__args__[0]
-        default: Column = getattr(cls, name, MISSING)
-        fields.append(Field(name, field_type, default))
+from .column import Column
+from .dtypes import get_query_clausule
+from .fields import get_fields
+from .foreign_key import ForeignKey, TableInfo
+from .module_tree.dfs_traversal import DFSTraversal
 
-        # Update __annotations__ to create Columns
-        cls.__annotations__[name] = Column[field_type]
-    return fields
+if TYPE_CHECKING:
+    from .fields import Field
 
 
 @dataclass_transform()
@@ -78,23 +24,32 @@ def __init_constructor__[T](cls: Type[T]) -> Type[T]:
     # TODOL: I don't know if it's better to create a global dictionary like in commit '7de69443d7a8e7264b8d5d604c95da0e5d7e9cc0'
     setattr(cls, "__properties_mapped__", {})
     fields = get_fields(cls)
-    locals_ = {}
-    init_args = []
+
+    locals_: dict[str, Any] = {}
+    init_args: list[str] = ["self"]
+    assignments: list[str] = []
 
     for field in fields:
-        if not field.name.startswith("__"):
-            locals_[field.type_name] = field.type_
+        if field.name.startswith("__"):
+            continue
+
+        locals_[field.type_name] = field.type_
+        locals_[field.default_name] = field.default.column_value
 
-            init_args.append(field.init_arg)
-            locals_[field.default_name] = None  # field.default.column_value
-            __create_properties(cls, field)
+        init_args.append(field.init_arg)
+        assignments.append(field.assginment)
+        __create_properties(cls, field)
+
+    string_locals_ = ", ".join(locals_)
+    string_init_args = ", ".join(init_args)
+    string_assignments = "\n\t\t".join(assignments)
 
     wrapper_fn = "\n".join(
         [
-            f"def wrapper({', '.join(locals_.keys())}):",
-            f" def __init__(self, {', '.join(init_args)}):",
-            "\n".join([f"  {f.assginment}" for f in fields]) or "  pass",
-            " return __init__",
+            f"def wrapper({string_locals_}):",
+            f"\n\tdef __init__({string_init_args}):",
+            f"\n\t\t{string_assignments}",
+            "\treturn __init__",
         ]
     )
 
@@ -109,11 +64,11 @@ def __init_constructor__[T](cls: Type[T]) -> Type[T]:
 
 def __create_properties(cls: Type["Table"], field: Field) -> property:
     _name: str = f"_{field.name}"
-    type_ = field.type_
+
     # we need to get Table attributes (Column class) and then called __getattribute__ or __setattr__ to make changes inside of Column
     prop = property(
-        fget=lambda self: __transform_getter(getattr(self, _name), type_),
-        fset=lambda self, value: __transform_setter(getattr(self, _name), value, type_),
+        fget=lambda self: getattr(self, _name).__getattribute__("column_value"),
+        fset=lambda self, value: getattr(self, _name).__setattr__("column_value", value),
     )
 
     # set property in public name
@@ -122,22 +77,6 @@ def __create_properties(cls: Type["Table"], field: Field) -> property:
     return None
 
 
-def __transform_getter[T](obj: object, type_: T) -> T:
-    return obj.__getattribute__("column_value")
-
-    # if type_ is str and isinstance(eval(obj), Iterable):
-    #     getter = eval(obj)
-    # return getter
-
-
-def __transform_setter[T](obj: object, value: Any, type_: T) -> None:
-    return obj.__setattr__("column_value", value)
-
-    # if type_ is list:
-    #     setter = str(setter)
-    # return None
-
-
 class TableMeta(type):
     def __new__[T](cls: "Table", name: str, bases: tuple, dct: dict[str, Any]) -> Type[T]:
         """
@@ -244,6 +183,7 @@ class Table(metaclass=TableMeta):
             Decimal: str,
             bytes: byte_to_string,
             set: list,
+            sph.Point: lambda x: sph.to_wkt(x, rounding_precision=-1),
         }
 
         if (dtype := type(_value)) in transform_map:
@@ -324,3 +264,35 @@ class Table(metaclass=TableMeta):
                 )
             )
         return False
+
+    @classmethod
+    def get_property_name(cls, _property: property) -> str:
+        name: str = cls.__properties_mapped__.get(_property, None)
+        if not name:
+            raise KeyError(f"Class '{cls.__name__}' has not propery '{_property}' mapped.")
+        return name
+
+    @overload
+    @classmethod
+    def get_column(cls, column: str) -> Column: ...
+    @overload
+    @classmethod
+    def get_column(cls, column: property) -> Column: ...
+    @overload
+    @classmethod
+    def get_column[TProp](cls, column: property, value: TProp) -> Column[TProp]: ...
+    @overload
+    @classmethod
+    def get_column[TProp](cls, column: str, value: TProp) -> Column[TProp]: ...
+    @classmethod
+    def get_column[TProp](cls, column: str | property, value: Optional[TProp] = None) -> Column[TProp]:
+        if isinstance(column, property):
+            _column = cls.get_property_name(column)
+        elif isinstance(column, str) and column in cls.get_columns():
+            _column = column
+        else:
+            raise ValueError(f"'Column' param with value'{column}' is not expected.")
+
+        instance_table: Table = cls(**{_column: value})
+
+        return getattr(instance_table, f"_{_column}")

{ormlambda-2.8.0.dist-info → ormlambda-2.9.4.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.1
 Name: ormlambda
-Version: 2.8.0
+Version: 2.9.4
 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
 Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: fluent-validation (>=3.1.0,<4.0.0)
+Requires-Dist: fluent-validation (==4.3.1)
 Requires-Dist: mysql-connector-python (>=9.0.0,<10.0.0)
+Requires-Dist: shapely (>=2.0.6,<3.0.0)
 Description-Content-Type: text/markdown
 
 ![PyPI version](https://img.shields.io/pypi/v/ormlambda.svg)

{ormlambda-2.8.0.dist-info → ormlambda-2.9.4.dist-info}/RECORD

@@ -1,19 +1,21 @@
-ormlambda/__init__.py,sha256=L-Enc4FPmW3ldBMnWOU3gLn9i4FEc7sQzLWy2mIEti8,538
+ormlambda/__init__.py,sha256=lWQxjf2cQ2bXenNaDpoy2Bar6imiPlzc4nK0hkIYhC0,723
 ormlambda/common/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 ormlambda/common/abstract_classes/__init__.py,sha256=tk2J4Mn_nD-1ZjtMVBE5FH7KR_8ppN_1Kx1s6c38GjM,167
-ormlambda/common/abstract_classes/abstract_model.py,sha256=0mGoW-MF0bX1VrAp2AJZ8Nk_BV7N_2NtzZoUFCg5Wm4,4595
-ormlambda/common/abstract_classes/decomposition_query.py,sha256=c-Vo0f2dnVCv9Qsmqt9AZaZAYvyYhtZFdc3HKyHCMZ0,11396
+ormlambda/common/abstract_classes/abstract_model.py,sha256=xmpr7_Hn5r1bRG2UtOKdhlZgXUqgFGuTTXsmm4LqmEI,5100
+ormlambda/common/abstract_classes/decomposition_query.py,sha256=vX4H-QLGo7mEuDgyXuKSd_1RySywN3fSislrmU4M-No,13791
 ormlambda/common/abstract_classes/non_query_base.py,sha256=5jhvyT7OZaJxlGp9XMP3vQ4ei5QQZBn-fFtJnD640mE,980
 ormlambda/common/abstract_classes/query_base.py,sha256=6qUFPwsVx45kUW3b66pHiSyjhcH4mzbdkddlGeUnG7c,266
 ormlambda/common/enums/__init__.py,sha256=4lVKCHi1JalwgNzjsAXqX-C54NJEH83y2v5baMO8fN4,103
 ormlambda/common/enums/condition_types.py,sha256=mDPMrtzZu4IYv3-q5Zw4NNgwUoNAx4lih5SIDFRn1Qo,309
 ormlambda/common/enums/join_type.py,sha256=7LEhE34bzYOwJxe8yxPJo_EjQpGylgClAPX1Wt3z4n4,292
+ormlambda/common/errors/__init__.py,sha256=cWFOYuAauXxzYyGKVP97Uy0EIim5D8ewoTyK-hXkonY,184
 ormlambda/common/interfaces/IAggregate.py,sha256=i9zZIYrstP2oolUYqR-udeQQl7M0NwSzrr-VUL0b5HI,271
-ormlambda/common/interfaces/IDecompositionQuery.py,sha256=dHdCxezbWwy-c4U4po2hQB8f_wa0wGFvA2TKaHBx0Do,1363
+ormlambda/common/interfaces/ICustomAlias.py,sha256=_4r8ew9trUY_DJWdYUZXhJCe_I62HUr7ZdsmW6Ln98M,121
+ormlambda/common/interfaces/IDecompositionQuery.py,sha256=7B4cnbJbyESk8GltS1A8wCXr56T_6kZJNIij66CcvPA,1447
 ormlambda/common/interfaces/INonQueryCommand.py,sha256=7CjLW4sKqkR5zUIGvhRXOtzTs6vypJW1a9EJHlgCw2c,260
 ormlambda/common/interfaces/IQueryCommand.py,sha256=hfzCosK4-n8RJIb2PYs8b0qU3TNmfYluZXBf47KxxKs,331
-ormlambda/common/interfaces/IRepositoryBase.py,sha256=zGm7tDrFLKj3FMYN-MWI-em3INws27g2yByNYYMx0qk,1126
-ormlambda/common/interfaces/IStatements.py,sha256=df3pGRFSwyBcFct0ntMy8E9RNCHreXTO-qirdetS05M,10674
+ormlambda/common/interfaces/IRepositoryBase.py,sha256=M4pD4t6tXo5WaRhwu2vsza1FoAj2S-rEJKjPfKeSRn0,1134
+ormlambda/common/interfaces/IStatements.py,sha256=RQpOy3REjRf9SV9kDo0ohEzfkzkVBxD_gSiM-Dii5-Y,12821
 ormlambda/common/interfaces/__init__.py,sha256=00ca9a-u_A8DzyEyxPfBMxfqLKFzzUgJaeNmoRitAbA,360
 ormlambda/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ormlambda/components/delete/IDelete.py,sha256=06ZEdbKBxsHSwsGMBu0E1om4WJjojZAm-L3b95eQrcc,139
@@ -33,19 +35,20 @@ ormlambda/components/where/abstract_where.py,sha256=93tIJBC81OUUVV6il7mISibBwqJe
 ormlambda/databases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ormlambda/databases/my_sql/__init__.py,sha256=3PbOp4WqxJzFOSRwBozqyNtQi25cLLdiJFPDzEnSI70,115
 ormlambda/databases/my_sql/clauses/__init__.py,sha256=F7p---sNQBefi_dgydV6Wp1YuOwDzvSQOdbcjWtBi2k,767
+ormlambda/databases/my_sql/clauses/alias.py,sha256=yRBEJ1IlL7j8ZozjR-4jtQNkJZDweu-1VNLJEOyA4o8,887
 ormlambda/databases/my_sql/clauses/count.py,sha256=UFJD-ELp-xvOyPbvYX37GvRZsP8M_axambnI7_h91yA,1177
 ormlambda/databases/my_sql/clauses/create_database.py,sha256=WnWaAuhxeE71NZKXW37WZ-msRqjum7TFCSRK1IGdSTE,1279
 ormlambda/databases/my_sql/clauses/delete.py,sha256=nUKNQgwF5YUfzk2icWpecYjrGk5DeXpp7eiwtWCf_3c,1924
 ormlambda/databases/my_sql/clauses/drop_database.py,sha256=nMM0YUbcH0D9X3bU70Uc6S_dsIrAZy-IrYuIKrQZNrg,505
 ormlambda/databases/my_sql/clauses/drop_table.py,sha256=meX4e-pVPQ7UwlPSHV5e9HHRblI1BlkLSc7ssl8WUiI,592
-ormlambda/databases/my_sql/clauses/group_by.py,sha256=xG8YhdaDWBm99EFMkzCsBJNhHOJy5lvXmpaHu3jClro,1042
-ormlambda/databases/my_sql/clauses/insert.py,sha256=LO9H8VVK3j62dICXqpEUXKxOHPxkD1LGvogmDq2zmho,2805
-ormlambda/databases/my_sql/clauses/joins.py,sha256=U6JnUvQo7AXyEeK-X1jMvckXefgAB7ugSmJCZhH1XQI,3058
+ormlambda/databases/my_sql/clauses/group_by.py,sha256=k2idhaHOfLFwc6XNwhai6LMoAySp6efBTsWCOBVzsc8,1052
+ormlambda/databases/my_sql/clauses/insert.py,sha256=mnOy62U4go0Ub6tmmgn8DRRWvPN12WRE5lqpCNbyR70,3136
+ormlambda/databases/my_sql/clauses/joins.py,sha256=2SHRAah4FDzYwCDfpqz9SLU0cFH20mL-epP_FCPgBxM,4402
 ormlambda/databases/my_sql/clauses/limit.py,sha256=a4lI8FVRKpfXwBQTXdkbVtlQkmzcjE20ymiCy1IaSc4,391
 ormlambda/databases/my_sql/clauses/offset.py,sha256=81170JhsQndjKlDfQj1ll-tiYHQbW8SuU4IE3mhQF7Y,395
-ormlambda/databases/my_sql/clauses/order.py,sha256=RVqyEtD0InnOPAmRvjtNJ-vrAy0V9OHMLoFB8TkpX0I,1137
-ormlambda/databases/my_sql/clauses/select.py,sha256=unJBteFK5D360KnIPyqz8OMaVJqXJlI5Kkp6u0JJ1vU,1574
-ormlambda/databases/my_sql/clauses/update.py,sha256=3Htw0_PT3EckEiF214-V2r63lcNoRBroKZI9yg48Ddg,1867
+ormlambda/databases/my_sql/clauses/order.py,sha256=XTMtR5ObAJxq8eTHp392rykQD991ecJ95dyXXLUpgeU,1680
+ormlambda/databases/my_sql/clauses/select.py,sha256=q-rJWbYtfgKEGf-OOH3ToGY90KXGzH3FnKHTc0xsAbM,1962
+ormlambda/databases/my_sql/clauses/update.py,sha256=d2nSLiGe8OUk0ASgGxchit_1DL-Yg8U-DUtBbgpfkto,1571
 ormlambda/databases/my_sql/clauses/upsert.py,sha256=eW2pQ4ax-GKuXiaWKoSRSS1GrHuILJBsmj83ADbBQ34,1951
 ormlambda/databases/my_sql/clauses/where_condition.py,sha256=UgU5vnTqFAx91wKwnECpww5tETDZ9F7IdC_SiZOgZhI,8336
 ormlambda/databases/my_sql/functions/__init__.py,sha256=hA8t3mUpV2p-pO4TVp5rjC5Yp7aIkWPsS8NpLi3DUh0,171
@@ -53,12 +56,13 @@ ormlambda/databases/my_sql/functions/concat.py,sha256=cZztl5eSATpYMKVKfyPbul6Ooc
 ormlambda/databases/my_sql/functions/max.py,sha256=zrO_RBKsHhyokEmSpPI6Yg5OY6Jf4GGp2RveBJdOuuA,1190
 ormlambda/databases/my_sql/functions/min.py,sha256=SEVuUdIJNz9zM5za1kLTWalFkhErjsjyBb8SU8n0F94,1190
 ormlambda/databases/my_sql/functions/sum.py,sha256=akKYr2dI8TZS5MDvybfHn_idhPOvEH0cj6mDRQIHe-M,1188
-ormlambda/databases/my_sql/repository.py,sha256=fSAAmO_T5mC1bodOVZn5CY9JSfRq4VhsdlWT1JLl7Zw,6927
-ormlambda/databases/my_sql/statements.py,sha256=inUEyLUl3Z6TxE7PpJUWw0SZBoO_JbnrS_XL_wCyHn4,11873
-ormlambda/model_base.py,sha256=RrAATQWX_bHJ0ZQ5sCHyJKA4NiR7ZJY4I6dqhnGWWAc,1216
+ormlambda/databases/my_sql/repository.py,sha256=6qrP-JC4tvUxin3ixGKBeuqvU9cl9mkjNCdwjWZQA9Y,9059
+ormlambda/databases/my_sql/statements.py,sha256=h7tcyCnGaT2nvWyGhfepLTfgn8bMi5f_Bi_09jOfZm4,12455
+ormlambda/model_base.py,sha256=_UGTnin-yUi9ecT-28YY6TniIPdrje-jMFD3QXyZD6c,1243
 ormlambda/utils/__init__.py,sha256=ywMdWqmA2jHj19-W-S04yfaYF5hv4IZ1lZDq0B8Jnjs,142
-ormlambda/utils/column.py,sha256=5FAGzCU4yvNS4MhwJJ5i73h7RvHD5UCVox0NdzMsMiE,1945
-ormlambda/utils/dtypes.py,sha256=1kRsT5JggNS1DMWgSUdBb67CefQHnZ-VTN1WI7nN2yQ,7879
+ormlambda/utils/column.py,sha256=SqbX8N63_RwXNrMXuVMOpatDw--aLc47o3kG1sEXhNs,3413
+ormlambda/utils/dtypes.py,sha256=Ji4QOyKD0n9bKe7yXIIduy9uEX5BaXolQSIsx0NXYJY,7843
+ormlambda/utils/fields.py,sha256=jyUJXJKblhLGqFGgAXkWJeE0FYLd5Ywd7H2pjQsfz8c,2128
 ormlambda/utils/foreign_key.py,sha256=ewGLPtf1MrFogvwGm_jsSnOLAH2G9virXvLcc3co36I,2973
 ormlambda/utils/lambda_disassembler/__init__.py,sha256=q23_F2Vp1_XgVpQSbWQPM5wxzRCZOr7ZMb9X5VG_YxU,229
 ormlambda/utils/lambda_disassembler/dis_types.py,sha256=Myuo9-KSBIJSyr9jfLSDDe1jbrzyOqZNLufv6ODHm98,4824
@@ -70,8 +74,8 @@ ormlambda/utils/lambda_disassembler/tree_instruction.py,sha256=QUnhG89WKJyAlEWAj
 ormlambda/utils/module_tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ormlambda/utils/module_tree/dfs_traversal.py,sha256=lSF03G63XtJFLp03ueAmsHMBvhUkjptDbK3IugXm8iU,1425
 ormlambda/utils/module_tree/dynamic_module.py,sha256=zwvjU3U2cz6H2CDp9Gncs5D5bSAyfITNa2SDqFDl8rw,8551
-ormlambda/utils/table_constructor.py,sha256=8Apm44K6MiYMK3PQyK74MUV18OatbFI9eDLAVklQO0w,11660
-ormlambda-2.8.0.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
-ormlambda-2.8.0.dist-info/METADATA,sha256=HV3vUXqD2StgsPEk4VwRtPLp44DRjIUgSoMTRsWAkNw,8428
-ormlambda-2.8.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ormlambda-2.8.0.dist-info/RECORD,,
+ormlambda/utils/table_constructor.py,sha256=ch1geCSJIQnnv_D_uzfYk6do533kjtZyeCIh2t0_dkU,10863
+ormlambda-2.9.4.dist-info/LICENSE,sha256=xBprFw8GJLdHMOoUqDk0427EvjIcbEREvXXVFULuuXU,1080
+ormlambda-2.9.4.dist-info/METADATA,sha256=URSNrN9Sg-EsXEJ-XI7iBDBXmB-V7rTCX1jvysybIb8,8461
+ormlambda-2.9.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ormlambda-2.9.4.dist-info/RECORD,,