Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/openai/util.rb
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ class << self
def encode_content(headers, body)
content_type = headers["content-type"]
case [content_type, body]
in ["application/json", Hash | Array]
in [%r{^application/(?:vnd\.api\+)?json}, Hash | Array]
[headers, JSON.fast_generate(body)]
in [%r{^multipart/form-data}, Hash | IO | StringIO]
boundary, strio = encode_multipart_streaming(body)
Expand Down Expand Up @@ -593,7 +593,10 @@ def decode_content(headers, stream:, suppress_error: false)
lines = decode_lines(stream)
decode_sse(lines)
in %r{^application/(?:x-)?jsonl}
decode_lines(stream)
lines = decode_lines(stream)
chain_fused(lines) do |y|
lines.each { y << JSON.parse(_1, symbolize_names: true) }
end
in %r{^text/}
stream.to_a.join
else
Expand Down
12 changes: 0 additions & 12 deletions rbi/lib/openai/cursor_page.rbi
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,5 @@ module OpenAI
sig { params(_: T::Boolean).returns(T::Boolean) }
def has_more=(_)
end

sig do
params(
client: OpenAI::BaseClient,
req: OpenAI::BaseClient::RequestComponentsShape,
headers: T.any(T::Hash[String, String], Net::HTTPHeader),
page_data: T::Hash[Symbol, T.anything]
)
.returns(T.attached_class)
end
def self.new(client:, req:, headers:, page_data:)
end
end
end
12 changes: 0 additions & 12 deletions rbi/lib/openai/page.rbi
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,5 @@ module OpenAI
sig { params(_: String).returns(String) }
def object=(_)
end

sig do
params(
client: OpenAI::BaseClient,
req: OpenAI::BaseClient::RequestComponentsShape,
headers: T.any(T::Hash[String, String], Net::HTTPHeader),
page_data: T::Array[T.anything]
)
.returns(T.attached_class)
end
def self.new(client:, req:, headers:, page_data:)
end
end
end
15 changes: 1 addition & 14 deletions rbi/lib/openai/stream.rbi
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,11 @@ module OpenAI
class Stream
include OpenAI::BaseStream

Message = type_member(:in) { {fixed: OpenAI::Util::SSEMessage} }
Message = type_member(:in) { {fixed: OpenAI::Util::ServerSentEvent} }
Elem = type_member(:out)

sig { override.returns(T::Enumerable[Elem]) }
private def iterator
end

sig do
params(
model: T.any(T::Class[T.anything], OpenAI::Converter),
url: URI::Generic,
status: Integer,
response: Net::HTTPResponse,
messages: T::Enumerable[OpenAI::Util::SSEMessage]
)
.returns(T.attached_class)
end
def self.new(model:, url:, status:, response:, messages:)
end
end
end
4 changes: 2 additions & 2 deletions rbi/lib/openai/util.rbi
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ module OpenAI
end
end

SSEMessage = T.type_alias do
ServerSentEvent = T.type_alias do
{event: T.nilable(String), data: T.nilable(String), id: T.nilable(String), retry: T.nilable(Integer)}
end

Expand All @@ -214,7 +214,7 @@ module OpenAI
def decode_lines(enum)
end

sig { params(lines: T::Enumerable[String]).returns(OpenAI::Util::SSEMessage) }
sig { params(lines: T::Enumerable[String]).returns(OpenAI::Util::ServerSentEvent) }
def decode_sse(lines)
end
end
Expand Down
7 changes: 0 additions & 7 deletions sig/openai/cursor_page.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,5 @@ module OpenAI
attr_accessor data: ::Array[Elem]

attr_accessor has_more: bool

def initialize: (
client: OpenAI::BaseClient,
req: OpenAI::BaseClient::request_components,
headers: ::Hash[String, String],
page_data: ::Hash[Symbol, top]
) -> void
end
end
7 changes: 0 additions & 7 deletions sig/openai/page.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,5 @@ module OpenAI
attr_accessor data: ::Array[Elem]

attr_accessor object: String

def initialize: (
client: OpenAI::BaseClient,
req: OpenAI::BaseClient::request_components,
headers: ::Hash[String, String],
page_data: ::Array[top]
) -> void
end
end
10 changes: 1 addition & 9 deletions sig/openai/stream.rbs
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
module OpenAI
class Stream[Elem]
include OpenAI::BaseStream[OpenAI::Util::sse_message, Elem]
include OpenAI::BaseStream[OpenAI::Util::server_sent_event, Elem]

private def iterator: -> Enumerable[Elem]

def initialize: (
model: Class | OpenAI::Converter,
url: URI::Generic,
status: Integer,
response: top,
messages: Enumerable[OpenAI::Util::sse_message]
) -> void
end
end
4 changes: 2 additions & 2 deletions sig/openai/util.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ module OpenAI
(Enumerator::Yielder arg0) -> void
} -> void

type sse_message =
type server_sent_event =
{ event: String?, data: String?, id: String?, retry: Integer? }

def self?.decode_lines: (Enumerable[String] enum) -> Enumerable[String]

def self?.decode_sse: (
Enumerable[String] lines
) -> OpenAI::Util::sse_message
) -> OpenAI::Util::server_sent_event
end
end