Merge pull request #49 from sunmh207/feature/20250321-config

Feature/20250321 config

Author: sunmh207

.gitignore

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

Dockerfile

@@ -13,12 +13,13 @@ COPY requirements.txt .
 # 安装依赖
 RUN pip install --no-cache-dir -r requirements.txt
 
+RUN mkdir -p log data conf
 COPY biz ./biz
 COPY core ./core
 COPY api.py ./api.py
 COPY ui.py ./ui.py
-COPY prompt_templates.yml ./prompt_templates.yml
-RUN mkdir -p log data
+COPY conf/prompt_templates.yml ./conf/prompt_templates.yml
+
 
 # 暴露 Flask 和 Streamlit 的端口
 EXPOSE 5001 5002
@@ -27,7 +28,7 @@ EXPOSE 5001 5002
 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
 
 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

api.py

@@ -21,7 +21,7 @@
 from biz.utils.reporter import Reporter
 from urllib.parse import urlparse
 
-load_dotenv()
+load_dotenv("conf/.env")
 api_app = Flask(__name__)
 
 PUSH_REVIEW_ENABLED = os.environ.get('PUSH_REVIEW_ENABLED', '0') == '1'

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,18 +1,15 @@
 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.log import logger
 
 
 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:

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,17 +1,14 @@
 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
 
 
 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:

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

@@ -1,17 +1,14 @@
 import os
 from typing import Dict, List, Optional
 
-from dotenv import load_dotenv
 from zhipuai import ZhipuAI
 
-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 ZhipuAIClient(BaseClient):
     def __init__(self, api_key: str = None):
-        if not os.getenv("ZHIPUAI_API_KEY"):
-            load_dotenv()
         self.api_key = api_key or os.getenv("ZHIPUAI_API_KEY")
         if not self.api_key:
             raise ValueError("API key is required. Please provide it or set it in the environment variables.")