springbootAI 2.2.1__tar.gz → 2.2.2__tar.gz

{springbootai-2.2.1 → springbootai-2.2.2}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.2.2] - 2026-08-13
+
+### 新增
+
+- ORM `@Entity` / `@Table` 注解对齐 Java JPA 分离风格，支持三种写法（均向后兼容）：
+
+  | 写法 | 说明 | 对齐 Java |
+  |------|------|-----------|
+  | `@Entity` + `@Table(...)` | 分离风格（推荐） | `@Entity` + `@Table` |
+  | `@Entity` 无括号 | 表名自动推导为 snake_case | `@Entity`（无 `@Table`） |
+  | `@Entity("name", ...)` | 一体化风格（完全兼容） | 原有写法不变 |
+
+- `Table` 类新增 `__call__`，可直接作为类装饰器使用（`@Table(name=..., indexes=[...], comment=...)`）。
+- `@Entity` 支持无括号形式（`@Entity`），检测到已有 `@Table` 时不覆盖表元数据。
+- 提取 `_auto_generate_init` 辅助函数，消除 `Entity` 与 `Table.__call__` 间的重复代码。
+
 ## [2.2.1] - 2026-08-13
 
 ### 修复

{springbootai-2.2.1/springbootAI.egg-info → springbootai-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: springbootAI
-Version: 2.2.1
+Version: 2.2.2
 Summary: Spring-style Python framework with Web, ORM, Cloud and AI integrations
 Author-email: YuConggen <1516933915@qq.com>
 License-Expression: MIT

{springbootai-2.2.1 → springbootai-2.2.2}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 [project]
 # 发行名 springbootAI（PyPI 包名，pip install springbootAI）；导入包名仍为 spring
 name = "springbootAI"
-version = "2.2.1"
+version = "2.2.2"
 description = "Spring-style Python framework with Web, ORM, Cloud and AI integrations"
 readme = "README.md"
 license = "MIT"

{springbootai-2.2.1 → springbootai-2.2.2}/spring/orm/ddl_auto.py

@@ -244,12 +244,47 @@ class Transient:
 
 
 class Table:
-    """表注解"""
+    """``@Table`` 表注解（对齐 JPA ``javax.persistence.Table``）。
+
+    既可作为元数据类使用（内部 ``EntityTable`` 解析），也可直接作为类装饰器使用。
+    作为装饰器时等价于 JPA 的 ``@Table``，与 ``@Entity`` 组合使用::
+
+        @Entity
+        @Table(name="sys_user", indexes=[Index("idx_name", ["name"])], comment="用户表")
+        class User:
+            id: int = Id()
+            name: str = Column(length=50)
+
+    也可单独使用（隐含 ``@Entity`` 语义，与 ``@Entity("sys_user")`` 等价）::
+
+        @Table(name="sys_user", comment="用户表")
+        class User:
+            id: int = Id()
+    """
     def __init__(self, name: str = "", indexes: List['Index'] = None, comment: str = ""):
         self.name = name
         self.indexes = indexes or []
         self.comment = comment
 
+    def __call__(self, cls):
+        """装饰器形式：将表元数据挂载到类上并标记为实体，返回类本身。
+
+        装饰器应用顺序（Python 底向上）::
+
+            @Entity          # 外层，后执行
+            @Table(...)      # 内层，先执行
+            class User: ...
+
+        ``@Table`` 先设置 ``__table__`` 与 ``__entity__``，随后 ``@Entity``
+        检测到已有 ``__table__`` 则不覆盖。
+        """
+        if not self.name:
+            self.name = _camel_to_snake(cls.__name__)
+        setattr(cls, '__table__', self)
+        setattr(cls, '__entity__', True)
+        _auto_generate_init(cls)
+        return cls
+
 
 class Index:
     """索引定义"""
@@ -1046,43 +1081,86 @@ class DdlAutoManager:
 
 # ==================== 装饰器API（便捷使用） ====================
 
-def Entity(table_name: str = "", indexes: List[Index] = None, comment: str = ""):
+def _auto_generate_init(cls):
+    """为描述符风格实体类自动生成 ``__init__``（若类未显式声明）。
+
+    扫描 MRO 中所有 ``Column`` 实例属性，生成关键字构造器。
+    若类已显式声明 ``__init__`` 则跳过，保持兼容。
     """
-    @Entity 装饰器，标注一个类为JPA风格的实体类
-    
-    Usage:
-        @Entity("sys_user")
+    if '__init__' in cls.__dict__:
+        return
+    fields = {}
+    for cls_base in reversed(cls.__mro__):
+        for name, value in cls_base.__dict__.items():
+            if isinstance(value, Column):
+                fields[name] = value
+
+    def __init__(self, **values):
+        unknown = set(values) - set(fields)
+        if unknown:
+            names = ', '.join(sorted(unknown))
+            raise TypeError(f"Unexpected entity field(s): {names}")
+        for name, column in fields.items():
+            setattr(self, name, values.get(name, column.default))
+
+    cls.__init__ = __init__
+
+
+def Entity(table_name: str = "", indexes: List[Index] = None, comment: str = ""):
+    """``@Entity`` 装饰器，标注一个类为 JPA 风格的实体类。
+
+    三种用法（均向后兼容）：
+
+    1. **Java JPA 风格**（``@Entity`` + ``@Table`` 分离，推荐）::
+
+        @Entity
+        @Table(name="sys_user", indexes=[Index("idx_name", ["name"])], comment="用户表")
+        class User:
+            id: int = Id()
+            name: str = Column(length=50)
+
+    2. **简化风格**（仅 ``@Entity``，表名自动推导为类名 snake_case）::
+
+        @Entity
+        class User:
+            id: int = Id()
+            name: str = Column(length=50)
+        # 表名自动推导为 "user"
+
+    3. **一体化风格**（当前写法，完全兼容）::
+
+        @Entity("sys_user", indexes=[...], comment="用户表")
         class User:
-            def __init__(self, id: int = None, username: str = "", email: str = ""):
-                self.id = id
-                self.username = username
-                self.email = email
+            id: int = Id()
+            name: str = Column(length=50)
     """
-    t = Table(name=table_name, indexes=indexes, comment=comment)
-    def decorator(cls):
+    # 支持 @Entity 无括号形式：直接接收类
+    if inspect.isclass(table_name):
+        cls = table_name
         setattr(cls, '__entity__', True)
-        setattr(cls, '__table__', t)
-        if not table_name:
-            t.name = _camel_to_snake(cls.__name__)
+        # 未显式指定表信息时，不覆盖已有 @Table 设置的 __table__
+        existing = getattr(cls, '__table__', None)
+        if not isinstance(existing, Table):
+            setattr(cls, '__table__', Table(name=_camel_to_snake(cls.__name__)))
+        _auto_generate_init(cls)
+        return cls
 
-        # Descriptor-style entities do not need repetitive constructors.
-        # Keep an explicitly declared __init__ unchanged for compatibility.
-        if '__init__' not in cls.__dict__:
-            fields = {}
-            for cls_base in reversed(cls.__mro__):
-                for name, value in cls_base.__dict__.items():
-                    if isinstance(value, Column):
-                        fields[name] = value
-
-            def __init__(self, **values):
-                unknown = set(values) - set(fields)
-                if unknown:
-                    names = ', '.join(sorted(unknown))
-                    raise TypeError(f"Unexpected entity field(s): {names}")
-                for name, column in fields.items():
-                    setattr(self, name, values.get(name, column.default))
-
-            cls.__init__ = __init__
+    # @Entity("table_name", ...) 或 @Entity() 形式
+    has_explicit_meta = bool(table_name or indexes or comment)
+    t = Table(name=table_name, indexes=indexes, comment=comment) if has_explicit_meta else None
+
+    def decorator(cls):
+        setattr(cls, '__entity__', True)
+        if t is not None:
+            if not t.name:
+                t.name = _camel_to_snake(cls.__name__)
+            setattr(cls, '__table__', t)
+        else:
+            # 无显式表信息：不覆盖已有 @Table 设置
+            existing = getattr(cls, '__table__', None)
+            if not isinstance(existing, Table):
+                setattr(cls, '__table__', Table(name=_camel_to_snake(cls.__name__)))
+        _auto_generate_init(cls)
         return cls
     return decorator
 

{springbootai-2.2.1 → springbootai-2.2.2}/spring/orm/pymybatis/version.py

@@ -2,7 +2,7 @@
 PyMyBatis版本信息
 """
 
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 __author__ = 'PyMyBatis Team'
 __email__ = 'dev@pymybatis.org'
 __license__ = 'MIT'

{springbootai-2.2.1 → springbootai-2.2.2/springbootAI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: springbootAI
-Version: 2.2.1
+Version: 2.2.2
 Summary: Spring-style Python framework with Web, ORM, Cloud and AI integrations
 Author-email: YuConggen <1516933915@qq.com>
 License-Expression: MIT