wenyongda/OpenDify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: wenyongda:main
Branches Tags
wenyongda:test
wenyongda:main
...
pull from: wenyongda:test
Branches Tags
wenyongda:test
wenyongda:main

3 Commits
main ... test

Author SHA1 Message Date
wenyongda
88b3259ba0 build(deployment): 优化 Docker 部署配置 
- 新增 .dockerignore 文件，排除不必要的文件和目录
- 修改 Dockerfile，使用环境变量 SERVER_PORT 替代固定端口 5000
- 更新 docker-compose.yaml，添加容器名称、调整端口映射并启用自动重启
- 优化 main.py 中的 chat_completions 函数逻辑
 2025-06-27 13:48:44 +08:00
wenyongda
2d3bc1971c build: 添加 Dockerfile 和 docker-compose.yaml 文件 
- 新增 Dockerfile 用于构建 Flask 应用的 Docker 镜像
- 添加 docker-compose.yaml 文件简化本地开发环境配置
- 在 main.py 中优化了 chat_completions 函数的逻辑
 2025-06-23 17:09:21 +08:00
wenyongda
ccf4e4cedc 去除缓存区 2025-06-23 10:34:47 +08:00
4 changed files with 142 additions and 95 deletions
Show Stats Expand all files Collapse all files

5
.dockerignore Normal file
View File

@ -0,0 +1,5 @@
.env.example
.git
.gitignore
*.md
images/

25
Dockerfile Normal file
View File

@ -0,0 +1,25 @@
# 使用官方的 Python 基础镜像
# 推荐使用特定版本，例如 python:3.9-slim-buster，更小更安全
FROM python:3.12-bookworm
# 设置工作目录，后续所有命令都将在此目录下执行
WORKDIR /app
# 将 requirements.txt 复制到工作目录，并安装 Python 依赖
# 这一步单独进行，利用 Docker 缓存机制，如果依赖不变，则不需要重新安装
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
# 将所有应用代码复制到容器中
COPY . .
# 暴露 Flask 应用监听的端口
# 注意：EXPOSE 只是声明端口，不会实际发布端口，需要在运行容器时进行端口映射
EXPOSE ${SERVER_PORT}
# 定义容器启动时执行的命令
# 这里使用 Gunicorn 作为生产级的 WSGI 服务器，而不是 Flask 内置的开发服务器
# 你需要先在 requirements.txt 中添加 gunicorn
# CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:5000", "app:app"]
# 如果只是测试或简单应用，也可以直接用 Flask 开发服务器
CMD ["python", "main.py"]

11
docker-compose.yaml Normal file
View File

@ -0,0 +1,11 @@
services:
web:
build: ./ # 指定 Dockerfile 的构建上下文路径
container_name: OpenDify
ports:
- "${SERVER_PORT}:${SERVER_PORT}" # 端口映射：主机端口:容器端口
restart: always
volumes:
- ./:/app # 挂载本地代码到容器，方便开发时修改代码立即生效
environment: # 环境变量，例如 Flask 的开发模式
FLASK_ENV: development

196
main.py
View File

@ -56,7 +56,7 @@ class DifyModelManager:
headers=headers,
params={"user": "default_user"}
)
if response.status_code == 200:
app_info = response.json()
return app_info.get("name", "Unknown App")
@ -71,7 +71,7 @@ class DifyModelManager:
"""刷新所有应用信息"""
self.name_to_api_key.clear()
self.api_key_to_name.clear()
for api_key in self.api_keys:
app_name = await self.fetch_app_info(api_key)
if app_name:
@ -112,14 +112,14 @@ def get_api_key(model_name):
def transform_openai_to_dify(openai_request, endpoint):
"""将OpenAI格式的请求转换为Dify格式"""
if endpoint == "/chat/completions":
messages = openai_request.get("messages", [])
stream = openai_request.get("stream", False)
# 尝试从历史消息中提取conversation_id
conversation_id = None
# 提取system消息内容
system_content = ""
system_messages = [msg for msg in messages if msg.get("role") == "system"]
@ -127,7 +127,7 @@ def transform_openai_to_dify(openai_request, endpoint):
system_content = system_messages[0].get("content", "")
# 记录找到的system消息
logger.info(f"Found system message: {system_content[:100]}{'...' if len(system_content) > 100 else ''}")
if CONVERSATION_MEMORY_MODE == 2: # 零宽字符模式
if len(messages) > 1:
# 遍历历史消息，找到最近的assistant消息
@ -138,15 +138,15 @@ def transform_openai_to_dify(openai_request, endpoint):
conversation_id = decode_conversation_id(content)
if conversation_id:
break
# 获取最后一条用户消息
user_query = messages[-1]["content"] if messages and messages[-1].get("role") != "system" else ""
# 如果有system消息且是首次对话(没有conversation_id)，则将system内容添加到用户查询前
if system_content and not conversation_id:
user_query = f"系统指令: {system_content}\n\n用户问题: {user_query}"
logger.info(f"[零宽字符模式] 首次对话，添加system内容到查询前")
dify_request = {
"inputs": {},
"query": user_query,
@ -157,12 +157,12 @@ def transform_openai_to_dify(openai_request, endpoint):
else: # history_message模式(默认)
# 获取最后一条用户消息
user_query = messages[-1]["content"] if messages and messages[-1].get("role") != "system" else ""
# 构造历史消息
if len(messages) > 1:
history_messages = []
has_system_in_history = False
# 检查历史消息中是否已经包含system消息
for msg in messages[:-1]: # 除了最后一条消息
role = msg.get("role", "")
@ -171,12 +171,12 @@ def transform_openai_to_dify(openai_request, endpoint):
if role == "system":
has_system_in_history = True
history_messages.append(f"{role}: {content}")
# 如果历史中没有system消息但现在有system消息，则添加到历史的最前面
if system_content and not has_system_in_history:
history_messages.insert(0, f"system: {system_content}")
logger.info(f"[history_message模式] 添加system内容到历史消息前")
# 将历史消息添加到查询中
if history_messages:
history_context = "\n\n".join(history_messages)
@ -184,7 +184,7 @@ def transform_openai_to_dify(openai_request, endpoint):
elif system_content: # 没有历史消息但有system消息
user_query = f"系统指令: {system_content}\n\n用户问题: {user_query}"
logger.info(f"[history_message模式] 首次对话，添加system内容到查询前")
dify_request = {
"inputs": {},
"query": user_query,
@ -193,21 +193,21 @@ def transform_openai_to_dify(openai_request, endpoint):
}
return dify_request
return None
def transform_dify_to_openai(dify_response, model="claude-3-5-sonnet-v2", stream=False):
"""将Dify格式的响应转换为OpenAI格式"""
if not stream:
# 首先获取回答内容，支持不同的响应模式
answer = ""
mode = dify_response.get("mode", "")
# 普通聊天模式
if "answer" in dify_response:
answer = dify_response.get("answer", "")
# 如果是Agent模式，需要从agent_thoughts中提取回答
elif "agent_thoughts" in dify_response:
# Agent模式下通常最后一个thought包含最终答案
@ -216,12 +216,12 @@ def transform_dify_to_openai(dify_response, model="claude-3-5-sonnet-v2", stream
for thought in agent_thoughts:
if thought.get("thought"):
answer = thought.get("thought", "")
# 只在零宽字符会话记忆模式时处理conversation_id
if CONVERSATION_MEMORY_MODE == 2:
conversation_id = dify_response.get("conversation_id", "")
history = dify_response.get("conversation_history", [])
# 检查历史消息中是否已经有会话ID
has_conversation_id = False
if history:
@ -231,14 +231,14 @@ def transform_dify_to_openai(dify_response, model="claude-3-5-sonnet-v2", stream
if decode_conversation_id(content) is not None:
has_conversation_id = True
break
# 只在新会话且历史消息中没有会话ID时插入
if conversation_id and not has_conversation_id:
logger.info(f"[Debug] Inserting conversation_id: {conversation_id}, history_length: {len(history)}")
encoded = encode_conversation_id(conversation_id)
answer = answer + encoded
logger.info(f"[Debug] Response content after insertion: {repr(answer)}")
return {
"id": dify_response.get("message_id", ""),
"object": "chat.completion",
@ -277,11 +277,11 @@ def encode_conversation_id(conversation_id):
"""将conversation_id编码为不可见的字符序列"""
if not conversation_id:
return ""
# 使用Base64编码减少长度
import base64
encoded = base64.b64encode(conversation_id.encode()).decode()
# 使用8种不同的零宽字符表示3位数字
# 这样可以将编码长度进一步减少
char_map = {
@ -294,7 +294,7 @@ def encode_conversation_id(conversation_id):
'6': '\u2061', # 函数应用
'7': '\u2062', # 不可见乘号
}
# 将Base64字符串转换为八进制数字
result = []
for c in encoded:
@ -312,14 +312,14 @@ def encode_conversation_id(conversation_id):
val = 63
else: # '='
val = 0
# 每个Base64字符可以产生2个3位数字
first = (val >> 3) & 0x7
second = val & 0x7
result.append(char_map[str(first)])
if c != '=': # 不编码填充字符的后半部分
result.append(char_map[str(second)])
return ''.join(result)
def decode_conversation_id(content):
@ -336,17 +336,17 @@ def decode_conversation_id(content):
'\u2061': '6', # 函数应用
'\u2062': '7', # 不可见乘号
}
# 提取最后一段零宽字符序列
space_chars = []
for c in reversed(content):
if c not in char_to_val:
break
space_chars.append(c)
if not space_chars:
return None
# 将零宽字符转换回Base64字符串
space_chars.reverse()
base64_chars = []
@ -357,7 +357,7 @@ def decode_conversation_id(content):
val = (first << 3) | second
else:
val = first << 3
# 转换回Base64字符
if val < 26:
base64_chars.append(chr(val + ord('A')))
@ -369,17 +369,17 @@ def decode_conversation_id(content):
base64_chars.append('+')
else:
base64_chars.append('/')
# 添加Base64填充
padding = len(base64_chars) % 4
if padding:
base64_chars.extend(['='] * (4 - padding))
# 解码Base64字符串
import base64
base64_str = ''.join(base64_chars)
return base64.b64decode(base64_str).decode()
except Exception as e:
logger.debug(f"Failed to decode conversation_id: {e}")
return None
@ -424,9 +424,9 @@ def chat_completions():
# 继续处理原始逻辑
openai_request = request.get_json()
logger.info(f"Received request: {json.dumps(openai_request, ensure_ascii=False)}")
model = openai_request.get("model", "claude-3-5-sonnet-v2")
# 验证模型是否支持
api_key = get_api_key(model)
if not api_key:
@ -439,9 +439,9 @@ def chat_completions():
"code": "model_not_found"
}
}, 404
dify_request = transform_openai_to_dify(openai_request, "/chat/completions")
if not dify_request:
logger.error("Failed to transform request")
return {
@ -463,11 +463,11 @@ def chat_completions():
if stream:
def generate():
client = httpx.Client(timeout=None)
def flush_chunk(chunk_data):
"""Helper function to flush chunks immediately"""
return chunk_data.encode('utf-8')
def calculate_delay(buffer_size):
"""
根据缓冲区大小动态计算延迟
@ -481,7 +481,7 @@ def chat_completions():
return 0.01 # 20ms延迟
else: # 内容很少，使用较慢的速度
return 0.02 # 30ms延迟
def send_char(char, message_id):
"""Helper function to send single character"""
openai_chunk = {
@ -499,10 +499,10 @@ def chat_completions():
}
chunk_data = f"data: {json.dumps(openai_chunk)}\n\n"
return flush_chunk(chunk_data)
# 初始化缓冲区
output_buffer = []
try:
with client.stream(
'POST',
@ -521,70 +521,76 @@ def chat_completions():
for raw_bytes in response.iter_raw():
if not raw_bytes:
continue
try:
buffer += raw_bytes.decode('utf-8')
while '\n' in buffer:
line, buffer = buffer.split('\n', 1)
line = line.strip()
if not line or not line.startswith('data: '):
continue
try:
json_str = line[6:]
dify_chunk = json.loads(json_str)
if dify_chunk.get("event") == "message" and "answer" in dify_chunk:
current_answer = dify_chunk["answer"]
if not current_answer:
continue
message_id = dify_chunk.get("message_id", "")
if not generate.message_id:
generate.message_id = message_id
# 将当前批次的字符添加到输出缓冲区
for char in current_answer:
output_buffer.append((char, generate.message_id))
# 根据缓冲区大小动态调整输出速度
while output_buffer:
char, msg_id = output_buffer.pop(0)
yield send_char(char, msg_id)
# 根据剩余缓冲区大小计算延迟
delay = calculate_delay(len(output_buffer))
time.sleep(delay)
# # 将当前批次的字符添加到输出缓冲区
# for char in current_answer:
# output_buffer.append((char, generate.message_id))
# # 根据缓冲区大小动态调整输出速度
# while output_buffer:
# char, msg_id = output_buffer.pop(0)
# yield send_char(char, msg_id)
# # 根据剩余缓冲区大小计算延迟
# delay = calculate_delay(len(output_buffer))
# time.sleep(delay)
if current_answer == "<think>\n\n":
current_answer = "<think>"
yield send_char(current_answer, message_id)
current_answer = "\n"
yield send_char(current_answer, message_id)
logger.info(f"message_id: {message_id}")
# 立即继续处理下一个请求
continue
# 处理Agent模式的消息事件
elif dify_chunk.get("event") == "agent_message" and "answer" in dify_chunk:
current_answer = dify_chunk["answer"]
if not current_answer:
continue
message_id = dify_chunk.get("message_id", "")
if not generate.message_id:
generate.message_id = message_id
# 将当前批次的字符添加到输出缓冲区
for char in current_answer:
output_buffer.append((char, generate.message_id))
# 根据缓冲区大小动态调整输出速度
while output_buffer:
char, msg_id = output_buffer.pop(0)
yield send_char(char, msg_id)
# 根据剩余缓冲区大小计算延迟
delay = calculate_delay(len(output_buffer))
time.sleep(delay)
# # 将当前批次的字符添加到输出缓冲区
# for char in current_answer:
# output_buffer.append((char, generate.message_id))
# # 根据缓冲区大小动态调整输出速度
# while output_buffer:
# char, msg_id = output_buffer.pop(0)
# yield send_char(char, msg_id)
# # 根据剩余缓冲区大小计算延迟
# delay = calculate_delay(len(output_buffer))
# time.sleep(delay)
yield send_char(current_answer, message_id)
# 立即继续处理下一个请求
continue
# 处理Agent的思考过程，记录日志但不输出给用户
elif dify_chunk.get("event") == "agent_thought":
thought_id = dify_chunk.get("id", "")
@ -592,7 +598,7 @@ def chat_completions():
tool = dify_chunk.get("tool", "")
tool_input = dify_chunk.get("tool_input", "")
observation = dify_chunk.get("observation", "")
logger.info(f"[Agent Thought] ID: {thought_id}, Tool: {tool}")
if thought:
logger.info(f"[Agent Thought] Thought: {thought}")
@ -600,35 +606,35 @@ def chat_completions():
logger.info(f"[Agent Thought] Tool Input: {tool_input}")
if observation:
logger.info(f"[Agent Thought] Observation: {observation}")
# 获取message_id以关联思考和最终输出
message_id = dify_chunk.get("message_id", "")
if not generate.message_id and message_id:
generate.message_id = message_id
continue
# 处理消息中的文件(如图片)，记录日志但不直接输出给用户
elif dify_chunk.get("event") == "message_file":
file_id = dify_chunk.get("id", "")
file_type = dify_chunk.get("type", "")
file_url = dify_chunk.get("url", "")
logger.info(f"[Message File] ID: {file_id}, Type: {file_type}, URL: {file_url}")
continue
elif dify_chunk.get("event") == "message_end":
# 快速输出剩余内容
while output_buffer:
char, msg_id = output_buffer.pop(0)
yield send_char(char, msg_id)
time.sleep(0.001) # 固定使用最小延迟快速输出剩余内容
# 只在零宽字符会话记忆模式时处理conversation_id
if CONVERSATION_MEMORY_MODE == 2:
conversation_id = dify_chunk.get("conversation_id")
history = dify_chunk.get("conversation_history", [])
has_conversation_id = False
if history:
for msg in history:
@ -637,7 +643,7 @@ def chat_completions():
if decode_conversation_id(content) is not None:
has_conversation_id = True
break
# 只在新会话且历史消息中没有会话ID时插入
if conversation_id and not has_conversation_id:
logger.info(f"[Debug] Inserting conversation_id in stream: {conversation_id}")
@ -645,7 +651,7 @@ def chat_completions():
logger.info(f"[Debug] Stream encoded content: {repr(encoded)}")
for char in encoded:
yield send_char(char, generate.message_id)
final_chunk = {
"id": generate.message_id,
"object": "chat.completion.chunk",
@ -659,11 +665,11 @@ def chat_completions():
}
yield flush_chunk(f"data: {json.dumps(final_chunk)}\n\n")
yield flush_chunk("data: [DONE]\n\n")
except json.JSONDecodeError as e:
logger.error(f"JSON decode error: {str(e)}")
continue
except Exception as e:
logger.error(f"Error processing chunk: {str(e)}")
continue
@ -692,7 +698,7 @@ def chat_completions():
json=dify_request,
headers=headers
)
if response.status_code != 200:
error_msg = f"Dify API error: {response.text}"
logger.error(f"Request failed: {error_msg}")
@ -746,13 +752,13 @@ def chat_completions():
def list_models():
"""返回可用的模型列表"""
logger.info("Listing available models")
# 刷新模型信息
asyncio.run(model_manager.refresh_model_info())
# 获取可用模型列表
available_models = model_manager.get_available_models()
response = {
"object": "list",
"data": available_models
@ -764,10 +770,10 @@ def list_models():
if __name__ == '__main__':
if not VALID_API_KEYS:
print("Warning: No API keys configured. Set the VALID_API_KEYS environment variable with comma-separated keys.")
# 启动时初始化模型信息
asyncio.run(model_manager.refresh_model_info())
host = os.getenv("SERVER_HOST", "127.0.0.1")
port = int(os.getenv("SERVER_PORT", 5000))
logger.info(f"Starting server on http://{host}:{port}")