bella-openapi 1.0.3.2__tar.gz → 1.0.4.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. {bella_openapi-1.0.3.2/src/bella_openapi.egg-info → bella_openapi-1.0.4.1}/PKG-INFO +1 -1
  2. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/setup.py +1 -1
  3. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/entity/standard_domtree.py +15 -17
  4. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1/src/bella_openapi.egg-info}/PKG-INFO +1 -1
  5. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/LICENSE +0 -0
  6. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/README.md +0 -0
  7. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/setup.cfg +0 -0
  8. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/__init__.py +0 -0
  9. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/auth_billing.py +0 -0
  10. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/authorize.py +0 -0
  11. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/bella_trace/__init__.py +0 -0
  12. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/bella_trace/_context.py +0 -0
  13. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/bella_trace/fastapi_interceptor.py +0 -0
  14. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/bella_trace/record_log.py +0 -0
  15. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/bella_trace/trace_requests.py +0 -0
  16. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/config.py +0 -0
  17. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/console/__init__.py +0 -0
  18. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/console/models.py +0 -0
  19. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/entity/__init__.py +0 -0
  20. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/exception.py +0 -0
  21. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/log.py +0 -0
  22. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/middleware/__init__.py +0 -0
  23. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/middleware/context_middleware.py +0 -0
  24. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/openapi_contexvar.py +0 -0
  25. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi/schema.py +0 -0
  26. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi.egg-info/SOURCES.txt +0 -0
  27. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi.egg-info/dependency_links.txt +0 -0
  28. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi.egg-info/not-zip-safe +0 -0
  29. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi.egg-info/requires.txt +0 -0
  30. {bella_openapi-1.0.3.2 → bella_openapi-1.0.4.1}/src/bella_openapi.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bella-openapi
3
- Version: 1.0.3.2
3
+ Version: 1.0.4.1
4
4
  Summary: client for openapi service.
5
5
  Home-page:
6
6
  Author: ['tangxiaolong', 'fanqiangwei', 'zhangxiaojia', 'liumin', 'wangyukun']
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
3
3
 
4
4
  SHORT = "client for openapi service."
5
5
 
6
- __version__ = "1.0.3.2"
6
+ __version__ = "1.0.4.1"
7
7
  __author__ = ["tangxiaolong", "fanqiangwei", "zhangxiaojia", 'liumin', 'wangyukun']
8
8
  __email__ = ''
9
9
  readme_path = 'README.md'
@@ -77,12 +77,26 @@ class StandardTableElement(StandardBaseElement):
77
77
  name: Optional[str] = None # 如果类型是Table、Figure为其名字
78
78
  description: Optional[str] = None # 如果类型是Table、Figure为其描述
79
79
  rows: List[StandardRow] = Field(default_factory=list) # 表格行
80
+
81
+ @root_validator(pre=True)
82
+ def validate_table_type(cls, values):
83
+ """确保只有type='Table'的数据才能创建StandardTableElement"""
84
+ if values.get('type') != 'Table':
85
+ raise ValueError(f"StandardTableElement只能用于type='Table'的数据,当前type='{values.get('type')}'")
86
+ return values
80
87
 
81
88
 
82
89
  class StandardImageElement(StandardElement):
83
90
  name: Optional[str] = None # 如果类型是Table、Figure为其名字
84
91
  description: Optional[str] = None # 如果类型是Table、Figure为其描述
85
92
  image: Optional[StandardImage] = None # 图片信息
93
+
94
+ @root_validator(pre=True)
95
+ def validate_image_type(cls, values):
96
+ """确保只有type='Figure'的数据才能创建StandardImageElement"""
97
+ if values.get('type') != 'Figure':
98
+ raise ValueError(f"StandardImageElement只能用于type='Figure'的数据,当前type='{values.get('type')}'")
99
+ return values
86
100
 
87
101
 
88
102
  class StandardNode(BaseModel):
@@ -90,25 +104,9 @@ class StandardNode(BaseModel):
90
104
  summary: Optional[str] = None # 摘要,文档的简要概述
91
105
  tokens: Optional[int] = None # token预估数量,文档中的token数量估计
92
106
  path: Optional[List[int]] = Field(default_factory=list) # 编号的层级信息,例如:1.2.1
93
- element: Optional[Union[StandardElement, StandardImageElement, StandardTableElement]] = None # 元素信息,当前节点的元素详情
107
+ element: Optional[Union[StandardTableElement, StandardImageElement, StandardElement]] = None # 元素信息,当前节点的元素详情
94
108
  children: Optional[List["StandardNode"]] = Field(default_factory=list) # 子节点信息,当前节点的所有子节点
95
109
 
96
- @root_validator(pre=True)
97
- def parse_element(cls, values):
98
- """根据element的type字段正确实例化element"""
99
- if 'element' in values and values['element'] is not None:
100
- element_data = values['element']
101
- # 只有当element是字典时才需要转换,如果已经是正确的实例则保持不变
102
- if isinstance(element_data, dict):
103
- element_type = element_data.get('type', '')
104
- if element_type == 'Figure':
105
- values['element'] = StandardImageElement(**element_data)
106
- elif element_type == 'Table':
107
- values['element'] = StandardTableElement(**element_data)
108
- else:
109
- values['element'] = StandardElement(**element_data)
110
- # 如果element已经是正确的实例类型,则保持不变
111
- return values
112
110
 
113
111
 
114
112
  class StandardDomTree(BaseModel):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bella-openapi
3
- Version: 1.0.3.2
3
+ Version: 1.0.4.1
4
4
  Summary: client for openapi service.
5
5
  Home-page:
6
6
  Author: ['tangxiaolong', 'fanqiangwei', 'zhangxiaojia', 'liumin', 'wangyukun']
File without changes