bella-openapi 1.0.2.4__py3-none-any.whl → 1.0.2.5__py3-none-any.whl

bella_openapi/entity/standard_domtree.py

@@ -31,16 +31,7 @@ layout_type_mapping = {
     "TableNote": "Text",  # 目前实际解析出来没有
 }
 
-# 自研模型均用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
+
 
 class SourceFile(BaseModel):
     id: str  # 文件ID，唯一标识符，类型为string
@@ -440,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=[],
@@ -491,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
 
@@ -500,3 +491,23 @@ class StandardDomTree(BaseModel):
 
         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.4.dist-info → bella_openapi-1.0.2.5.dist-info}/METADATA

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

{bella_openapi-1.0.2.4.dist-info → bella_openapi-1.0.2.5.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=GJZ4_2zcagtmUf4XMf6_IGWCr1unW6NoCwbjEm6QfCU,20293
+bella_openapi/entity/standard_domtree.py,sha256=EzeYH_UH8MfcVucOcviof8qAIZ5BULVu2DO2EBN7F-c,20510
 bella_openapi/middleware/__init__.py,sha256=XWvZG1xO30ZXIn10YVYthmT1BV-9fonMEP_jVRZbAlQ,157
 bella_openapi/middleware/context_middleware.py,sha256=YawQyKAxMzvlDs_MxcuQKh90pP6VoMKzCBDS94qmlzQ,3870
-bella_openapi-1.0.2.4.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
-bella_openapi-1.0.2.4.dist-info/METADATA,sha256=FGMjsUJzbybMQLvPf_VHvyhhKMwTkSfmirp1DLTCvpM,9377
-bella_openapi-1.0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bella_openapi-1.0.2.4.dist-info/top_level.txt,sha256=EZuq3F6tKeF-vmZQi6_S2XzmES7SPW7HAbGN1Uv9vN8,14
-bella_openapi-1.0.2.4.dist-info/RECORD,,
+bella_openapi-1.0.2.5.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+bella_openapi-1.0.2.5.dist-info/METADATA,sha256=ohCbeW5mv4uFMn3NgoscDQxEBKW7zi168nRfIbgltc0,9377
+bella_openapi-1.0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bella_openapi-1.0.2.5.dist-info/top_level.txt,sha256=EZuq3F6tKeF-vmZQi6_S2XzmES7SPW7HAbGN1Uv9vN8,14
+bella_openapi-1.0.2.5.dist-info/RECORD,,