oauth-1

.gitignore

@@ -1,5 +1,6 @@
 tts_openai_secrets.py
 tts_openai_secrets*
+.virtual_documents
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

app.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "id": "3bedf0dc-8d8e-4ede-a9e6-b8f35136aa00",
    "metadata": {},
    "outputs": [],
@@ -12,10 +12,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "id": "667802a7-0f36-4136-a381-e66210b20462",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "OPENAI_API_KEY environment variable was not found.\n",
+      "GRADIO_PASSWORD environment variable was not found.\n",
+      "import tts_openai_secrets succeeded\n"
+     ]
+    }
+   ],
    "source": [
     "#| export\n",
     "#tts_openai_secrets.py content:\n",
@@ -44,7 +54,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "id": "4d9863fc-969e-409b-8e20-b9c3cd2cc3e7",
    "metadata": {},
    "outputs": [],
@@ -58,7 +68,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "id": "4f486d3a",
    "metadata": {},
    "outputs": [],
@@ -81,10 +91,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "id": "0ffd33b4-cb9b-4c01-bff6-4c3102854ab6",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "successfully got tts model list: ['tts-1-hd-1106', 'tts-1-hd', 'tts-1', 'tts-1-1106']\n"
+     ]
+    }
+   ],
    "source": [
     "#| export\n",
     "try:\n",
@@ -96,7 +114,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "id": "2ddbca5d-4b04-43ab-afaf-430802980e78",
    "metadata": {},
    "outputs": [],
@@ -107,7 +125,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 8,
    "id": "8eb7e7d5-7121-4762-b8d1-e5a9539e2b36",
    "metadata": {},
    "outputs": [],
@@ -118,7 +136,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "id": "52d373be-3a79-412e-8ca2-92bb443fa52d",
    "metadata": {},
    "outputs": [],
@@ -130,7 +148,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 10,
    "id": "24674094-4d47-4e48-b591-55faabcff8df",
    "metadata": {},
    "outputs": [],
@@ -171,7 +189,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 11,
    "id": "e6224ae5-3792-42b2-8392-3abd42998a50",
    "metadata": {},
    "outputs": [],
@@ -209,7 +227,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 12,
    "id": "4691703d-ed0f-4481-8006-b2906289b780",
    "metadata": {},
    "outputs": [],
@@ -229,13 +247,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 13,
    "id": "e34bb4aa-698c-4452-8cda-bd02b38f7122",
    "metadata": {},
    "outputs": [],
    "source": [
     "#| export\n",
     "def create_speech2(input_text, model='tts-1', voice='alloy', progress=gr.Progress(), **kwargs):\n",
+    "    assert authorized(None) is not None,'Unauthorized M'\n",
     "    start = datetime.now()\n",
     "    # Split the input text into chunks\n",
     "    chunks = split_text(input_text)\n",
@@ -270,13 +289,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 14,
    "id": "5388e860",
    "metadata": {},
    "outputs": [],
    "source": [
     "#| export\n",
     "def create_speech(input_text, model='tts-1', voice='alloy', progress=gr.Progress()):\n",
+    "    assert authorized(None) is not None,'Unauthorized M'\n",
     "    # Split the input text into chunks\n",
     "    chunks = split_text(input_text)\n",
     "\n",
@@ -320,7 +340,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 15,
    "id": "236dd8d3-4364-4731-af93-7dcdec6f18a1",
    "metadata": {},
    "outputs": [],
@@ -332,7 +352,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 16,
    "id": "0523a158-ee07-48b3-9350-ee39d4deee7f",
    "metadata": {},
    "outputs": [],
@@ -349,10 +369,33 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "id": "e4fb3159-579b-4271-bc96-4cd1e2816eca",
+   "execution_count": 17,
+   "id": "b5b29507-92bc-453d-bcc5-6402c17e9a0d",
    "metadata": {},
    "outputs": [],
+   "source": [
+    "#| export\n",
+    "def authorized(profile: gr.OAuthProfile) -> str:\n",
+    "    if profile in [\"matdmiller\"]:\n",
+    "        return f\"{profile.username}\"\n",
+    "    return None"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 18,
+   "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/oauth.py:138: UserWarning: Gradio does not support OAuth features outside of a Space environment. To help you debug your app locally, the login and logout buttons are mocked with your profile. To make it work, your machine must be logged in to Huggingface.\n",
+      "  warnings.warn(\n"
+     ]
+    }
+   ],
    "source": [
     "#| export\n",
     "with gr.Blocks(title='OpenAI TTS', head='OpenAI TTS') as app:\n",
@@ -374,28 +417,165 @@
     "    go_btn.click(fn=create_speech2, inputs=[input_text, tts_model_dropdown, tts_voice_dropdown], outputs=[output_audio])\n",
     "    clear_btn = gr.Button('Clear')\n",
     "    clear_btn.click(fn=lambda: '', outputs=input_text)\n",
+    "\n",
+    "    gr.LoginButton()\n",
+    "    m = gr.Markdown('')\n",
+    "    app.load(authorized, None, m)\n",
     "    "
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 20,
    "id": "a00648a1-891b-470b-9959-f5d502055713",
    "metadata": {},
    "outputs": [],
    "source": [
     "#| export\n",
-    "launch_kwargs = {'auth':('username',GRADIO_PASSWORD),\n",
-    "                 'auth_message':'Please log in to Mat\\'s TTS App with username: username and password.'}\n",
+    "# launch_kwargs = {'auth':('username',GRADIO_PASSWORD),\n",
+    "#                  'auth_message':'Please log in to Mat\\'s TTS App with username: username and password.'}\n",
+    "launch_kwargs = {}\n",
     "queue_kwargs = {'default_concurrency_limit':10}"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 21,
    "id": "4b534fe7-4337-423e-846a-1bdb7cccc4ea",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Running on local URL:  http://127.0.0.1:7860\n",
+      "\n",
+      "To create a public link, set `share=True` in `launch()`.\n"
+     ]
+    },
+    {
+     "data": {
+      "text/html": [
+       "<div><iframe src=\"http://127.0.0.1:7860/\" width=\"100%\" height=\"500\" allow=\"autoplay; camera; microphone; clipboard-read; clipboard-write;\" frameborder=\"0\" allowfullscreen></iframe></div>"
+      ],
+      "text/plain": [
+       "<IPython.core.display.HTML object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/plain": []
+     },
+     "execution_count": 21,
+     "metadata": {},
+     "output_type": "execute_result"
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/Users/mathewmiller/anaconda3/envs/gradio1/lib/python3.11/site-packages/gradio/components/login_button.py:74: UserWarning: LoginButton created outside of a Blocks context. May not work unless you call its `activate()` method manually.\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 907, in special_args\n",
+      "    raise Error(\n",
+      "gradio.exceptions.Error: 'This action requires a logged in user. Please sign in and retry.'\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 907, in special_args\n",
+      "    raise Error(\n",
+      "gradio.exceptions.Error: 'This action requires a logged in user. Please sign in and retry.'\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 907, in special_args\n",
+      "    raise Error(\n",
+      "gradio.exceptions.Error: 'This action requires a logged in user. Please sign in and retry.'\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Processing time: 0 seconds.\n",
+      "Processing time: 0 seconds.\n"
+     ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "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 907, in special_args\n",
+      "    raise Error(\n",
+      "gradio.exceptions.Error: 'This action requires a logged in user. Please sign in and retry.'\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 907, in special_args\n",
+      "    raise Error(\n",
+      "gradio.exceptions.Error: 'This action requires a logged in user. Please sign in and retry.'\n"
+     ]
+    }
+   ],
    "source": [
     "#| hide\n",
     "#Notebook launch\n",
@@ -430,7 +610,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 22,
    "id": "afbc9699-4d16-4060-88f4-cd1251754cbd",
    "metadata": {},
    "outputs": [],
@@ -461,9 +641,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "python3",
+   "display_name": "gradio1",
    "language": "python",
-   "name": "python3"
+   "name": "gradio1"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.11.8"
   }
  },
  "nbformat": 4,

app.py

@@ -3,7 +3,7 @@
 # %% auto 0
 __all__ = ['secret_import_failed', 'tts_voices', 'clean_text_prompt', 'OPENAI_CLIENT_TTS_THREADS', 'launch_kwargs',
            'queue_kwargs', 'split_text', 'concatenate_mp3', 'create_speech_openai', 'create_speech2', 'create_speech',
-           'get_input_text_len', 'get_generation_cost']
+           'get_input_text_len', 'get_generation_cost', 'authorized']
 
 # %% app.ipynb 1
 #tts_openai_secrets.py content:
@@ -139,6 +139,7 @@ def create_speech_openai(chunk_idx, input, model='tts-1', voice='alloy', speed=1
 
 # %% app.ipynb 11
 def create_speech2(input_text, model='tts-1', voice='alloy', progress=gr.Progress(), **kwargs):
+    assert authorized(None) is not None,'Unauthorized M'
     start = datetime.now()
     # Split the input text into chunks
     chunks = split_text(input_text)
@@ -173,6 +174,7 @@ def create_speech2(input_text, model='tts-1', voice='alloy', progress=gr.Progres
 
 # %% app.ipynb 12
 def create_speech(input_text, model='tts-1', voice='alloy', progress=gr.Progress()):
+    assert authorized(None) is not None,'Unauthorized M'
     # Split the input text into chunks
     chunks = split_text(input_text)
 
@@ -228,6 +230,12 @@ def get_generation_cost(input_text, tts_model_dropdown):
     return "${:,.3f}".format(cost)
 
 # %% app.ipynb 15
+def authorized(profile: gr.OAuthProfile) -> str:
+    if profile in ["matdmiller"]:
+        return f"{profile.username}"
+    return None
+
+# %% app.ipynb 16
 with gr.Blocks(title='OpenAI TTS', head='OpenAI TTS') as app:
     gr.Markdown("# OpenAI TTS")
     gr.Markdown("""Start typing below and then click **Go** to create the speech from your text. The current limit is 4,000 characters. 
@@ -247,14 +255,19 @@ For requests longer than 4,000 chars they will be broken into chunks of 4,000 or
     go_btn.click(fn=create_speech2, inputs=[input_text, tts_model_dropdown, tts_voice_dropdown], outputs=[output_audio])
     clear_btn = gr.Button('Clear')
     clear_btn.click(fn=lambda: '', outputs=input_text)
+
+    gr.LoginButton()
+    m = gr.Markdown('')
+    app.load(authorized, None, m)
     
 
-# %% app.ipynb 16
-launch_kwargs = {'auth':('username',GRADIO_PASSWORD),
-                 'auth_message':'Please log in to Mat\'s TTS App with username: username and password.'}
+# %% app.ipynb 17
+# launch_kwargs = {'auth':('username',GRADIO_PASSWORD),
+#                  'auth_message':'Please log in to Mat\'s TTS App with username: username and password.'}
+launch_kwargs = {}
 queue_kwargs = {'default_concurrency_limit':10}
 
-# %% app.ipynb 18
+# %% app.ipynb 19
 #.py launch
 if __name__ == "__main__":
     app.queue(**queue_kwargs)