From c4eebafff6d4143f6571786c77e28ed615543386 Mon Sep 17 00:00:00 2001 From: Sebarocks Date: Thu, 31 Jul 2025 22:50:03 -0400 Subject: [PATCH] more docker fixes --- Dockerfile | 5 +++-- chatgraph.py | 7 ++++--- frontend/.vscode/extensions.json | 3 --- frontend/src/lib/chatApi.svelte.js | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 frontend/.vscode/extensions.json diff --git a/Dockerfile b/Dockerfile index c2f2f1d..38090fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,9 @@ COPY pyproject.toml uv.lock ./ # Install Python dependencies RUN uv sync --frozen -# Copy backend source code +# Copy backend source code and .env file COPY *.py ./ +COPY .env ./ # Copy built frontend from previous stage COPY --from=frontend-builder /app/frontend/dist ./frontend/dist @@ -38,4 +39,4 @@ COPY --from=frontend-builder /app/frontend/dist ./frontend/dist EXPOSE 8000 # Run the application -CMD ["uv", "run", "app.py"] \ No newline at end of file +CMD ["uv", "run", "app.py"] diff --git a/chatgraph.py b/chatgraph.py index 1a418ad..64e4351 100644 --- a/chatgraph.py +++ b/chatgraph.py @@ -2,15 +2,16 @@ from langchain_openai import ChatOpenAI from langchain_core.messages import HumanMessage, AIMessage from os import getenv from dotenv import load_dotenv +from pydantic import SecretStr load_dotenv() def get_llm(provider: str): """Return a LangChain chat model for the requested provider.""" return ChatOpenAI( - openai_api_key=getenv("OPENROUTER_API_KEY"), - openai_api_base=getenv("OPENROUTER_BASE_URL"), - model_name=provider, + api_key=SecretStr(getenv("OPENROUTER_API_KEY","")), + base_url=getenv("OPENROUTER_BASE_URL"), + model=provider, ) def get_messages(chats, chat_id): diff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.json deleted file mode 100644 index bdef820..0000000 --- a/frontend/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["svelte.svelte-vscode"] -} diff --git a/frontend/src/lib/chatApi.svelte.js b/frontend/src/lib/chatApi.svelte.js index 918f554..d07688c 100644 --- a/frontend/src/lib/chatApi.svelte.js +++ b/frontend/src/lib/chatApi.svelte.js @@ -1,4 +1,4 @@ -const API = "http://localhost:8000"; // change if needed +const API = import.meta.env.CHATSBT_API_URL || ""; export async function createChat(model = "qwen/qwen3-235b-a22b-2507") { const r = await fetch(`${API}/chats`, { @@ -29,7 +29,7 @@ export async function fetchModels() { const data = await response.json(); return data.models || []; } catch (error) { - console.error('Failed to fetch models:', error); + console.error("Failed to fetch models:", error); return []; } }