MirrorMirror
/
01
mirror of https://github.com/OpenInterpreter/01.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix api keys

This commit is contained in:
Ben Xu 2024-06-14 11:29:18 -07:00
parent 72f7d140d4
commit 5e9f94024c
4 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
software/source/clients/base_device.py
View File

@ -152,6 +152,15 @@ class Device:
async def play_audiosegments(self): async def play_audiosegments(self):
"""Plays them sequentially.""" """Plays them sequentially."""
mpv_command = ["mpv", "--no-cache", "--no-terminal", "--", "fd://0"]
mpv_process = subprocess.Popen(
mpv_command,
stdin=subprocess.PIPE,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
)
while True: while True:
try: try:
audio = await self.audiosegments.get() audio = await self.audiosegments.get()
@ -161,6 +170,10 @@ class Device:
print(f"Time from request to playback: {elapsed_time} seconds") print(f"Time from request to playback: {elapsed_time} seconds")
self.playback_latency = None self.playback_latency = None
if audio is not None:
mpv_process.stdin.write(audio) # type: ignore
mpv_process.stdin.flush() # type: ignore
"""
args = ["ffplay", "-autoexit", "-", "-nodisp"] args = ["ffplay", "-autoexit", "-", "-nodisp"]
proc = subprocess.Popen( proc = subprocess.Popen(
args=args, args=args,
@ -171,7 +184,8 @@ class Device:
out, err = proc.communicate(input=audio) out, err = proc.communicate(input=audio)
proc.poll() proc.poll()
# play(audio) play(audio)
"""
# self.audiosegments.remove(audio) # self.audiosegments.remove(audio)
# await asyncio.sleep(0.1) # await asyncio.sleep(0.1)
except asyncio.exceptions.CancelledError: except asyncio.exceptions.CancelledError:
@ -391,7 +405,7 @@ class Device:
# signed 16-bit little-endian format # signed 16-bit little-endian format
sample_width=2, sample_width=2,
# 24,000 Hz frame rate # 24,000 Hz frame rate
frame_rate=24000, frame_rate=16000,
# mono sound # mono sound
channels=1, channels=1,
) )
@ -400,6 +414,8 @@ class Device:
# print("audio segment was created") # print("audio segment was created")
await self.audiosegments.put(audio_bytes) await self.audiosegments.put(audio_bytes)
# await self.audiosegments.put(audio)
# Run the code if that's the client's job # Run the code if that's the client's job
if os.getenv("CODE_RUNNER") == "client": if os.getenv("CODE_RUNNER") == "client":
if message["type"] == "code" and "end" in message: if message["type"] == "code" and "end" in message:
@ -434,7 +450,8 @@ class Device:
async def start_async(self): async def start_async(self):
print("start async was called!!!!!") print("start async was called!!!!!")
# Configuration for WebSocket # Configuration for WebSocket
WS_URL = f"ws://{self.server_url}/ws" WS_URL = f"ws://{self.server_url}"
# Start the WebSocket communication # Start the WebSocket communication
asyncio.create_task(self.websocket_communication(WS_URL)) asyncio.create_task(self.websocket_communication(WS_URL))

14
software/source/server/async_interpreter.py
View File

@ -24,6 +24,7 @@ from RealtimeSTT import AudioToTextRecorder
import time import time
import asyncio import asyncio
import json import json
import os
class AsyncInterpreter: class AsyncInterpreter:
@ -47,9 +48,7 @@ class AsyncInterpreter:
elif self.interpreter.tts == "gtts": elif self.interpreter.tts == "gtts":
engine = GTTSEngine() engine = GTTSEngine()
elif self.interpreter.tts == "elevenlabs": elif self.interpreter.tts == "elevenlabs":
engine = ElevenlabsEngine( engine = ElevenlabsEngine(api_key=os.environ["ELEVEN_LABS_API_KEY"])
api_key="sk_077cb1cabdf67e62b85f8782e66e5d8e11f78b450c7ce171"
)
elif self.interpreter.tts == "system": elif self.interpreter.tts == "system":
engine = SystemEngine() engine = SystemEngine()
else: else:
@ -96,12 +95,12 @@ class AsyncInterpreter:
pass pass
if "start" in chunk: if "start" in chunk:
print("input received") # print("Starting STT")
self.stt.start() self.stt.start()
self._last_lmc_start_flag = time.time() self._last_lmc_start_flag = time.time()
# self.interpreter.computer.terminal.stop() # Stop any code execution... maybe we should make interpreter.stop()? # self.interpreter.computer.terminal.stop() # Stop any code execution... maybe we should make interpreter.stop()?
elif "end" in chunk: elif "end" in chunk:
print("running oi on input now") # print("Running OI on input")
asyncio.create_task(self.run()) asyncio.create_task(self.run())
else: else:
await self._add_to_queue(self._input_queue, chunk) await self._add_to_queue(self._input_queue, chunk)
@ -139,6 +138,7 @@ class AsyncInterpreter:
print("STT LATENCY", self.stt_latency) print("STT LATENCY", self.stt_latency)
# print(message) # print(message)
end_interpreter = 0
# print(message) # print(message)
def generate(message): def generate(message):
@ -165,7 +165,7 @@ class AsyncInterpreter:
# Experimental: The AI voice sounds better with replacements like these, but it should happen at the TTS layer # Experimental: The AI voice sounds better with replacements like these, but it should happen at the TTS layer
# content = content.replace(". ", ". ... ").replace(", ", ", ... ").replace("!", "! ... ").replace("?", "? ... ") # content = content.replace(". ", ". ... ").replace(", ", ", ... ").replace("!", "! ... ").replace("?", "? ... ")
print("yielding this", content) # print("yielding this", content)
yield content yield content
# Handle code blocks # Handle code blocks
@ -214,6 +214,7 @@ class AsyncInterpreter:
while True: while True:
if self.tts.is_playing(): if self.tts.is_playing():
start_tts = time.time() start_tts = time.time()
break break
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
while True: while True:
@ -231,6 +232,7 @@ class AsyncInterpreter:
end_tts = time.time() end_tts = time.time()
self.tts_latency = end_tts - start_tts self.tts_latency = end_tts - start_tts
print("TTS LATENCY", self.tts_latency) print("TTS LATENCY", self.tts_latency)
self.tts.stop()
break break
async def _on_tts_chunk_async(self, chunk): async def _on_tts_chunk_async(self, chunk):

39
software/source/server/async_server.py
View File

@ -2,6 +2,7 @@ import asyncio
import traceback import traceback
import json import json
from fastapi import FastAPI, WebSocket, Header from fastapi import FastAPI, WebSocket, Header
from fastapi.responses import PlainTextResponse
from uvicorn import Config, Server from uvicorn import Config, Server
from interpreter import interpreter as base_interpreter from interpreter import interpreter as base_interpreter
from .async_interpreter import AsyncInterpreter from .async_interpreter import AsyncInterpreter
@ -18,38 +19,25 @@ base_interpreter.system_message = (
"You are a helpful assistant that can answer questions and help with tasks." "You are a helpful assistant that can answer questions and help with tasks."
) )
base_interpreter.computer.import_computer_api = False base_interpreter.computer.import_computer_api = False
base_interpreter.llm.model = "groq/mixtral-8x7b-32768" base_interpreter.llm.model = "groq/llama3-8b-8192"
base_interpreter.llm.api_key = ( base_interpreter.llm.api_key = os.environ["GROQ_API_KEY"]
"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" print(base_interpreter.llm.api_key)
)
base_interpreter.llm.supports_functions = False base_interpreter.llm.supports_functions = False
base_interpreter.auto_run = True
os.environ["STT_RUNNER"] = "server" os.environ["STT_RUNNER"] = "server"
os.environ["TTS_RUNNER"] = "server" os.environ["TTS_RUNNER"] = "server"
# Parse command line arguments for port number # Parse command line arguments for port number
"""
parser = argparse.ArgumentParser(description="FastAPI server.") parser = argparse.ArgumentParser(description="FastAPI server.")
parser.add_argument("--port", type=int, default=8000, help="Port to run on.") parser.add_argument("--port", type=int, default=8000, help="Port to run on.")
args = parser.parse_args() args = parser.parse_args()
"""
base_interpreter.tts = "elevenlabs" base_interpreter.tts = "elevenlabs"
async def main(): async def main(server_host, server_port):
"""
sentry_sdk.init(
dsn="https://a1465f62a31c7dfb23e1616da86341e9@o4506046614667264.ingest.us.sentry.io/4507374662385664",
enable_tracing=True,
# Set traces_sample_rate to 1.0 to capture 100%
# of transactions for performance monitoring.
traces_sample_rate=1.0,
# Set profiles_sample_rate to 1.0 to profile 100%
# of sampled transactions.
# We recommend adjusting this value in production.
profiles_sample_rate=1.0,
)
"""
interpreter = AsyncInterpreter(base_interpreter) interpreter = AsyncInterpreter(base_interpreter)
app = FastAPI() app = FastAPI()
@ -62,6 +50,10 @@ async def main():
allow_headers=["*"], # Allow all headers allow_headers=["*"], # Allow all headers
) )
@app.get("/ping")
async def ping():
return PlainTextResponse("pong")
@app.post("/load_chat") @app.post("/load_chat")
async def load_chat(messages: List[Dict[str, Any]]): async def load_chat(messages: List[Dict[str, Any]]):
interpreter.interpreter.messages = messages interpreter.interpreter.messages = messages
@ -69,7 +61,7 @@ async def main():
print("🪼🪼🪼🪼🪼🪼 Messages loaded: ", interpreter.active_chat_messages) print("🪼🪼🪼🪼🪼🪼 Messages loaded: ", interpreter.active_chat_messages)
return {"status": "success"} return {"status": "success"}
@app.websocket("/ws") @app.websocket("/")
async def websocket_endpoint(websocket: WebSocket): async def websocket_endpoint(websocket: WebSocket):
await websocket.accept() await websocket.accept()
try: try:
@ -85,7 +77,7 @@ async def main():
await interpreter.input(data) await interpreter.input(data)
elif "bytes" in data: elif "bytes" in data:
await interpreter.input(data["bytes"]) await interpreter.input(data["bytes"])
# print("SERVER FEEDING AUDIO") # print("RECEIVED INPUT", data)
elif "text" in data: elif "text" in data:
# print("RECEIVED INPUT", data) # print("RECEIVED INPUT", data)
await interpreter.input(data["text"]) await interpreter.input(data["text"])
@ -111,7 +103,8 @@ async def main():
if not websocket.client_state == "DISCONNECTED": if not websocket.client_state == "DISCONNECTED":
await websocket.close() await websocket.close()
config = Config(app, host="0.0.0.0", port=8000, lifespan="on") print(f"Starting server on {server_host}:{server_port}")
config = Config(app, host=server_host, port=server_port, lifespan="on")
server = Server(config) server = Server(config)
await server.serve() await server.serve()

8
software/start.py
View File

@ -22,7 +22,7 @@ def run(
help="Specify the server host where the server will deploy", help="Specify the server host where the server will deploy",
), ),
server_port: int = typer.Option( server_port: int = typer.Option(
8000, 10001,
"--server-port", "--server-port",
help="Specify the server port where the server will deploy", help="Specify the server port where the server will deploy",
), ),
@ -152,8 +152,8 @@ def _run(
target=loop.run_until_complete, target=loop.run_until_complete,
args=( args=(
main( main(
# server_host, server_host,
# server_port, server_port,
# llm_service, # llm_service,
# model, # model,
# llm_supports_vision, # llm_supports_vision,
@ -196,7 +196,7 @@ def _run(
module = importlib.import_module( module = importlib.import_module(
f".clients.{client_type}.device", package="source" f".clients.{client_type}.device", package="source"
) )
server_url = "0.0.0.0:8000" # server_url = "0.0.0.0:8000"
client_thread = threading.Thread(target=module.main, args=[server_url]) client_thread = threading.Thread(target=module.main, args=[server_url])
print("client thread started") print("client thread started")
client_thread.start() client_thread.start()