Reorganize apps

api_app.py

@@ -0,0 +1,85 @@
+from io import BytesIO
+from flask import Flask, Response, send_from_directory, request, jsonify
+from flask_cors import CORS
+import datetime
+import soundfile as sf
+
+from config import Config
+from tts import TTS
+
+def create_api_app():
+    app = Flask(__name__)
+    CORS(app)  # Enable CORS for all routes
+
+    @app.route('/')
+    def index():
+        return 'Server is up!'
+
+    @app.route('/api/text_to_speech', methods=['POST'])
+    def text_to_speech():
+        try:
+            data = request.json
+            input_text = data.get('text')
+
+            try:
+                audio_array = TTS.generate(input_text)
+
+                now = datetime.datetime.now()
+                now_str = now.strftime("%Y%m%d_%H%M%S")
+                file_name = f"output_{now_str}.wav"
+                file_path = f"./outputs/{file_name}"
+
+                # Save the audio to a file
+                TTS.save_audio(audio_array, file_path)
+
+                audio_url = f"{Config.BASE_URL}/api/audio/{file_name}";
+            
+                return dict(success=True, audio_url=audio_url)
+            except Exception as e:
+                return dict(success=False, error=str(e))
+        except Exception as e:
+            return dict(success=False, error=str(e))
+        
+    @app.route('/api/text_to_speech', methods=['GET'])
+    def text_to_speech2():
+        try:
+        # Parse GET parameters
+            input_text = request.args.get('text')
+
+            if not input_text:
+                return jsonify(success=False, error="Missing 'text' parameter"), 400
+
+
+            try:
+                audio_array = TTS.generate(input_text)
+
+                # Use an in-memory buffer to store the audio
+                buffer = BytesIO()
+                sf.write(buffer, audio_array, 44100, format='WAV')  # Write audio to buffer in WAV format
+                buffer.seek(0)  # Reset buffer pointer to the beginning
+
+                # Return the binary data with appropriate headers
+                return Response(
+                    buffer.read(),
+                    mimetype="audio/wav",
+                    headers={
+                        "Content-Disposition": "inline; filename=output.wav"
+                    }
+                )
+            except Exception as e:
+                return dict(success=False, error=str(e))
+        except Exception as e:
+            return dict(success=False, error=str(e))
+
+    @app.route('/api/audio/<path:path>')
+    def send_audio(path):
+        return send_from_directory('outputs', path)
+    
+    return app
+
+def start_api_app(port=Config.PORT, debug=Config.DEBUG):
+    app = create_api_app()
+    app.run(host=Config.HOST, port=port, debug=debug)
+
+if __name__ == '__main__':
+   start_api_app()

server.py

@@ -1,91 +0,0 @@
-from io import BytesIO
-from flask import Flask, Response, send_from_directory, request, jsonify
-from flask_cors import CORS
-
-app = Flask(__name__)
-CORS(app)  # Enable CORS for all routes
-
-# Import the TTS class
-from frontend import start_gradio
-from tts import TTS
-import numpy as np
-import onnxruntime as ort
-from pathlib import Path
-import datetime
-from config import Config
-import soundfile as sf
-import threading
-
-@app.route('/')
-def index():
-  return 'Server is up!'
-
-
-@app.route('/api/text_to_speech', methods=['POST'])
-def text_to_speech():
-    try:
-        data = request.json
-        input_text = data.get('text')
-
-        try:
-            audio_array = TTS.generate(input_text)
-
-            now = datetime.datetime.now()
-            now_str = now.strftime("%Y%m%d_%H%M%S")
-            file_name = f"output_{now_str}.wav"
-            file_path = f"./outputs/{file_name}"
-
-            # Save the audio to a file
-            TTS.save_audio(audio_array, file_path)
-
-            audio_url = f"{Config.BASE_URL}/api/audio/{file_name}";
-        
-            return dict(success=True, audio_url=audio_url)
-        except Exception as e:
-            return dict(success=False, error=str(e))
-    except Exception as e:
-        return dict(success=False, error=str(e))
-    
-@app.route('/api/text_to_speech', methods=['GET'])
-def text_to_speech2():
-    try:
-       # Parse GET parameters
-        input_text = request.args.get('text')
-
-        if not input_text:
-            return jsonify(success=False, error="Missing 'text' parameter"), 400
-
-
-        try:
-            audio_array = TTS.generate(input_text)
-
-            # Use an in-memory buffer to store the audio
-            buffer = BytesIO()
-            sf.write(buffer, audio_array, 44100, format='WAV')  # Write audio to buffer in WAV format
-            buffer.seek(0)  # Reset buffer pointer to the beginning
-
-            # Return the binary data with appropriate headers
-            return Response(
-                buffer.read(),
-                mimetype="audio/wav",
-                headers={
-                    "Content-Disposition": "inline; filename=output.wav"
-                }
-            )
-        except Exception as e:
-            return dict(success=False, error=str(e))
-    except Exception as e:
-        return dict(success=False, error=str(e))
-
-@app.route('/api/audio/<path:path>')
-def send_audio(path):
-    return send_from_directory('outputs', path)
-
-
-# Start Gradio in a separate thread
-thread = threading.Thread(target=start_gradio)
-thread.daemon = True
-thread.start()
-
-if __name__ == '__main__':
-    app.run(host=Config.HOST, port=Config.PORT, debug=Config.DEBUG)

frontend.py → spaces_app.py

@@ -3,6 +3,9 @@ import os
 import sys
 import logging
 import requests
+import threading
+
+from api_app import start_api_app
 
 # Add the current directory to the path so we can import from app
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
@@ -50,4 +53,13 @@ def create_gradio_interface():
 # Start Gradio in a separate thread
 def start_gradio(port=9090):
     demo = create_gradio_interface()
-    demo.launch(server_name="0.0.0.0", server_port=port)
+    demo.launch(server_name="0.0.0.0", server_port=port)
+
+# Start Gradio in a separate thread
+thread = threading.Thread(target=start_api_app)
+thread.daemon = True
+thread.start()
+
+# Launch the app
+if __name__ == "__main__":
+    start_gradio()

startup.sh

@@ -11,4 +11,4 @@ if [ $? -ne 0 ]; then
 fi
 
 # Start Gunicorn for the Flask app
-gunicorn --bind 0.0.0.0:8080 server:app
+gunicorn --bind 0.0.0.0:9090 spaces_app:app