fix auth and dropdowns

app.ipynb

@@ -539,6 +539,7 @@
     "#| export\n",
     "def create_speech(input_text, provider, model='tts-1', voice='alloy', profile: gr.OAuthProfile|None=None, progress=gr.Progress(), **kwargs):\n",
     "\n",
+    "    #Verify auth if it is required. This is very important if this is in a HF space. DO NOT DELETE!!!\n",
     "    verify_authorization(profile)\n",
     "    start = datetime.now()\n",
     "\n",
@@ -683,21 +684,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 29,
    "id": "e4fb3159-579b-4271-bc96-4cd1e2816eca",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/utils.py:1000: UserWarning: Expected 3 arguments for function <function get_generation_cost at 0x1174f2e80>, received 4.\n",
-      "  warnings.warn(\n",
-      "/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/utils.py:1008: UserWarning: Expected maximum 3 arguments for function <function get_generation_cost at 0x1174f2e80>, received 4.\n",
-      "  warnings.warn(\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#| export\n",
     "with gr.Blocks(title='TTS', head='TTS', delete_cache=(3600,3600)) as app:\n",
@@ -707,9 +697,12 @@
     "    with gr.Row():\n",
     "        input_text = gr.Textbox(max_lines=100, label=\"Enter text here\")\n",
     "    with gr.Row():\n",
-    "        tts_provider_dropdown = gr.Dropdown(value=DEFAULT_PROVIDER,choices=[(v,k) for k,v in providers.items()], label='Provider')\n",
-    "        tts_model_dropdown = gr.Dropdown(value=DEFAULT_MODEL,choices=get_model_choices(DEFAULT_PROVIDER), label='Model')\n",
-    "        tts_voice_dropdown = gr.Dropdown(value=DEFAULT_VOICE,choices=get_voice_choices(DEFAULT_PROVIDER, DEFAULT_MODEL),label='Voice')\n",
+    "        tts_provider_dropdown = gr.Dropdown(value=DEFAULT_PROVIDER,\n",
+    "            choices=tuple([(v['name'],k) for k,v in providers.items()]), label='Provider', interactive=True)\n",
+    "        tts_model_dropdown = gr.Dropdown(value=DEFAULT_MODEL,choices=get_model_choices(DEFAULT_PROVIDER), \n",
+    "                                         label='Model', interactive=True)\n",
+    "        tts_voice_dropdown = gr.Dropdown(value=DEFAULT_VOICE,choices=get_voice_choices(DEFAULT_PROVIDER, DEFAULT_MODEL),\n",
+    "                                         label='Voice', interactive=True)\n",
     "        input_text_length = gr.Label(label=\"Number of characters\")\n",
     "        generation_cost = gr.Label(label=\"Generation cost\")\n",
     "    with gr.Row():\n",
@@ -718,8 +711,8 @@
     "    #input_text \n",
     "    input_text.input(fn=get_input_text_len, inputs=input_text, outputs=input_text_length)\n",
     "    input_text.input(fn=get_generation_cost, \n",
-    "                     inputs=[input_text,tts_model_dropdown,tts_provider_dropdown, tts_provider_dropdown], \n",
-    "                     outputs=tts_voice_dropdown)\n",
+    "                     inputs=[input_text,tts_model_dropdown,tts_provider_dropdown], \n",
+    "                     outputs=generation_cost)\n",
     "\n",
     "    tts_provider_dropdown.change(fn=update_model_choices, inputs=[tts_provider_dropdown], \n",
     "                                 outputs=tts_model_dropdown)\n",
@@ -746,7 +739,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 30,
    "id": "a00648a1-891b-470b-9959-f5d502055713",
    "metadata": {},
    "outputs": [],
@@ -760,7 +753,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 31,
    "id": "4b534fe7-4337-423e-846a-1bdb7cccc4ea",
    "metadata": {},
    "outputs": [
@@ -789,9 +782,59 @@
      "data": {
       "text/plain": []
      },
-     "execution_count": 27,
+     "execution_count": 31,
      "metadata": {},
      "output_type": "execute_result"
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/components/dropdown.py:181: UserWarning: The value passed into gr.Dropdown() is not in the list of choices. Please update the list of choices to include: $0.000 or set allow_custom_value=True.\n",
+      "  warnings.warn(\n",
+      "Traceback (most recent call last):\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/queueing.py\", line 532, in process_events\n",
+      "    response = await route_utils.call_process_api(\n",
+      "               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/route_utils.py\", line 276, in call_process_api\n",
+      "    output = await app.get_blocks().process_api(\n",
+      "             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/blocks.py\", line 1928, in process_api\n",
+      "    result = await self.call_function(\n",
+      "             ^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/blocks.py\", line 1500, in call_function\n",
+      "    processed_input, progress_index, _ = special_args(\n",
+      "                                         ^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/helpers.py\", line 891, in special_args\n",
+      "    getattr(request, \"session\", {})\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/route_utils.py\", line 158, in __getattr__\n",
+      "    return self.dict_to_obj(getattr(self.request, name))\n",
+      "                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/starlette/requests.py\", line 157, in session\n",
+      "    \"session\" in self.scope\n",
+      "AssertionError: SessionMiddleware must be installed to access request.session\n",
+      "Traceback (most recent call last):\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/queueing.py\", line 532, in process_events\n",
+      "    response = await route_utils.call_process_api(\n",
+      "               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/route_utils.py\", line 276, in call_process_api\n",
+      "    output = await app.get_blocks().process_api(\n",
+      "             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/blocks.py\", line 1928, in process_api\n",
+      "    result = await self.call_function(\n",
+      "             ^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/blocks.py\", line 1500, in call_function\n",
+      "    processed_input, progress_index, _ = special_args(\n",
+      "                                         ^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/helpers.py\", line 891, in special_args\n",
+      "    getattr(request, \"session\", {})\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/route_utils.py\", line 158, in __getattr__\n",
+      "    return self.dict_to_obj(getattr(self.request, name))\n",
+      "                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
+      "  File \"/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/starlette/requests.py\", line 157, in session\n",
+      "    \"session\" in self.scope\n",
+      "AssertionError: SessionMiddleware must be installed to access request.session\n"
+     ]
     }
    ],
    "source": [
@@ -817,7 +860,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": 33,
    "id": "28e8d888-e790-46fa-bbac-4511b9ab796c",
    "metadata": {},
    "outputs": [
@@ -836,22 +879,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 34,
    "id": "afbc9699-4d16-4060-88f4-cd1251754cbd",
    "metadata": {},
-   "outputs": [
-    {
-     "ename": "NameError",
-     "evalue": "name 'gr' is not defined",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mNameError\u001b[0m                                 Traceback (most recent call last)",
-      "Cell \u001b[0;32mIn[2], line 2\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[38;5;66;03m#| hide\u001b[39;00m\n\u001b[0;32m----> 2\u001b[0m \u001b[43mgr\u001b[49m\u001b[38;5;241m.\u001b[39mclose_all()\n",
-      "\u001b[0;31mNameError\u001b[0m: name 'gr' is not defined"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#| hide\n",
     "gr.close_all()"
@@ -859,7 +890,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 36,
    "id": "0420310d-930b-4904-8bd4-3458ad8bdbd3",
    "metadata": {},
    "outputs": [],

app.py

@@ -227,6 +227,7 @@ def create_speech_cartesiaai(chunk_idx, input, model='upbeat-moon',
 # %% app.ipynb 25
 def create_speech(input_text, provider, model='tts-1', voice='alloy', profile: gr.OAuthProfile|None=None, progress=gr.Progress(), **kwargs):
 
+    #Verify auth if it is required. This is very important if this is in a HF space. DO NOT DELETE!!!
     verify_authorization(profile)
     start = datetime.now()
 
@@ -319,9 +320,12 @@ For requests longer than allowed by the API they will be broken into chunks auto
     with gr.Row():
         input_text = gr.Textbox(max_lines=100, label="Enter text here")
     with gr.Row():
-        tts_provider_dropdown = gr.Dropdown(value=DEFAULT_PROVIDER,choices=[(v,k) for k,v in providers.items()], label='Provider')
-        tts_model_dropdown = gr.Dropdown(value=DEFAULT_MODEL,choices=get_model_choices(DEFAULT_PROVIDER), label='Model')
-        tts_voice_dropdown = gr.Dropdown(value=DEFAULT_VOICE,choices=get_voice_choices(DEFAULT_PROVIDER, DEFAULT_MODEL),label='Voice')
+        tts_provider_dropdown = gr.Dropdown(value=DEFAULT_PROVIDER,
+            choices=tuple([(v['name'],k) for k,v in providers.items()]), label='Provider', interactive=True)
+        tts_model_dropdown = gr.Dropdown(value=DEFAULT_MODEL,choices=get_model_choices(DEFAULT_PROVIDER), 
+                                         label='Model', interactive=True)
+        tts_voice_dropdown = gr.Dropdown(value=DEFAULT_VOICE,choices=get_voice_choices(DEFAULT_PROVIDER, DEFAULT_MODEL),
+                                         label='Voice', interactive=True)
         input_text_length = gr.Label(label="Number of characters")
         generation_cost = gr.Label(label="Generation cost")
     with gr.Row():
@@ -330,8 +334,8 @@ For requests longer than allowed by the API they will be broken into chunks auto
     #input_text 
     input_text.input(fn=get_input_text_len, inputs=input_text, outputs=input_text_length)
     input_text.input(fn=get_generation_cost, 
-                     inputs=[input_text,tts_model_dropdown,tts_provider_dropdown, tts_provider_dropdown], 
-                     outputs=tts_voice_dropdown)
+                     inputs=[input_text,tts_model_dropdown,tts_provider_dropdown], 
+                     outputs=generation_cost)
 
     tts_provider_dropdown.change(fn=update_model_choices, inputs=[tts_provider_dropdown], 
                                  outputs=tts_model_dropdown)