sublayer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5a558f063c63cab9aca167a16ae3ac31300614e1a042097c544cc6361e3775
-  data.tar.gz: 59eb567e5ccecc071e204685fbe81f8b10fee384dadd4a04ba96275b38e9235f
+  metadata.gz: 3b88b5a8d08e537fed46f26b445126a1482f13e79732a545b225c6b6447e9417
+  data.tar.gz: 7903ce4058e07fa95faee094bc937f41eb297d23a941a8f2287365c052773797
 SHA512:
-  metadata.gz: a0006db5e1aaacc819cc883ac16094d66c9e99b17b3069c19f5d43af59803ab8e032f07c900a7225b66a3ae91c14f49229742240676a74e9ce0548e5b423daeb
-  data.tar.gz: 3072682126490797db51ba03dde2c8accaccb869f7c861338cb5a1019152701079709d26340096cc1685318119716683842ca2b15d9d37833746835dfa89b34b
+  metadata.gz: 07701102f65938db5dc6e9c1ed3de303073c4a185ecde0fc12c458e6051294d3bd00def3f89219663dc6f6f879b4aac29f84163b000f310bf18831fa94d3e831
+  data.tar.gz: e5c34b702ba9aabb599e4d95e13671ef3a433c577dc0a68fd2d1a3ff938d137819da31908ee11cd8eed334fb16dc02f08cd99be21f33ef41dd00db3d5e728065

data/lib/sublayer/components/output_adapters/formattable.rb

@@ -3,23 +3,41 @@ module Sublayer
     module OutputAdapters
       module Formattable
         def format_properties
+          build_json_schema(self.properties)
+        end
+
+        def build_json_schema(props)
           formatted_properties = {}
-          self.properties.each do |prop|
-            property = {
-              type: prop.type,
-              description: prop.description
-            }
-
-            property[:enum] = prop.enum if prop.respond_to?(:enum) && prop.enum
-            property[:default] = prop.default if prop.respond_to?(:default) && !prop.default.nil?
-            property[:minimum] = prop.minimum if prop.respond_to?(:minimum) && !prop.minimum.nil?
-            property[:maximum] = prop.maximum if prop.respond_to?(:maximum) && !prop.maximum.nil?
-            property[:items] = prop.items if prop.respond_to?(:items) && prop.items
-            formatted_properties[prop.name.to_sym] = property
+
+          props.map do |prop|
+            formatted_property = format_property(prop)
+            formatted_properties[prop.name.to_sym] = formatted_property
           end
+
           formatted_properties
         end
 
+        def format_property(property)
+          result = {
+            type: property.type,
+            description: property.description
+          }
+
+          result[:enum] = property.enum if property.respond_to?(:enum) && property.enum
+          result[:default] = property.default if property.respond_to?(:default) && !property.default.nil?
+          result[:minimum] = property.minimum if property.respond_to?(:minimum) && !property.minimum.nil?
+          result[:maximum] = property.maximum if property.respond_to?(:maximum) && !property.maximum.nil?
+
+          case property.type
+          when 'array'
+            result[:items] = property.items.is_a?(OpenStruct) ? format_property(property.items) : property.items
+          when 'object'
+            result[:properties] = build_json_schema(property.properties) if property.properties
+          end
+
+          result
+        end
+
         def format_required
           self.properties.select(&:required).map(&:name)
         end

data/lib/sublayer/components/output_adapters/named_strings.rb

@@ -0,0 +1,31 @@
+module Sublayer
+  module Components
+    module OutputAdapters
+      class NamedStrings
+        attr_reader :name, :description, :attributes
+
+        def initialize(options)
+          @name = options[:name]
+          @description = options[:description]
+          @attributes = options[:attributes]
+        end
+
+        def properties
+          [
+            OpenStruct.new(
+              name: @name,
+              type: "object",
+              description: @description,
+              required: true,
+              properties: @attributes.map { |attribute| OpenStruct.new(type: "string", description: attribute[:description], required: true, name: attribute[:name]) }
+            )
+          ]
+        end
+
+        def materialize_result(raw_result)
+          OpenStruct.new( @attributes.map { |attribute| [attribute[:name], raw_result[attribute[:name]]] }.to_h)
+        end
+      end
+    end
+  end
+end

data/lib/sublayer/generators/base.rb

@@ -10,7 +10,10 @@ module Sublayer
 
       def generate
         self.class::OUTPUT_ADAPTER.load_instance_data(self) if self.class::OUTPUT_ADAPTER.respond_to?(:load_instance_data)
-        @results = Sublayer.configuration.ai_provider.call(prompt: prompt, output_adapter: self.class::OUTPUT_ADAPTER)
+
+        raw_results = Sublayer.configuration.ai_provider.call(prompt: prompt, output_adapter: self.class::OUTPUT_ADAPTER)
+
+        @results = self.class::OUTPUT_ADAPTER.respond_to?(:materialize_result) ? self.class::OUTPUT_ADAPTER.materialize_result(raw_results) : raw_results
       end
     end
   end

data/lib/sublayer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sublayer
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sublayer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Scott Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -195,6 +195,7 @@ files:
 - lib/sublayer/components/output_adapters.rb
 - lib/sublayer/components/output_adapters/formattable.rb
 - lib/sublayer/components/output_adapters/list_of_strings.rb
+- lib/sublayer/components/output_adapters/named_strings.rb
 - lib/sublayer/components/output_adapters/single_string.rb
 - lib/sublayer/components/output_adapters/string_selection_from_list.rb
 - lib/sublayer/generators/base.rb