oai key

app.py

@@ -70,17 +70,17 @@ def initializeChatbot(temp, k, modelName, stdlQs, api_key_st, vsDict_st, progres
     print('Chatbot initialized at ', datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
 
     return qa_chain_st, btn.update(interactive=True), initChatbot_btn.update('Chatbot ready. Now visit the chatbot Tab.', interactive=False)\
-        , aKey_tb.update(), gr.Tabs.update(selected='cb'), chatbot.update(value=[('', welMsg)])
+        , oaiKey_tb.update(), gr.Tabs.update(selected='cb'), chatbot.update(value=[('', welMsg)])
 
 
-def setApiKey(api_key):
+def setOaiApiKey(api_key):
     api_key = transformApi(api_key)
     try:
         openai.Model.list(api_key=api_key) # test the API key
         api_key_st = api_key
-        return aKey_tb.update('API Key accepted', interactive=False, type='text'), aKey_btn.update(interactive=False), api_key_st
+        return oaiKey_tb.update('API Key accepted', interactive=False, type='text'), oaiKey_btn.update(interactive=False), api_key_st
     except Exception as e:
-        return aKey_tb.update(str(e), type='text'), *[x.update() for x in [aKey_btn, api_key_state]]
+        return oaiKey_tb.update(str(e), type='text'), *[x.update() for x in [oaiKey_btn, api_key_state]]
     
 # convert user uploaded data to vectorstore
 def uiData_vecStore(userFiles, userUrls, api_key_st, vsDict_st={}, progress=gr.Progress()):
@@ -172,7 +172,7 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue='orange', secondary_hue='gray
     # Initialize state variables - stored in this browser session - these can only be used within input or output of .click/.submit etc, not as a python var coz they are not stored in backend, only as a frontend gradio component
     # but if you initialize it with a default value, that value will be stored in backend and accessible across all users. You can also change it with statear.value='newValue'
     qa_state = gr.State()
-    api_key_state = gr.State(os.getenv("OPENAI_API_KEY") if mode.type=='personalBot' else 'Null')
+    api_key_state = gr.State(getPersonalBotApiKey() if mode.type=='personalBot' else 'Null') # can be string (OpenAI) or dict (WX)
     chromaVS_state = gr.State({})
 
 
@@ -182,10 +182,10 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue='orange', secondary_hue='gray
         with gr.Tab('Initialization', id='init'):
             with gr.Row():
                 with gr.Column():
-                    aKey_tb = gr.Textbox(label="OpenAI API Key", type='password'\
+                    oaiKey_tb = gr.Textbox(label="OpenAI API Key", type='password'\
                             , info='You can find OpenAI API key at https://platform.openai.com/account/api-keys'\
                             , placeholder='Enter your API key here and hit enter to begin chatting')
-                    aKey_btn = gr.Button("Submit API Key")
+                    oaiKey_btn = gr.Button("Submit API Key")
             with gr.Row(visible=mode.uiAddDataVis):
                 upload_fb = gr.Files(scale=5, label="Upload (multiple) Files - pdf/txt/docx supported", file_types=['.doc', '.docx', 'text', '.pdf', '.csv'])
                 urls_tb = gr.Textbox(scale=5, label="Enter URLs starting with https (comma separated)"\
@@ -221,9 +221,9 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue='orange', secondary_hue='gray
     ### Setup the Gradio Event Listeners
 
     # API button
-    aKey_btn_args = {'fn':setApiKey, 'inputs':[aKey_tb], 'outputs':[aKey_tb, aKey_btn, api_key_state]}
-    aKey_btn.click(**aKey_btn_args)
-    aKey_tb.submit(**aKey_btn_args)
+    oaiKey_btn_args = {'fn':setOaiApiKey, 'inputs':[oaiKey_tb], 'outputs':[oaiKey_tb, oaiKey_btn, api_key_state]}
+    oaiKey_btn.click(**oaiKey_btn_args)
+    oaiKey_tb.submit(**oaiKey_btn_args)
 
     # Data Ingest Button
     data_ingest_event = data_ingest_btn.click(uiData_vecStore, [upload_fb, urls_tb, api_key_state, chromaVS_state], [chromaVS_state, status_tb, data_ingest_btn, upload_fb, urls_tb])
@@ -236,7 +236,7 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue='orange', secondary_hue='gray
     stdlQs_rb.change(**advSet_args)
 
     # Initialize button
-    initCb_args = {'fn':initializeChatbot, 'inputs':[temp_sld, k_sld, model_dd, stdlQs_rb, api_key_state, chromaVS_state], 'outputs':[qa_state, btn, initChatbot_btn, aKey_tb, tabs, chatbot]}
+    initCb_args = {'fn':initializeChatbot, 'inputs':[temp_sld, k_sld, model_dd, stdlQs_rb, api_key_state, chromaVS_state], 'outputs':[qa_state, btn, initChatbot_btn, oaiKey_tb, tabs, chatbot]}
     if mode.type=='personalBot':
         demo.load(**initCb_args) # load Chatbot UI directly on startup
     initChatbot_btn.click(**initCb_args)

ttyd_functions.py

@@ -261,4 +261,16 @@ def num_tokens_from_string(string, encoding_name = "cl100k_base"):
     """Returns the number of tokens in a text string."""
     encoding = tiktoken.get_encoding(encoding_name)
     num_tokens = len(encoding.encode(string))
-    return num_tokens
+    return num_tokens
+
+def getPersonalBotApiKey():
+    print('funcCalled')
+    if os.getenv("OPENAI_API_KEY"):
+        return os.getenv("OPENAI_API_KEY")
+    elif os.getenv("WX_API_KEY"):
+        wxCreds = {'credentials' : {"url": "https://us-south.ml.cloud.ibm.com", "apikey": os.getenv("WX_API_KEY") },
+                    'project_id': os.getenv("WX_PROJECT_ID")
+                    }
+        return wxCreds
+    else:
+        return None

vecstore/c87f6fd4-541b-11ee-842a-acde48001122/c2ef6a64-23e9-4547-8d53-32e82b52f85f/data_level0.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f18abd8c514282db82706e52b0a33ed659cd534e925a6f149deb7af9ce34bd8e
+size 6284000

vecstore/c87f6fd4-541b-11ee-842a-acde48001122/c2ef6a64-23e9-4547-8d53-32e82b52f85f/header.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:effaa959ce2b30070fdafc2fe82096fc46e4ee7561b75920dd3ce43d09679b21
+size 100

vecstore/c87f6fd4-541b-11ee-842a-acde48001122/c2ef6a64-23e9-4547-8d53-32e82b52f85f/length.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fa0f3de3eca485efea4ea8901f5a34a2bf77ee4fbba4afb491745539ccee6af
+size 4000

vecstore/ea86f048-541b-11ee-a314-acde48001122/eebc97bc-095a-4715-8ec5-f3ffedb1b4ea/data_level0.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f18abd8c514282db82706e52b0a33ed659cd534e925a6f149deb7af9ce34bd8e
+size 6284000

vecstore/ea86f048-541b-11ee-a314-acde48001122/eebc97bc-095a-4715-8ec5-f3ffedb1b4ea/header.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:effaa959ce2b30070fdafc2fe82096fc46e4ee7561b75920dd3ce43d09679b21
+size 100

vecstore/ea86f048-541b-11ee-a314-acde48001122/eebc97bc-095a-4715-8ec5-f3ffedb1b4ea/length.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc19b1997119425765295aeab72d76faa6927d4f83985d328c26f20468d6cc76
+size 4000

vecstore/ff5dbf74-541b-11ee-a0d2-acde48001122/4dda0e11-f96d-46f6-ad54-53cd3dde649f/data_level0.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f18abd8c514282db82706e52b0a33ed659cd534e925a6f149deb7af9ce34bd8e
+size 6284000

vecstore/ff5dbf74-541b-11ee-a0d2-acde48001122/4dda0e11-f96d-46f6-ad54-53cd3dde649f/header.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:effaa959ce2b30070fdafc2fe82096fc46e4ee7561b75920dd3ce43d09679b21
+size 100

vecstore/ff5dbf74-541b-11ee-a0d2-acde48001122/4dda0e11-f96d-46f6-ad54-53cd3dde649f/length.bin

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc19b1997119425765295aeab72d76faa6927d4f83985d328c26f20468d6cc76
+size 4000