env variables fix

.dockerignore

@@ -1,9 +1,8 @@
 .streamlit/
 env/
-.env
+.env/
 .git/
 __pycache__/
 obj/
-data/
 bin/
 *pyproj*

Dockerfile

@@ -11,12 +11,15 @@ RUN apt-get update && apt-get install -y \
     git \
     && rm -rf /var/lib/apt/lists/*
 
-RUN git clone https://hanch-raized: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@github.com/hanch-raized/ml.git .
+#RUN git clone https://hanch-raized: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@github.com/hanch-raized/ml.git .
 
-RUN pip3 install -r requirements.txt
+ADD ./requirements.txt /app/requirements.txt
+RUN pip3 install -r ./requirements.txt
 RUN pip3 install streamlit
 #COPY .streamlit/secrets.toml /app/.streamlit/secrets.toml
 
+COPY . .
+
 EXPOSE 8501
 
 HEALTHCHECK CMD curl --fail http://localhost:8501/_stcore/health

README.md

@@ -9,10 +9,12 @@ app_file: app.py
 pinned: false
 ---
 
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
-
 Build Docker:
-docker build -t streamlit .
+docker build --no-cache -t semsearchdemo .
+
+Run docker onport 8601
+docker run -dp 8601:8601  semsearchdemo
+docker run -dp 8601:8601 --env-file .env semsearchdemo
 
 ## deploy container on GCP:
 ### First time

app.py

@@ -1,5 +1,6 @@
 import json
 
+
 from langchain.chains import RetrievalQA
 from langchain.embeddings.openai import OpenAIEmbeddings
 from langchain.prompts import PromptTemplate
@@ -13,6 +14,14 @@ from sentence_transformers import SentenceTransformer
 
 import streamlit.components.v1 as components
 
+st.set_page_config(
+    layout="wide", 
+    initial_sidebar_state="collapsed",
+    page_title="RaizedAI Startup Discovery Assistant",
+    #page_icon=":robot:"
+    )
+
+
 import utils
 import openai_utils as oai 
 
@@ -29,12 +38,6 @@ from streamlit_extras.stylable_container import stylable_container
 
 #"🤖", 
 
-st.set_page_config(
-    layout="wide", 
-    initial_sidebar_state="collapsed",
-    page_title="RaizedAI Startup Discovery Assistant",
-    #page_icon=":robot:"
-    )
 
 COUNTRIES_FN="data/countries.csv"
 country_geo = pd.read_csv(COUNTRIES_FN)

semsearch.pyproj

@@ -12,7 +12,7 @@
     <ProjectTypeGuids>{e614c764-6d9e-4607-9337-b7073809a0bd};{1b580a1a-fdb3-4b32-83e1-6407eb2722e6};{349c5851-65df-11da-9384-00065b846f21};{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
     <LaunchProvider>Web launcher</LaunchProvider>
     <InterpreterId>MSBuild|env|$(MSBuildProjectFullPath)</InterpreterId>
-    <WebBrowserUrl>http://localhost</WebBrowserUrl>
+    <WebBrowserUrl>http://localhost:8501</WebBrowserUrl>
     <PythonDebugWebServerCommandArguments> -m streamlit.cli run app.py --debug $(CommandLineArguments)</PythonDebugWebServerCommandArguments>
     <PythonWsgiHandler>{StartupModule}.wsgi_app()</PythonWsgiHandler>
     <PythonRunWebServerCommand>
@@ -30,6 +30,7 @@
     <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Content Include=".env" />
     <Content Include=".gitignore" />
     <Content Include=".streamlit\secrets.toml" />
     <Content Include="Dockerfile" />

utils.py

@@ -10,16 +10,18 @@ import psycopg2
 from psycopg2 import extras
 import streamlit as st
 
-
+print(f"openai-key{os.getenv('OPENAI_API_KEY')}")
 # gcp_client = secretmanager.SecretManagerServiceClient()
 # response = gcp_client.access_secret_version(request={"name": version.name})
 
 def get_variable(name):
-    res = ""
-    try:    
-        res = os.getenv(name, st.secrets[name])
-    except Exception as e:
-        pass  
+    res = os.getenv(name)    
+    if not res:
+        try:    
+            res = st.secrets[name]
+        except Exception as e:
+            pass  
+    print(f"Got var {name}: {res}")
     return res
 
 OPENAI_API_KEY = get_variable("OPENAI_API_KEY")  # app.pinecone.io
@@ -117,12 +119,12 @@ def search_index(query, top_k, regions, countries, retriever, index_namespace):
 def check_password():
     """Returns `True` if the user had the correct password."""
 
-    if st.secrets['SKIP_PASSWORD']=="True":
+    if get_variable('SKIP_PASSWORD')=="True":
         return True
 
     def password_entered():
         """Checks whether a password entered by the user is correct."""
-        if st.session_state["password"] == st.secrets["password"]:
+        if st.session_state["password"] == get_variable("password"):
             st.session_state["password_correct"] = True
             del st.session_state["password"]  # don't store password
         else: