llm.rb 15.3.0 → 15.4.0

data/lib/llm/providers/deepinfra/audio.rb

@@ -23,9 +23,9 @@ class LLM::DeepInfra
       path = path("/v1/inference/#{model}", base_path: false)
       req = LLM::Transport::Request.post(path, headers)
       req.body = JSON.dump(params.merge(text: input))
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt LLM::Response.new(res), type: :audio
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 
@@ -45,9 +45,9 @@ class LLM::DeepInfra
       req = LLM::Transport::Request.post(path, headers)
       req["content-type"] = multi.content_type
       transport.set_body_stream(req, multi.body)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/deepinfra/images.rb

@@ -44,9 +44,9 @@ class LLM::DeepInfra
       req = LLM::Transport::Request.post(path("/images/generations"), headers)
       params = {prompt:, model:, size:, n:, response_format:, quality:, style:}.compact
       req.body = LLM.json.dump(params)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::OpenAI::ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 
@@ -75,9 +75,9 @@ class LLM::DeepInfra
       req = LLM::Transport::Request.post(path("/images/edits"), headers)
       req["content-type"] = multi.content_type
       transport.set_body_stream(req, multi.body)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::OpenAI::ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/google/error_handler.rb

@@ -21,10 +21,13 @@ class LLM::Google
     #  The span
     # @param [LLM::Transport::Response, Net::HTTPResponse] res
     #  The response from the server
+    # @param [String] request_id
+    #  The id of the request that failed
     # @return [LLM::Google::ErrorHandler]
-    def initialize(tracer, span, res)
+    def initialize(tracer, span, res, request_id)
       @tracer = tracer
       @span = span
+      @request_id = request_id
       @res = LLM::Transport::Response.from(res)
     end
 
@@ -33,7 +36,7 @@ class LLM::Google
     #  Raises a subclass of {LLM::Error LLM::Error}
     def raise_error!
       ex = error
-      @tracer.on_request_error(ex:, span:)
+      @tracer.on_request_error(ex:, span:, request_id: @request_id)
     ensure
       raise(ex) if ex
     end

data/lib/llm/providers/google/files.rb

@@ -46,9 +46,9 @@ class LLM::Google
     def all(**params)
       query = URI.encode_www_form(params.merge!(key: key))
       req = LLM::Transport::Request.get("/v1beta/files?#{query}", headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :files)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -70,9 +70,9 @@ class LLM::Google
       req["X-Goog-Upload-Command"] = "upload, finalize"
       file.with_io do |io|
         transport.set_body_stream(req, io)
-        res, span, tracer = execute(request: req, operation: "request")
+        res, span, tracer, request_id = execute(request: req, operation: "request")
         res = ResponseAdapter.adapt(res, type: :file)
-        tracer.on_request_finish(operation: "request", res:, span:)
+        tracer.on_request_finish(operation: "request", res:, span:, request_id:)
         res
       end
     end
@@ -92,9 +92,9 @@ class LLM::Google
       file_id = file.respond_to?(:name) ? file.name : file.to_s
       query = URI.encode_www_form(params.merge!(key: key))
       req = LLM::Transport::Request.get("/v1beta/#{file_id}?#{query}", headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :file)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -112,9 +112,9 @@ class LLM::Google
       file_id = file.respond_to?(:name) ? file.name : file.to_s
       query = URI.encode_www_form(params.merge!(key: key))
       req = LLM::Transport::Request.delete("/v1beta/#{file_id}?#{query}", headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -134,9 +134,9 @@ class LLM::Google
       req["X-Goog-Upload-Header-Content-Length"] = file.bytesize
       req["X-Goog-Upload-Header-Content-Type"] = file.mime_type
       req.body = LLM.json.dump({file: {display_name: File.basename(file.path)}})
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       trace_res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res: trace_res, span:)
+      tracer.on_request_finish(operation: "request", res: trace_res, span:, request_id:)
       res["x-goog-upload-url"]
     end
 

data/lib/llm/providers/google/images.rb

@@ -51,9 +51,9 @@ class LLM::Google
         instances: [{prompt:}]
       })
       req.body = body
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/google/models.rb

@@ -40,9 +40,9 @@ class LLM::Google
     def all(**params)
       query = URI.encode_www_form(params.merge!(key: key))
       req = LLM::Transport::Request.get("/v1beta/models?#{query}", headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :models)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/google.rb

@@ -58,9 +58,9 @@ module LLM
       path = ["/v1beta/models/#{model}", "embedContent?key=#{@key}"].join(":")
       req = LLM::Transport::Request.post(path, headers)
       req.body = LLM.json.dump({content: {parts: [{text: input}]}})
-      res, span, tracer = execute(request: req, operation: "embeddings", model:)
+      res, span, tracer, request_id = execute(request: req, operation: "embeddings", model:)
       res = ResponseAdapter.adapt(res, type: :embedding)
-      tracer.on_request_finish(operation: "embeddings", model:, res:, span:)
+      tracer.on_request_finish(operation: "embeddings", model:, res:, span:, request_id:)
       res
     end
 
@@ -77,10 +77,10 @@ module LLM
     def complete(prompt, params = {})
       params, stream, tools, role, model = normalize_complete_params(params)
       req = build_complete_request(prompt, params, role, model, stream)
-      res, span, tracer = execute(request: req, stream: stream, operation: "chat", model:)
+      res, span, tracer, request_id = execute(request: req, stream: stream, operation: "chat", model:)
       res = ResponseAdapter.adapt(res, type: :completion)
         .extend(Module.new { define_method(:__tools__) { tools } })
-      tracer.on_request_finish(operation: "chat", model:, res:, span:)
+      tracer.on_request_finish(operation: "chat", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/ollama/error_handler.rb

@@ -21,10 +21,13 @@ class LLM::Ollama
     #  The span
     # @param [LLM::Transport::Response, Net::HTTPResponse] res
     #  The response from the server
+    # @param [String] request_id
+    #  The id of the request that failed
     # @return [LLM::Ollama::ErrorHandler]
-    def initialize(tracer, span, res)
+    def initialize(tracer, span, res, request_id)
       @tracer = tracer
       @span = span
+      @request_id = request_id
       @res = LLM::Transport::Response.from(res)
     end
 
@@ -33,7 +36,7 @@ class LLM::Ollama
     #  Raises a subclass of {LLM::Error LLM::Error}
     def raise_error!
       ex = error
-      @tracer.on_request_error(ex:, span:)
+      @tracer.on_request_error(ex:, span:, request_id: @request_id)
     ensure
       raise(ex) if ex
     end

data/lib/llm/providers/ollama/models.rb

@@ -41,9 +41,9 @@ class LLM::Ollama
     def all(**params)
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get("/api/tags?#{query}", headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :models)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/ollama.rb

@@ -50,9 +50,9 @@ module LLM
       params   = {model:}.merge!(params)
       req      = LLM::Transport::Request.post("/v1/embeddings", headers)
       req.body = LLM.json.dump({input:}.merge!(params))
-      res, span, tracer = execute(request: req, operation: "embeddings", model:)
+      res, span, tracer, request_id = execute(request: req, operation: "embeddings", model:)
       res = ResponseAdapter.adapt(res, type: :embedding)
-      tracer.on_request_finish(operation: "embeddings", model:, res:, span:)
+      tracer.on_request_finish(operation: "embeddings", model:, res:, span:, request_id:)
       res
     end
 
@@ -69,10 +69,10 @@ module LLM
     def complete(prompt, params = {})
       params, stream, tools, role = normalize_complete_params(params)
       req = build_complete_request(prompt, params, role)
-      res, span, tracer = execute(request: req, stream: stream, operation: "chat", model: params[:model])
+      res, span, tracer, request_id = execute(request: req, stream: stream, operation: "chat", model: params[:model])
       res = ResponseAdapter.adapt(res, type: :completion)
         .extend(Module.new { define_method(:__tools__) { tools } })
-      tracer.on_request_finish(operation: "chat", model: params[:model], res:, span:)
+      tracer.on_request_finish(operation: "chat", model: params[:model], res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/audio.rb

@@ -35,13 +35,13 @@ class LLM::OpenAI
       req = LLM::Transport::Request.post(path("/audio/speech"), headers)
       req.body = LLM.json.dump({input:, voice:, model:, response_format:}.merge!(params))
       io = StringIO.new("".b)
-      res, span, tracer = execute(request: req, operation: "request") { _1.read_body { |chunk| io << chunk } }
+      res, span, tracer, request_id = execute(request: req, operation: "request") { _1.read_body { |chunk| io << chunk } }
       content_type = res["content-type"].to_s.split(";").first
       content_type = content_type.empty? ? LLM::Mime[".#{response_format}"] : content_type
       data = "data:#{content_type};base64,#{[io.string].pack("m0")}"
       res.body = LLM::Object.from(audio: data)
       res = ResponseAdapter.adapt(LLM::Response.new(res), type: :audio)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 
@@ -62,9 +62,9 @@ class LLM::OpenAI
       req = LLM::Transport::Request.post(path("/audio/transcriptions"), headers)
       req["content-type"] = multi.content_type
       transport.set_body_stream(req, multi.body)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 
@@ -86,9 +86,9 @@ class LLM::OpenAI
       req = LLM::Transport::Request.post(path("/audio/translations"), headers)
       req["content-type"] = multi.content_type
       transport.set_body_stream(req, multi.body)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/error_handler.rb

@@ -21,10 +21,13 @@ class LLM::OpenAI
     #  The span
     # @param [LLM::Transport::Response, Net::HTTPResponse] res
     #  The response from the server
+    # @param [String] request_id
+    #  The id of the request that failed
     # @return [LLM::OpenAI::ErrorHandler]
-    def initialize(tracer, span, res)
+    def initialize(tracer, span, res, request_id)
       @tracer = tracer
       @span = span
+      @request_id = request_id
       @res = LLM::Transport::Response.from(res)
     end
 
@@ -33,7 +36,7 @@ class LLM::OpenAI
     #  Raises a subclass of {LLM::Error LLM::Error}
     def raise_error!
       ex = error
-      @tracer.on_request_error(ex:, span:)
+      @tracer.on_request_error(ex:, span:, request_id: @request_id)
     ensure
       raise(ex) if ex
     end

data/lib/llm/providers/openai/files.rb

@@ -41,9 +41,9 @@ class LLM::OpenAI
     def all(**params)
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/files?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :enumerable)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -63,9 +63,9 @@ class LLM::OpenAI
       req = LLM::Transport::Request.post(path("/files"), headers)
       req["content-type"] = multi.content_type
       transport.set_body_stream(req, multi.body)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :file)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -84,9 +84,9 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/files/#{file_id}?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :file)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -107,9 +107,9 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       req = LLM::Transport::Request.get(path("/files/#{file_id}/content?#{query}"), headers)
       io = StringIO.new("".b)
-      res, span, tracer = execute(request: req, operation: "request") { |res| res.read_body { |chunk| io << chunk } }
+      res, span, tracer, request_id = execute(request: req, operation: "request") { |res| res.read_body { |chunk| io << chunk } }
       res = LLM::Response.new(res).tap { _1.define_singleton_method(:file) { io } }
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -126,9 +126,9 @@ class LLM::OpenAI
     def delete(file:)
       file_id = file.respond_to?(:id) ? file.id : file
       req = LLM::Transport::Request.delete(path("/files/#{file_id}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/images.rb

@@ -38,9 +38,9 @@ class LLM::OpenAI
     def create(prompt:, model: "gpt-image-1-mini", output_format: "png", **params)
       req = LLM::Transport::Request.post(path("/images/generations"), headers)
       req.body = LLM.json.dump({prompt:, n: 1, model:, output_format:}.merge!(params))
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 
@@ -64,9 +64,9 @@ class LLM::OpenAI
       req = LLM::Transport::Request.post(path("/images/edits"), headers)
       req["content-type"] = multi.content_type
       transport.set_body_stream(req, multi.body)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/models.rb

@@ -40,9 +40,9 @@ class LLM::OpenAI
     def all(**params)
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/models?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :models)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/moderations.rb

@@ -50,9 +50,9 @@ class LLM::OpenAI
       req = LLM::Transport::Request.post(path("/moderations"), headers)
       input = RequestAdapter::Moderation.new(input).adapt
       req.body = LLM.json.dump({input:, model:}.merge!(params))
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :moderations)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/responses.rb

@@ -54,10 +54,10 @@ class LLM::OpenAI
       params.delete(:input)
       body = LLM.json.dump({input: [adapt(messages, mode: :response)].flatten}.merge!(params))
       transport.set_body_stream(req, StringIO.new(body))
-      res, span, tracer = execute(request: req, stream:, stream_parser:, operation: "chat", model: params[:model])
+      res, span, tracer, request_id = execute(request: req, stream:, stream_parser:, operation: "chat", model: params[:model])
       res = ResponseAdapter.adapt(res, type: :responds)
         .extend(Module.new { define_method(:__tools__) { tools } })
-      tracer.on_request_finish(operation: "chat", model: params[:model], res:, span:)
+      tracer.on_request_finish(operation: "chat", model: params[:model], res:, span:, request_id:)
       res
     end
 
@@ -71,9 +71,9 @@ class LLM::OpenAI
       response_id = response.respond_to?(:id) ? response.id : response
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/responses/#{response_id}?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :responds)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -86,9 +86,9 @@ class LLM::OpenAI
     def delete(response)
       response_id = response.respond_to?(:id) ? response.id : response
       req = LLM::Transport::Request.delete(path("/responses/#{response_id}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai/vector_stores.rb

@@ -32,9 +32,9 @@ class LLM::OpenAI
     def all(**params)
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/vector_stores?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :enumerable)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -49,9 +49,9 @@ class LLM::OpenAI
     def create(name:, file_ids: nil, **params)
       req = LLM::Transport::Request.post(path("/vector_stores"), headers)
       req.body = LLM.json.dump(params.merge({name:, file_ids:}).compact)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -73,9 +73,9 @@ class LLM::OpenAI
     def get(vector:)
       vector_id = vector.respond_to?(:id) ? vector.id : vector
       req = LLM::Transport::Request.get(path("/vector_stores/#{vector_id}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -91,9 +91,9 @@ class LLM::OpenAI
       vector_id = vector.respond_to?(:id) ? vector.id : vector
       req = LLM::Transport::Request.post(path("/vector_stores/#{vector_id}"), headers)
       req.body = LLM.json.dump(params.merge({name:}).compact)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -106,9 +106,9 @@ class LLM::OpenAI
     def delete(vector:)
       vector_id = vector.respond_to?(:id) ? vector.id : vector
       req = LLM::Transport::Request.delete(path("/vector_stores/#{vector_id}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -124,9 +124,9 @@ class LLM::OpenAI
       vector_id = vector.respond_to?(:id) ? vector.id : vector
       req = LLM::Transport::Request.post(path("/vector_stores/#{vector_id}/search"), headers)
       req.body = LLM.json.dump(params.merge({query:}).compact)
-      res, span, tracer = execute(request: req, operation: "retrieval")
+      res, span, tracer, request_id = execute(request: req, operation: "retrieval")
       res = ResponseAdapter.adapt(res, type: :enumerable)
-      tracer.on_request_finish(operation: "retrieval", res:, span:)
+      tracer.on_request_finish(operation: "retrieval", res:, span:, request_id:)
       res
     end
 
@@ -141,9 +141,9 @@ class LLM::OpenAI
       vector_id = vector.respond_to?(:id) ? vector.id : vector
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/vector_stores/#{vector_id}/files?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = ResponseAdapter.adapt(res, type: :enumerable)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -161,9 +161,9 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       req = LLM::Transport::Request.post(path("/vector_stores/#{vector_id}/files"), headers)
       req.body = LLM.json.dump(params.merge({file_id:, attributes:}).compact)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
     alias_method :create_file, :add_file
@@ -192,9 +192,9 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       req = LLM::Transport::Request.post(path("/vector_stores/#{vector_id}/files/#{file_id}"), headers)
       req.body = LLM.json.dump(params.merge({attributes:}).compact)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -210,9 +210,9 @@ class LLM::OpenAI
       file_id = file.respond_to?(:id) ? file.id : file
       query = URI.encode_www_form(params)
       req = LLM::Transport::Request.get(path("/vector_stores/#{vector_id}/files/#{file_id}?#{query}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 
@@ -227,9 +227,9 @@ class LLM::OpenAI
       vector_id = vector.respond_to?(:id) ? vector.id : vector
       file_id = file.respond_to?(:id) ? file.id : file
       req = LLM::Transport::Request.delete(path("/vector_stores/#{vector_id}/files/#{file_id}"), headers)
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::Response.new(res)
-      tracer.on_request_finish(operation: "request", res:, span:)
+      tracer.on_request_finish(operation: "request", res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/openai.rb

@@ -54,9 +54,9 @@ module LLM
     def embed(input, model: "text-embedding-3-small", **params)
       req = LLM::Transport::Request.post(path("/embeddings"), headers)
       req.body = LLM.json.dump({input:, model:}.merge!(params))
-      res, span, tracer = execute(request: req, operation: "embeddings", model:)
+      res, span, tracer, request_id = execute(request: req, operation: "embeddings", model:)
       res = ResponseAdapter.adapt(res, type: :embedding)
-      tracer.on_request_finish(operation: "embeddings", model:, res:, span:)
+      tracer.on_request_finish(operation: "embeddings", model:, res:, span:, request_id:)
       res
     end
 
@@ -74,10 +74,10 @@ module LLM
       params, stream, tools, role = normalize_complete_params(params)
       req, messages = build_complete_request(prompt, params, role)
       tracer.set_request_metadata(user_input: extract_user_input(messages, fallback: prompt))
-      res, span, tracer = execute(request: req, stream: stream, operation: "chat", model: params[:model])
+      res, span, tracer, request_id = execute(request: req, stream: stream, operation: "chat", model: params[:model])
       res = ResponseAdapter.adapt(res, type: :completion)
         .extend(Module.new { define_method(:__tools__) { tools } })
-      tracer.on_request_finish(operation: "chat", model: params[:model], res:, span:)
+      tracer.on_request_finish(operation: "chat", model: params[:model], res:, span:, request_id:)
       res
     end
 

data/lib/llm/providers/xai/images.rb

@@ -34,9 +34,9 @@ class LLM::XAI
     def create(prompt:, model: "grok-imagine-image-quality", **params)
       req = LLM::Transport::Request.post(path("/images/generations"), headers)
       req.body = LLM.json.dump({prompt:, n: 1, model:, response_format: "b64_json"}.merge!(params))
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::OpenAI::ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end
 
@@ -61,9 +61,9 @@ class LLM::XAI
         image: image_url(image),
         response_format: "b64_json"
       }.merge!(params))
-      res, span, tracer = execute(request: req, operation: "request")
+      res, span, tracer, request_id = execute(request: req, operation: "request")
       res = LLM::OpenAI::ResponseAdapter.adapt(res, type: :image)
-      tracer.on_request_finish(operation: "request", model:, res:, span:)
+      tracer.on_request_finish(operation: "request", model:, res:, span:, request_id:)
       res
     end