Fix secret, run in one command

Dockerfile

@@ -1,28 +1,27 @@
-FROM python:3.9-slim-bullseye as langchain-serve-img
+FROM python:3.9-slim-bullseye as pdfgpt-chat-img
 
+# Expose the secret OPENAI_API_KEY at buildtime and use its value as git remote URL
+RUN --mount=type=secret,id=OPENAI_API_KEY,mode=0444,required=true \
+ git init && \
+ git remote add origin $(cat /run/secrets/OPENAI_API_KEY)
+ 
 COPY requirements_pytorch.txt requirements_pytorch.txt
 COPY requirements_api.txt requirements_api.txt
+COPY requirements_app.txt requirements_app.txt
+
 RUN pip3 install -r requirements_pytorch.txt
 RUN pip3 install -r requirements_api.txt
-
-COPY api.py api.py
-
-EXPOSE 8080
-
-ENTRYPOINT [ "lc-serve", "deploy", "local", "api.py" ]
-
-FROM python:3.9-slim-bullseye as pdfgpt-chat-img
-
-COPY requirements_app.txt requirements_app.txt
 RUN pip3 install -r requirements_app.txt
 
 WORKDIR /app
 
 COPY intfloat /app/intfloat
 COPY app.py app.py
+COPY api.py api.py
 
 EXPOSE 7860
+EXPOSE 8080
 
 HEALTHCHECK CMD curl --fail http://localhost:7860/_stcore/health
 
-ENTRYPOINT  ["streamlit", "run", "app.py", "--server.port=7860"]
+CMD  ["lc-serve", "deploy", "local", "api.py", "&&", "streamlit", "run", "app.py", "--server.port=7860"]

app.py

@@ -22,7 +22,7 @@ def main():
     @st.cache_data
     def convert_df(df):
         return df.to_csv(index=False).encode("utf-8")
-
+  
     def pdf_change():
         st.session_state["pdf_change"] = True
 
@@ -62,7 +62,7 @@ def main():
                         "embedding_model": embedding_model,
                         "gpt_model": gpt_model,
                         "envs": {
-                            "OPENAI_API_KEY": os.environ.get("OPENAI_API_KEY"),
+                            "OPENAI_API_KEY": OPENAI_API_KEY,
                         }
                     },
                 )
@@ -73,7 +73,7 @@ def main():
                 "embedding_model": embedding_model,
                 "gpt_model": gpt_model,
                 "envs": {
-                    "OPENAI_API_KEY": os.environ.get("OPENAI_API_KEY"),
+                    "OPENAI_API_KEY": OPENAI_API_KEY,
                 }
             }
 
@@ -116,7 +116,6 @@ def main():
         url: str,
         file: _TemporaryFileWrapper,
         question: str,
-        openai_key: str,
     ) -> dict:
         if question.strip() == "":
             return "[ERROR]: Question field is empty"
@@ -127,7 +126,7 @@ def main():
             "embedding_model": embedding_model,
             "gpt_model": gpt_model,
             "envs": {
-                "OPENAI_API_KEY": os.environ.get("OPENAI_API_KEY"),
+                "OPENAI_API_KEY": OPENAI_API_KEY,
             },
         }
 
@@ -209,6 +208,7 @@ def main():
         "gpt-4": "GPT-4 (smarter, costlier)",
     }
     LCSERVE_HOST = "http://localhost:8080"
+    OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
     PDFGPT_URL = "https://github.com/bhaskatripathi/pdfGPT"
     SIGNATURE = """<style>
 .footer {
@@ -273,19 +273,6 @@ color:darkgray'>Developed with ❤ by asyafiqe</p>
     # sidebar
     with input_details:
         # sidebar
-        st.title("Input details")
-        OPENAI_URL = "https://platform.openai.com/account/api-keys"
-        openai_key = st.text_input(
-            ":key: Enter your OpenAI API key here",
-            type="password",
-            help="Get your Open AI API key [here](%s)" % OPENAI_URL,
-        )
-        colored_header(
-            label="",
-            description="",
-            color_name="blue-40",
-        )
-
         pdf_url = st.text_input(
             ":globe_with_meridians: Enter PDF URL here", on_change=pdf_change
         )
@@ -323,7 +310,6 @@ color:darkgray'>Developed with ❤ by asyafiqe</p>
                         pdf_url,
                         file,
                         user_input,
-                        os.environ.get("OPENAI_API_KEY"),
                     )
                     st.session_state.past.append(user_input)
                     st.session_state.generated.append(response["answer"])

docker-compose.yaml

@@ -1,15 +0,0 @@
-version: '3'
-
-services:
-  langchain-serve:
-    build:
-      context: . 
-      target: langchain-serve-img
-    ports:
-      - '8080:8080'
-  pdf-gpt:
-    build:
-      context: . 
-      target: pdf-gpt-img
-    ports:
-      - '7860:7860'