pycoze 0.1.286__py3-none-any.whl → 0.1.288__py3-none-any.whl

pycoze/ai/llm/chat.py

@@ -1,131 +1,124 @@
-from pycoze import utils
-import json5
-import re
-from retrying import retry
-from openai import OpenAI
-import openai
-import requests
-import os
-
-
-def never_retry_on_rate_limit_error(exception):
-    """Return True if we should retry (in this case when it's NOT a RateLimitError), False otherwise"""
-    return not isinstance(exception, openai.RateLimitError)
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
-def chat(user_text, history, temperature=0.2, stop=None, **kwargs):
-    user_msg = {"role": "user", "content": user_text}
-    cfg = utils.read_json_file("llm.json")
-
-    base_url = cfg["baseURL"]
-    api_key = cfg["apiKey"]
-    model = cfg["model"]
-
-    base_url = base_url.replace("/chat/completions", "")
-
-    client = OpenAI(api_key=api_key, base_url=base_url)
-
-    response = client.chat.completions.create(model=model,
-                                              messages=simple_history(history) + [user_msg],
-                                              temperature=temperature,
-                                              stop=stop)
-    return response.choices[0].message.content
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
-def chat_stream(user_text, history, temperature=0.2, stop=None, **kwargs):
-    user_msg = {"role": "user", "content": user_text}
-    cfg = utils.read_json_file("llm.json")
-
-    base_url = cfg["baseURL"]
-    api_key = cfg["apiKey"]
-    model = cfg["model"]
-    
-    base_url = base_url.replace("/chat/completions", "")
-
-    client = OpenAI(api_key=api_key, base_url=base_url)
-
-
-    stream = client.chat.completions.create(model=model,
-                                            messages=simple_history(history) + [user_msg],
-                                            stream=True,
-                                            temperature=temperature,
-                                            stop=stop)
-    for chunk in stream:
-        yield chunk.choices[0].delta.content or ""
-
-
-def simple_history(history):
-    return [{"role": h["role"], "content": h["content"]} for h in history]
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
-def extract(response_data, text: str, temperature=0, **kwargs):
-    """print(extract({"name": "lowercase"}, "hello XiaoMing"))"""
-    if isinstance(response_data, dict):
-        response_items = [[res, response_data[res]] for res in response_data]
-    else:
-        response_items = response_data
-
-    json_text = ""
-    for i, res in enumerate(response_items):
-        comma = "," if i != len(response_items) - 1 else ""
-        json_text += f'    "{res[0]}": {res[1]}{comma}\n'
-
-    # Combine the provided text with the formatted JSON schema
-    chat_text = f"""
-The output should be a markdown code snippet formatted in the following schema, including the leading and trailing "```json" and "```" tags:
-```json
-{{
-{json_text}
-}}
-```
-
-Request:
-{text}
-"""
-    # text放后面,当翻译等情况时,不会把"The output should"之类翻译了,导致错误
-    markdown = chat(chat_text, [], temperature=temperature, **kwargs)
-    pattern = r'```json(.*?)```'
-    matches = re.findall(pattern, markdown, re.DOTALL)
-    if matches:
-        json_str = matches[0].strip() 
-    # lines = [line.split("//")[0] for line in json_str.split("\n")]//这样当json中有//时会出错，例如https://
-    json_dict = json5.loads(json_str)
-    for item in response_items:
-        if item[0] not in json_dict:
-            raise "item:" + item + " not exists"
-    return json_dict
-
-
-def yes_or_no(question, temperature=0, **kwargs):
-    result = extract([("Result", "Yes or No")], question, 
-                     temperature=temperature, **kwargs)["Result"]
-    if isinstance(result, bool):
-        return result
-    return result.upper() == "YES"
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
-def extract_code(text: str, temperature=0, language="python", markdown_word='python', **kwargs):
-    """print(extract_code("sum 1~100"))"""
-    chat_text = text + f"""
-The output should be a complete and usable {language} code snippet, including the leading and trailing "```{markdown_word}" and "```":
-"""
-    markdown = chat(chat_text, [], temperature=temperature, **kwargs)
-    # 使用正则表达式匹配围绕在```{markdown_word} 和 ```之间的文本
-    pattern = rf'```{markdown_word}(.*?)```'
-    matches = re.findall(pattern, markdown, re.DOTALL)
-    if matches:
-        # 去除可能的前后空白字符
-        return matches[0].strip()
-    else:
-        raise Exception("The string is not a valid python code.")
-
-
-if __name__ == "__main__":
-    print(chat("你好", []))
-    for chunk in chat_stream("你好", []):
-        print(chunk)
-    print(extract({"name": "lowercase"}, "hello XiaoMing"))
-    print(extract_code("sum 1~100"))
+from pycoze import utils
+import json5
+import re
+from retrying import retry
+from openai import OpenAI
+import openai
+
+
+def never_retry_on_rate_limit_error(exception):
+    """Return True if we should retry (in this case when it's NOT a RateLimitError), False otherwise"""
+    return not isinstance(exception, openai.RateLimitError)
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
+def chat(messages, temperature=0.2, stop=None, **kwargs):
+    cfg = utils.read_json_file("llm.json")
+
+    base_url = cfg["baseURL"]
+    api_key = cfg["apiKey"]
+    model = cfg["model"]
+
+    base_url = base_url.replace("/chat/completions", "")
+
+    client = OpenAI(api_key=api_key, base_url=base_url)
+
+    response = client.chat.completions.create(model=model,
+                                              messages=messages,
+                                              temperature=temperature,
+                                              stop=stop)
+    return response.choices[0].message.content
+
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
+def chat_stream(user_text, history, temperature=0.2, stop=None, **kwargs):
+    user_msg = {"role": "user", "content": user_text}
+    cfg = utils.read_json_file("llm.json")
+
+    base_url = cfg["baseURL"]
+    api_key = cfg["apiKey"]
+    model = cfg["model"]
+
+    base_url = base_url.replace("/chat/completions", "")
+
+    client = OpenAI(api_key=api_key, base_url=base_url)
+
+
+    stream = client.chat.completions.create(model=model,
+                                            messages=simple_history(history) + [user_msg],
+                                            stream=True,
+                                            temperature=temperature,
+                                            stop=stop)
+    for chunk in stream:
+        yield chunk.choices[0].delta.content or ""
+
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
+def extract(response_data, text: str, temperature=0, **kwargs):
+    """print(extract({"name": "lowercase"}, "hello XiaoMing"))"""
+    if isinstance(response_data, dict):
+        response_items = [[res, response_data[res]] for res in response_data]
+    else:
+        response_items = response_data
+
+    json_text = ""
+    for i, res in enumerate(response_items):
+        comma = "," if i != len(response_items) - 1 else ""
+        json_text += f'    "{res[0]}": {res[1]}{comma}\n'
+
+    # Combine the provided text with the formatted JSON schema
+    chat_text = f"""
+The output should be a markdown code snippet formatted in the following schema, including the leading and trailing "```json" and "```" tags:
+```json
+{{
+{json_text}
+}}
+```
+
+Request:
+{text}
+"""
+    # text放后面,当翻译等情况时,不会把"The output should"之类翻译了,导致错误
+    markdown = chat([{"role": "user", "content": chat_text}], temperature=temperature, **kwargs)
+    pattern = r'```json(.*?)```'
+    matches = re.findall(pattern, markdown, re.DOTALL)
+    if matches:
+        json_str = matches[0].strip()
+    # lines = [line.split("//")[0] for line in json_str.split("\n")]//这样当json中有//时会出错，例如https://
+    json_dict = json5.loads(json_str)
+    for item in response_items:
+        if item[0] not in json_dict:
+            raise "item:" + item + " not exists"
+    return json_dict
+
+
+def yes_or_no(question, temperature=0, **kwargs):
+    result = extract([("Result", "Yes or No")], question,
+                     temperature=temperature, **kwargs)["Result"]
+    if isinstance(result, bool):
+        return result
+    return result.upper() == "YES"
+
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
+def extract_code(text: str, temperature=0, language="python", markdown_word='python', **kwargs):
+    """print(extract_code("sum 1~100"))"""
+    chat_text = text + f"""
+The output should be a complete and usable {language} code snippet, including the leading and trailing "```{markdown_word}" and "```":
+"""
+    markdown = chat([{"role": "user", "content": chat_text}], temperature=temperature, **kwargs)
+    # 使用正则表达式匹配围绕在```{markdown_word} 和 ```之间的文本
+    pattern = rf'```{markdown_word}(.*?)```'
+    matches = re.findall(pattern, markdown, re.DOTALL)
+    if matches:
+        # 去除可能的前后空白字符
+        return matches[0].strip()
+    else:
+        raise Exception("The string is not a valid python code.")
+
+
+if __name__ == "__main__":
+    print(chat([{"role": "user", "content": "你好"}]))
+    for chunk in chat_stream([{"role": "user", "content": "你好"}]):
+        print(chunk)
+    print(extract({"name": "lowercase"}, "hello XiaoMing"))
+    print(extract_code("sum 1~100"))

{pycoze-0.1.286.dist-info → pycoze-0.1.288.dist-info}/METADATA

@@ -1,22 +1,18 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.286
+Version: 0.1.288
 Summary: Package for pycoze only!
+Home-page: UNKNOWN
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: requires-python
-Dynamic: summary
 
 # PYCOZE
 
@@ -32,3 +28,5 @@ Package for pycoze only!
 <!-- python setup.py sdist bdist_wheel -->
 <!-- twine upload dist/* -->
 <!-- 修改src\renderer\layout\init\const.ts中的库版本要求 -->
+
+

{pycoze-0.1.286.dist-info → pycoze-0.1.288.dist-info}/RECORD

@@ -2,7 +2,7 @@ pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/ai/__init__.py,sha256=amfVImcuiRRnGbmOjIqjXKiuH1H3zZPHOrJue2dEB8U,355
 pycoze/ai/vram_reserve.py,sha256=DRxKzqf89fLAts0DzU8e19z9kecIF8OdMkQnJlCKZV0,4244
 pycoze/ai/llm/__init__.py,sha256=5_AnOrzXI2V6ZZsLUWW1v5ATRWmJy53JLN9jfSZQXCg,249
-pycoze/ai/llm/chat.py,sha256=izriC7nCp5qeJRqcUVQBVqTHiH6MJS77ROzGBJufdNI,5133
+pycoze/ai/llm/chat.py,sha256=_aJo0KzqA2m4lLql-9AqTh9f6mJmwi80K_tam7F2ehU,4882
 pycoze/ai/llm/text_to_image_prompt.py,sha256=0bx2C_YRvjAo7iphHGp1-pmGKsKqwur7dM0t3SiA8kA,3398
 pycoze/ai/llm/think.py,sha256=sUgTBdGzcZtL3r-Wx8M3lDuVUmDVz8g3qC0VU8uiKAI,5143
 pycoze/api/__init__.py,sha256=GGRRRPop0ZxdXe5JRhg2XvHITGIWfNcHA25opJZ0f1w,313
@@ -35,8 +35,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.286.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.286.dist-info/METADATA,sha256=CE7H9CpBdsQrmZo7FaGjGSQNBcOAO0rkp7BsVQ3ZCYU,854
-pycoze-0.1.286.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.286.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.286.dist-info/RECORD,,
+pycoze-0.1.288.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.288.dist-info/METADATA,sha256=72pjOMZ7pPYKaJ7PLzFV-fa2zfNZkfCHuulwkvb2HOs,755
+pycoze-0.1.288.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+pycoze-0.1.288.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.288.dist-info/RECORD,,

{pycoze-0.1.286.dist-info → pycoze-0.1.288.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: bdist_wheel (0.37.0)
 Root-Is-Purelib: true
 Tag: py3-none-any