pycoze 0.1.238__py3-none-any.whl → 0.1.240__py3-none-any.whl

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -34,41 +34,7 @@ def get_tools(last_message):
     if "tool_calls" in last_message.additional_kwargs:
         return last_message.additional_kwargs["tool_calls"]
     else:
-        tool_calls = None
-        # if '"name"' in last_message.content and '"parameters":' in last_message.content:
-        #     print("name 和 paremeters 模式")
-        #     all_json = get_all_markdown_json(last_message.content)
-        #     tool_calls = []
-        #     for tool_call in all_json:
-        #         if "name" not in tool_call or "parameters" not in tool_call:
-        #             return "end"
-        #         tool_call["arguments"] = json.dumps(tool_call["parameters"])
-        #         tool_call.pop("parameters")
-        #         tool_calls.append(
-        #             {
-        #                 "function": tool_call,
-        #                 "id": random.randint(0, 1000000),
-        #             }
-        #         )
-        # if "<｜tool▁sep｜>" in last_message.content:
-        #     print("deepseek的bug: <｜tool▁sep｜> 模式")
-        #     name = (
-        #         last_message.content.split("<｜tool▁sep｜>")[1].split("```")[0].strip()
-        #     )
-        #     all_json = get_all_markdown_json(last_message.content)
-        #     tool_calls = []
-        #     for argument in all_json:
-        #         tool_calls.append(
-        #             {
-        #                 "function": {
-        #                     "name": name,
-        #                     "arguments": json.dumps(argument),
-        #                 },
-        #                 "id": random.randint(0, 1000000),
-        #             }
-        #         )
-
-        return tool_calls
+        return None
 
 
 def create_openai_func_call_agent_executor(
@@ -109,8 +75,6 @@ def create_openai_func_call_agent_executor(
             return 'continue'
         return 'end'
 
-        
-
     # Define the function to execute tools
     async def call_tool(messages):
         actions: list[ToolInvocation] = []
@@ -120,14 +84,6 @@ def create_openai_func_call_agent_executor(
         for tool_call in get_tools(last_message):
             function = tool_call["function"]
             function_name = function["name"]
-            if function_name == "a_delay_function":
-                return [
-                    ToolMessage(
-                        tool_call_id=tool_call["id"],
-                        content="a_delay_function只是一个占位符，请忽略重新调用工具",
-                        additional_kwargs={"name": tool_call["function"]["name"]},
-                    )
-                ]
 
             _tool_input = json.loads(function["arguments"] or "{}")
             # We construct an ToolInvocation from the function_call

pycoze/bot/agent_chat.py

@@ -1,12 +1,11 @@
 import json
 from langchain_openai import ChatOpenAI
-from .agent import run_agent, Runnable, output, CHAT_DATA, clear_chat_data
+from .agent import run_agent, Runnable, CHAT_DATA, clear_chat_data
 import asyncio
 from pycoze import utils
 from pycoze.reference.bot import ref_bot
 from pycoze.reference.tool import ref_tools
 from pycoze.reference.workflow import ref_workflow
-from langchain_core.utils.function_calling import convert_to_openai_tool
 import os
 
 cfg = utils.read_json_file("llm.json")
@@ -75,15 +74,11 @@ async def agent_chat(bot_setting_file, history):
         api_key=cfg["apiKey"],
         base_url=cfg["baseURL"],
         model=cfg["model"],
-        temperature=(
-            role_setting["temperature"] * 2
-            if cfg["model"].startswith("deepseek")
-            else role_setting["temperature"]
-        ),
-        stop_sequences=[
-            "tool▁calls▁end",
-            "tool▁call▁end",
-        ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
+        temperature=(role_setting["temperature"]),
+        # stop_sequences=[
+        #     "tool▁calls▁end",
+        #     "tool▁call▁end",
+        # ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
     )
     prompt = role_setting["prompt"]
 

{pycoze-0.1.238.dist-info → pycoze-0.1.240.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.238
+Version: 0.1.240
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.238.dist-info → pycoze-0.1.240.dist-info}/RECORD

@@ -5,11 +5,8 @@ pycoze/ai/llm/__init__.py,sha256=kAXcQ7SefJYysgKeVInlwYZoDk0BPuEnUuixy-quD_A,127
 pycoze/ai/llm/chat.py,sha256=izriC7nCp5qeJRqcUVQBVqTHiH6MJS77ROzGBJufdNI,5133
 pycoze/ai/llm/text_to_image_prompt.py,sha256=0bx2C_YRvjAo7iphHGp1-pmGKsKqwur7dM0t3SiA8kA,3398
 pycoze/ai/llm/think.py,sha256=sUgTBdGzcZtL3r-Wx8M3lDuVUmDVz8g3qC0VU8uiKAI,5143
-pycoze/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/automation/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/automation/browser/edge_driver_manager.py,sha256=gpgseunph5owZH6EskSYthuhey2SU3UP204gY0yIcuI,3022
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/agent_chat.py,sha256=BREcg2L1LVZ4mZybTfFtxIL3OMHaxoQcPsBVumq2a1s,3556
+pycoze/bot/agent_chat.py,sha256=Lj7YWG0TrCmdyETnV_NlFL6X6HPkRHEjD3wTFKJah9o,3356
 pycoze/bot/bot.py,sha256=_qmUTZ09FmRLifHrW5stDZWGVK6yuMEMBC3fmeYJnqk,844
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
 pycoze/bot/agent/agent.py,sha256=iZzvem9_NyFyfu1uvnCxS89SNo2O4Qx1n3CxMIrIy0A,3447
@@ -17,7 +14,7 @@ pycoze/bot/agent/assistant.py,sha256=s1y_gR_9UK_jzjX6YztXK5JNhnV-_YvUA6vv1lToS-k
 pycoze/bot/agent/chat.py,sha256=mubOCAHvA6VtyE6N40elI6KrP6A69uB_G6ihE3G_Vi4,860
 pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7YTqLhpzJC6k,179
 pycoze/bot/agent/agent_types/const.py,sha256=BfUKPrhAHREoMLHuFNG2bCIEkC1-f7K0LEqNg4RwiRE,70
-pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=S61rQoQliW7I54ouwnEw_xBHEsVrnd06NP6ZXqBvGHc,6481
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=_R42UdImIjeOJdiiRghRn9A5Cjse9fX3OQTGFNHPr_E,4575
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=BDflTV3zYoZqWnJpD5lMM_1vU_5b20M3XiFt1p-RHWM,2427
 pycoze/reference/lib.py,sha256=0xQJTLTHedGzQBsjuTFNBVqYc4-8Yl65gGCrAhWyOX8,2155
@@ -32,8 +29,8 @@ pycoze/utils/__init__.py,sha256=Gi5EnrWZGMD2JRejgV4c_VLCXyvA2wwBFI_niDF5MUE,110
 pycoze/utils/arg.py,sha256=GtfGbMTMdaK75Fwh6MpUe1pCA5X6Ep4LFG7a72YrzjI,525
 pycoze/utils/env.py,sha256=W04lhvTHhAAC6EldP6kk2xrctqtu8K6kl1vDLZDNeh8,561
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.238.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.238.dist-info/METADATA,sha256=J_iEhDaeh0SsfdMH0fBLNYCmjBRh6USXxHc4zywm9dk,699
-pycoze-0.1.238.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pycoze-0.1.238.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.238.dist-info/RECORD,,
+pycoze-0.1.240.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.240.dist-info/METADATA,sha256=HUZlCIs52nql_SLc8f5mCsiBNQVzX3rzXR5I8Dy45fo,699
+pycoze-0.1.240.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pycoze-0.1.240.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.240.dist-info/RECORD,,

pycoze/automation/browser/edge_driver_manager.py

@@ -1,77 +0,0 @@
-import os
-import requests
-from selenium.webdriver.edge.service import Service
-from webdriver_manager.microsoft import EdgeChromiumDriverManager
-from selenium import webdriver
-
-
-# Function to check network availability
-def is_network_available():
-    try:
-        # Attempt to access the download URL for Edge Chromium driver to check network connection
-        response = requests.get("https://msedgedriver.azureedge.net/", timeout=3)
-        return response.status_code == 200
-    except requests.ConnectionError:
-        return False
-
-
-# Function to get the default download path for Edge Chromium driver
-def get_default_driver_path():
-    manager = EdgeChromiumDriverManager()
-    return manager.install()
-
-
-# Function to get the driver version from cache
-def get_cached_driver_version(manager):
-    cache_dir = manager._cache_manager._root_dir  # Get the root path of the cache directory
-    os_type = manager._os_system_manager.get_os_type()  # Get the OS type
-    driver_name = manager.driver.get_name()
-
-    # List all versions in the cache directory
-    versions_dir = os.path.join(cache_dir, "drivers", driver_name, os_type)
-    if os.path.exists(versions_dir):
-        versions = os.listdir(versions_dir)
-        if versions:
-            # Return the latest version found in the cache
-            return max(versions)
-    return None
-
-
-# Function to check if the driver has already been downloaded
-def get_driver_path():
-    network_available = is_network_available()
-    print("Network status:", "Available" if network_available else "Unavailable")
-    manager = EdgeChromiumDriverManager()
-    if network_available:
-        return get_default_driver_path()
-    else:
-        # If no network, check the cache directory
-        driver_version = get_cached_driver_version(manager)
-        if driver_version:
-            driver_name = manager.driver.get_name()
-            os_type = manager._os_system_manager.get_os_type()
-            cache_dir = manager._cache_manager._root_dir
-
-            # Determine the correct driver filename based on the OS
-            if os.name == 'nt':  # Windows
-                driver_filename = "msedgedriver.exe"
-            else:  # macOS and Linux
-                driver_filename = "msedgedriver"
-
-            # Construct the driver path
-            driver_path = os.path.join(cache_dir, "drivers", driver_name, os_type, driver_version, driver_filename)
-            # Check if the driver path exists
-            if os.path.exists(driver_path):
-                return driver_path
-        raise Exception("Network unavailable and no downloaded driver found")
-
-
-# Function to get the Edge driver service
-def get_edge_driver_service():
-    driver_path = get_driver_path()
-    print("driver_path", driver_path)
-    # Check if the driver path exists
-    if os.path.exists(driver_path):
-        return Service(driver_path)
-    else:
-        raise Exception("Network unavailable and no downloaded driver found")