From 2d5c464d3b6dc4d17fbaa83bae52eed47cbd2da4 Mon Sep 17 00:00:00 2001 From: Gokul Mohanarangan Date: Tue, 25 Jul 2023 12:50:43 +0530 Subject: [PATCH] move client files --- .gitignore | 2 +- client-local/__init__.py | 6 ++++++ client.py => client-local/client.py | 4 ++-- .../stream_client.py | 6 +++--- server.py | 21 ++++++++++++++----- 5 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 client-local/__init__.py rename client.py => client-local/client.py (94%) rename stream_client.py => client-local/stream_client.py (97%) diff --git a/.gitignore b/.gitignore index c08eb9a3..c6d9edb2 100644 --- a/.gitignore +++ b/.gitignore @@ -165,7 +165,7 @@ cython_debug/ transcript_*.txt test_*.txt wordcloud*.png -*.ini +utils/config.ini test_samples/ *.wav *.mp3 diff --git a/client-local/__init__.py b/client-local/__init__.py new file mode 100644 index 00000000..c2897b64 --- /dev/null +++ b/client-local/__init__.py @@ -0,0 +1,6 @@ +import sys +import os + +parent_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), + os.pardir)) +sys.path.append(parent_dir) diff --git a/client.py b/client-local/client.py similarity index 94% rename from client.py rename to client-local/client.py index b0fa46a5..af1f4c7a 100644 --- a/client.py +++ b/client-local/client.py @@ -5,15 +5,15 @@ import signal from aiortc.contrib.signaling import (add_signaling_arguments, create_signaling) +from ..utils.log_utils import logger from stream_client import StreamClient -from utils.log_utils import logger async def main(): parser = argparse.ArgumentParser(description="Data channels ping/pong") parser.add_argument( - "--url", type=str, nargs="?", default="http://127.0.0.1:1250/offer" + "--url", type=str, nargs="?", default="http://0.0.0.0:1250/offer" ) parser.add_argument( diff --git a/stream_client.py b/client-local/stream_client.py similarity index 97% rename from stream_client.py rename to client-local/stream_client.py index 1ed9cf31..b044b1bb 100644 --- a/stream_client.py +++ b/client-local/stream_client.py @@ -9,15 +9,15 @@ import stamina from aiortc import (RTCPeerConnection, RTCSessionDescription) from aiortc.contrib.media import (MediaPlayer, MediaRelay) -from utils.log_utils import logger -from utils.run_utils import config +from ..utils.log_utils import logger +from ..utils.run_utils import config class StreamClient: def __init__( self, signaling, - url="http://127.0.0.1:1250", + url="http://0.0.0.0:1250", play_from=None, ping_pong=False ): diff --git a/server.py b/server.py index 290e0456..55066eef 100644 --- a/server.py +++ b/server.py @@ -1,3 +1,4 @@ +import argparse import asyncio import datetime import json @@ -16,7 +17,7 @@ from faster_whisper import WhisperModel from loguru import logger from sortedcontainers import SortedDict -from utils.run_utils import run_in_executor +from utils.run_utils import run_in_executor, config pcs = set() relay = MediaRelay() @@ -31,8 +32,8 @@ audio_buffer = AudioFifo() executor = ThreadPoolExecutor() transcription_text = "" last_transcribed_time = 0.0 -LLM_MACHINE_IP = "216.153.52.83" -LLM_MACHINE_PORT = "5000" +LLM_MACHINE_IP = config["DEFAULT"]["LLM_MACHINE_IP"] +LLM_MACHINE_PORT = config["DEFAULT"]["LLM_MACHINE_PORT"] LLM_URL = f"http://{LLM_MACHINE_IP}:{LLM_MACHINE_PORT}/api/v1/generate" incremental_responses = [] sorted_transcripts = SortedDict() @@ -43,7 +44,7 @@ blacklisted_messages = [" Thank you.", " See you next time!", def get_title_and_summary(llm_input_text, last_timestamp): - ("Generating title and summary") + logger.info("Generating title and summary") # output = llm.generate(prompt) # Use monadical-ml to fire this query to an LLM and get result @@ -306,6 +307,16 @@ async def on_shutdown(app): if __name__ == "__main__": + parser = argparse.ArgumentParser( + description="WebRTC based server for Reflector" + ) + parser.add_argument( + "--host", default="0.0.0.0", help="Server host IP (def: 0.0.0.0)" + ) + parser.add_argument( + "--port", type=int, default=1250, help="Server port (def: 1250)" + ) + args = parser.parse_args() app = web.Application() cors = aiohttp_cors.setup( app, @@ -321,4 +332,4 @@ if __name__ == "__main__": offer_resource = cors.add(app.router.add_resource("/offer")) cors.add(offer_resource.add_route("POST", offer)) app.on_shutdown.append(on_shutdown) - web.run_app(app, access_log=None, host="127.0.0.1", port=1250) + web.run_app(app, access_log=None, host=args.host, port=args.port)