app.py: Remove free tier

app.py

@@ -1,7 +1,7 @@
 """
 Copyright 2023 Balacoon
 
-Voice Conversion service interactive demo
+Revoice Service interactive demo
 """
 
 import glob
@@ -13,31 +13,9 @@ from typing import Dict
 import gradio as gr
 import soundfile as sf
 
-from vc_service_request import vc_service_request, prepare_audio
+from service_request import service_request, prepare_audio
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
-counter = 0
-# dict to limit max numer of usages per user without API key
-# clears up on demo restart, but thats ok for now
-users: Dict[str, int] = {}
-FREE_TIER = 5
-
-data, fs = sf.read(os.path.join(script_dir, "free_tier.wav"))
-audio_msg = prepare_audio((fs, data))
-
-
-def get_ip(request: gr.Request) -> str:
-    """
-    returns user IP from request
-    as in https://huggingface.co/spaces/radames/gradio-request-get-client-ip/blob/main/app.py
-    """
-    client_ip = request.client.host
-    local_ip = socket.gethostbyname(socket.gethostbyname(""))
-    headers = request.kwargs['headers']
-    if headers and 'x-forwarded-for' in headers:
-        x_forwarded_for = headers['x-forwarded-for']
-        client_ip = x_forwarded_for.split(' ')[0] if x_forwarded_for else ""
-    return client_ip
 
 
 def main():
@@ -56,42 +34,38 @@ def main():
     with gr.Blocks() as demo:
         gr.Markdown(
             """
-            <h1 align="center">Balacoon🦝 Voice Conversion</h1>
+            <h1 align="center">Balacoon🦝 Revoice</h1>
 
 
-            Welcome to the live demo of Balacoon's Voice Conversion service.
-            Check out our [website](https://balacoon.com/demo/#voice-conversion)
-            to learn more.
-            Voice Conversion allows you to transform your own voice
-            into the voice of another person using just a single sample.
+            Welcome to the live demo of Balacoon's Revoice service.
+            Check out our [website](https://balacoon.com/products/) to learn more.
+            Zero-shot speech generation allows to generate speech with any voice
+            given just a single sample as a reference.
             For optimal results, we recommend using clean audio files in English.
 
             Here's how it works:
 
-            1. Provide your credentials (API key and secret) or leave fields blank to use free tier.
-            2. Begin by recording your voice.
+            1. Provide your credentials (API key and secret).
+            2. Recording or upload your voice for conversion, or provide text for synthesis. 
             3. Select an audio sample that represents the target voice you want to convert to.
-            4. Click the "Convert" button and listen to the result!
+            4. Click the "Generate" button and listen to the result!
 
             If providing your own audio files, please use WAVE PCM.
             Service works with 16kHz, 16 bit, mono audio.
-
-            If you are interested to plug in Voice Conversion
-            service into your own application, don't hesitate to get in touch with us at
-            [contact@balacoon.com](mailto:contact@balacoon.com)
             """
         )
         gr.Markdown(badges)
         with gr.Row():
-            apikey = gr.Textbox(label="API key", placeholder="Enter API key or leave empty for a free tier")
+            apikey = gr.Textbox(label="API key", placeholder="Enter API key")
         with gr.Row():
-            apisecret = gr.Textbox(label="API secret", placeholder="Enter API secret or leave empty for a free tier")
+            apisecret = gr.Textbox(label="API secret", placeholder="Enter API secret")
         with gr.Row():
             with gr.Column(variant="panel"):
                 src_audio_mic = gr.Audio(source="microphone", label="Record your voice")
                 src_audio_file = gr.Audio(
                     source="upload", label="Or upload audio to convert"
                 )
+                src_text = gr.Textbox(label="Text", placeholder="Or provide text to synthesize")
 
             with gr.Column(variant="panel"):
                 tgt_audio_file = gr.Audio(
@@ -106,11 +80,11 @@ def main():
                 )
 
         with gr.Row():
-            convert_btn = gr.Button("Convert")
+            convert_btn = gr.Button("Generate")
         with gr.Row():
             result_audio = gr.Audio()
 
-        def voice_conversion(src_from_mic_, src_from_file_, tgt_from_file_, api_key_, api_secret_, request_: gr.Request):
+        def speech_generation(src_from_mic_, src_from_file_, src_text_, tgt_from_file_, api_key_, api_secret_, request_: gr.Request):
             """
             helper function which checks where source come from
             """
@@ -119,29 +93,17 @@ def main():
                 src_ = src_from_mic_
             elif src_from_file_:
                 src_ = src_from_file_
+            elif src_text_:
+                src_ = src_text_
             tgt_ = tgt_from_file_
             if not src_ or not tgt_:
                 logging.warning("source or target are not provided")
                 return
-            global counter, users, audio_msg
-            ip_ = get_ip(request_)
-            past_requests_ = users.get(ip_, 0)
-            free_tier_ = False
-            if not api_key_ or not api_secret_:
-                free_tier_ = True
-                api_key_ = os.environ["api_key"]
-                api_secret_ = os.environ["api_secret"]
-            if free_tier_ and past_requests_ >= FREE_TIER:
-                logging.info(f"Free tier exceeded for {ip_}")
-                return 16000, audio_msg
-            logging.info(f"Total number of requests: {counter}. {past_requests_} for {ip_}")
-            counter += 1
-            users[ip_] = past_requests_ + 1
-            return vc_service_request(src_, tgt_, api_key_, api_secret_)
+            return service_request(src_, tgt_, api_key_, api_secret_)
 
         convert_btn.click(
-            voice_conversion,
-            inputs=[src_audio_mic, src_audio_file, tgt_audio_file, apikey, apisecret],
+            speech_generation,
+            inputs=[src_audio_mic, src_audio_file, src_text, tgt_audio_file, apikey, apisecret],
             outputs=result_audio,
         )