pycoze 0.1.252__tar.gz → 0.1.254__tar.gz

{pycoze-0.1.252 → pycoze-0.1.254}/PKG-INFO

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

pycoze-0.1.254/pycoze/ai/__init__.py

@@ -0,0 +1,14 @@
+from .vram_reserve import reserve_vram, reserve_vram_retry, unreserve_vram
+from .llm import chat, chat_stream, extract, yes_or_no, extract_code, text_to_image_prompt
+
+__all__ = [
+    reserve_vram,
+    reserve_vram_retry,
+    unreserve_vram,
+    chat,
+    chat_stream,
+    extract,
+    yes_or_no,
+    extract_code,
+    text_to_image_prompt
+]

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/ai/llm/__init__.py

@@ -1,2 +1,11 @@
 from .text_to_image_prompt import text_to_image_prompt
 from .chat import chat, chat_stream, extract, yes_or_no, extract_code
+
+__all__ = [
+    text_to_image_prompt,
+    chat,
+    chat_stream,
+    extract,
+    yes_or_no,
+    extract_code
+]

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/ai/vram_reserve.py

@@ -8,7 +8,7 @@ import sys
 from pycoze import utils
 
 # 定义数据库连接和初始化
-params = utils.read_params_file()
+params = utils.params
 if params:
     DATABASE_PATH = params["appPath"] + "/vram_usage.db"
 else:

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/bot/__init__.py

@@ -1 +1,3 @@
 from .bot import chat, get_chat_response
+
+__all__ = [chat, get_chat_response]

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -92,7 +92,7 @@ def create_openai_func_call_agent_executor(
 
         return [SystemMessage(content=system_message)] + msgs
 
-    if tools and tool_compatibility_mode:
+    if tools and not tool_compatibility_mode:
         llm_with_tools = llm.bind(tools=[convert_to_openai_tool(t) for t in tools])
     else:
         llm_with_tools = llm
@@ -106,7 +106,6 @@ def create_openai_func_call_agent_executor(
         if last_message.content.strip().endswith("```"):
             last_message.content = last_message.content + "\n\n"  # 避免影响阅读
         tools = get_tools(last_message)
-        print("tools", tools)
         if last_message.tool_calls or tools:
             return 'continue'
         return 'end'

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/bot/agent/assistant.py

@@ -26,7 +26,7 @@ class Runnable(RunnableBinding):
         )
         agent_executor = agent_executor.with_config({"recursion_limit": 50})
         super().__init__(
-            tools=tools,
+            tools=tools if not tool_compatibility_mode else [],
             llm=llm,
             agent_execution_mode=agent_execution_mode,
             assistant_message=assistant_message,

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/bot/agent_chat.py

@@ -1,6 +1,6 @@
 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
@@ -100,7 +100,7 @@ async def agent_chat(bot_setting_file, history):
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
-    params = utils.read_params_file()
+    params = utils.params
     if "interruptFile" in params:
         interrupt_file_path = params["interruptFile"]
         result = await run_with_interrupt_check(agent, history, cfg["toolCompatibilityMode"], interrupt_file_path)

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/bot/bot.py

@@ -1,5 +1,4 @@
 from langchain_core.messages import HumanMessage, AIMessage
-import threading
 import json
 from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
 from .agent_chat import agent_chat

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/ui/__init__.py

@@ -25,3 +25,31 @@ from .ui_def import (
     seed,
     button
 )
+
+__all__ = [
+    get_ui,
+    get_ui_text,
+    label,
+    number,
+    text,
+    textarea,
+    password,
+    tool,
+    color,
+    checkbox,
+    single_select,
+    multi_select,
+    single_file_select,
+    multi_file_select,
+    single_folder_select,
+    multi_folder_select,
+    folder_tree,
+    single_image_select,
+    multi_image_select,
+    single_audio_select,
+    multi_audio_select,
+    single_video_select,
+    multi_video_select,
+    seed,
+    button
+]

pycoze-0.1.254/pycoze/utils/__init__.py

@@ -0,0 +1,5 @@
+from .arg import read_arg
+from .env import read_params_file, params, read_json_file
+from .text_or_file import to_text
+
+__all__ = [read_arg, read_params_file, params, read_json_file, to_text]

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/utils/arg.py

@@ -1,6 +1,4 @@
 import sys
-import json
-import os
 
 
 def read_arg(param, is_path=False, posix=True):

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze/utils/env.py

@@ -13,9 +13,13 @@ def read_params_file():
             print(e)
     return params
 
+
+params = read_params_file()
+
+
 def read_json_file(filename):
-    params = read_params_file()
     json_file = os.path.join(params['appPath'], 'JsonStorage', filename)
     with open(json_file, encoding='utf-8') as f:
         return json.load(f)
-        
+
+

pycoze-0.1.254/pycoze/utils/socket.py

@@ -0,0 +1,72 @@
+import socket
+import json
+import uuid
+
+
+tcp_port = read_arg("tcp_port")
+
+
+
+class TcpSocket:
+    def __init__(self):
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.connect(("localhost", int(tcp_port)))
+        self.is_connected = True
+
+    def post(self, subject, message):
+        subject = "python-event:" + subject
+        message = message.copy()
+        message["subject"] = subject
+        message = json.dumps(message)
+        message_bytes = message.encode()
+        message_length = len(message_bytes)
+        message_length_bytes = message_length.to_bytes(4, byteorder='big')
+
+        self.socket.sendall(message_length_bytes + message_bytes)
+
+    def recv(self):
+        # 接收消息长度
+        message_length_bytes = self.socket.recv(4)
+        message_length = int.from_bytes(message_length_bytes, byteorder='big')
+        # 初始化接收到的消息
+        message = b''
+        # 循环接收直到收到完整的消息
+        while len(message) < message_length:
+            # 接收剩余的消息
+            chunk = self.socket.recv(message_length - len(message))
+            if not chunk:  # 如果没有接收到数据，则断开连接
+                raise RuntimeError("Socket connection broken")
+            message += chunk
+        message = json.loads(message.decode())
+        return message
+
+    def post_and_recv_result(self, subject, message):
+        message = message.copy()
+        message["uid"] = str(uuid.uuid4())
+        socket_subscribe(subject + ":" +  message["uid"]) # 先订阅,再发送,防止消息丢失
+        self.post(subject, message)
+        ret_val = self.recv()        
+        result = ret_val["result"] if "result" in ret_val else None # 传输时，可能会丢失result字段，因此需要判断
+        return result
+
+    def close(self):
+        if self.is_connected:
+            self.is_connected = False
+
+    def __del__(self):
+        # 垃圾回收时自动关闭socket
+        if self.is_connected:
+            self.close()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        # with 语句块结束时自动触发的
+        if self.is_connected:
+            self.close()
+
+
+socket = TcpSocket()
+
+def socket_subscribe(subject: str):
+    subject = "python-event:" + subject
+    socket.post(subject, {"subscribe": subject})
+    return socket

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.252 → pycoze-0.1.254}/pycoze.egg-info/SOURCES.txt

@@ -35,4 +35,5 @@ pycoze/ui/ui_def.py
 pycoze/utils/__init__.py
 pycoze/utils/arg.py
 pycoze/utils/env.py
+pycoze/utils/socket.py
 pycoze/utils/text_or_file.py

{pycoze-0.1.252 → pycoze-0.1.254}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.252",
+    version="0.1.254",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",

pycoze-0.1.252/pycoze/ai/__init__.py

@@ -1,2 +0,0 @@
-from .vram_reserve import reserve_vram, reserve_vram_retry, unreserve_vram
-from .llm import chat, chat_stream, extract, yes_or_no, extract_code, text_to_image_prompt

pycoze-0.1.252/pycoze/utils/__init__.py

@@ -1,3 +0,0 @@
-from .arg import read_arg
-from .env import read_params_file, read_json_file
-from .text_or_file import to_text