Skip to content
Open
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
9 changes: 5 additions & 4 deletions lib/ruby_llm/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ def additional_properties(value = nil)
@additional_properties = value
end

def strict(value = nil)
if value.nil?
return @strict.nil? ? (@strict = true) : @strict
def strict(*args)
if args.empty?
instance_variable_defined?(:@strict) ? @strict : true
else
@strict = args.first
end
@strict = value
end

def validate!
Expand Down
5 changes: 3 additions & 2 deletions lib/ruby_llm/schema/json_output.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ def to_json_schema
type: "object",
properties: self.class.properties,
required: self.class.required_properties,
additionalProperties: self.class.additional_properties,
strict: self.class.strict
additionalProperties: self.class.additional_properties
}

schema_hash[:strict] = self.class.strict unless self.class.strict.nil?

# Only include $defs if there are definitions
schema_hash["$defs"] = self.class.definitions unless self.class.definitions.empty?

Expand Down
29 changes: 29 additions & 0 deletions spec/ruby_llm/schema/strict_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# frozen_string_literal: true

require "spec_helper"

RSpec.describe RubyLLM::Schema, ".strict" do
it "outputs strict: true by default" do
schema = Class.new(RubyLLM::Schema)
output = schema.new.to_json_schema
expect(output[:schema][:strict]).to eq(true)
end

it "omits strict from output when set to nil" do
schema = Class.new(RubyLLM::Schema) { strict nil }
output = schema.new.to_json_schema
expect(output[:schema]).not_to have_key(:strict)
end

it "outputs strict: true when set to true" do
schema = Class.new(RubyLLM::Schema) { strict true }
output = schema.new.to_json_schema
expect(output[:schema][:strict]).to eq(true)
end

it "outputs strict: false when set to false" do
schema = Class.new(RubyLLM::Schema) { strict false }
output = schema.new.to_json_schema
expect(output[:schema][:strict]).to eq(false)
end
end