Checking in

jordancde · jordancde · commit 0fb8324eb35d · 2023-11-22T21:11:40.000-05:00
diff --git a/README.md b/README.md
@@ -24,14 +24,36 @@ Then, create a new instance of the Vapi class, passing your API Key as a paramet
 vapi = Vapi(api_key='your-api-key')
 ```
 
-You can start a new call by calling the `start` method and passing an `assistant` object or `assistantId`:
+You can start a new call by calling the `start` method and passing an `assistant` object or `assistantId`. You can find the available options here: [docs.vapi.ai](https://docs.vapi.ai/api-reference/assistants/create-assistant)
 
 ```python
 vapi.start(assistant_id='your-assistant-id')
 ```
 or
 ```python
-vapi.start(assistant={'context': 'You are a shopping assistant...', 'voice': 'steve', ...})
+assistant = {
+  'firstMessage': 'Hey, how are you?',
+  'context': 'You are a shopping assistant...',
+  'model': 'gpt-3.5-turbo',
+  'voice': 'jennifer-playht',
+  "recordingEnabled": True,
+  "functions": [
+    {
+      "name": "setColor",
+      "description": "Used to set the color",
+      "parameters": { 
+          "type": "object",
+          "properties": { 
+              "color": { 
+              "type": "string" 
+              } 
+          }
+      }
+    }
+  ]
+}
+
+vapi.start(assistant=assistant)
 ```
 
 The `start` method will initiate a new call. 
diff --git a/setup.py b/setup.py
@@ -49,6 +49,6 @@ def read_requirements(file):
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/jordan.cde/vapi_python',
-    version='0.1.3',
+    version='0.1.4',
     zip_safe=False,
 )
diff --git a/vapi_python/daily_call.py b/vapi_python/daily_call.py
@@ -1,8 +1,6 @@
 import daily
 import threading
 import pyaudio
-import wave
-from speexdsp import EchoCanceller
 
 SAMPLE_RATE = 16000
 NUM_CHANNELS = 1
@@ -17,75 +15,11 @@ def is_playable_speaker(participant):
     return is_speaker and is_subscribed and is_playable
 
 
-class EchoCancellerWrapper():
-    def __init__(self, chunk_size, filter_length, sample_rate, audio_interface):
-        self.__audio_interface = audio_interface
-        self.__echo_canceller = EchoCanceller.create(
-            int(chunk_size / 2), filter_length, sample_rate)
-        self.__mic_buffer = b''
-        self.__speaker_buffer = b''
-
-        # Initialize wav files for mic input, speaker input, and processed output
-        self.__mic_wav = wave.open('mic_input.wav', 'wb')
-        self.__mic_wav.setnchannels(NUM_CHANNELS)
-        self.__mic_wav.setsampwidth(
-            self.__audio_interface.get_sample_size(pyaudio.paInt16))
-        self.__mic_wav.setframerate(SAMPLE_RATE)
-
-        self.__speaker_wav = wave.open('speaker_input.wav', 'wb')
-        self.__speaker_wav.setnchannels(NUM_CHANNELS)
-        self.__speaker_wav.setsampwidth(
-            self.__audio_interface.get_sample_size(pyaudio.paInt16))
-        self.__speaker_wav.setframerate(SAMPLE_RATE)
-
-        self.__output_wav = wave.open('processed_output.wav', 'wb')
-        self.__output_wav.setnchannels(NUM_CHANNELS)
-        self.__output_wav.setsampwidth(
-            self.__audio_interface.get_sample_size(pyaudio.paInt16))
-        self.__output_wav.setframerate(SAMPLE_RATE)
-
-    def send_mic_audio(self, audio):
-        self.__mic_buffer += audio
-
-    def send_speaker_audio(self, audio):
-        self.__speaker_buffer += audio
-
-    def read(self, length):
-        min_length = min(len(self.__mic_buffer), length)
-        if min_length > 0:
-            mic_audio = self.__mic_buffer[:min_length]
-            speaker_audio = self.__speaker_buffer[:min_length]
-            # If speaker buffer is less than mic buffer, pad it with silence
-            if len(speaker_audio) < len(mic_audio):
-                speaker_audio += b'\x00' * \
-                    (len(mic_audio) - len(speaker_audio))
-
-            self.__mic_wav.writeframes(mic_audio)
-            self.__speaker_wav.writeframes(speaker_audio)
-
-            self.__mic_buffer = self.__mic_buffer[min_length:]
-            self.__speaker_buffer = self.__speaker_buffer[min_length:]
-            processed_audio = self.__echo_canceller.process(
-                mic_audio, speaker_audio)
-            # Write processed output to wav file
-            self.__output_wav.writeframes(processed_audio)
-            return processed_audio
-        return b''
-
-    def __del__(self):
-        # Close wav files when the object is destroyed
-        self.__mic_wav.close()
-        self.__speaker_wav.close()
-        self.__output_wav.close()
-
-
 class DailyCall(daily.EventHandler):
     def __init__(self):
         daily.Daily.init()
 
         self.__audio_interface = pyaudio.PyAudio()
-        self.__echo_canceller = EchoCancellerWrapper(
-            CHUNK_SIZE, 256, SAMPLE_RATE, self.__audio_interface)
 
         self.__input_audio_stream = self.__audio_interface.open(
             format=pyaudio.paInt16,
@@ -146,14 +80,11 @@ def __init__(self):
         self.__start_event = threading.Event()
         self.__receive_bot_audio_thread = threading.Thread(
             target=self.receive_bot_audio)
-        self.__receive_mic_audio_thread = threading.Thread(
-            target=self.receive_mic_audio)
-        self.__send_echo_cancelled_mic_audio_thread = threading.Thread(
-            target=self.send_echo_cancelled_mic_audio)
+        self.__send_user_audio_thread = threading.Thread(
+            target=self.send_user_audio)
 
         self.__receive_bot_audio_thread.start()
-        self.__receive_mic_audio_thread.start()
-        self.__send_echo_cancelled_mic_audio_thread.start()
+        self.__send_user_audio_thread.start()
 
     def on_inputs_updated(self, inputs):
         self.__app_inputs_updated = True
@@ -186,8 +117,7 @@ def join(self, meeting_url):
     def leave(self):
         self.__app_quit = True
         self.__receive_bot_audio_thread.join()
-        self.__receive_mic_audio_thread.join()
-        self.__send_echo_cancelled_mic_audio_thread.join()
+        self.__send_user_audio_thread.join()
         self.__call_client.leave()
 
     def maybe_start(self):
@@ -197,33 +127,22 @@ def maybe_start(self):
         if self.__app_inputs_updated and self.__app_joined:
             self.__start_event.set()
 
-    def send_echo_cancelled_mic_audio(self):
+    def send_user_audio(self):
         self.__start_event.wait()
 
         if self.__app_error:
-            print(f"Unable to send mic audio!")
+            print(f"Unable to receive mic audio!")
             return
 
         while not self.__app_quit:
-            buffer = self.__echo_canceller.read(CHUNK_SIZE)
+            buffer = self.__input_audio_stream.read(
+                CHUNK_SIZE, exception_on_overflow=False)
             if len(buffer) > 0:
                 try:
                     self.__mic_device.write_frames(buffer)
                 except Exception as e:
                     print(e)
 
-    def receive_mic_audio(self):
-        self.__start_event.wait()
-
-        if self.__app_error:
-            print(f"Unable to receive mic audio!")
-            return
-
-        while not self.__app_quit:
-            buffer = self.__input_audio_stream.read(
-                CHUNK_SIZE, exception_on_overflow=False)
-            self.__echo_canceller.send_mic_audio(buffer)
-
     def receive_bot_audio(self):
         self.__start_event.wait()
 
@@ -233,7 +152,6 @@ def receive_bot_audio(self):
 
         while not self.__app_quit:
             buffer = self.__speaker_device.read_frames(CHUNK_SIZE)
-            self.__echo_canceller.send_speaker_audio(buffer)
 
             if len(buffer) > 0:
                 self.__output_audio_stream.write(buffer, CHUNK_SIZE)
diff --git a/vapi_python/vapi_python.py b/vapi_python/vapi_python.py
@@ -13,14 +13,13 @@ def create_web_call(api_url, api_key, assistant):
         'Content-Type': 'application/json'
     }
     response = requests.post(url, headers=headers, json=assistant)
-
+    data = response.json()
     if response.status_code == 201:
-        data = response.json()
         call_id = data.get('id')
         web_call_url = data.get('webCallUrl')
         return call_id, web_call_url
     else:
-        print(f"Error: {response.status_code}")
+        print(f"Error: {data['message']}")
         return None
 
 

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ def read_requirements(file):`
`49`	`49`	`test_suite='tests',`
`50`	`50`	`tests_require=test_requirements,`
`51`	`51`	`url='https://github.com/jordan.cde/vapi_python',`
`52`		`- version='0.1.3',`
	`52`	`+ version='0.1.4',`
`53`	`53`	`zip_safe=False,`
`54`	`54`	`)`