use also env variables

app.py

@@ -33,7 +33,7 @@ COUNTRIES_FN="data/countries.csv"
 country_geo = pd.read_csv(COUNTRIES_FN)
 
 st.session_state.index = utils.init_pinecone()
-st.session_state.results = []
+st.session_state.db_search_results = []
 
 carddict = {
         "name": [],
@@ -165,7 +165,7 @@ def run_query(query, report_type, top_k , regions, countries, is_debug, index_na
         #descriptions = "\n".join([f"Description of company \"{res['name']}\":  {res['data']['Summary']}.\n" for res in results[:20] if 'Summary' in res['data']])
         
         m_text = oai.call_openai(query, engine=openai_model, temp=0, top_p=1.0)
-        results = st.session_state.results
+        results = st.session_state.db_search_results
         m_text
         st.session_state.messages.append({"role": "user", "content": query})
         st.session_state.messages.append({"role": "system", "content": m_text})

openai_utils.py

@@ -8,18 +8,11 @@ import streamlit as st
 
 import utils
 
-OPENAI_API_KEY = st.secrets["OPENAI_API_KEY"]  # app.pinecone.io
-OPENAI_ORGANIZATION_ID = st.secrets["OPENAI_ORGANIZATION_ID"]
-
-
-headers = {"Content-Type": "application/json",
-           "Authorization": f"Bearer {OPENAI_API_KEY}"
-           }
 
 SEED = 42     
 
 def get_client():
-    return openai.OpenAI(api_key = OPENAI_API_KEY,organization=OPENAI_ORGANIZATION_ID)
+    return openai.OpenAI(api_key = utils.OPENAI_API_KEY,organization=utils.OPENAI_ORGANIZATION_ID)
 
 def getListOfCompanies(query, filters = {}):
     country_filters = filters['country'] if 'country' in filters else st.session_state.country
@@ -72,10 +65,14 @@ def wait_for_response(thread, run):
                     if tool_call.function.name =="getListOfCompanies":
                         try:
                             args = json.loads(tool_call.function.arguments)
-                            print(f"Processing tool_call {tool_call.id}. Calling 'getListOfCompanies with args: {args}" )
-                            res = getListOfCompanies(args['query'], json.loads(args['filters']))
-                            if len(res)>0:
-                                outputs[tool_call.id] = res
+                            res = ''
+                            if 'query' in args:
+                                print(f"Processing tool_call {tool_call.id}. Calling 'getListOfCompanies with args: {args}" )
+                                search_filters = json.loads(args['filters']) if 'filters' in args else []
+                                res = getListOfCompanies(args['query'], search_filters)
+                            
+                                
+                            outputs[tool_call.id] = res
                         except Exception as e:
                             print(f"Error calling tools, {str(e)}")
                             traceback.print_exc()

utils.py

@@ -1,11 +1,34 @@
 import json
 
 import pandas as pd
+import os
+
+# from google.cloud import secretmanager
+import openai
 import pinecone
 import psycopg2
 from psycopg2 import extras
 import streamlit as st
-import openai
+
+
+# gcp_client = secretmanager.SecretManagerServiceClient()
+# response = gcp_client.access_secret_version(request={"name": version.name})
+
+def get_variable(name):
+    return os.getenv(name, st.secrets[name])
+
+OPENAI_API_KEY = get_variable("OPENAI_API_KEY")  # app.pinecone.io
+OPENAI_ORGANIZATION_ID = get_variable("OPENAI_ORGANIZATION_ID")
+
+PINECONE_KEY = get_variable("PINECONE_API_KEY")  # app.pinecone.io
+PINE_CONE_ENVIRONMENT = get_variable("PINE_CONE_ENVIRONMENT")  # app.pinecone.io
+
+# OPENAI_API_KEY = st.secrets["OPENAI_API_KEY"]  # app.pinecone.io
+# OPENAI_ORGANIZATION_ID = st.secrets["OPENAI_ORGANIZATION_ID"]
+
+# PINECONE_KEY = st.secrets["PINECONE_API_KEY"]  # app.pinecone.io
+# PINE_CONE_ENVIRONMENT = st.secrets["PINE_CONE_ENVIRONMENT"]  # app.pinecone.io
+
 
 # def create_connection():
 #     host = st.secrets["RAIZED_DB_HOST"]
@@ -24,9 +47,6 @@ import openai
 
 ## Pinecone
 
-PINECONE_KEY = st.secrets["PINECONE_API_KEY"]  # app.pinecone.io
-PINE_CONE_ENVIRONMENT = st.secrets["PINE_CONE_ENVIRONMENT"]  # app.pinecone.io
-
 @st.cache_resource
 def init_pinecone():
     pinecone.init(api_key=PINECONE_KEY, environment=PINE_CONE_ENVIRONMENT)  # get a free api key from app.pinecone.io