hjxdl 0.2.77__py3-none-any.whl → 0.2.79__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.77'
-__version_tuple__ = version_tuple = (0, 2, 77)
+__version__ = version = '0.2.79'
+__version_tuple__ = version_tuple = (0, 2, 79)

hdl/utils/llm/chat.py

@@ -32,28 +32,44 @@ def parse_fn_markdown(markdown_text, params_key="params"):
     result[params_key] = params
     return result
 
+def parse_fn_markdown(markdown_text, params_key="params"):
+    # 将 Markdown 文本按行分割并去掉空白
+    lines = markdown_text.strip().split("\n")
+    result = {}
+    params = {}
+
+    for line in lines:
+        # 匹配键值对（即 key: value 格式），支持中英文冒号和空白
+        match = re.match(r"-\s*(\w+)\s*[:：]\s*(.+)", line.strip())
+        if match:
+            key, value = match.groups()
+            if key == "function_name":
+                result[key] = value.strip()  # 固定的 function_name
+            else:
+                params[key] = value.strip()  # 其他进入 params
+
+    # 如果有 params_key，就嵌套到该键名下
+    result[params_key] = params
+    return result
+
 def parse_cot_markdown(markdown_text):
-    # 提取标题
-    title_match = re.search(r"##\s*(.+)", markdown_text)
-    title = title_match.group(1) if title_match else ""
-    # title = title.replace("：", "").replace(":", "").replace(" ", "")
+    # 提取标题（支持跨行）
+    title_match = re.search(r"##\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
+    title = title_match.group(1).strip() if title_match else ""
 
     # 提取工具
-    tool_match = re.search(r"- tool:\s*(.+)", markdown_text)
+    tool_match = re.search(r"-\s*tool\s*[:：]\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
     tool = tool_match.group(1).strip() if tool_match else ""
-    # tool = tool.replace("：", "").replace(":", "").replace(" ", "")
 
-    # 提取内容
-    content_match = re.search(r"- content:\s*(.+)", markdown_text)
-    content = content_match.group(1) if content_match else ""
-    # content = content.replace("：", "").replace(":", "").replace(" ", "")
+    # 提取内容（支持跨行）
+    content_match = re.search(r"-\s*content\s*[:：]\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
+    content = content_match.group(1).strip() if content_match else ""
 
     # 提取停止思考
-    stop_thinking_match = re.search(r"- stop_thinking:\s*(.+)", markdown_text)
-    stop_thinking = stop_thinking_match.group(1) == "true" or stop_thinking_match.group(1) == "True" if stop_thinking_match else False
+    stop_thinking_match = re.search(r"-\s*stop_thinking\s*[:：]\s*(.+?)(?=\n-|\Z)", markdown_text, re.DOTALL)
+    stop_thinking = stop_thinking_match.group(1).strip().lower() in ["true"] if stop_thinking_match else False
 
-
-    # 组装为字典
+    # 返回解析结果的字典
     return {
         "title": title,
         "tool": tool,
@@ -61,81 +77,6 @@ def parse_cot_markdown(markdown_text):
         "stop_thinking": stop_thinking
     }
 
-def chat_oai_stream(
-    base_url="http://127.0.0.1:8000/v1",
-    api_key="dummy_key",
-    model="default_model",
-    prompt="Who are you?",
-    *args,
-    **kwargs
-):
-    """Chat with OpenAI's GPT-3 model using the specified parameters.
-
-    Args:
-        base_url (str): The base URL for the OpenAI API. Default is "http://127.0.0.1:8000/v1".
-        api_key (str): The API key for accessing the OpenAI API. Default is "dummy_key".
-        model (str): The model ID to use for the chat. Default is "/data/models/Qwen-7B-Chat-Int4".
-        prompt (str): The initial prompt for the chat conversation.
-
-    Yields:
-        str: The generated content from the chat conversation.
-
-    """
-    client = OpenAI(
-        base_url=base_url,
-        api_key=api_key,
-    )
-    response = client.chat.completions.create(
-        model=model,
-        messages=[{
-            "role": "user",
-            "content": prompt
-        }],
-        stream=True,
-        *args,
-        **kwargs
-    )
-
-    for chunk in response:
-        content = chunk.choices[0].delta.content
-        yield content
-
-
-def chat_oai_invoke(
-    base_url="http://127.0.0.1:8000/v1",
-    api_key="dummy_key",
-    model="default_model",
-    prompt="Who are you?",
-    *args,
-    **kwargs
-):
-    """Invoke OpenAI chat API to generate a response based on the given prompt.
-
-    Args:
-        base_url (str): The base URL of the OpenAI API. Default is "http://127.0.0.1:8000/v1".
-        api_key (str): The API key for accessing the OpenAI API. Default is "dummy_key".
-        model (str): The model to use for generating the response. Default is "/data/models/Qwen-7B-Chat-Int4".
-        prompt (str): The prompt message to start the conversation. Default is "Who are you?".
-
-    Returns:
-        str: The response generated by the OpenAI chat API based on the prompt.
-    """
-    client = OpenAI(
-        base_url=base_url,
-        api_key=api_key,
-    )
-    response = client.chat.completions.create(
-        model=model,
-        messages=[{
-            "role": "user",
-            "content": prompt
-        }],
-        stream=False,
-        *args,
-        **kwargs
-    )
-
-    return response.choices[0].message.content
 
 def run_tool_with_kwargs(tool, func_kwargs):
     """Run the specified tool with the provided keyword arguments.

{hjxdl-0.2.77.dist-info → hjxdl-0.2.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.2.77
+Version: 0.2.79
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu

{hjxdl-0.2.77.dist-info → hjxdl-0.2.79.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=Nd1CqTRytkWtvQt-z5Az52Eh3KcCyXtTTJPNfTIm4xU,413
+hdl/_version.py,sha256=Bq7VoQXo0kndBONXau_LHpnDFGs-mLCodLWPjZgvFhA,413
 hdl/args/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/args/loss_args.py,sha256=s7YzSdd7IjD24rZvvOrxLLFqMZQb9YylxKeyelSdrTk,70
 hdl/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,7 +128,7 @@ hdl/utils/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 hdl/utils/general/glob.py,sha256=8-RCnt6L297wMIfn34ZAMCsGCZUjHG3MGglGZI1cX0g,491
 hdl/utils/general/runners.py,sha256=EFTk9PeVnqc51yU4b-HxsLwJyMA7dFMZBsdAa-VZ-sQ,2880
 hdl/utils/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdl/utils/llm/chat.py,sha256=C2MOYHnJ5zwf7KfQoI1rPlusomM501YR3LivE1YJ1K0,21954
+hdl/utils/llm/chat.py,sha256=AeGyN6Fv4SjhvDwjKFpE-GyBlSA5THSbb0rXzUjzQ2A,20437
 hdl/utils/llm/chatgr.py,sha256=A9SCWAvQulgO2x0ArIqcmgd_iVWVbSi1Oj15Diwb3Ok,3743
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
@@ -139,7 +139,7 @@ hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 hdl/utils/schedulers/norm_lr.py,sha256=bDwCmdEK-WkgxQMFBiMuchv8Mm7C0-GZJ6usm-PQk14,4461
 hdl/utils/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/weather/weather.py,sha256=k11o6wM15kF8b9NMlEfrg68ak-SfSYLN3nOOflFUv-I,4381
-hjxdl-0.2.77.dist-info/METADATA,sha256=pfTOv5zSYB9p_t-q3aglGeKfznV7Rgr8sTDazHX2T_A,836
-hjxdl-0.2.77.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hjxdl-0.2.77.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.2.77.dist-info/RECORD,,
+hjxdl-0.2.79.dist-info/METADATA,sha256=2JpIP2r7MfUMvX6C9hoBY-XG9ibPP8Ai0Jyg_Gm654o,836
+hjxdl-0.2.79.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hjxdl-0.2.79.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.2.79.dist-info/RECORD,,