updated image of streamlit and docker compose

Author: LeooR22

create_fastapi_project/templates/langchain_basic/Makefile

@@ -51,9 +51,6 @@ run-prod:
 stop-prod:
 	docker compose down
 
-run-streamlit:
-	docker compose -f streamlit.yml up --force-recreate
-
 formatter:
 	cd app && \
 	poetry run black app

create_fastapi_project/templates/langchain_basic/backend/app/app/api/v1/endpoints/chat.py

@@ -1,6 +1,6 @@
+from app.core.config import settings
 from app.schemas.message_schema import (
     IChatResponse,
-    IUserMessage,
 )
 import logging
 from app.utils.adaptive_cards.cards import create_adaptive_card
@@ -15,7 +15,7 @@
     YoutubeSearchTool,
     GeneralWeatherTool,
 )
-from fastapi import APIRouter, WebSocket
+from fastapi import APIRouter, WebSocket, WebSocketDisconnect
 from app.utils.uuid6 import uuid7
 from langchain.chat_models import ChatOpenAI
 from langchain.schema import SystemMessage
@@ -37,6 +37,10 @@
 @router.websocket("")
 async def websocket_endpoint(websocket: WebSocket):
     await websocket.accept()
+    if not settings.OPENAI_API_KEY.startswith("sk-"):
+        await websocket.send_json({"error": "OPENAI_API_KEY is not set"})
+        return
+
     while True:
         data = await websocket.receive_json()
         user_message = data["message"]
@@ -86,6 +90,10 @@ async def websocket_endpoint(websocket: WebSocket):
 async def websocket_endpoint(websocket: WebSocket):
     await websocket.accept()
 
+    if not settings.OPENAI_API_KEY.startswith("sk-"):
+        await websocket.send_json({"error": "OPENAI_API_KEY is not set"})
+        return
+
     while True:
         try:
             data = await websocket.receive_json()

create_fastapi_project/templates/langchain_basic/backend/app/app/main.py

@@ -1,6 +1,4 @@
-from fastapi import (
-    FastAPI,
-)
+from fastapi import FastAPI, HTTPException
 from fastapi.responses import HTMLResponse
 from app.api.v1.api import api_router as api_router_v1
 from app.core.config import settings
@@ -37,6 +35,11 @@ async def root():
 
 @app.get("/chat", response_class=HTMLResponse)
 async def chat():
+    if not settings.OPENAI_API_KEY.startswith("sk-"):
+        raise HTTPException(
+            status_code=500, detail="OPENAI_API_KEY is not set or not start with sk-"
+        )
+
     return chat_html
 
 

create_fastapi_project/templates/langchain_basic/caddy/Caddyfile

@@ -2,7 +2,7 @@
   email [email protected]
 }
 
-fastapi.{$EXT_ENDPOINT1}:80, fastapi.{$LOCAL_1}:80, fastapi.{$LOCAL_2}:80, :80 {
+fastapi.{$EXT_ENDPOINT1}:80, fastapi.{$LOCAL_1}:80, fastapi.{$LOCAL_2}:80 {
   reverse_proxy fastapi_server:8000
 }
 

create_fastapi_project/templates/langchain_basic/docker-compose-dev.yml

@@ -10,8 +10,17 @@ services:
       - ./backend/app:/code
     expose:
       - 8000
-    ports:
-      - 8000:8000
+    env_file: ".env"
+
+  streamlit_frontend:
+    container_name: streamlit_frontend
+    build: ./frontend
+    restart: always
+    volumes:
+      - ./frontend/app:/code
+    expose:
+      - 8501
+
     env_file: ".env"
 
   caddy_reverse_proxy:

create_fastapi_project/templates/langchain_basic/docker-compose.yml

@@ -6,9 +6,41 @@ services:
     restart: always
     command: "sh -c 'gunicorn -w 3 -k uvicorn.workers.UvicornWorker app.main:app  --bind 0.0.0.0:8000 --preload --log-level=debug --timeout 120'"
     volumes:
-      - ./app:/code
+      - ./backend/app:/code
     expose:
       - 8000
     ports:
       - 8000:8000
     env_file: ".env"
+
+  streamlit_frontend:
+    container_name: streamlit_frontend
+    build: ./frontend
+    restart: always
+    volumes:
+      - ./frontend/app:/code
+    expose:
+      - 8501
+
+    env_file: ".env"
+
+  caddy_reverse_proxy:
+    container_name: caddy_reverse_proxy
+    image: caddy:alpine
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
+    environment:
+      - EXT_ENDPOINT1=${EXT_ENDPOINT1}
+      - LOCAL_1=${LOCAL_1}
+      - LOCAL_2=${LOCAL_2}
+    volumes:
+      - ./caddy/Caddyfile:/etc/caddy/Caddyfile
+      - ./static:/code/static
+      - caddy_data:/data
+      - caddy_config:/config
+
+volumes:
+  caddy_data:
+  caddy_config:

create_fastapi_project/templates/langchain_basic/frontend/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.10-slim
 ENV PYTHONUNBUFFERED=1
-WORKDIR /app
+WORKDIR /code
 # Install Poetry
 RUN apt clean && apt update && apt install curl -y
 RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python && \
@@ -9,10 +9,13 @@ RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python
     poetry config virtualenvs.create false
 
 # Copy poetry.lock* in case it doesn't exist in the repo
-COPY app/pyproject.toml app/poetry.lock* /app/
+COPY app/pyproject.toml app/poetry.lock* /code/
 
+ENV PYTHONPATH=/code
 EXPOSE 8501
 
-HEALTHCHECK CMD curl --fail http://localhost:8501/_stcore/health
+ARG INSTALL_DEV=false
+RUN bash -c "if [ $INSTALL_DEV == 'true' ] ; then poetry install --no-root ; else poetry install --no-root --no-dev ; fi"
 
-ENTRYPOINT ["streamlit", "run", "streamlit_app.py", "--server.port=8501", "--server.address=0.0.0.0"]
+
+ENTRYPOINT ["streamlit", "run", "main.py", "--server.port=8501", "--server.address=0.0.0.0"]

create_fastapi_project/templates/langchain_basic/frontend/app/streamlit_app.py renamed to create_fastapi_project/templates/langchain_basic/frontend/app/main.py

@@ -21,6 +21,10 @@ async def retrieve_bot_response(text):
                     response = await asyncio.wait_for(websocket.recv(), timeout=20)
                     response = json.loads(response)
 
+                    if "error" in response:
+                        stream_data = response["error"]
+                        break
+
                     if response["sender"] == "bot":
                         stream_data = (
                             response["message"]["body"][0]["items"][0]["text"]