Update ngrok regex match and add ngrok auth

notebooks/AudioPalette.ipynb

@@ -2,12 +2,12 @@
   "cells": [
     {
       "cell_type": "markdown",
-      "metadata": {
-        "id": "w4LtdMb23tZ4"
-      },
       "source": [
         "## Prerequisites"
-      ]
+      ],
+      "metadata": {
+        "id": "w4LtdMb23tZ4"
+      }
     },
     {
       "cell_type": "markdown",
@@ -43,11 +43,6 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "Nl0CQxwHCrFd"
-      },
-      "outputs": [],
       "source": [
         "!pip install typing-extensions==4.5.0\n",
         "!pip install python-multipart\n",
@@ -57,7 +52,12 @@
         "!pip install fastapi\n",
         "!pip install \"uvicorn[standard]\"\n",
         "!pip install pyngrok"
-      ]
+      ],
+      "metadata": {
+        "id": "Nl0CQxwHCrFd"
+      },
+      "execution_count": null,
+      "outputs": []
     },
     {
       "cell_type": "markdown",
@@ -110,20 +110,15 @@
     },
     {
       "cell_type": "markdown",
-      "metadata": {
-        "id": "8nydshMdxKab"
-      },
       "source": [
         "#### Model Class"
-      ]
+      ],
+      "metadata": {
+        "id": "8nydshMdxKab"
+      }
     },
     {
       "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "4V49E7xpxNPu"
-      },
-      "outputs": [],
       "source": [
         "import numpy as np\n",
         "import typing\n",
@@ -137,7 +132,7 @@
         "\n",
         "    def generate(self):\n",
         "        if isinstance(self.caption, str):\n",
-        "            return self.generate_single()\n",
+        "            return self.generate_single(max_new_tokens=1024)\n",
         "        else:\n",
         "            return self.generate_multiple()\n",
         "\n",
@@ -174,18 +169,23 @@
         "            else:\n",
         "                audio = self.generate_audio_with_melody_conditioning(prompt, audio)\n",
         "        return audio"
-      ]
+      ],
+      "metadata": {
+        "id": "4V49E7xpxNPu"
+      },
+      "execution_count": null,
+      "outputs": []
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "source": [
+        "audiopalette = AudioPalette()"
+      ],
       "metadata": {
         "id": "qW65Q68o-R7f"
       },
-      "outputs": [],
-      "source": [
-        "audiopalette = AudioPalette()"
-      ]
+      "execution_count": null,
+      "outputs": []
     },
     {
       "cell_type": "markdown",
@@ -221,11 +221,6 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "iYUH3-GpfbN8"
-      },
-      "outputs": [],
       "source": [
         "import typing\n",
         "import numpy as np\n",
@@ -241,7 +236,12 @@
         "\n",
         "#     class Config:\n",
         "#         arbitrary_types_allowed = True"
-      ]
+      ],
+      "metadata": {
+        "id": "iYUH3-GpfbN8"
+      },
+      "execution_count": null,
+      "outputs": []
     },
     {
       "cell_type": "code",
@@ -297,11 +297,25 @@
       },
       "outputs": [],
       "source": [
+        "from getpass import getpass\n",
+        "\n",
         "import nest_asyncio\n",
-        "from pyngrok import ngrok\n",
-        "import uvicorn"
+        "import uvicorn\n",
+        "from pyngrok import ngrok"
       ]
     },
+    {
+      "cell_type": "code",
+      "source": [
+        "ngrok_auth_token = getpass(prompt=\"Enter ngrok auth token: \")\n",
+        "ngrok.set_auth_token(ngrok_auth_token)"
+      ],
+      "metadata": {
+        "id": "QFDDncCJEs4f"
+      },
+      "execution_count": null,
+      "outputs": []
+    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -341,8 +355,7 @@
     "accelerator": "GPU",
     "colab": {
       "collapsed_sections": [
-        "w4LtdMb23tZ4",
-        "46yDPBYqpYYN"
+        "w4LtdMb23tZ4"
       ],
       "gpuType": "T4",
       "provenance": []
@@ -366,4 +379,4 @@
   },
   "nbformat": 4,
   "nbformat_minor": 0
-}
+}

utils/audio_palette.py

@@ -27,7 +27,7 @@ class AudioPalette:
             "Medium": "medium",
             "Slow": "low"
         }
-        self.ngrok_url_pattern = re.compile("https:\/\/[a-z0-9\-]+\.ngrok\.io\/")
+        self.ngrok_url_pattern = re.compile("(https:\/\/[a-z0-9\-]+\.ngrok\.io\/)|(https:\/\/[a-z0-9\-]+\.ngrok-free.app\/)")
     
     def prompt_construction(self, caption: str, pace: str, sentiment: typing.Union[str, None], instrument: typing.Union[str, None], first: bool = True):
         instrument = instrument if instrument is not None else ""