From a473f9f1304a0debb42dd1c8cdf09d46ec962d4b Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 12:32:25 +0000 Subject: [PATCH] fix: pages should be able to accept non-converter models --- lib/openai/cursor_page.rb | 2 +- lib/openai/page.rb | 2 +- test/openai/resources/batches_test.rb | 2 ++ test/openai/resources/beta/assistants_test.rb | 2 ++ test/openai/resources/beta/threads/messages_test.rb | 2 ++ test/openai/resources/beta/threads/runs/steps_test.rb | 2 ++ test/openai/resources/beta/threads/runs_test.rb | 2 ++ test/openai/resources/chat/completions/messages_test.rb | 2 ++ test/openai/resources/chat/completions_test.rb | 2 ++ test/openai/resources/files_test.rb | 2 ++ test/openai/resources/fine_tuning/jobs/checkpoints_test.rb | 2 ++ test/openai/resources/fine_tuning/jobs_test.rb | 4 ++++ test/openai/resources/models_test.rb | 2 ++ test/openai/resources/responses/input_items_test.rb | 2 ++ test/openai/resources/vector_stores/file_batches_test.rb | 2 ++ test/openai/resources/vector_stores/files_test.rb | 4 ++++ test/openai/resources/vector_stores_test.rb | 4 ++++ 17 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/openai/cursor_page.rb b/lib/openai/cursor_page.rb index 3ba7ab46..fa0e9fc7 100644 --- a/lib/openai/cursor_page.rb +++ b/lib/openai/cursor_page.rb @@ -43,7 +43,7 @@ def initialize(client:, req:, headers:, page_data:) case page_data in {data: Array | nil => data} - @data = data&.map { model.coerce(_1) } + @data = data&.map { OpenAI::Converter.coerce(model, _1) } else end diff --git a/lib/openai/page.rb b/lib/openai/page.rb index 6dd82f08..3e00417d 100644 --- a/lib/openai/page.rb +++ b/lib/openai/page.rb @@ -43,7 +43,7 @@ def initialize(client:, req:, headers:, page_data:) case page_data in {data: Array | nil => data} - @data = data&.map { model.coerce(_1) } + @data = data&.map { OpenAI::Converter.coerce(model, _1) } else end diff --git a/test/openai/resources/batches_test.rb b/test/openai/resources/batches_test.rb index 08893c6c..59e25d4f 100644 --- a/test/openai/resources/batches_test.rb +++ b/test/openai/resources/batches_test.rb @@ -82,6 +82,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Batch end diff --git a/test/openai/resources/beta/assistants_test.rb b/test/openai/resources/beta/assistants_test.rb index e0ffb63a..f6363319 100644 --- a/test/openai/resources/beta/assistants_test.rb +++ b/test/openai/resources/beta/assistants_test.rb @@ -89,6 +89,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Beta::Assistant end diff --git a/test/openai/resources/beta/threads/messages_test.rb b/test/openai/resources/beta/threads/messages_test.rb index 42f89d03..bd430759 100644 --- a/test/openai/resources/beta/threads/messages_test.rb +++ b/test/openai/resources/beta/threads/messages_test.rb @@ -92,6 +92,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Beta::Threads::Message end diff --git a/test/openai/resources/beta/threads/runs/steps_test.rb b/test/openai/resources/beta/threads/runs/steps_test.rb index e18e9336..97fa3d2b 100644 --- a/test/openai/resources/beta/threads/runs/steps_test.rb +++ b/test/openai/resources/beta/threads/runs/steps_test.rb @@ -40,6 +40,8 @@ def test_list_required_params end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Beta::Threads::Runs::RunStep end diff --git a/test/openai/resources/beta/threads/runs_test.rb b/test/openai/resources/beta/threads/runs_test.rb index 9341955e..919cb65f 100644 --- a/test/openai/resources/beta/threads/runs_test.rb +++ b/test/openai/resources/beta/threads/runs_test.rb @@ -131,6 +131,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Beta::Threads::Run end diff --git a/test/openai/resources/chat/completions/messages_test.rb b/test/openai/resources/chat/completions/messages_test.rb index 72c10f96..e9fac539 100644 --- a/test/openai/resources/chat/completions/messages_test.rb +++ b/test/openai/resources/chat/completions/messages_test.rb @@ -11,6 +11,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Chat::ChatCompletionStoreMessage end diff --git a/test/openai/resources/chat/completions_test.rb b/test/openai/resources/chat/completions_test.rb index ffbd392e..f4d9b7f7 100644 --- a/test/openai/resources/chat/completions_test.rb +++ b/test/openai/resources/chat/completions_test.rb @@ -75,6 +75,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Chat::ChatCompletion end diff --git a/test/openai/resources/files_test.rb b/test/openai/resources/files_test.rb index c517f42f..6384982e 100644 --- a/test/openai/resources/files_test.rb +++ b/test/openai/resources/files_test.rb @@ -55,6 +55,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::FileObject end diff --git a/test/openai/resources/fine_tuning/jobs/checkpoints_test.rb b/test/openai/resources/fine_tuning/jobs/checkpoints_test.rb index 96ee1164..feb9c651 100644 --- a/test/openai/resources/fine_tuning/jobs/checkpoints_test.rb +++ b/test/openai/resources/fine_tuning/jobs/checkpoints_test.rb @@ -11,6 +11,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::FineTuning::Jobs::FineTuningJobCheckpoint end diff --git a/test/openai/resources/fine_tuning/jobs_test.rb b/test/openai/resources/fine_tuning/jobs_test.rb index 2b35089a..7df07711 100644 --- a/test/openai/resources/fine_tuning/jobs_test.rb +++ b/test/openai/resources/fine_tuning/jobs_test.rb @@ -75,6 +75,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::FineTuning::FineTuningJob end @@ -144,6 +146,8 @@ def test_list_events end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::FineTuning::FineTuningJobEvent end diff --git a/test/openai/resources/models_test.rb b/test/openai/resources/models_test.rb index d91063a2..33384138 100644 --- a/test/openai/resources/models_test.rb +++ b/test/openai/resources/models_test.rb @@ -28,6 +28,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Model end diff --git a/test/openai/resources/responses/input_items_test.rb b/test/openai/resources/responses/input_items_test.rb index 9ae8f8e4..1250f3bd 100644 --- a/test/openai/resources/responses/input_items_test.rb +++ b/test/openai/resources/responses/input_items_test.rb @@ -11,6 +11,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::Responses::ResponseItem end diff --git a/test/openai/resources/vector_stores/file_batches_test.rb b/test/openai/resources/vector_stores/file_batches_test.rb index d9d66e4d..f4bcecf5 100644 --- a/test/openai/resources/vector_stores/file_batches_test.rb +++ b/test/openai/resources/vector_stores/file_batches_test.rb @@ -68,6 +68,8 @@ def test_list_files_required_params end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::VectorStores::VectorStoreFile end diff --git a/test/openai/resources/vector_stores/files_test.rb b/test/openai/resources/vector_stores/files_test.rb index 6e38e8a7..2b789caa 100644 --- a/test/openai/resources/vector_stores/files_test.rb +++ b/test/openai/resources/vector_stores/files_test.rb @@ -82,6 +82,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::VectorStores::VectorStoreFile end @@ -125,6 +127,8 @@ def test_content_required_params end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::VectorStores::FileContentResponse end diff --git a/test/openai/resources/vector_stores_test.rb b/test/openai/resources/vector_stores_test.rb index 2296e034..c7ae05cb 100644 --- a/test/openai/resources/vector_stores_test.rb +++ b/test/openai/resources/vector_stores_test.rb @@ -83,6 +83,8 @@ def test_list end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::VectorStore end @@ -128,6 +130,8 @@ def test_search_required_params end row = response.to_enum.first + return if row.nil? + assert_pattern do row => OpenAI::Models::VectorStoreSearchResponse end