lesscode-flask 0.1.67__tar.gz → 0.1.68__tar.gz

{lesscode_flask-0.1.67 → lesscode_flask-0.1.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.67
+Version: 0.1.68
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.1.67 → lesscode_flask-0.1.68}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.67'
+__version__ = '0.1.68'
 
 import functools
 import logging

lesscode_flask-0.1.67/lesscode_flask/utils/dify.py → lesscode_flask-0.1.68/lesscode_flask/utils/dify_utils.py

@@ -1,71 +1,10 @@
-import json
 import uuid
 
 import requests
-from flask import current_app
 
-from lesscode_flask.model.user import flask_login
 from lesscode_flask.utils.helpers import app_config
 
 
-# def dify_messages(dify_server_url: str, api_key, query: str = None, inputs: dict = None, response_mode="streaming",
-#                   mode: str = "chat", user_id: str = None, conversation_id: str = ""):
-#     """
-#     调用dify 的应用api接口
-#
-#     :param dify_server_url: dify服务地址
-#     :param api_key: api key
-#     :param query: 用户查询语句
-#     :param inputs: 调用参数
-#     :param response_mode: 响应类型 streaming:流式
-#     :param mode: 应用类型(# 聊天助手:chat 文本生成:completion 聊天流程:advanced-chat 工作流:workflow Agent:agent-chat)
-#     :param user_id: 调用人user_id
-#     :return:
-#     """
-#     if user_id is None:
-#         user_id = uuid.uuid4().hex
-#     data = {
-#         "inputs": inputs,
-#         "response_mode": response_mode,
-#         "user": user_id,
-#         "conversation_id": conversation_id
-#     }
-#     if "chat" in mode:  # 聊天
-#         data["query"] = query
-#         server_url = dify_server_url + "/v1/chat-messages"
-#     elif mode == "completion":  # 文本生成
-#         if inputs is None:
-#             inputs = {"query": query}
-#         data["inputs"] = inputs
-#         server_url = dify_server_url + "/v1/completion-messages"
-#     elif mode == "workflow":  # 工作流
-#         server_url = dify_server_url + "/v1/workflows/run"
-#     headers = {
-#         'Authorization': f'Bearer {api_key}',
-#         'Content-Type': 'application/json'
-#     }
-#     try:
-#         response = requests.post(server_url, headers=headers, json=data, stream=True)
-#         for line in response.iter_lines(decode_unicode=True):
-#             if line and line != "event: ping":  # 过滤掉空行和ping事件
-#                 if not line.startswith("data: "):
-#                     message_error = {"event": "message_error", "message": line}
-#                     yield f'data: {json.dumps(message_error)}\n\n'
-#                     break
-#                 yield f"{line}\n\n"
-#     except Exception as e:
-#         print(f"Error: {e}")
-#         yield 'data: {"event": "message_end"}'
-
-
-# def get_app_key(app_id):
-#     difyAppKey = DifyAppKeyService().get_item(app_id)
-#     if difyAppKey is None:
-#         return "应用不存在"
-#     API_KEY = difyAppKey.get("dify_api_key")
-#     return API_KEY
-
-
 def dify_chat_messages(api_key, query: str = None, inputs: dict = None, conversation_id: str = "", files=None,
                        response_mode="streaming", user_id: str = None, server_url: str = None):
     """
@@ -91,41 +30,116 @@ def dify_chat_messages(api_key, query: str = None, inputs: dict = None, conversa
         "conversation_id": conversation_id,
         "user": user_id,
         "files": files
-        # "files": [
-        #     {
-        #         "type": "image",
-        #         "transfer_method": "remote_url",
-        #         "url": "https://cloud.dify.ai/logo/logo-site.png"
-        #     }
-        # ]
     }
-    # if files is not None:
-    #     data["files"] = files
-    # if "chat" in mode:  # 聊天
-    #     data["query"] = query
-    #     server_url = server_url + "/v1/chat-messages"
-    # elif mode == "completion":  # 文本生成
-    #     if inputs is None:
-    #         inputs = {"query": query}
-    #     data["inputs"] = inputs
-    #     server_url = server_url + "/v1/completion-messages"
-    # elif mode == "workflow":  # 工作流
-    #     server_url = server_url + "/v1/workflows/run"
     headers = {
         'Authorization': f'Bearer {api_key}',
         'Content-Type': 'application/json'
     }
     try:
         response = requests.post(f"{server_url}/v1/chat-messages", headers=headers, json=data, stream=True)
+        if "streaming" == response_mode:
+            for line in response.iter_lines(decode_unicode=True):
+                yield line
+        else:  # blocking
+            res = response.text
+            yield res
+    except Exception as e:
+        if "streaming" == response_mode:
+            print(f"Error: {e}")
+            yield 'data: {"event": "message_end"}'
+        else:  # blocking
+            return f'{{"event": "message", "answer": "{e}"}}'
+
+
+def dify_completion_messages(api_key, query: str = None, inputs: dict = None, conversation_id: str = "", files=None,
+                             response_mode="streaming", user_id: str = None, server_url: str = None):
+    """
+    发送对话消息
+    :param api_key: API 秘钥
+    :param query: 用户查询语句
+    :param inputs: 调用参数
+    :param conversation_id: 会话 ID
+    :param files: 文件列表，适用于传入文件结合文本理解并回答问题
+    :param server_url:模型服务地址
+    :param response_mode: 响应类型 streaming:流式 ，blocking 阻塞式
+    :param user_id: 调用人user_id
+    :return:
+    """
+    if server_url is None:
+        server_url = app_config.get("DIFY_SERVER_URL")
+    if user_id is None:
+        user_id = uuid.uuid4().hex
+    if inputs is None:
+        inputs = {"query": query}
+    else:
+        inputs["query"] = query
+    data = {
+        "inputs": inputs,
+        "response_mode": response_mode,
+        "conversation_id": conversation_id,
+        "user": user_id,
+        "files": files
+    }
+    headers = {
+        'Authorization': f'Bearer {api_key}',
+        'Content-Type': 'application/json'
+    }
+    try:
+        response = requests.post(f"{server_url}/v1/completion-messages", headers=headers, json=data, stream=True)
+        if "streaming" == response_mode:
+            pass
+            for line in response.iter_lines(decode_unicode=True):
+                yield line
+        else:  # blocking
+            res = response.text
+            yield res
+    except Exception as e:
+        if "streaming" == response_mode:
+            print(f"Error: {e}")
+            yield 'data: {"event": "message_end"}'
+        else:  # blocking
+            return f'{{"event": "message", "answer": "{e}"}}'
+
+
+def dify_workflows_run(api_key, query: str = None, inputs: dict = None, conversation_id: str = "", files=None,
+                       response_mode="streaming", user_id: str = None, server_url: str = None):
+    """
+    发送对话消息
+    :param api_key: API 秘钥
+    :param query: 用户查询语句
+    :param inputs: 调用参数
+    :param conversation_id: 会话 ID
+    :param files: 文件列表，适用于传入文件结合文本理解并回答问题
+    :param server_url:模型服务地址
+    :param response_mode: 响应类型 streaming:流式 ，blocking 阻塞式
+    :param user_id: 调用人user_id
+    :return:
+    """
+    if server_url is None:
+        server_url = app_config.get("DIFY_SERVER_URL")
+    if user_id is None:
+        user_id = uuid.uuid4().hex
+    if inputs is None:
+        inputs = {"query": query}
+    else:
+        inputs["query"] = query
+    data = {
+        "inputs": inputs,
+        "response_mode": response_mode,
+        "user": user_id,
+        "files": files
+    }
+    headers = {
+        'Authorization': f'Bearer {api_key}',
+        'Content-Type': 'application/json'
+    }
+    try:
+        response = requests.post(f"{server_url}/v1/workflows/run", headers=headers, json=data, stream=True)
         if "streaming" == response_mode:
             pass
             for line in response.iter_lines(decode_unicode=True):
                 if line and line != "event: ping":  # 过滤掉空行和ping事件
-                    if not line.startswith("data: "):
-                        message_error = {"event": "message_error", "message": line}
-                        yield f'data: {json.dumps(message_error)}\n\n'
-                        break
-                    yield f"{line}\n\n"
+                    yield line
         else:  # blocking
             res = response.text
             yield res
@@ -137,6 +151,66 @@ def dify_chat_messages(api_key, query: str = None, inputs: dict = None, conversa
             return f'{{"event": "message", "answer": "{e}"}}'
 
 
+def dify_stop_completion_messages(api_key: str, task_id: str, user_id=None, server_url: str = None):
+    """
+    停止响应 仅支持流式模式。
+    :param api_key: API 秘钥
+    :param task_id: 任务 ID，可在流式返回 Chunk 中获取
+    :param user_id: 调用人user_id
+    :param server_url: 模型服务地址
+    :return:
+    """
+
+    if user_id is None:
+        user_id = uuid.uuid4().hex
+    data = {
+        "user": user_id
+    }
+    headers = {
+        'Authorization': f'Bearer {api_key}',
+        'Content-Type': 'application/json'
+    }
+    if server_url is None:
+        server_url = app_config.get("DIFY_SERVER_URL")
+    try:
+        requests.post(f"{server_url}/v1/completion-messages/{task_id}/stop", headers=headers, json=data, stream=False)
+    finally:
+        # 接口固定返回success
+        return {
+            "result": "success"
+        }
+
+
+def dify_stop_workflows(api_key: str, task_id: str, user_id=None, server_url: str = None):
+    """
+    停止响应 仅支持流式模式。
+    :param api_key: API 秘钥
+    :param task_id: 任务 ID，可在流式返回 Chunk 中获取
+    :param user_id: 调用人user_id
+    :param server_url: 模型服务地址
+    :return:
+    """
+
+    if user_id is None:
+        user_id = uuid.uuid4().hex
+    data = {
+        "user": user_id
+    }
+    headers = {
+        'Authorization': f'Bearer {api_key}',
+        'Content-Type': 'application/json'
+    }
+    if server_url is None:
+        server_url = app_config.get("DIFY_SERVER_URL")
+    try:
+        requests.post(f"{server_url}/v1/workflows/tasks/{task_id}/stop", headers=headers, json=data, stream=False)
+    finally:
+        # 接口固定返回success
+        return {
+            "result": "success"
+        }
+
+
 def dify_stop_messages(api_key: str, task_id: str, user_id=None, server_url: str = None):
     """
     停止响应 仅支持流式模式。
@@ -324,11 +398,9 @@ def dify_conversations_rename(api_key: str, conversation_id: str, name: str = No
 def dify_files_upload(api_key: str, file, user_id=None,
                       server_url: str = None):
     """
-    会话重命名
+    上传文件
     :param api_key: API 秘钥
-    :param conversation_id: 会话 ID
-    :param name: （选填）名称，若 auto_generate 为 true 时，该参数可不传。
-    :param auto_generate: （选填）自动生成标题，默认 false。
+    :param file: 文件对象
     :param user_id: 调用人user_id
     :param server_url: 模型服务地址
     :return:
@@ -345,7 +417,6 @@ def dify_files_upload(api_key: str, file, user_id=None,
         server_url = app_config.get("DIFY_SERVER_URL")
     headers = {
         'Authorization': f'Bearer {api_key}',
-        # 'Content-Type': 'multipart/form-data'
     }
     response = requests.post(f"{server_url}/v1/files/upload", headers=headers, data=data, files=files)
     return response.json()

{lesscode_flask-0.1.67 → lesscode_flask-0.1.68}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.67
+Version: 0.1.68
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.1.67 → lesscode_flask-0.1.68}/lesscode_flask.egg-info/SOURCES.txt

@@ -28,7 +28,7 @@ lesscode_flask/setting/__init__.py
 lesscode_flask/setup/__init__.py
 lesscode_flask/static/swagger.py
 lesscode_flask/utils/__init__.py
-lesscode_flask/utils/dify.py
+lesscode_flask/utils/dify_utils.py
 lesscode_flask/utils/helpers.py
 lesscode_flask/utils/decorator/__init__.py
 lesscode_flask/utils/decorator/cache.py