omniai 1.8.4 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38eed1bd7e34d8cd092630356e9de0d6ec31ad1943d2657d866f9f2bc62a3b3c
-  data.tar.gz: 457d415c96fd8e79b37f8502288dcbaec8fccaca1454405be5d3168bc25d8280
+  metadata.gz: 0a97ef62618647e49906212c6b7d01e1b17fe3f8149a651d3f3481a3ffd46b79
+  data.tar.gz: d97ec89bb5eac0f6e2c393bacdc9e2e3408d1eec62b612371e465506477bc598
 SHA512:
-  metadata.gz: 83d6770055e2b05a25e4e68dcb3ef3be825ce63326b25c492d206fe88b772d7689e7474f56ed1a4e9ad7e0d42f9afc7e6b2a44d9b7c7021297869550e126c8a2
-  data.tar.gz: 99b584ab83c1e2c5c4f4e4ad73fd803263b5d60a47c8f27c24758bffb5a618f9b23df8a34cfdde43e23adf55252b281dd10c7f67034affdc78498e39f833ea31
+  metadata.gz: '08f05b135a0ac4d9acaf33fc0b221d4c4cf6634a0face266a57d0886821816984b7cdda3dffe266dc4b178497bf385a75221abb0b3afd8a650065631dea8838d'
+  data.tar.gz: b0c5655ac13cfdc37e429181e6e7315d2a1717b2a17bce253c655c715efa9a9dd595ad1ddc05bdb9e172a0ff9167b05f9b9ddc0344a10c224be4bbc5d11b087c

data/README.md

@@ -72,16 +72,38 @@ require 'omniai/google'
 
 CLIENT = OmniAI::Google::Client.new
 
+LOCATION = OmniAI::Tool::Property.object(
+  properties: {
+    city: OmniAI::Tool::Property.string(description: 'e.g. "Toronto"'),
+    country: OmniAI::Tool::Property.string(description: 'e.g. "Canada"'),
+  },
+  required: %i[city country]
+)
+
+LOCATIONS = OmniAI::Tool::Property.array(
+  min_items: 1,
+  max_items: 5,
+  items: LOCATION
+)
+
+UNIT = OmniAI::Tool::Property.string(enum: %w[celcius fahrenheit])
+
+WEATHER = proc do |locations:, unit: 'celsius'|
+  locations.map do |location|
+    "#{rand(20..50)}° #{unit} in #{location[:city]}, #{location[:country]}"
+  end.join("\n")
+end
+
 TOOL = OmniAI::Tool.new(
-  proc { |location:, unit: 'celsius'| "#{rand(20..50)}° #{unit} in #{location}" },
+  WEATHER,
   name: 'Weather',
   description: 'Lookup the weather in a location',
   parameters: OmniAI::Tool::Parameters.new(
     properties: {
-      location: OmniAI::Tool::Property.string(description: 'e.g. Toronto'),
-      unit: OmniAI::Tool::Property.string(enum: %w[celcius fahrenheit]),
+      locations: LOCATIONS,
+      unit: UNIT,
     },
-    required: %i[location]
+    required: %i[locations]
   )
 )
 

data/lib/omniai/tool/array.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module OmniAI
+  class Tool
+    # Represents a schema object.
+    #
+    # @example
+    #    array = OmniAI::Tool::Array.new(
+    #      description: 'A list of people.',
+    #      items: OmniAI::Tool::Object.new(
+    #        properties: {
+    #          name: OmniAI::Tool::Property.string(description: 'The name of the person.'),
+    #          age: OmniAI::Tool::Property.integer(description: 'The age of the person.'),
+    #        },
+    #        required: %i[name]
+    #      ),
+    #      min_items: 1,
+    #      max_items: 5,
+    #    })
+    class Array
+      TYPE = 'array'
+
+      # @!attribute [rw] items
+      #   @return [OmniAI::Tool::Object, OmniAI::Tool::Array, OmniAI::Tool::Property]
+      attr_accessor :items
+
+      # @!attribute [rw] max_items
+      #   @return [Integer, nil]
+      attr_accessor :max_items
+
+      # @!attribute [rw] min_items
+      #   @return [Integer, nil]
+      attr_accessor :min_items
+
+      # @!attribute [rw] description
+      #   @return [String, nil]
+      attr_accessor :description
+
+      # @param items [OmniAI::Tool::Object, OmniAI::Tool::Array, OmniAI::Tool::Property] required
+      # @param max_items [Integer] optional
+      # @param min_items [Integer] optional
+      # @param description [String] optional
+      def initialize(items:, max_items: nil, min_items: nil, description: nil)
+        @items = items
+        @description = description
+        @max_items = max_items
+        @min_items = min_items
+      end
+
+      # @example
+      #   array.serialize # => { type: 'array', items: { type: 'string' } }
+      #
+      # @return [Hash]
+      def serialize
+        {
+          type: TYPE,
+          description: @description,
+          items: @items.serialize,
+          maxItems: @max_items,
+          minItems: @min_items,
+        }.compact
+      end
+
+      # @example
+      #   array.parse(['1', '2', '3']) # => [1, 2, 3]
+      # @param args [Array]
+      #
+      # @return [Array]
+      def parse(args)
+        args.map { |arg| @items.parse(arg) }
+      end
+    end
+  end
+end

data/lib/omniai/tool/object.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module OmniAI
+  class Tool
+    # Represents a schema object.
+    #
+    # @example
+    #    object = OmniAI::Tool::Object.new(
+    #      properties: {
+    #        name: OmniAI::Tool::Property.string(description: 'The name of the person.'),
+    #        age: OmniAI::Tool::Property.integer(description: 'The age of the person.'),
+    #      },
+    #      required: %i[name]
+    #    })
+    class Object
+      TYPE = 'object'
+
+      # @!attribute [rw] properties
+      #   @return [Hash]
+      attr_accessor :properties
+
+      # @!attribute [rw] required
+      #   @return [Array<String>]
+      attr_accessor :required
+
+      # @!attribute [rw] description
+      #   @return [String, nil]
+      attr_accessor :description
+
+      # @param properties [Hash]
+      # @param required [Array<String>]
+      # @return [OmniAI::Tool::Parameters]
+      def initialize(properties: {}, required: [], description: nil)
+        @properties = properties
+        @required = required
+        @description = description
+      end
+
+      # @return [Hash]
+      def serialize
+        {
+          type: TYPE,
+          description: @description,
+          properties: @properties.transform_values(&:serialize),
+          required: @required,
+        }.compact
+      end
+
+      # @param args [Hash]
+      #
+      # @return [Hash]
+      def parse(args)
+        result = {}
+        @properties.each do |name, property|
+          value = args[String(name)]
+          result[name.intern] = property.parse(value) unless value.nil?
+        end
+        result
+      end
+    end
+  end
+end

data/lib/omniai/tool/parameters.rb

@@ -2,46 +2,22 @@
 
 module OmniAI
   class Tool
-    # Usage:
+    # Parameters are used to define the arguments for a tool.
     #
-    # parameters = OmniAI::Tool::Parameters.new(properties: {
-    #   n: OmniAI::Tool::Parameters.integer(description: 'The nth number to calculate.')
-    #   required: %i[n]
-    # })
-    class Parameters
-      module Type
-        OBJECT = 'object'
-      end
-
-      # @param type [String]
-      # @param properties [Hash]
-      # @param required [Array<String>]
-      # @return [OmniAI::Tool::Parameters]
-      def initialize(type: Type::OBJECT, properties: {}, required: [])
-        @type = type
-        @properties = properties
-        @required = required
-      end
-
-      # @return [Hash]
-      def serialize
-        {
-          type: @type,
-          properties: @properties.transform_values(&:serialize),
-          required: @required,
-        }.compact
-      end
-
-      # @param args [Hash]
-      # @return [Hash]
-      def parse(args)
-        result = {}
-        @properties.each do |name, property|
-          value = args[String(name)]
-          result[name.intern] = property.parse(value) if value
-        end
-        result
-      end
+    # @example
+    #    parameters = OmniAI::Tool::Parameters.new(properties: {
+    #      people: OmniAI::Tool::Parameters.array(
+    #        items: OmniAI::Tool::Parameters.object(
+    #          properties: {
+    #            name: OmniAI::Tool::Parameters.string(description: 'The name of the person.'),
+    #            age: OmniAI::Tool::Parameters.integer(description: 'The age of the person.'),
+    #            employeed: OmniAI::Tool::Parameters.boolean(description: 'Is the person employeed?'),
+    #          }
+    #      n: OmniAI::Tool::Parameters.integer(description: 'The nth number to calculate.')
+    #      required: %i[n]
+    #    })
+    #    tool = OmniAI::Tool.new(fibonacci, parameters: parameters)
+    class Parameters < Object
     end
   end
 end

data/lib/omniai/tool/property.rb

@@ -2,9 +2,15 @@
 
 module OmniAI
   class Tool
-    # Usage:
+    # A property used for a tool parameter.
     #
-    # property = OmniAI::Tool::Property.new(type: 'string', description: 'The nth number to calculate.')
+    # @example
+    #   OmniAI::Tool::Property.array(description: '...', items: ...)
+    #   OmniAI::Tool::Property.object(description: '...', properties: { ... }, required: %i[...])
+    #   OmniAI::Tool::Property.string(description: '...')
+    #   OmniAI::Tool::Property.integer(description: '...')
+    #   OmniAI::Tool::Property.number(description: '...')
+    #   OmniAI::Tool::Property.boolean(description: '...')
     class Property
       module Type
         BOOLEAN = 'boolean'
@@ -22,36 +28,80 @@ module OmniAI
       # @return [Array<String>, nil]
       attr_reader :enum
 
-      # @param description [String]
-      # @param enum [Array<String>]
+      # @example
+      #   property = OmniAI::Tool::Property.array(
+      #     items: OmniAI::Tool::Property.string(description: 'The name of the person.'),
+      #     description: 'A list of names.'
+      #     min_items: 1,
+      #     max_items: 5,
+      #   )
+      #
+      # @param items [OmniAI::Tool::Property] required - the items in the array
+      # @param min_items [Integer] optional - the minimum number of items
+      # @param max_items [Integer] optional - the maximum number of items
+      # @param description [String] optional - a description of the array
+      #
+      # @return [OmniAI::Tool::Array]
+      def self.array(items:, min_items: nil, max_items: nil, description: nil)
+        OmniAI::Tool::Array.new(items:, description:, min_items:, max_items:)
+      end
+
+      # @example
+      #   property = OmniAI::Tool::Property.object(
+      #     properties: {
+      #       name: OmniAI::Tool::Property.string(description: 'The name of the person.'),
+      #       age: OmniAI::Tool::Property.integer(description: 'The age of the person.'),
+      #       employeed: OmniAI::Tool::Property.boolean(description: 'Is the person employeed?'),
+      #     },
+      #     description: 'A person.'
+      #     required: %i[name]
+      #   )
+      #
+      # @param properties [Hash<String, OmniAI::Tool::Property>] required - the properties of the object
+      # @param requird [Array<Symbol>] optional - the required properties
+      # @param description [String] optional - a description of the object
+      #
+      # @return [OmniAI::Tool::Array]
+      def self.object(properties: {}, required: [], description: nil)
+        OmniAI::Tool::Object.new(properties:, required:, description:)
+      end
+
+      # @param description [String] optional - a description of the property
+      # @param enum [Array<Boolean>] optional - the possible values of the property
+      #
       # @return [OmniAI::Tool::Property]
       def self.boolean(description: nil, enum: nil)
         new(type: Type::BOOLEAN, description:, enum:)
       end
 
-      # @param description [String]
-      # @param enum [Array<String>]
+      # @param description [String] optional - a description of the property
+      # @param enum [Array<Integer>] optinoal - the possible values of the property
+      #
       # @return [OmniAI::Tool::Property]
       def self.integer(description: nil, enum: nil)
         new(type: Type::INTEGER, description:, enum:)
       end
 
-      # @param description [String]
-      # @param enum [Array<String>]
+      # @param description [String] optional - a description of the property
+      # @param enum [Array<String>] optional - the possible values of the property
+      #
       # @return [OmniAI::Tool::Property]
       def self.string(description: nil, enum: nil)
         new(type: Type::STRING, description:, enum:)
       end
 
-      # @param description [String]
-      # @param enum [Array<String>]
+      # @param description [String] optional - a description of the property
+      # @param enum [Array<Number>] optional - the possible values of the property
+      #
       # @return [OmniAI::Tool::Property]
       def self.number(description: nil, enum: nil)
         new(type: Type::NUMBER, description:, enum:)
       end
 
-      # @param description [String]
-      # @param enum [Array<String>]
+      # @param type [String] required - the type of the property
+      # @param description [String] optional - a description of the property
+      # @param enum [Array] optional - the possible values of the property
+      #
       # @return [OmniAI::Tool::Property]
       def initialize(type:, description: nil, enum: nil)
         @type = type
@@ -60,12 +110,7 @@ module OmniAI
       end
 
       # @example
-      #   property.serialize
-      #   # {
-      #   #   type: 'string',
-      #   #   description: 'The unit (e.g. "fahrenheit" or "celsius").'
-      #   #   enum: %w[fahrenheit celsius]
-      #   # }
+      #   property.serialize #=> { type: 'string' }
       #
       # @return [Hash]
       def serialize
@@ -76,6 +121,9 @@ module OmniAI
         }.compact
       end
 
+      # @example
+      #   property.parse('123') #=> 123
+      #
       # @return [String, Integer, Float, Boolean, Object]
       def parse(value)
         case @type

data/lib/omniai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OmniAI
-  VERSION = '1.8.4'
+  VERSION = '1.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.1
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser
@@ -98,6 +98,8 @@ files:
 - lib/omniai/instrumentation.rb
 - lib/omniai/speak.rb
 - lib/omniai/tool.rb
+- lib/omniai/tool/array.rb
+- lib/omniai/tool/object.rb
 - lib/omniai/tool/parameters.rb
 - lib/omniai/tool/property.rb
 - lib/omniai/transcribe.rb
@@ -118,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="