From 1e041cad3bb7e7e1b10c6b2acd65429870d0decb Mon Sep 17 00:00:00 2001 From: spdis Date: Sat, 15 Nov 2025 17:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86docker=E4=B8=AD?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E7=94=A8=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=AE=9A=E4=B9=89openai=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AF=86?= =?UTF-8?q?=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- elastic/indexes.py | 2 +- elastic/views.py | 6 ++++-- requirements.txt | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index afd8d8c..9a6fc34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple COPY . /app diff --git a/elastic/indexes.py b/elastic/indexes.py index 13b4ba0..2bd3a5a 100644 --- a/elastic/indexes.py +++ b/elastic/indexes.py @@ -1,5 +1,5 @@ INDEX_NAME = "wordsearch266666" -USER_NAME = "users" +USER_NAME = "users11111" ACHIEVEMENT_INDEX_NAME = INDEX_NAME USER_INDEX_NAME = USER_NAME GLOBAL_INDEX_NAME = "global11111" diff --git a/elastic/views.py b/elastic/views.py index a1b801b..427d199 100644 --- a/elastic/views.py +++ b/elastic/views.py @@ -267,8 +267,10 @@ def ocr_and_extract_info(image_path: str): # raise RuntimeError("缺少 AISTUDIO_API_KEY，请在环境变量或 settings 中配置") - api_key="188f57db3766e02ed2c7e18373996d84f4112272" - base_url="https://aistudio.baidu.com/llm/lmapi/v3" + api_key = getattr(settings, "AISTUDIO_API_KEY", "") + base_url = getattr(settings, "OPENAI_BASE_URL", "") + if not api_key or not base_url: + raise RuntimeError("缺少模型服务配置，请设置 AISTUDIO_API_KEY 与 OPENAI_BASE_URL") client = OpenAI(api_key=api_key, base_url=base_url) types = get_type_list() diff --git a/requirements.txt b/requirements.txt index efd6d56..4212bfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ ---index-url https://pypi.tuna.tsinghua.edu.cn/simple ---extra-index-url https://pypi.org/simple Django==5.2.8 elasticsearch==7.17.9 django-elasticsearch-dsl==7.4.0 @@ -7,6 +5,7 @@ django-elasticsearch-dsl-drf==0.22 elasticsearch-dsl==7.4.1 requests==2.32.3 openai==1.52.2 +httpx==0.27.2 Pillow==10.4.0 gunicorn==21.2.0 whitenoise==6.6.0