diff --git a/google/genai/chats.py b/google/genai/chats.py index d849e7199..3d5e181e9 100644 --- a/google/genai/chats.py +++ b/google/genai/chats.py @@ -35,8 +35,6 @@ def _validate_content(content: Content) -> bool: for part in content.parts: if part == Part(): return False - if part.text is not None and part.text == "": - return False return True diff --git a/google/genai/tests/chats/test_get_history.py b/google/genai/tests/chats/test_get_history.py index af8787b98..e29862a77 100644 --- a/google/genai/tests/chats/test_get_history.py +++ b/google/genai/tests/chats/test_get_history.py @@ -55,7 +55,7 @@ def mock_api_client(vertexai=False): @pytest.fixture -def mock_generate_content_invalid_content(): +def mock_generate_content_with_empty_text_part(): with mock.patch.object( models.Models, 'generate_content' ) as mock_generate_content: @@ -84,7 +84,7 @@ def mock_generate_content_empty_content(): @pytest.fixture -def mock_generate_content_stream_invalid_content(): +def mock_generate_content_stream_with_empty_text_part(): with mock.patch.object( models.Models, 'generate_content_stream' ) as mock_generate_content: @@ -95,7 +95,8 @@ def mock_generate_content_stream_invalid_content(): content=types.Content( role='model', parts=[types.Part(text='')], - ) + ), + finish_reason=types.FinishReason.STOP, ) ] ) @@ -481,7 +482,7 @@ def test_history_with_invalid_turns(): assert chat.get_history(curated=True) == curated_history -def test_chat_with_invalid_content(mock_generate_content_invalid_content): +def test_chat_with_empty_text_part(mock_generate_content_with_empty_text_part): models_module = models.Models(mock_api_client) chats_module = chats.Chats(modules=models_module) chat = chats_module.create(model='gemini-2.5-flash') @@ -496,7 +497,7 @@ def test_chat_with_invalid_content(mock_generate_content_invalid_content): ), ] assert chat.get_history() == expected_comprehensive_history - assert not chat.get_history(curated=True) + assert chat.get_history(curated=True) == expected_comprehensive_history def test_chat_with_empty_content(mock_generate_content_empty_content): @@ -517,8 +518,8 @@ def test_chat_with_empty_content(mock_generate_content_empty_content): assert not chat.get_history(curated=True) -def test_chat_stream_with_invalid_content( - mock_generate_content_stream_invalid_content, +def test_chat_stream_with_empty_text_part( + mock_generate_content_stream_with_empty_text_part, ): models_module = models.Models(mock_api_client) chats_module = chats.Chats(modules=models_module) @@ -536,7 +537,7 @@ def test_chat_stream_with_invalid_content( ), ] assert chat.get_history() == expected_comprehensive_history - assert not chat.get_history(curated=True) + assert chat.get_history(curated=True) == expected_comprehensive_history def test_chat_stream_with_empty_content( diff --git a/google/genai/tests/chats/test_validate_response.py b/google/genai/tests/chats/test_validate_response.py index dab8a0969..40c63094b 100644 --- a/google/genai/tests/chats/test_validate_response.py +++ b/google/genai/tests/chats/test_validate_response.py @@ -53,7 +53,7 @@ def test_validate_response_part_with_empty_text(): ] ) - assert not _validate_response(response) + assert _validate_response(response) def test_validate_response_part_with_text():