bella-openapi 1.0.2.3__tar.gz → 1.0.2.5__tar.gz

{bella_openapi-1.0.2.3/src/bella_openapi.egg-info → bella_openapi-1.0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bella-openapi
-Version: 1.0.2.3
+Version: 1.0.2.5
 Summary: client for openapi service.
 Home-page: 
 Author: ['tangxiaolong', 'fanqiangwei', 'zhangxiaojia', 'liumin', 'wangyukun']

{bella_openapi-1.0.2.3 → bella_openapi-1.0.2.5}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 SHORT = "client for openapi service."
 
-__version__ = "1.0.2.3"
+__version__ = "1.0.2.5"
 __author__ = ["tangxiaolong", "fanqiangwei", "zhangxiaojia", 'liumin', 'wangyukun']
 __email__ = ''
 readme_path = 'README.md'
@@ -16,9 +16,7 @@ setup(
     install_requires=[
         'httpx>=0.10.0,<=0.26.0',
         'Werkzeug==3.0.1',
-        # 'pydantic>=1.10.0',
         'tiktoken>=0.5.0',
-        # 'fastapi>=0.110.0',
     ],
     url='',
     author=__author__,

{bella_openapi-1.0.2.3 → bella_openapi-1.0.2.5}/src/bella_openapi/__init__.py

@@ -3,7 +3,19 @@ from .log import operation_log, submit_log
 from .openapi_contexvar import trace_id_context, caller_id_context, request_url_context
 from .auth_billing import ErrorInfo, async_authenticate_decorator_args, authenticate_user, print_context, \
 get_context, set_context, clean_context, report
-from .domtree import StandardDomTree, StandardNode
+from .entity import (
+    StandardDomTree,
+    StandardNode,
+    SourceFile,
+    StandardPosition,
+    StandardImage,
+    Cell,
+    StandardRow,
+    StandardBaseElement,
+    StandardElement,
+    StandardTableElement,
+    StandardImageElement
+)
 
 __all__ = ["validate_token", "operation_log",
            "support_model",
@@ -22,5 +34,14 @@ __all__ = ["validate_token", "operation_log",
            "clean_context",
            "report",
            "StandardDomTree",
-           "StandardNode"
+           "StandardNode",
+           "SourceFile",
+           "StandardPosition",
+           "StandardImage",
+           "Cell",
+           "StandardRow",
+           "StandardBaseElement",
+           "StandardElement",
+           "StandardTableElement",
+           "StandardImageElement"
            ]

bella_openapi-1.0.2.5/src/bella_openapi/entity/__init__.py

@@ -0,0 +1,27 @@
+from .standard_domtree import (
+    StandardDomTree,
+    StandardNode,
+    SourceFile,
+    StandardPosition,
+    StandardImage,
+    Cell,
+    StandardRow,
+    StandardBaseElement,
+    StandardElement,
+    StandardTableElement,
+    StandardImageElement
+)
+
+__all__ = [
+    "StandardDomTree",
+    "StandardNode", 
+    "SourceFile",
+    "StandardPosition",
+    "StandardImage",
+    "Cell",
+    "StandardRow",
+    "StandardBaseElement",
+    "StandardElement",
+    "StandardTableElement",
+    "StandardImageElement"
+]

{bella_openapi-1.0.2.3/src/bella_openapi/domtree → bella_openapi-1.0.2.5/src/bella_openapi/entity}/standard_domtree.py

@@ -10,8 +10,7 @@ StandardDomTree - 新的DOM树协议定义
 
 from typing import List, Optional, Literal, Any, Union
 from pydantic import BaseModel, Field
-
-from bella_openapi.domtree.utils import count_tokens
+import tiktoken
 
 # 布局类型映射表：将旧解析器的布局类型映射到新的标准类型
 # 注意：这个映射表是临时的，后续计划统一布局类型定义
@@ -33,6 +32,7 @@ layout_type_mapping = {
 }
 
 
+
 class SourceFile(BaseModel):
     id: str  # 文件ID，唯一标识符，类型为string
     name: str  # 文件名，文档的名称，类型为string
@@ -431,7 +431,7 @@ class StandardDomTree(BaseModel):
                                       cell_data['end_col']],
                                 text=cell_text,
                                 # 目前只会有一个元素,且是Text类型，Path重新从头编号，相对cell是root
-                                nodes=[StandardNode(summary="", tokens=count_tokens(cell_text), path=[1], children=[],
+                                nodes=[StandardNode(summary="", tokens=cls.count_tokens(cell_text), path=[1], children=[],
                                                     element=StandardElement(
                                                         type='Text',
                                                         positions=[],
@@ -482,7 +482,7 @@ class StandardDomTree(BaseModel):
                     standard_node.children.append(standard_child)
 
         # 计算 token 数量：自身 text 的 token 数量 + 子节点 token 数量
-        tokens = count_tokens(text)
+        tokens = cls.count_tokens(text)
         for child in standard_node.children:
             tokens += child.tokens
 
@@ -490,3 +490,24 @@ class StandardDomTree(BaseModel):
         standard_node.tokens = tokens
 
         return standard_node
+
+    @classmethod
+    def count_tokens(cls, text: str, model: str = "gpt-4") -> int:
+        """
+        计算文本的token数量
+
+        Args:
+            text: 要计算的文本
+            model: 使用的模型名称，默认为gpt-4
+
+        Returns:
+            int: token数量
+        """
+        if not text:
+            return 0
+        encoding = tiktoken.encoding_for_model(model)
+        tokens = encoding.encode(text)
+        # 计算标记列表的长度，即标记的数量
+        token_count = len(tokens)
+        # 返回标记的数量
+        return token_count

{bella_openapi-1.0.2.3 → bella_openapi-1.0.2.5/src/bella_openapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bella-openapi
-Version: 1.0.2.3
+Version: 1.0.2.5
 Summary: client for openapi service.
 Home-page: 
 Author: ['tangxiaolong', 'fanqiangwei', 'zhangxiaojia', 'liumin', 'wangyukun']

{bella_openapi-1.0.2.3 → bella_openapi-1.0.2.5}/src/bella_openapi.egg-info/SOURCES.txt

@@ -22,8 +22,7 @@ src/bella_openapi/bella_trace/record_log.py
 src/bella_openapi/bella_trace/trace_requests.py
 src/bella_openapi/console/__init__.py
 src/bella_openapi/console/models.py
-src/bella_openapi/domtree/__init__.py
-src/bella_openapi/domtree/standard_domtree.py
-src/bella_openapi/domtree/utils.py
+src/bella_openapi/entity/__init__.py
+src/bella_openapi/entity/standard_domtree.py
 src/bella_openapi/middleware/__init__.py
 src/bella_openapi/middleware/context_middleware.py

bella_openapi-1.0.2.3/src/bella_openapi/domtree/__init__.py

@@ -1,3 +0,0 @@
-from .standard_domtree import StandardDomTree, StandardNode
-
-__all__ = ["StandardDomTree", "StandardNode"]

bella_openapi-1.0.2.3/src/bella_openapi/domtree/utils.py

@@ -1,12 +0,0 @@
-import tiktoken
-
-# 自研模型均用gpt-4计算（可能有误差，可忽略）
-def count_tokens(text: str, model: str = "gpt-4") -> int:
-    if not text:
-        return 0
-    encoding = tiktoken.encoding_for_model(model)
-    tokens = encoding.encode(text)
-    # 计算标记列表的长度，即标记的数量
-    token_count = len(tokens)
-    # 返回标记的数量
-    return token_count