python-plugins 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

python_plugins/sqla/utils/__init__.py

@@ -1,6 +1,6 @@
 from .attr import is_column
 from .attr import is_relationship
-from .attr import is_hybrid
+from .attr import is_hybrid_property
 from .attr import is_association_proxy
 from .attr import get_field_with_path
 from .expression import parse_like_term

python_plugins/sqla/utils/attr.py

@@ -1,10 +1,12 @@
 from typing import Tuple, List
+from sqlalchemy import inspect
 from sqlalchemy.orm import ColumnProperty
 from sqlalchemy.orm import RelationshipProperty
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.associationproxy import AssociationProxy
 
+
 def is_instrumented_attribute(attr):
     return isinstance(attr, InstrumentedAttribute)
 
@@ -17,94 +19,67 @@ def is_relationship(attr):
     return hasattr(attr, "property") and isinstance(attr.property, RelationshipProperty)
 
 
-def is_hybrid(attr):
-    return isinstance(attr, hybrid_property)
+def is_hybrid_property(model, attr_name):
+    mapper = inspect(model)
+    descriptor = mapper.all_orm_descriptors.get(attr_name)
+    return isinstance(descriptor, hybrid_property)
+
 
-def is_association_proxy(attr):
-    return isinstance(attr, AssociationProxy)
+def is_association_proxy(model, attr_name):
+    mapper = inspect(model)
+    descriptor = mapper.all_orm_descriptors.get(attr_name)
+    return isinstance(descriptor, AssociationProxy)
 
 
 def get_field_with_path(
-    model, path: str
+    model, name: str
 ) -> Tuple[InstrumentedAttribute, List[InstrumentedAttribute]]:
     """
     Resolve a dot-separated field path (e.g., 'profile.contact.email')
-    starting from `model`, handling AssociationProxy and relationships.
+    starting from `model`, handling columns and relationships.
 
     Returns:
         (final_attr, join_path)
         - final_attr: The terminal InstrumentedAttribute (e.g., Contact.email)
-        - join_path: List of relationship attributes for explicit joins
-                     (e.g., [User.profile, Profile.contact])
+        - join_path: List of relationship attributes for explicit joins (e.g., [User.profile, Profile.contact])
     """
-    print(model, path)
-    parts = path.split(".")
-    current_model = model
-    current_attr = None
+    final_attr = None
     join_path: List[InstrumentedAttribute] = []
 
+    parts = name.split(".")
+    current_model = model
     for i, part in enumerate(parts):
         attr = getattr(current_model, part)
         # Case 1: Column (must be last)
-        if hasattr(attr, "property") and isinstance(attr.property, ColumnProperty):
+        if is_column(attr):
             if i != len(parts) - 1:
                 raise ValueError(
                     f"Column '{part}' cannot be followed by further path segments."
                 )
-            current_attr = attr
+            final_attr = attr
             break
         # Case 2: Relationship
         elif is_relationship(attr):
-            if i == len(parts) - 1:
-                raise ValueError(
-                    f"Cannot sort/filter on relationship '{path}' directly. "
-                    "Specify a column (e.g., '{path}.id')."
-                )
             join_path.append(attr)
             current_model = attr.property.mapper.class_
         # Case 3: AssociationProxy
-        elif isinstance(attr, AssociationProxy):
-            # Step into the underlying relationship
-            local_rel_name = attr.local_attr  # str, e.g., 'profile'
-            local_rel = getattr(current_model, local_rel_name)
-
-            if not is_relationship(local_rel):
+        elif is_association_proxy(current_model, part):
+            if i != len(parts) - 1:
                 raise ValueError(
-                    f"AssociationProxy '{part}' is not backed by a relationship "
-                    f"(got {type(local_rel.property).__name__})."
+                    f"AssociationProxy '{part}' cannot be followed by further path segments."
                 )
-
+            # Step into the underlying relationship
+            local_rel = attr.local_attr
             join_path.append(local_rel)
-            target_model = local_rel.property.mapper.class_
-
-            # Get the remote attribute (should be InstrumentedAttribute in SA 2.0)
             remote_attr = attr.remote_attr
-
-            # If there are more parts after this proxy, recurse
-            if i < len(parts) - 1:
-                remaining = ".".join(parts[i + 1 :])
-                final_attr, extra_joins = get_field_with_path(target_model, remaining)
-                join_path.extend(extra_joins)
-                return final_attr, join_path
-
-            # This is the last part — ensure remote_attr is usable
-            if isinstance(remote_attr, str):
-                # Fallback for older versions (not needed in SA 2.0+, but safe)
-                remote_attr = getattr(target_model, remote_attr)
-
-            if not hasattr(remote_attr, "property"):
-                raise ValueError(
-                    f"Remote attribute {remote_attr} is not a mapped ORM attribute."
-                )
-
-            current_attr = remote_attr
+            final_attr = remote_attr
             break
         else:
             raise ValueError(
                 f"Unsupported attribute type for '{model}':'{part}': {type(attr)}"
             )
 
-    if current_attr is None:
+    if final_attr is None:
         raise RuntimeError("Failed to resolve path — no terminal attribute found.")
 
-    return current_attr, join_path
+    return final_attr, join_path

python_plugins/sqla/utils/paginate.py

@@ -0,0 +1,74 @@
+from math import ceil
+from typing import Any, Optional, Generic, TypeVar, Iterator
+from sqlalchemy.sql import Select
+from sqlalchemy.sql import select,func
+from sqlalchemy.orm import Session
+
+T = TypeVar("T")
+
+class Pagination(Generic[T]):
+    def __init__(
+        self,
+        items: list[T],
+        total: int,
+        page: int,
+        per_page: int,
+    ):
+        self.items = items
+        self.total = total
+        self.page = page
+        self.per_page = per_page
+        self.pages = ceil(total / per_page) if per_page > 0 else 0
+        self.has_prev = page > 1
+        self.has_next = page < self.pages
+        self.prev_num = page - 1 if self.has_prev else None
+        self.next_num = page + 1 if self.has_next else None
+
+    def iter_pages(self) -> Iterator[int]:
+        """Iterate over page numbers for pagination controls."""
+        return iter(range(1, self.pages + 1))
+
+    def __repr__(self):
+        return f"<Pagination page={self.page} of {self.pages}>"
+
+def paginate(
+    session: Session,
+    stmt: Select,
+    *,
+    page: int = 1,
+    per_page: int = 20,
+) -> Pagination:
+    """
+    Paginate a SQLAlchemy 2.0 select statement.
+
+    Args:
+        session: SQLAlchemy Session instance
+        stmt: A SQLAlchemy Select statement (e.g., select(User))
+        page: Current page number (1-indexed)
+        per_page: Number of items per page
+
+    Returns:
+        Pagination object with .items, .total, .has_next, etc.
+    """
+
+    # Count total rows
+    count_stmt = select(func.count()).select_from(stmt.subquery())
+    total = session.execute(count_stmt).scalar_one()
+
+    if total == 0:
+        return Pagination(items=[], total=0, page=page, per_page=per_page)
+
+    if page < 1:
+        # raise ValueError("Page must be >= 1")
+        page = 1        
+    
+    pages = ceil(total / per_page)
+    if page > pages:
+        # raise ValueError(f"Page {page} is out of range (total pages: {pages})")
+        page = pages
+
+    # Apply limit/offset
+    paginated_stmt = stmt.offset((page - 1) * per_page).limit(per_page)
+    items = session.execute(paginated_stmt).scalars().all()
+
+    return Pagination(items=items, total=total, page=page, per_page=per_page)

{python_plugins-1.0.3.dist-info → python_plugins-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-plugins
-Version: 1.0.3
+Version: 1.0.4
 Summary: A collection of Python functions and classes.
 Project-URL: Documentation, https://python-plugins.readthedocs.io
 Project-URL: Source, https://github.com/ojso/python-plugins

{python_plugins-1.0.3.dist-info → python_plugins-1.0.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-python_plugins/__about__.py,sha256=2plzdEEb24FLjE2I2XyBBcJEPYWHccNL4SgtLC_6erg,22
+python_plugins/__about__.py,sha256=acuR_XSJzp4OrQ5T8-Ac5gYe48mUwObuwjRmisFmZ7k,22
 python_plugins/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 python_plugins/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_plugins/crypto/aes_cipher.py,sha256=7lTvA01h3Z56riv7sB7CrZRh_OO66m21wVTVizU9PYg,1946
@@ -10,6 +10,7 @@ python_plugins/crypto/txtfile_cipher.py,sha256=-mTkvQgtNYLUvrQLKTnepBBdkf-T0w-Dn
 python_plugins/crypto/zip7mix.py,sha256=tQMmX_6ax99LXNfY8HBbu9EXSwQSgGOF3EwWEcrtdUo,5272
 python_plugins/email/__init__.py,sha256=HubZT2h3m5WEjic3NZ0H7gYp-9tUgZaDkAE9O-Tm7hM,26
 python_plugins/email/smtp.py,sha256=CY1fWxdBDqqGZ22R8yqEvFZvMeEsMnqTb4h5IZ8WAVU,1641
+python_plugins/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_plugins/examples/datetime.py,sha256=bmC9d1W7XKA1ED9XO9reUiUyfQcM_BqGoGyOF21RW9A,282
 python_plugins/examples/hashes.py,sha256=uSF3ohZRD7b2VAIvjjpTWC0SlY7QsFhsFZUejINrRGU,640
 python_plugins/examples/higher_order_functions.py,sha256=vTfT3OEfuKkIW7UMD3JtreVDMeRbXHbjlz3G-j-J4x4,4574
@@ -18,12 +19,14 @@ python_plugins/examples/pretty.py,sha256=igN4uq67AADcPOiy_h3_M-oEwgc1i3gJScbKtkf
 python_plugins/examples/random_string.py,sha256=U7B-bAa4zEpewkd4_8KIPZ0XsPdbGlJ_FEj0FnTGdms,2210
 python_plugins/examples/run_jwt.py,sha256=ZwjUXg5PKeophiXqwSaMlHrhwVKhHTsRb68HtkRLX8k,1485
 python_plugins/examples/run_process.py,sha256=I_wjCqzWI6d39ebL-YArQ8LiXFQ3bwEoCnxJTZK1Zbc,780
+python_plugins/examples/sphinx_google_style.py,sha256=TJuxBqXG3OtZHmlbLlCRD07ADs1QImOhZu33HksSgKM,9688
+python_plugins/examples/sphinx_numpy_style.py,sha256=jhtOp7fiQcbtj-dUufloPQlV4vAKwlAlRgw8r6rxVgw,9735
 python_plugins/examples/xml2dict.py,sha256=RUxqDt6NKzwbuodTxKVoiR4dP-vNbmL77dztLx_9UzY,164
 python_plugins/examples/tkinter/calculate.py,sha256=M1b-w7-pVe-7FS3erBJxgFNfmm4lzP3zlK41glyhWx8,1142
 python_plugins/ospath/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_plugins/ospath/walk_remove.py,sha256=rnDHr1wGSxufo2YV9_EXeVNEAnT4LGjG7-5dOI2gWY0,494
+python_plugins/ospath/walk.py,sha256=zj8616KtK4bduJyuyw2b7bg6udV_-ssEAGPLJblhPlM,792
 python_plugins/sqla/__init__.py,sha256=dJyZS1js_pdpAgLnsqfRFPQBFeZ8PdssdPfTzgie5c8,30
-python_plugins/sqla/db.py,sha256=fA601WJ3QiUyXAQGwS72wa9S1b973T-HK1ZsE6OL0c0,3179
+python_plugins/sqla/db.py,sha256=rW0x7U0d3oqhZSL2GbxTEtyy83neGogt5VUNTnJadnA,3217
 python_plugins/sqla/orm.py,sha256=7h0oY4TGfdrvAFKedVbKdWTvWHq_Sc-ycd2VvWiZJyo,1331
 python_plugins/sqla/mixins/__init__.py,sha256=l4dJVgUFI7aISA7X-CcVBOp19rXBgqyyhHwtuQnSgR0,241
 python_plugins/sqla/mixins/data_mixin.py,sha256=HCc1uvF6_O4yjK38uWAsqysEedLWgc7wtds3NjQTMZ8,366
@@ -31,23 +34,15 @@ python_plugins/sqla/mixins/primary_key_mixin.py,sha256=QUO-7ZmYtAMMi7ReRQDYV0uwQ
 python_plugins/sqla/mixins/timestamp_mixin.py,sha256=u9rIu0IrzdCRRbnMk4IN4nTlNNiVPB8yPnTcHjQC1KU,547
 python_plugins/sqla/mixins/token_minxin.py,sha256=SxNftZXS-hCwqxov7whF_tBtlayuoi3LUPtu-ofMmdg,276
 python_plugins/sqla/mixins/user_minxin.py,sha256=D-N45bunicBuuwKs--s_tyDxxLC3mkxV9Tva8JAhsko,579
-python_plugins/sqla/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_plugins/sqla/models/association_proxy.py,sha256=a3_ffi4gyXMuDV9NtlCo2POoBxwFCKCA2fSJlfft1Ow,1454
-python_plugins/sqla/models/demo.py,sha256=UbibjsBvm542Gyx8t8qf8Izqs47K88v9BN0Pc2RPAJc,3218
-python_plugins/sqla/models/message.py,sha256=NDxcN8mWnWFTTunf5dz-Tb5FmHv8HHzppsZ8IVHmpAw,435
-python_plugins/sqla/models/model1.py,sha256=NxOsygCCt9q1hpt2QmGsuCs6yl1Kn5tv5HGuhHaPCRQ,4596
-python_plugins/sqla/models/multpk.py,sha256=pexTSm7CzXpf0pD_ECfHraM0QlZcMAYf9Qv_KPijvUA,396
-python_plugins/sqla/models/polymorphic.py,sha256=-nwEoKkAZL97mnykisZ1VkntyeqNLmfEbd7tXxAYnuY,938
-python_plugins/sqla/models/relations.py,sha256=zjbZrhW9pv8Tpnu6zApdO-rhwjbFF3Vv1r_xp5DCKWc,2669
-python_plugins/sqla/models/tree_node.py,sha256=VGGdIGhfDe_0BUp3UpxEjexMSirwezOUXGv-fKiBXvk,575
-python_plugins/sqla/utils/__init__.py,sha256=lq6KaQfwmnobgas87D26ijnaCfDau3H7ZkmozBYWzk0,302
-python_plugins/sqla/utils/attr.py,sha256=IdWj17GXKk4tk-dQROWZh7ZyPPlO4--YaoeZp0EWgUQ,4119
+python_plugins/sqla/utils/__init__.py,sha256=sHrgAp1TJ3k02gbhMIf2or9IzI7in1P70PqqhFNhBUY,311
+python_plugins/sqla/utils/attr.py,sha256=R6ehESBt3G-ukfczmqoKb9BiWdS0AC9uz2y0OZgzjQE,2947
 python_plugins/sqla/utils/expression.py,sha256=_9P59Elc3jqdXFiXxkrRY9gsaUSum-chNMPbiqQcC58,202
 python_plugins/sqla/utils/instance.py,sha256=EbcI3pQhsRj-mPW9ZHs0yQ4zMGVMHw-HtmmXHY15kK0,255
 python_plugins/sqla/utils/model.py,sha256=R9ObqEMDOaYKLv8pcoDHoV7m4mxWHgEDiZ74NokMMjA,678
+python_plugins/sqla/utils/paginate.py,sha256=Fqqb3N6HAdSD4OXvu62XgmIQp1eUAY0ODS4e3e_gtWQ,2186
 python_plugins/sqla/utils/stmt.py,sha256=3GzzEvi0RmvE3q-zBweol9LmsEQ0UPkn9G6P0epNwWw,876
 python_plugins/sqla/utils/update.py,sha256=jsTgivwzIeFSpbpFwb48_pTUNT-KM6TYnGv3wKH98HM,631
-python_plugins-1.0.3.dist-info/METADATA,sha256=1ImRtLGKGW7nNd06mtiLso56_D3ZxVPBy4soald9ghs,2624
-python_plugins-1.0.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-python_plugins-1.0.3.dist-info/licenses/LICENSE.rst,sha256=X5eLIsAn1yAKd88LWTYkXUe0PmVK_Z5SD7_5NheGR-s,1104
-python_plugins-1.0.3.dist-info/RECORD,,
+python_plugins-1.0.4.dist-info/METADATA,sha256=Cxs-TUoFEfTwbCNeYCtWxiH08_xQZVER8zz8g-5PH_c,2624
+python_plugins-1.0.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_plugins-1.0.4.dist-info/licenses/LICENSE.rst,sha256=X5eLIsAn1yAKd88LWTYkXUe0PmVK_Z5SD7_5NheGR-s,1104
+python_plugins-1.0.4.dist-info/RECORD,,

{python_plugins-1.0.3.dist-info → python_plugins-1.0.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.28.0
+Generator: hatchling 1.29.0
 Root-Is-Purelib: true
 Tag: py3-none-any

python_plugins/ospath/walk_remove.py

@@ -1,19 +0,0 @@
-import os
-import shutil
-
-def remove(dir,rm_dir_name):
-    for root, dirs, files in os.walk(dir):
-        if "venv" in root or "git" in root:
-            continue
-        for dir in dirs:
-            if dir == rm_dir_name:
-                rm_path = os.path.join(root, dir)
-                print(f"Removing {rm_path}")
-                shutil.rmtree(rm_path)
-
-def remove_pycache(dir="."):
-    remove(dir,"__pycache__")
-
-def remove_ipynb_checkpoints(dir="."):
-    remove(dir,".ipynb_checkpoints")
-

python_plugins/sqla/models/association_proxy.py

@@ -1,48 +0,0 @@
-from typing import Final
-from typing import List
-from .. import db
-from ..orm import Mapped
-from ..orm import mapped_column
-from ..orm import ForeignKey
-from ..orm import relationship
-from ..orm import Table
-from ..orm import Column
-from ..orm import Integer
-from ..orm import String
-from ..orm import association_proxy
-from ..orm import AssociationProxy
-
-
-class AssociationProxyChild(db.Model):
-    __tablename__ = "association_proxy_child"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    name: Mapped[str] = mapped_column(String(64))
-
-
-class AssociationProxyParent(db.Model):
-    __tablename__ = "association_proxy_parent"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    name: Mapped[str] = mapped_column(String(64))
-    children: Mapped[List[AssociationProxyChild]] = relationship(
-        secondary=lambda: association_proxy_parent_child_table
-    )
-    # proxy the 'name' attribute from the 'children' relationship
-    childrennames: AssociationProxy[List[str]] = association_proxy("children", "name")
-
-
-association_proxy_parent_child_table: Final[Table] = Table(
-    "association_proxy_parent_child",
-    db.Model.metadata,
-    Column(
-        "association_proxy_parent_id",
-        Integer,
-        ForeignKey("association_proxy_parent.id"),
-        primary_key=True,
-    ),
-    Column(
-        "association_proxy_child_id",
-        Integer,
-        ForeignKey("association_proxy_child.id"),
-        primary_key=True,
-    ),
-)

python_plugins/sqla/models/demo.py

@@ -1,114 +0,0 @@
-from typing import Optional, List
-from datetime import datetime
-from datetime import date
-from datetime import time
-import enum
-
-from .. import db
-from ..orm import Integer
-from ..orm import Boolean
-from ..orm import String
-from ..orm import Float
-from ..orm import DateTime
-from ..orm import Date
-from ..orm import Time
-from ..orm import LargeBinary
-from ..orm import Enum
-from ..orm import JSON
-from ..orm import Mapped
-from ..orm import mapped_column
-from ..orm import relationship
-from ..orm import composite
-from ..orm import synonym
-from ..orm import Table
-from ..orm import Column
-from ..orm import ForeignKey
-from ..orm import hybrid_property
-from ..orm import hybrid_method
-from ..orm import association_proxy
-from ..orm import AssociationProxy
-
-# see https://docs.sqlalchemy.org/en/20/orm/extensions/associationproxy.html
-
-class Point:
-    x: int
-    y: int
-
-
-# Status = Literal["pending", "received", "completed"]
-class Status(enum.Enum):
-    PENDING = "pending"
-    RECEIVED = "received"
-    COMPLETED = "completed"
-
-
-class Demo(db.Model):
-    __tablename__ = "demo"
-    
-    id: Mapped[int] = mapped_column(primary_key=True)
-    name: Mapped[str] = mapped_column(unique=True)
-    first_name: Mapped[str]
-    last_name: Mapped[str]
-    data: Mapped[dict] = mapped_column(JSON)
-    bool_field: Mapped[bool] = mapped_column(Boolean, nullable=True)
-    date_field: Mapped[date] = mapped_column(Date, nullable=True)
-    time_field: Mapped[time] = mapped_column(Time, nullable=True)
-    datetime_field: Mapped[datetime] = mapped_column(DateTime, nullable=True)
-    x: Mapped[int]
-    y: Mapped[int]
-    start: Mapped[int]
-    end: Mapped[int]
-    status: Mapped[Status]
-    created_at: Mapped[datetime] = mapped_column(default=datetime.now)
-    updated_at: Mapped[datetime] = mapped_column(
-        default=datetime.now, onupdate=datetime.now
-    )
-    point: Mapped[Point] = composite("x", "y")
-
-    syn_status = synonym("status")
-
-    @hybrid_property
-    def full_name(self) -> str:
-        return f"{self.first_name} {self.last_name}"
-
-    @hybrid_method
-    def contains(self, point: int) -> bool:
-        return (self.start <= point) & (point <= self.end)
-
-    tg: Mapped[List["Tag"]] = relationship(secondary=lambda: demo_tag_table)
-    # proxy the 'keyword' attribute from the 'kw' relationship
-    tags: AssociationProxy[List[str]] = association_proxy("tg", "tag")
-
-    addresses: Mapped[List["Address"]] = relationship(back_populates="demo")
-
-    def __init__(self, name: str):
-        self.name = name
-
-
-class Address(db.Model):
-    __tablename__ = "address"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    street: Mapped[str]
-    demo_id = mapped_column(ForeignKey("demo.id"))
-    demo: Mapped["Demo"] = relationship(back_populates="addresses")
-
-
-class Tag(db.Model):
-    __tablename__ = "tag"
-
-    id: Mapped[int] = mapped_column(primary_key=True)
-    tag: Mapped[str]
-
-    def __init__(self, tag: str):
-        self.tag = tag
-
-    def __repr__(self) -> str:
-        return f"Tag({self.tag!r})"
-
-
-demo_tag_table = Table(
-    "demo_tag",
-    db.Model.metadata,
-    Column("demo_id", ForeignKey("demo.id"), primary_key=True),
-    Column("tag_id", ForeignKey("tag.id"), primary_key=True),
-)

python_plugins/sqla/models/message.py

@@ -1,19 +0,0 @@
-import enum
-from .. import db
-from ..orm import Mapped
-from ..orm import mapped_column
-
-
-class MyCat(enum.Enum):
-    CAT1 = "Category A"
-    CAT2 = "Category B"
-
-
-class Message(db.Model):
-    __table__tablename__ = "message"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    text: Mapped[str]
-    sender: Mapped[str]
-    recipient: Mapped[str]
-    category:Mapped[MyCat] = mapped_column(default=MyCat.CAT1,nullable=False)
-    

python_plugins/sqla/models/model1.py

@@ -1,161 +0,0 @@
-import enum
-from datetime import datetime, date, time
-from .. import db
-from ..orm import Mapped
-from ..orm import mapped_column
-from ..orm import Enum
-from ..orm import hybrid_property
-from ..orm import cast
-
-
-class EnumChoices(enum.Enum):
-    first = 1
-    second = 2
-
-
-class Model1(db.Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    test1:Mapped[str]
-    test2:Mapped[str]
-    test3:Mapped[str]
-    test4:Mapped[str]
-    bool_field: Mapped[bool]
-    date_field: Mapped[date]
-    time_field: Mapped[time]
-    datetime_field: Mapped[datetime]
-    email_field:Mapped[str]
-    enum_field: Mapped[str] = mapped_column(Enum("model1_v1", "model1_v2"), nullable=True)
-    enum_type_field = mapped_column(Enum(EnumChoices), nullable=True)
-    choice_field:Mapped[str]
-
-    def __init__(
-        self,
-        test1=None,
-        test2=None,
-        test3=None,
-        test4=None,
-        bool_field=False,
-        date_field=None,
-        time_field=None,
-        datetime_field=None,
-        choice_field=None,
-        enum_field=None,
-        enum_type_field=None,
-    ):
-        self.test1 = test1
-        self.test2 = test2
-        self.test3 = test3
-        self.test4 = test4
-        self.bool_field = bool_field
-        self.date_field = date_field
-        self.time_field = time_field
-        self.datetime_field = datetime_field
-        self.choice_field = choice_field
-        self.enum_field = enum_field
-        self.enum_type_field = enum_type_field
-
-    def __str__(self):
-        return str(self.test1)
-
-
-class Model2(db.Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    string_field:Mapped[str]
-    string_field_default = db.Column(db.Text, nullable=False, default="")
-    string_field_empty_default = db.Column(db.Text, nullable=False, default="")
-    int_field = db.Column(db.Integer)
-    bool_field = db.Column(db.Boolean)
-    enum_field = db.Column(db.Enum("model2_v1", "model2_v2"), nullable=True)
-    float_field = db.Column(db.Float)
-
-    # Relation
-    model1_id = db.Column(db.Integer, db.ForeignKey(Model1.id))
-    model1 = db.relationship(lambda: Model1, backref="model2")
-
-    def __init__(
-        self,
-        string_field=None,
-        int_field=None,
-        bool_field=None,
-        model1=None,
-        float_field=None,
-        string_field_default=None,
-        string_field_empty_default=None,
-    ):
-        self.string_field = string_field
-        self.int_field = int_field
-        self.bool_field = bool_field
-        self.model1 = model1
-        self.float_field = float_field
-        self.string_field_default = string_field_default
-        self.string_field_empty_default = string_field_empty_default
-
-
-class Model3(db.Model):
-    def __init__(self, id=None, val1=None):
-        self.id = id
-        self.val1 = val1
-
-    id = db.Column(db.String(20), primary_key=True)
-    val1 = db.Column(db.String(20))
-
-
-class ModelHybrid(db.Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    name = db.Column(db.String)
-    width = db.Column(db.Integer)
-    height = db.Column(db.Integer)
-
-    firstname = db.Column(db.String)
-    lastname = db.Column(db.String)
-
-    @hybrid_property
-    def fullname(self):
-        return "{} {}".format(self.firstname, self.lastname)
-
-    @hybrid_property
-    def number_of_pixels(self):
-        return self.width * self.height
-
-    @hybrid_property
-    def number_of_pixels_str(self):
-        return str(self.number_of_pixels())
-
-    @number_of_pixels_str.expression
-    def number_of_pixels_str(cls):
-        return cast(cls.width * cls.height, db.String)
-
-
-class ModelHybrid2(db.Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    name = db.Column(db.String)
-    owner_id = db.Column(
-        db.Integer, db.ForeignKey("model_hybrid.id", ondelete="CASCADE")
-    )
-    owner = db.relationship("ModelHybrid", backref=db.backref("tiles"), uselist=False)
-
-
-class ModelNoint(db.Model):
-    id: Mapped[str] = mapped_column(primary_key=True)
-    test = db.Column(db.String)
-
-
-class ModelForm(db.Model):
-    id: Mapped[str] = mapped_column(primary_key=True)
-    int_field = db.Column(db.Integer)
-    datetime_field = db.Column(db.DateTime)
-    text_field = db.Column(db.UnicodeText)
-    excluded_column = db.Column(db.String)
-
-
-class ModelChild(db.Model):
-    id: Mapped[str] = mapped_column(primary_key=True)
-    model_id = db.Column(db.Integer, db.ForeignKey(ModelForm.id))
-    model = db.relationship(ModelForm, backref="backref")
-    enum_field = db.Column(db.Enum("model1_v1", "model1_v2"), nullable=True)
-    choice_field = db.Column(db.String, nullable=True)
-
-
-
-
-    

python_plugins/sqla/models/multpk.py

@@ -1,16 +0,0 @@
-from .. import db
-from ..orm import Mapped
-from ..orm import mapped_column
-
-
-class Singlepk(db.Model):
-    __tablename__ = "singlepk"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    data: Mapped[str]
-
-
-class Multpk(db.Model):
-    __tablename__ = "multpk"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    id2: Mapped[int] = mapped_column(primary_key=True)
-    data: Mapped[str]