Merge branch 'hotfix/remove-tongyi-usage-details'

Author: chenlb

langfarm/hooks/langfuse/callback/langchain.py

@@ -30,9 +30,15 @@ def _parse_usage(response: LLMResult):
                     if generation_chunk.generation_info and (
                             "token_usage" in generation_chunk.generation_info
                     ):
-                        llm_usage = _parse_usage_model(
+                        _usage = _parse_usage_model(
                             generation_chunk.generation_info["token_usage"]
                         )
+                        # 只上报3个字段
+                        llm_usage = {
+                            'input': _usage['input']
+                            , 'output': _usage['output']
+                            , 'total': _usage['total']
+                        }
                         break
         if llm_usage is None:
             # 调用找到使用原来的函数找。

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langfarm"
-version = "0.1.1"
+version = "0.1.2"
 description = "LLM 相关工具集"
 authors = ["chenlb <chenlbphoto@163.com>"]
 license = "MIT"

scripts/test.sh

@@ -3,6 +3,6 @@
 set -e
 set -x
 
-coverage run --source=langfarm,tests -m pytest
+coverage run --source=langfarm -m pytest
 coverage report --show-missing
 coverage html --title "${@-coverage}"

tests/test_hook_langfuse_callback.py

@@ -1,4 +1,5 @@
 import logging
+import os
 import time
 import unittest
 
@@ -15,7 +16,7 @@ class HookLangfuseCallbackTestCase(base.BaseTestCase):
 
     def test_use_tongyi_with_langfuse_callback(self):
         query = '请用50个字描写春天的景色。'
-        llm = Tongyi(model="qwen-plus")
+        llm = Tongyi(model="qwen-plus", api_key=os.getenv('DASHSCOPE_API_KEY'))
         # base.BaseTestCase 的 setUpClass() 使用 load_dotenv() 加载了 .env 配置
         # LANGFUSE_PUBLIC_KEY
         # LANGFUSE_SECRET_KEY
@@ -52,7 +53,7 @@ def test_use_tongyi_with_langfuse_callback(self):
 
     def test_use_tongyi_stream_with_langfuse_callback(self):
         query = '请用200个字描写春天的景色。'
-        llm: BaseLLM = Tongyi(model="qwen-turbo")
+        llm: BaseLLM = Tongyi(model="qwen-turbo", api_key=os.getenv('DASHSCOPE_API_KEY'))
         langfuse_handler = CallbackHandler(trace_name="Tongyi-stream")
         chunks = llm.stream(query, config={"callbacks": [langfuse_handler]})
         output_chunk = []