pycoze 0.1.218__tar.gz → 0.1.221__tar.gz

{pycoze-0.1.218 → pycoze-0.1.221}/PKG-INFO

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

{pycoze-0.1.218 → pycoze-0.1.221}/pycoze/ai/__init__.py

@@ -1 +1,2 @@
 from .vram_reserve import reserve_vram, reserve_vram_retry, unreserve_vram
+from .llm import think, think_stream, extract, yes_or_no, extract_code

pycoze-0.1.221/pycoze/ai/llm/__init__.py

@@ -0,0 +1,2 @@
+from .text_to_image_prompt import text_to_image_prompt
+from .think import think, think_stream, extract, yes_or_no, extract_code

pycoze-0.1.221/pycoze/ai/llm/text_to_image_prompt.py

@@ -0,0 +1,66 @@
+import re
+from .. import yes_or_no
+from .. import extract
+
+
+def contains_chinese(text):
+    pattern = re.compile(r'[\u4e00-\u9fa5]')  # Regular expression to match Chinese characters
+    return bool(re.search(pattern, text))
+
+
+requirement = """
+Please reflect the scene content as prompts for the drawing AI.
+
+## Prompt Concept
+- A prompt is used to describe the image content, composed of common words, using English commas (",") as separators. For example, a prompt like "woman" indicates that the image should include a woman.
+
+## Tag Restrictions
+- Tags should be described using English words or phrases, avoiding Chinese.
+- Tags can only contain keywords or key phrases, and should not include personal names, place names, etc.
+- Tags should try to preserve physical characteristics of people, like body shape and hairstyle, but not use personal names, instead using terms like "man" to refer to people.
+- The number of tags in a prompt is limited to 40, and the number of words is limited to 60.
+
+## Incorrect Examples of Prompts
+"In the bustling Shanghai Bund, there is a young man named Li Yang."
+The prompt includes non-keywords like "there is", as well as the personal name "Li Yang" and the place name "Shanghai."
+It should be modified to "a young man, in the bustling Bund"
+
+"""
+
+# As the LLM used is not very effective, negative prompts are not suitable for generation by LLM at this stage
+# - Negative prompts describe content that should not appear in the image, for example if "bird, man" appears in the negative prompt, it means the image should not include "birds and men".
+
+
+def text_to_image_prompt(query, style, negative_style, with_prompt="best quality,4k,", with_negative_prompt=""):
+    query = query.replace("{", "【").replace("}", "】")
+    needed = f"The scene I need: {query}"
+    style = style.replace(",", " ").replace("，", " ")
+    if len(style) > 0:
+        needed += f"\nThe style I need: {style}"
+    # if len(negative_style) > 0:
+    #     needed += f"\nStyles to avoid: {negative_style}"
+
+    for i in range(15):
+        try:
+            print("doing")
+            output_obj = extract([("prompt", "Describe the image content with keywords")], needed + "\n" + requirement)
+            print("done")
+            if contains_chinese(output_obj["prompt"]):
+                print("Contains Chinese, regenerating")
+                continue
+            if yes_or_no("Does it include personal names:\n"+output_obj["prompt"]):
+                print(output_obj["prompt"]+" contains personal names, correcting")
+                output_obj["prompt"] = extract(
+                    [("text without personal names", "Modified result (personal names can be changed to man, woman, he, she, etc.)")],
+                    "Modify the following text, personal names can be changed to man, woman, he, she, etc.: \n"+output_obj["prompt"])["text without personal names"]
+            break
+        except Exception as e:
+            print(e)
+    output_obj["prompt"] = with_prompt + output_obj["prompt"].replace(" and ", ",")
+    output_obj["negative_prompt"] = with_negative_prompt
+    output_obj["with_prompt"] = with_prompt
+    output_obj["with_negative_prompt"] = with_negative_prompt
+    output_obj["query"] = query
+    output_obj["style"] = style
+    output_obj["negative_style"] = negative_style
+    return output_obj

pycoze-0.1.221/pycoze/ai/llm/think.py

@@ -0,0 +1,131 @@
+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 think(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 think_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
+    think_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 = think(think_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"))"""
+    think_text = text + f"""
+The output should be a complete and usable {language} code snippet, including the leading and trailing "```{markdown_word}" and "```":
+"""
+    markdown = think(think_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(lib_think("你好", []))
+    for chunk in lib_think_stream("你好", []):
+        print(chunk)
+    print(extract({"name": "lowercase"}, "hello XiaoMing"))
+    print(extract_code("sum 1~100"))

{pycoze-0.1.218 → pycoze-0.1.221}/pycoze/bot/agent_chat.py

@@ -10,6 +10,8 @@ from langchain_core.utils.function_calling import convert_to_openai_tool
 import os
 
 cfg = utils.read_json_file("llm.json")
+if cfg["model"].startswith("qwen-"):
+    cfg["toolCompatibilityMode"] = False
 
 
 def load_role_setting(bot_setting_file: str):

{pycoze-0.1.218 → pycoze-0.1.221}/pycoze/ui/ui_def.py

@@ -185,13 +185,11 @@ def multi_video_select(
 def seed(name, default=0, tip="", hide_if="", style="", cls="") -> int:
     return useDefault(name, default)
 
+
 _cache_button_ui = get_ui()
-def button( name, tip="", hide_if="")->bool:
-    value = useDefault(name, -1)
-    if value is None: #value==None只会发生在在首次打开UI，后续每次运行都不会进入这里
-        value = _cache_button_ui[name]
+def button(name, tip="", hide_if="") -> bool:
+    value = useDefault(name, _cache_button_ui[name])
     if value != _cache_button_ui[name]:
-        _cache_button_ui[name] = value  # 更新last_value的值
+        _cache_button_ui[name] = value
         return True
-    return False
-    
+    return False

{pycoze-0.1.218 → pycoze-0.1.221}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.218 → pycoze-0.1.221}/pycoze.egg-info/SOURCES.txt

@@ -8,6 +8,9 @@ pycoze.egg-info/dependency_links.txt
 pycoze.egg-info/top_level.txt
 pycoze/ai/__init__.py
 pycoze/ai/vram_reserve.py
+pycoze/ai/llm/__init__.py
+pycoze/ai/llm/text_to_image_prompt.py
+pycoze/ai/llm/think.py
 pycoze/automation/__init__.py
 pycoze/automation/browser/__init__.py
 pycoze/automation/browser/edge_driver_manager.py

{pycoze-0.1.218 → pycoze-0.1.221}/setup.py

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