Merge branch 'main_upstream'

# Conflicts:
#	Dockerfile
#	biz/llm/client/deepseek.py
#	biz/llm/client/openai.py
#	biz/llm/client/zhipuai.py
#	biz/llm/factory.py
#	biz/utils/code_reviewer.py
#	biz/utils/reporter.py
#	conf/prompt_templates.yml
#	docker-compose.prod.yml
#	docker-compose.yml
#	locales/zh_CN/prompt_templates.yml
#	prompt_templates.yml
#	requirements.txt
#	ui.py

Author: mashb1t

.gitignore

@@ -2,14 +2,13 @@
 venv/
 test/
 .idea/
-docker
 
 log/*
 !log/.gitkeep
 data/*
 !data/.gitkeep
 
-.env
+conf/.env
 .pyc
 __pycache__/
 .cursorignore

Dockerfile

@@ -13,25 +13,24 @@ COPY requirements.txt .
 # 安装依赖
 RUN pip install --no-cache-dir -r requirements.txt
 
+RUN mkdir -p log data
 COPY biz ./biz
-COPY core ./core
 COPY locales ./locales
 COPY api.py ./api.py
 COPY ui.py ./ui.py
-RUN mkdir -p log data
 
 # 使用 supervisord 作为启动命令
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
 
 FROM base AS dev
-COPY supervisord.dev.conf /etc/supervisor/conf.d/supervisord.conf
+COPY ./conf/supervisord.dev.conf /etc/supervisor/conf.d/supervisord.conf
 # 暴露 Flask 和 Streamlit 的端口
 EXPOSE 5001 5002
 
 FROM base AS prod
-COPY supervisord.prod.conf /etc/supervisor/conf.d/supervisord.conf
+COPY ./conf/supervisord.prod.conf /etc/supervisor/conf.d/supervisord.conf
 # 暴露 Flask 和 Streamlit 的端口
 EXPOSE 5001 5002
 
 FROM base AS worker
-COPY supervisord.worker.conf /etc/supervisor/conf.d/supervisord.conf
+COPY ./conf/supervisord.worker.conf /etc/supervisor/conf.d/supervisord.conf

README.md

@@ -17,9 +17,9 @@
 
 ![MR图片](./doc/img/mr.png)
 
-![Note图片](./doc/img/note.jpeg)
+![Note图片](./doc/img/note.jpg)
 
-![Dashboard图片](./doc/img/dashboard.png)
+![Dashboard图片](./doc/img/dashboard.jpg)
 
 ## 原理
 

api.py

@@ -18,7 +18,7 @@
 from biz.utils.queue import handle_queue
 from biz.utils.reporter import Reporter
 
-load_dotenv()
+load_dotenv("conf/.env")
 api_app = Flask(__name__)
 
 from biz.utils.i18n import get_translator

core/__init__.py renamed to biz/llm/__init__.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from typing import List, Dict, Optional
 
-from core.llm.types import NotGiven, NOT_GIVEN, CompletionMessage
+from biz.llm.types import NotGiven, NOT_GIVEN
 
 
 class BaseClient:

core/llm/__init__.py renamed to biz/llm/client/__init__.py

@@ -1,25 +1,24 @@
 import os
 from typing import Dict, List, Optional
 
-from dotenv import load_dotenv
 from openai import OpenAI
-from biz.utils.log import logger
 
-from core.llm.client.base import BaseClient
-from core.llm.types import NotGiven, NOT_GIVEN
+from biz.llm.client.base import BaseClient
+from biz.llm.types import NotGiven, NOT_GIVEN
 from biz.utils.i18n import get_translator
+from biz.utils.log import logger
+
 _ = get_translator()
 
+
 class DeepSeekClient(BaseClient):
     def __init__(self, api_key: str = None):
-        if not os.getenv("DEEPSEEK_API_KEY"):
-            load_dotenv()
         self.api_key = api_key or os.getenv("DEEPSEEK_API_KEY")
         self.base_url = os.getenv("DEEPSEEK_API_BASE_URL", "https://api.deepseek.com")
         if not self.api_key:
             raise ValueError(_("API key is required. Please provide it or set it in the environment variables."))
 
-        self.client = OpenAI(api_key=self.api_key, base_url=self.base_url) # DeepSeek supports OpenAI API SDK
+        self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)  # DeepSeek supports OpenAI API SDK
         self.default_model = os.getenv("DEEPSEEK_API_MODEL", "deepseek-chat")
 
     def completions(self,
@@ -28,19 +27,20 @@ def completions(self,
                     ) -> str:
         try:
             model = model or self.default_model
-            logger.debug(_("Sending request to DeepSeek API. Model: {model}, Messages: {messages}").format(model=model, messages=messages))
-            
+            logger.debug(_("Sending request to DeepSeek API. Model: {model}, Messages: {messages}").format(model=model,
+                                                                                                           messages=messages))
+
             completion = self.client.chat.completions.create(
                 model=model,
                 messages=messages
             )
-            
+
             if not completion or not completion.choices:
                 logger.error(_("Empty response from DeepSeek API"))
                 return _("AI服务返回为空，请稍后重试")
-                
+
             return completion.choices[0].message.content
-            
+
         except Exception as e:
             logger.error(_("DeepSeek API error: {e}").format(e=str(e)))
             # 检查是否是认证错误

core/llm/client/base.py renamed to biz/llm/client/base.py

@@ -5,8 +5,8 @@
 from ollama import ChatResponse
 from ollama import Client
 
-from core.llm.client.base import BaseClient
-from core.llm.types import NotGiven, NOT_GIVEN
+from biz.llm.client.base import BaseClient
+from biz.llm.types import NotGiven, NOT_GIVEN
 
 
 class OllamaClient(BaseClient):

core/llm/client/deepseek.py renamed to biz/llm/client/deepseek.py

@@ -1,18 +1,17 @@
 import os
 from typing import Dict, List, Optional
 
-from dotenv import load_dotenv
 from openai import OpenAI
 
-from core.llm.client.base import BaseClient
-from core.llm.types import NotGiven, NOT_GIVEN
+from biz.llm.client.base import BaseClient
+from biz.llm.types import NotGiven, NOT_GIVEN
 from biz.utils.i18n import get_translator
+
 _ = get_translator()
 
+
 class OpenAIClient(BaseClient):
     def __init__(self, api_key: str = None):
-        if not os.getenv("OPENAI_API_KEY"):
-            load_dotenv()
         self.api_key = api_key or os.getenv("OPENAI_API_KEY")
         self.base_url = os.getenv("OPENAI_API_BASE_URL", "https://api.openai.com")
         if not self.api_key: