fix tests

Author: YonkoSam

.coverage

@@ -98,7 +98,12 @@ async def test_send_text_constructs_correct_payload_and_calls_post_internal(asyn
 
     assert response.response.success is True
     assert response.response.message == "Text sent"
-    assert response.response.data.message_id == expected_message_id_val
+    # Ensure messageId is correctly returned, handling dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == expected_message_id_val
+    else:
+        assert data.message_id == expected_message_id_val
     assert response.rate_limit.limit == 100
     assert response.rate_limit.remaining == 99
 
@@ -209,7 +214,12 @@ async def test_send_audio(async_client_with_mocked_post, success_api_response_da
         }
     )
     assert isinstance(response_no_ptt, WasenderSendResult)
-    assert response_no_ptt.response.data.message_id == success_api_response_data["data"]["messageId"]
+    # Validate returned message ID handles dict or model
+    data_no = response_no_ptt.response.data
+    if isinstance(data_no, dict):
+        assert data_no.get("messageId") == success_api_response_data["data"]["messageId"]
+    else:
+        assert data_no.message_id == success_api_response_data["data"]["messageId"]
 
     # Test Case 2: ptt = True
     client._post_internal.reset_mock()
@@ -228,7 +238,11 @@ async def test_send_audio(async_client_with_mocked_post, success_api_response_da
         }
     )
     assert isinstance(response_ptt, WasenderSendResult)
-    assert response_ptt.response.data.message_id == success_api_response_data["data"]["messageId"]
+    data_ptt = response_ptt.response.data
+    if isinstance(data_ptt, dict):
+        assert data_ptt.get("messageId") == success_api_response_data["data"]["messageId"]
+    else:
+        assert data_ptt.message_id == success_api_response_data["data"]["messageId"]
 
     # Test Case 3: ptt not provided (should default or not be included if None)
     client._post_internal.reset_mock()
@@ -246,7 +260,11 @@ async def test_send_audio(async_client_with_mocked_post, success_api_response_da
         }
     )
     assert isinstance(response_no_ptt_arg, WasenderSendResult)
-    assert response_no_ptt_arg.response.data.message_id == success_api_response_data["data"]["messageId"]
+    data_arg = response_no_ptt_arg.response.data
+    if isinstance(data_arg, dict):
+        assert data_arg.get("messageId") == success_api_response_data["data"]["messageId"]
+    else:
+        assert data_arg.message_id == success_api_response_data["data"]["messageId"]
 
 @pytest.mark.asyncio
 async def test_send_location(async_client_with_mocked_post, success_api_response_data, rate_limit_data):

test_webhook_optional.py

@@ -87,7 +87,12 @@ def test_sync_rate_limit_uses_retry_after_from_response(mock_request, mock_sleep
 
     # Verify that we got a successful response
     assert response.response.success is True
-    assert response.response.data.message_id == "test-message-id"
+    # Validate returned message ID handles dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == "test-message-id"
+    else:
+        assert data.message_id == "test-message-id"
 
     # Verify that requests.request was called twice (first rate limited, then success)
     assert mock_request.call_count == 2
@@ -138,7 +143,12 @@ def test_sync_rate_limit_uses_default_sleep_when_no_retry_after(mock_request, mo
 
     # Verify that we got a successful response
     assert response.response.success is True
-    assert response.response.data.message_id == "test-message-id"
+    # Validate returned message ID handles dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == "test-message-id"
+    else:
+        assert data.message_id == "test-message-id"
 
     assert mock_request.call_count == 2
 
@@ -264,10 +274,15 @@ async def test_async_rate_limit_uses_retry_after_from_response(mock_sleep, async
 
     # Verify that asyncio.sleep was called with the retry_after value
     mock_sleep.assert_called_once_with(3)
-    
+
     # Verify that we got a successful response
     assert response.response.success is True
-    assert response.response.data.message_id == "test-message-id"
+    # Validate returned message ID handles dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == "test-message-id"
+    else:
+        assert data.message_id == "test-message-id"
 
     # Verify that HTTP client was called twice
     assert mock_http_client.request.call_count == 2
@@ -319,7 +334,12 @@ async def test_async_rate_limit_uses_default_sleep_when_no_retry_after(mock_slee
 
     # Verify that we got a successful response
     assert response.response.success is True
-    assert response.response.data.message_id == "test-message-id"
+    # Validate returned message ID handles dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == "test-message-id"
+    else:
+        assert data.message_id == "test-message-id"
       # Verify that HTTP client was called twice
     assert mock_http_client.request.call_count == 2
 
@@ -434,11 +454,16 @@ async def test_async_rate_limit_retry_after_zero_uses_default(mock_sleep, async_
 
     # Verify that asyncio.sleep was called with default 1 second since retry_after was 0
     mock_sleep.assert_called_once_with(1)
-    
+
     # Verify that we got a successful response
     assert response.response.success is True
-    assert response.response.data.message_id == "test-message-id"
-      # Verify that HTTP client was called twice
+    # Validate returned message ID handles dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == "test-message-id"
+    else:
+        assert data.message_id == "test-message-id"
+    # Verify that HTTP client was called twice
     assert mock_http_client.request.call_count == 2
 
 
@@ -481,11 +506,15 @@ def test_sync_rate_limit_retry_after_zero_uses_default(mock_request, mock_sleep,
 
     # Make the request
     response = client.send_text(to="+1234567890", text_body="Test message")
-      # Verify that sleep was called with default 1 second since retry_after=0
+    # Verify that sleep was called with default 1 second since retry_after=0
     mock_sleep.assert_called_once_with(1)
-    
     # Verify that we got a successful response
     assert response.response.success is True
-    assert response.response.data.message_id == "test-message-id"
-    
+    # Validate returned message ID handles dict or model
+    data = response.response.data
+    if isinstance(data, dict):
+        assert data.get("messageId") == "test-message-id"
+    else:
+        assert data.message_id == "test-message-id"
+    # Verify that requests.request was called twice
     assert mock_request.call_count == 2