pycoze 0.1.80__tar.gz → 0.1.82__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. {pycoze-0.1.80 → pycoze-0.1.82}/PKG-INFO +1 -1
  2. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/agent/agent_types/openai_func_call_agent.py +2 -0
  3. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/bot.py +12 -3
  4. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze.egg-info/PKG-INFO +1 -1
  5. {pycoze-0.1.80 → pycoze-0.1.82}/setup.py +1 -1
  6. {pycoze-0.1.80 → pycoze-0.1.82}/LICENSE +0 -0
  7. {pycoze-0.1.80 → pycoze-0.1.82}/README.md +0 -0
  8. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/__init__.py +0 -0
  9. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/access/__init__.py +0 -0
  10. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/access/tool_for_bot.py +0 -0
  11. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ai/__init__.py +0 -0
  12. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ai/comfyui.py +0 -0
  13. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ai/vram_reserve.py +0 -0
  14. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/__init__.py +0 -0
  15. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/agent/__init__.py +0 -0
  16. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/agent/agent.py +0 -0
  17. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/agent/agent_types/__init__.py +0 -0
  18. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/agent/assistant.py +0 -0
  19. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/bot/agent/chat.py +0 -0
  20. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/module.py +0 -0
  21. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ui/__init__.py +0 -0
  22. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ui/base.py +0 -0
  23. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ui/color.py +0 -0
  24. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ui/typ.py +0 -0
  25. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/ui/ui_def.py +0 -0
  26. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/utils/__init__.py +0 -0
  27. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/utils/arg.py +0 -0
  28. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze/utils/text_or_file.py +0 -0
  29. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze.egg-info/SOURCES.txt +0 -0
  30. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze.egg-info/dependency_links.txt +0 -0
  31. {pycoze-0.1.80 → pycoze-0.1.82}/pycoze.egg-info/top_level.txt +0 -0
  32. {pycoze-0.1.80 → pycoze-0.1.82}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pycoze
3
- Version: 0.1.80
3
+ Version: 0.1.82
4
4
  Summary: Package for pycoze only!
5
5
  Author: Yuan Jie Xiong
6
6
  Author-email: aiqqqqqqq@qq.com
@@ -150,6 +150,7 @@ def create_openai_func_call_agent_executor(
150
150
  # We call the tool_executor and get back a response
151
151
  responses = await tool_executor.abatch(actions, **kwargs)
152
152
  # We use the response to create a ToolMessage
153
+ print("call_tool")
153
154
  tool_messages = []
154
155
  for tool_call, response in zip(
155
156
  last_message.additional_kwargs["tool_calls"], responses
@@ -165,6 +166,7 @@ def create_openai_func_call_agent_executor(
165
166
  additional_kwargs={"name": tool_call["function"]["name"]},
166
167
  )
167
168
  tool_messages.append(message)
169
+ print(tool_messages)
168
170
  return tool_messages
169
171
 
170
172
  workflow = MessageGraph()
@@ -5,6 +5,7 @@ import asyncio
5
5
  from langchain_core.messages import HumanMessage
6
6
  from pycoze import utils
7
7
  from pycoze.access.tool_for_bot import import_tools
8
+ from langchain_core.utils.function_calling import convert_to_openai_tool
8
9
 
9
10
  params = utils.arg.read_params_file()
10
11
  llm_file = params["appPath"] + "/JsonStorage/llm.json"
@@ -36,7 +37,7 @@ def agent_chat(bot_setting_file, history):
36
37
  model=cfg["model"],
37
38
  temperature=(
38
39
  role_setting["temperature"] * 2
39
- if cfg["model"].startswith("deepseek")
40
+ if cfg["model"].startswith("deepseek") or cfg["model"].startswith("yi-")
40
41
  else role_setting["temperature"]
41
42
  ),
42
43
  stop_sequences=[
@@ -45,15 +46,23 @@ def agent_chat(bot_setting_file, history):
45
46
  ], # 停用deepseek的工具调用标记,不然会虚构工具调用过程和结果
46
47
  )
47
48
  prompt = role_setting["prompt"]
48
- if cfg["model"].startswith("deepseek") and len(tools) > 0:
49
+ if (
50
+ cfg["model"].startswith("deepseek")
51
+ or cfg["model"].startswith("yi-")
52
+ and len(tools) > 0
53
+ ):
49
54
  prompt += """
50
55
  如果需要调用工具,请使用以正确的json格式进行结尾(务必保证json格式正确,不要出现反斜杠未转义等问题):
51
56
  ```json
52
57
  {"name": 函数名, "parameters": 参数词典}
53
58
  ```
54
59
  """
60
+ if cfg["model"].startswith("yi-"):
61
+ prompt += "\nAvailable functions:\n"
62
+ for t in tools:
63
+ prompt += f"\n```json\n{json.dumps(convert_to_openai_tool(t))}\n```"
55
64
  agent = Runnable(
56
- "FuncCall",
65
+ agent_execution_mode="FuncCall",
57
66
  tools=tools,
58
67
  llm=chat,
59
68
  assistant_message=prompt,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pycoze
3
- Version: 0.1.80
3
+ Version: 0.1.82
4
4
  Summary: Package for pycoze only!
5
5
  Author: Yuan Jie Xiong
6
6
  Author-email: aiqqqqqqq@qq.com
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name="pycoze",
5
- version="0.1.80",
5
+ version="0.1.82",
6
6
  packages=find_packages(),
7
7
  install_requires=[],
8
8
  author="Yuan Jie Xiong",
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes