bella-openapi 1.0.3__py3-none-any.whl → 1.0.3.2__py3-none-any.whl

bella_openapi/entity/standard_domtree.py

@@ -9,7 +9,7 @@ StandardDomTree - 新的DOM树协议定义
 """
 
 from typing import List, Optional, Literal, Any, Union
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, root_validator
 import tiktoken
 
 # 布局类型映射表：将旧解析器的布局类型映射到新的标准类型
@@ -92,6 +92,23 @@ class StandardNode(BaseModel):
     path: Optional[List[int]] = Field(default_factory=list)  # 编号的层级信息，例如：1.2.1
     element: Optional[Union[StandardElement, StandardImageElement, StandardTableElement]] = None  # 元素信息，当前节点的元素详情
     children: Optional[List["StandardNode"]] = Field(default_factory=list)  # 子节点信息，当前节点的所有子节点
+    
+    @root_validator(pre=True)
+    def parse_element(cls, values):
+        """根据element的type字段正确实例化element"""
+        if 'element' in values and values['element'] is not None:
+            element_data = values['element']
+            # 只有当element是字典时才需要转换，如果已经是正确的实例则保持不变
+            if isinstance(element_data, dict):
+                element_type = element_data.get('type', '')
+                if element_type == 'Figure':
+                    values['element'] = StandardImageElement(**element_data)
+                elif element_type == 'Table':
+                    values['element'] = StandardTableElement(**element_data)
+                else:
+                    values['element'] = StandardElement(**element_data)
+            # 如果element已经是正确的实例类型，则保持不变
+        return values
 
 
 class StandardDomTree(BaseModel):
@@ -400,19 +417,22 @@ class StandardDomTree(BaseModel):
                     url=element['image_link']
                 )
 
-            # 创建 StandardNode
-            standard_node = StandardNode(
+            # 创建StandardImageElement实例
+            image_element = StandardImageElement(
+                type=element_type,
+                positions=positions,
+                name="",
+                description="",
+                text=text,
+                image=image,
+            )
+            
+            # 使用construct方法跳过validator，保持正确的element类型
+            standard_node = StandardNode.construct(
                 summary="",
                 tokens=0,  # 先设置为 0，后面再计算
                 path=[],  # 初始化为空列表，后续再计算
-                element=StandardImageElement(
-                    type=element_type,
-                    positions=positions,
-                    name="",
-                    description="",
-                    text=text,
-                    image=image,
-                ),
+                element=image_element,
                 children=[]
             )
         elif element_type == "Table":
@@ -447,17 +467,21 @@ class StandardDomTree(BaseModel):
             # 将所有单元格的文本合并，用于计算 token 数量
             text = " ".join(cell_texts)
 
-            standard_node = StandardNode(
+            # 创建StandardTableElement实例
+            table_element = StandardTableElement(
+                type=element_type,
+                positions=positions,
+                name="",
+                description="",
+                rows=rows
+            )
+            
+            # 使用construct方法跳过validator，保持正确的element类型
+            standard_node = StandardNode.construct(
                 summary="",
                 tokens=0,  # 先设置为 0，后面再计算
                 path=[],  # 初始化为空列表，后续再计算
-                element=StandardTableElement(
-                    type=element_type,
-                    positions=positions,
-                    name="",
-                    description="",
-                    rows=rows
-                ),
+                element=table_element,
                 children=[]
             )
         else:
@@ -510,4 +534,9 @@ class StandardDomTree(BaseModel):
         # 计算标记列表的长度，即标记的数量
         token_count = len(tokens)
         # 返回标记的数量
-        return token_count
+        return token_count
+
+
+# 更新forward references
+StandardNode.update_forward_refs()
+Cell.update_forward_refs()

{bella_openapi-1.0.3.dist-info → bella_openapi-1.0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bella-openapi
-Version: 1.0.3
+Version: 1.0.3.2
 Summary: client for openapi service.
 Home-page: 
 Author: ['tangxiaolong', 'fanqiangwei', 'zhangxiaojia', 'liumin', 'wangyukun']
@@ -12,6 +12,8 @@ License-File: LICENSE
 Requires-Dist: httpx<=0.26.0,>=0.10.0
 Requires-Dist: Werkzeug==3.0.1
 Requires-Dist: tiktoken>=0.5.0
+Requires-Dist: pydantic==1.10.14
+Requires-Dist: fastapi==0.110.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -259,3 +261,5 @@ get接口地址：/v1/openapi/log/{requestId}
     * rename 包名
 * 1.0.2
     * 修复bug
+* 1.0.3 
+    * 新增standard domtree

{bella_openapi-1.0.3.dist-info → bella_openapi-1.0.3.2.dist-info}/RECORD

@@ -14,11 +14,11 @@ bella_openapi/bella_trace/trace_requests.py,sha256=ADA8J_gbC3TwUo5LWQ3c_yTmCSZRa
 bella_openapi/console/__init__.py,sha256=uSfr5v6JLRSqTlftjK_ZU1pnbkEyxAPbuQbMyYX_phk,64
 bella_openapi/console/models.py,sha256=Hh1UuYHIxFtF9r5QK-pSJPFrSqbZUHv6spLvPbCeX08,1274
 bella_openapi/entity/__init__.py,sha256=zzsYYg859pzPSgx1Py2kxB2ozQ0tt4OtTatBtpm2bAw,512
-bella_openapi/entity/standard_domtree.py,sha256=oN2z_t5uTzO01szVSEnsN_GWYtxKkgvQPgJuOnOOaFs,20270
+bella_openapi/entity/standard_domtree.py,sha256=6b-490HP6wt8Z4kU6e3kwuNp5UdNtiNmTML3akNGx5U,21574
 bella_openapi/middleware/__init__.py,sha256=XWvZG1xO30ZXIn10YVYthmT1BV-9fonMEP_jVRZbAlQ,157
 bella_openapi/middleware/context_middleware.py,sha256=YawQyKAxMzvlDs_MxcuQKh90pP6VoMKzCBDS94qmlzQ,3870
-bella_openapi-1.0.3.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
-bella_openapi-1.0.3.dist-info/METADATA,sha256=DauqWLJgwkWy0eSl-l_HISwuvEQ1t3NScpBmkZ9qa6c,9375
-bella_openapi-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bella_openapi-1.0.3.dist-info/top_level.txt,sha256=EZuq3F6tKeF-vmZQi6_S2XzmES7SPW7HAbGN1Uv9vN8,14
-bella_openapi-1.0.3.dist-info/RECORD,,
+bella_openapi-1.0.3.2.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+bella_openapi-1.0.3.2.dist-info/METADATA,sha256=YAppGGwIIymFj1Q5QVFgHK3Q31s2t0KV2Z7FO-4rLwo,9480
+bella_openapi-1.0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bella_openapi-1.0.3.2.dist-info/top_level.txt,sha256=EZuq3F6tKeF-vmZQi6_S2XzmES7SPW7HAbGN1Uv9vN8,14
+bella_openapi-1.0.3.2.dist-info/RECORD,,