reverts FunctionCallingMessage to FunctionCalling

deepgram/__init__.py

@@ -324,7 +324,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,

deepgram/client.py

@@ -330,7 +330,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,

deepgram/clients/__init__.py

@@ -341,7 +341,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,

deepgram/clients/agent/__init__.py

@@ -22,7 +22,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,

deepgram/clients/agent/client.py

@@ -21,7 +21,7 @@
     ConversationTextResponse as LatestConversationTextResponse,
     UserStartedSpeakingResponse as LatestUserStartedSpeakingResponse,
     AgentThinkingResponse as LatestAgentThinkingResponse,
-    FunctionCallingMessage as LatestFunctionCallingMessage,
+    FunctionCalling as LatestFunctionCalling,
     FunctionCallRequest as LatestFunctionCallRequest,
     AgentStartedSpeakingResponse as LatestAgentStartedSpeakingResponse,
     AgentAudioDoneResponse as LatestAgentAudioDoneResponse,
@@ -69,7 +69,7 @@
 ConversationTextResponse = LatestConversationTextResponse
 UserStartedSpeakingResponse = LatestUserStartedSpeakingResponse
 AgentThinkingResponse = LatestAgentThinkingResponse
-FunctionCallingMessage = LatestFunctionCallingMessage
+FunctionCalling = LatestFunctionCalling
 FunctionCallRequest = LatestFunctionCallRequest
 AgentStartedSpeakingResponse = LatestAgentStartedSpeakingResponse
 AgentAudioDoneResponse = LatestAgentAudioDoneResponse

deepgram/clients/agent/enums.py

@@ -21,7 +21,7 @@ class AgentWebSocketEvents(StrEnum):
     ConversationText: str = "ConversationText"
     UserStartedSpeaking: str = "UserStartedSpeaking"
     AgentThinking: str = "AgentThinking"
-    FunctionCallingMessage: str = "FunctionCallingMessage"
+    FunctionCalling: str = "FunctionCalling"
     FunctionCallRequest: str = "FunctionCallRequest"
     AgentStartedSpeaking: str = "AgentStartedSpeaking"
     AgentAudioDone: str = "AgentAudioDone"

deepgram/clients/agent/v1/__init__.py

@@ -26,7 +26,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,

deepgram/clients/agent/v1/websocket/__init__.py

@@ -18,7 +18,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,

deepgram/clients/agent/v1/websocket/async_client.py

@@ -21,7 +21,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,
@@ -429,11 +429,11 @@ async def _process_text(self, message: str) -> None:
                         **dict(cast(Dict[Any, Any], self._kwargs)),
                     )
                 case AgentWebSocketEvents.FunctionCalling:
-                    function_calling_result: FunctionCallingMessage = (
-                        FunctionCallingMessage.from_json(message)
+                    function_calling_result: FunctionCalling = (
+                        FunctionCalling.from_json(message)
                     )
                     self._logger.verbose(
-                        "FunctionCallingMessage: %s", function_calling_result
+                        "FunctionCalling: %s", function_calling_result
                     )
                     await self._emit(
                         AgentWebSocketEvents(AgentWebSocketEvents.FunctionCalling),

deepgram/clients/agent/v1/websocket/client.py

@@ -21,7 +21,7 @@
     ConversationTextResponse,
     UserStartedSpeakingResponse,
     AgentThinkingResponse,
-    FunctionCallingMessage,
+    FunctionCalling,
     FunctionCallRequest,
     AgentStartedSpeakingResponse,
     AgentAudioDoneResponse,
@@ -424,11 +424,11 @@ def _process_text(self, message: str) -> None:
                         **dict(cast(Dict[Any, Any], self._kwargs)),
                     )
                 case AgentWebSocketEvents.FunctionCalling:
-                    function_calling_result: FunctionCallingMessage = (
-                        FunctionCallingMessage.from_json(message)
+                    function_calling_result: FunctionCalling = (
+                        FunctionCalling.from_json(message)
                     )
                     self._logger.verbose(
-                        "FunctionCallingMessage: %s", function_calling_result
+                        "FunctionCalling: %s", function_calling_result
                     )
                     self._emit(
                         AgentWebSocketEvents(AgentWebSocketEvents.FunctionCalling),

deepgram/clients/agent/v1/websocket/response.py

@@ -68,7 +68,7 @@ class AgentThinkingResponse(BaseResponse):
 
 
 @dataclass
-class FunctionCallingMessage(BaseResponse):
+class FunctionCalling(BaseResponse):
     """
     The server will sometimes send FunctionCalling messages when making function calls to help the client developer debug function calling workflows.
     """

examples/agent/simple/main.py

@@ -9,10 +9,25 @@
     DeepgramClientOptions,
     AgentWebSocketEvents,
     SettingsConfigurationOptions,
-    FunctionCallingMessage,
+    FunctionCalling,
+    FunctionCallRequest,
     FunctionCallResponse,
 )
 
+# Add debug prints for imports
+print("Checking imports...")
+try:
+    from deepgram import FunctionCallRequest
+    print("Successfully imported FunctionCallRequest")
+except ImportError as e:
+    print(f"Failed to import FunctionCallRequest: {e}")
+
+try:
+    from deepgram import FunctionCallResponse
+    print("Successfully imported FunctionCallResponse")
+except ImportError as e:
+    print(f"Failed to import FunctionCallResponse: {e}")
+
 TTS_TEXT = "Hello, this is a text to speech example using Deepgram."
 
 global warning_notice
@@ -21,7 +36,7 @@
 
 def main():
     try:
-        # example of setting up a client config. logging values: WARNING, VERBOSE, DEBUG, SPAM
+        print("Starting main function...")
         config: DeepgramClientOptions = DeepgramClientOptions(
             options={
                 "keepalive": "true",
@@ -30,10 +45,13 @@ def main():
             },
             # verbose=verboselogs.DEBUG,
         )
+        print("Created DeepgramClientOptions...")
+
         deepgram: DeepgramClient = DeepgramClient("", config)
+        print("Created DeepgramClient...")
 
-        # Create a websocket connection to Deepgram
         dg_connection = deepgram.agent.websocket.v("1")
+        print("Created WebSocket connection...")
 
         def on_open(self, open, **kwargs):
             print(f"\n\n{open}\n\n")
@@ -64,17 +82,19 @@ def on_user_started_speaking(self, user_started_speaking, **kwargs):
         def on_agent_thinking(self, agent_thinking, **kwargs):
             print(f"\n\n{agent_thinking}\n\n")
 
-        def on_function_calling(self, function_calling: FunctionCallingMessage, **kwargs):
-            print(f"\n\nFunction Calling Message: {function_calling}\n\n")
+        def on_function_calling(self, function_calling: FunctionCalling, **kwargs):
+            print(f"\n\nFunction Calling Debug: {function_calling}\n\n")
 
-        def on_function_call_request(self, function_call_request, **kwargs):
+        def on_function_call_request(self, function_call_request: FunctionCallRequest, **kwargs):
             print(f"\n\nFunction Call Request: {function_call_request}\n\n")
-            # Send a response back
-            response = FunctionCallResponse(
-                function_call_id=function_call_request.function_call_id,
-                output="Function response here"
-            )
-            dg_connection.send_function_call_response(response)
+            try:
+                response = FunctionCallResponse(
+                    function_call_id=function_call_request.function_call_id,
+                    output="Function response here"
+                )
+                dg_connection.send_function_call_response(response)
+            except Exception as e:
+                print(f"Error in function call: {e}")
 
         def on_agent_started_speaking(self, agent_started_speaking, **kwargs):
             print(f"\n\n{agent_started_speaking}\n\n")
@@ -132,10 +152,14 @@ def on_unhandled(self, unhandled, **kwargs):
 
         print("Finished")
 
-    except ValueError as e:
-        print(f"Invalid value encountered: {e}")
+    except ImportError as e:
+        print(f"Import Error Details: {e}")
+        print(f"Error occurred in module: {getattr(e, 'name', 'unknown')}")
+        print(f"Path that failed: {getattr(e, 'path', 'unknown')}")
     except Exception as e:
-        print(f"An unexpected error occurred: {e}")
+        print(f"Unexpected error type: {type(e)}")
+        print(f"Error message: {str(e)}")
+        print(f"Error occurred in: {__file__}")
 
 
 if __name__ == "__main__":