squishling 0.1.0 → 0.2.0

data/lib/squishling/schema.rb

@@ -7,6 +7,14 @@ module Squishling
     CACHE = {}.compare_by_identity
     CACHE_LOCK = Mutex.new
 
+    # Conditional keywords (Schematist's `given` and `dependent`) that providers' strict modes don't support.
+    # They're validated locally and kept out of the schema sent to the LLM.
+    LOCAL_ONLY_KEYWORDS = %w[if then else dependentRequired dependentSchemas].freeze
+    # Keywords whose value is a map of names to schemas: the names are data, never keywords to strip.
+    SCHEMA_MAPS = %w[properties patternProperties $defs definitions].freeze
+    # Keywords whose value is literal data, copied untouched.
+    DATA_KEYWORDS = %w[enum const default examples].freeze
+
     class << self
       def for(raw)
         CACHE_LOCK.synchronize { CACHE[raw] ||= new(raw) }
@@ -18,9 +26,9 @@ module Squishling
       end
     end
 
-    # The payload handed to RubyLLM's `with_schema`: always strict.
+    # The payload handed to RubyLLM's `with_schema`: always strict, without LOCAL_ONLY_KEYWORDS.
     attr_reader :llm_schema
-    # The bare JSON Schema used for validation and result typing.
+    # The full JSON Schema used for validation and result typing.
     attr_reader :json_schema
 
     def initialize(raw)
@@ -36,7 +44,7 @@ module Squishling
       @llm_schema = {
         "name" => hash["name"] || body["title"],
         "description" => hash["description"] || body["description"],
-        "schema" => @json_schema,
+        "schema" => provider_schema(@json_schema),
         "strict" => true
       }.compact
       @validator = JSONSchemer.schema(@json_schema)
@@ -72,6 +80,40 @@ module Squishling
       end
     end
 
+    # A copy of the schema without the conditional keywords. An allOf made only of conditionals (how
+    # Schematist emits several `given` blocks) goes too.
+    def provider_schema(node)
+      case node
+      when Array then node.map { |item| provider_schema(item) }
+      when Hash
+        copy = node.each_with_object({}) do |(key, value), stripped|
+          next if LOCAL_ONLY_KEYWORDS.include?(key)
+
+          stripped[key] =
+            if DATA_KEYWORDS.include?(key)
+              value
+            elsif SCHEMA_MAPS.include?(key) && value.is_a?(Hash)
+              value.transform_values { |schema| provider_schema(schema) }
+            else
+              provider_schema(value)
+            end
+        end
+        without_conditional_all_of(copy, node)
+      else node
+      end
+    end
+
+    def without_conditional_all_of(copy, original)
+      return copy unless original["allOf"].is_a?(Array)
+
+      kept = copy["allOf"].zip(original["allOf"]).reject { |_, branch| conditional_only?(branch) }.map(&:first)
+      kept.empty? ? copy.except("allOf") : copy.merge("allOf" => kept)
+    end
+
+    def conditional_only?(branch)
+      branch.is_a?(Hash) && branch.any? && (branch.keys - LOCAL_ONLY_KEYWORDS - %w[description $comment]).empty?
+    end
+
     # Some schema objects emit a { name:, description:, schema: {...} } wrapper instead of a bare schema.
     def wrapped?(hash)
       hash["schema"].is_a?(Hash) && !hash.key?("type") && !hash.key?("properties")

data/lib/squishling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squishling
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/squishling.rb

@@ -9,6 +9,7 @@ require_relative "squishling/version"
 require_relative "squishling/errors"
 require_relative "squishling/configuration"
 require_relative "squishling/params"
+require_relative "squishling/model_path"
 require_relative "squishling/result"
 require_relative "squishling/schema"
 require_relative "squishling/source"
@@ -58,8 +59,10 @@ module Squishling
   # handle this input. Returns the typed result (squished? true, or false when the declared fallback supplied
   # it); return it from the method. The overrides apply to this call only: append_instructions adds to (or,
   # with false, replaces) the declared sections, context is sent alongside the declared squish_context,
-  # model/provider/instructions replace the declared ones, and params merge key by key over them.
-  def squish!(append_instructions: nil, context: nil, instructions: nil, model: nil, provider: nil, params: nil)
-    Router.escalate(self, { append_instructions:, context:, instructions:, model:, provider:, params: })
+  # model/escalation (one or the other)/provider/instructions replace the declared ones, and params merge key
+  # by key over them.
+  def squish!(append_instructions: nil, context: nil, instructions: nil, model: nil, escalation: nil, provider: nil,
+    params: nil)
+    Router.hand_off(self, { append_instructions:, context:, instructions:, model:, escalation:, provider:, params: })
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squishling
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Carroll
@@ -81,6 +81,7 @@ files:
 - lib/squishling/definition.rb
 - lib/squishling/errors.rb
 - lib/squishling/invoker.rb
+- lib/squishling/model_path.rb
 - lib/squishling/params.rb
 - lib/squishling/result.rb
 - lib/squishling/router.rb