sublayer 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c0626295be488d2a39cfbe94652d3e1238b5885c24c5d4d130e0659939387fd
-  data.tar.gz: e21ee3e2177caff3a1125de4ba07672db13df661c5888e031d84148f4bfa0a01
+  metadata.gz: 3b88b5a8d08e537fed46f26b445126a1482f13e79732a545b225c6b6447e9417
+  data.tar.gz: 7903ce4058e07fa95faee094bc937f41eb297d23a941a8f2287365c052773797
 SHA512:
-  metadata.gz: 8b2a17ca1598e68b7da6a0caf07d61d53f99c6de561f03bbd4f4a74a4bf05ad30ebb1c9261f34320297a1af88c4b82e35163a7711a3d260d97732d2b34b87f1a
-  data.tar.gz: adcb0094652bdd477f5cbbf3346037bbfa1b2b62a7c54a148ddd0d4cb440bef8d7c994487a8ef47aee30c0039d3bad7ddfafee587c3fa6c688c6e51f0e89d26e
+  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/logging/base.rb

@@ -0,0 +1,9 @@
+module Sublayer
+  module Logging
+    class Base
+      def log(level, message, data = {})
+        raise NotImplementedError, "Subclasses must implement log method"
+      end
+    end
+  end
+end

data/lib/sublayer/logging/debug_logger.rb

@@ -0,0 +1,10 @@
+module Sublayer
+  module Logging
+    class DebugLogger < Base
+      def log(level, message, data = {})
+        puts "[#{Time.now.iso8601}] #{level.upcase}: #{message}"
+        pp data unless data.empty?
+      end
+    end
+  end
+end

data/lib/sublayer/logging/json_logger.rb

@@ -0,0 +1,20 @@
+module Sublayer
+  module Logging
+    class JsonLogger < Base
+      def initialize(log_file = "./tmp/sublayer.log")
+        @log_file = log_file
+      end
+
+      def log(level, message, data = {})
+        File.open(@log_file, "a") do |f|
+          f.puts JSON.generate({
+            timestamp: Time.now.iso8601,
+            level: level,
+            message: message,
+            data: data
+          })
+        end
+      end
+    end
+  end
+end

data/lib/sublayer/logging/null_logger.rb

@@ -0,0 +1,9 @@
+module Sublayer
+  module Logging
+    class NullLogger < Base
+      def log(level, message, data = {})
+        # do nothing
+      end
+    end
+  end
+end

data/lib/sublayer/providers/claude.rb

@@ -5,6 +5,15 @@ module Sublayer
   module Providers
     class Claude
       def self.call(prompt:, output_adapter:)
+        request_id = SecureRandom.uuid
+        Sublayer.configuration.logger.log(:info, "Claude API request", {
+          model: Sublayer.configuration.ai_model,
+          prompt: prompt,
+          request_id: request_id
+        });
+
+        before_request = Time.now
+
         response = HTTParty.post(
           "https://api.anthropic.com/v1/messages",
           headers: {
@@ -34,9 +43,25 @@ module Sublayer
 
         raise "Error generating with Claude, error: #{response.body}" unless response.code == 200
 
-        tool_use = JSON.parse(response.body).dig("content").find { |content| content['type'] == 'tool_use' && content['name'] == output_adapter.name }
+        after_request = Time.now
+        response_time = after_request - before_request
+
+        json_response = JSON.parse(response.body)
+
+        Sublayer.configuration.logger.log(:info, "Claude API response", {
+          request_id: request_id,
+          response_time: response_time,
+          usage: {
+            input_tokens: json_response.dig("usage", "input_tokens"),
+            output_tokens: json_response.dig("usage", "output_tokens"),
+            total_tokens: json_response.dig("usage", "input_tokens") + json_response.dig("usage", "output_tokens")
+          }
+        })
+
+        tool_use = json_response.dig("content").find { |content| content['type'] == 'tool_use' && content['name'] == output_adapter.name }
 
         raise "Error generating with Claude, error: No function called. If the answer is in the response, try rewording your prompt or output adapter name to be from the perspective of the model. Response: #{response.body}" unless tool_use
+        raise "Error generating with Claude, error: Max tokens exceeded. Try breaking your problem up into smaller pieces." if json_response.dig("stop_reason") == "max_tokens"
 
         tool_use.dig("input")[output_adapter.name]
       end

data/lib/sublayer/providers/gemini.rb

@@ -8,6 +8,15 @@ module Sublayer
   module Providers
     class Gemini
       def self.call(prompt:, output_adapter:)
+
+        request_id = SecureRandom.uuid
+        before_request = Time.now
+        Sublayer.configuration.logger.log(:info, "Gemini API request", {
+          model: Sublayer.configuration.ai_model,
+          prompt: prompt,
+          request_id: request_id
+        })
+
         response = HTTParty.post(
           "https://generativelanguage.googleapis.com/v1beta/models/#{Sublayer.configuration.ai_model}:generateContent?key=#{ENV['GEMINI_API_KEY']}",
           body: {
@@ -17,8 +26,8 @@ module Sublayer
                 text: "#{prompt}"
               },
             },
-            tools: {
-              functionDeclarations: [
+            tools: [{
+              function_declarations: [
                 {
                   name: output_adapter.name,
                   description: output_adapter.description,
@@ -29,7 +38,7 @@ module Sublayer
                   }
                 }
               ]
-            },
+            }],
             tool_config: {
               function_calling_config: {
                 mode: "ANY",
@@ -42,6 +51,19 @@ module Sublayer
           }
         )
 
+        after_request = Time.now
+        response_time = after_request - before_request
+
+        Sublayer.configuration.logger.log(:info, "Gemini API response", {
+          request_id: request_id,
+          response_time: response_time,
+          usage: {
+            input_tokens: response["usageMetadata"]["promptTokenCount"],
+            output_tokens: response["usageMetadata"]["candidatesTokenCount"],
+            total_tokens: response["usageMetadata"]["totalTokenCount"]
+          }
+        })
+
         raise "Error generating with Gemini, error: #{response.body}" unless response.success?
 
         argument = response.dig("candidates", 0, "content", "parts", 0, "functionCall", "args", output_adapter.name)

data/lib/sublayer/providers/open_ai.rb

@@ -7,6 +7,16 @@ module Sublayer
       def self.call(prompt:, output_adapter:)
         client = ::OpenAI::Client.new(access_token: ENV.fetch("OPENAI_API_KEY"))
 
+        request_id = SecureRandom.uuid
+
+        Sublayer.configuration.logger.log(:info, "OpenAI API request", {
+          model: Sublayer.configuration.ai_model,
+          prompt: prompt,
+          request_id: request_id,
+        })
+
+        before_request = Time.now
+
         response = client.chat(
           parameters: {
             model: Sublayer.configuration.ai_model,
@@ -31,9 +41,21 @@ module Sublayer
                 }
               }
             ]
-
           })
 
+        after_request = Time.now
+        response_time = after_request - before_request
+
+        Sublayer.configuration.logger.log(:info, "OpenAI API response", {
+          request_id: request_id,
+          response_time: response_time,
+          usage: {
+            input_tokens: response["usage"]["prompt_tokens"],
+            output_tokens: response["usage"]["completion_tokens"],
+            total_tokens: response["usage"]["total_tokens"]
+          }
+        })
+
         message = response.dig("choices", 0, "message")
 
         raise "No function called" unless message["tool_calls"]
@@ -41,6 +63,7 @@ module Sublayer
         function_body = message.dig("tool_calls", 0, "function", "arguments")
 
         raise "Error generating with OpenAI. Empty response. Try rewording your output adapter params to be from the perspective of the model. Full Response: #{response}" if function_body == "{}"
+        raise "Error generating with OpenAI. Error: Max tokens exceeded. Try breaking your problem up into smaller pieces." if response["choices"][0]["finish_reason"] == "length"
 
         results = JSON.parse(function_body)[output_adapter.name]
       end

data/lib/sublayer/version.rb

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

data/lib/sublayer.rb

@@ -9,6 +9,8 @@ require "httparty"
 require "openai"
 require "nokogiri"
 require "listen"
+require "securerandom"
+require "time"
 
 require_relative "sublayer/version"
 
@@ -22,7 +24,8 @@ module Sublayer
   def self.configuration
     @configuration ||= OpenStruct.new(
       ai_provider: Sublayer::Providers::OpenAI,
-      ai_model: "gpt-4o"
+      ai_model: "gpt-4o",
+      logger: Sublayer::Logging::NullLogger.new
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sublayer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Scott Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-04 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -195,9 +195,14 @@ 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
+- lib/sublayer/logging/base.rb
+- lib/sublayer/logging/debug_logger.rb
+- lib/sublayer/logging/json_logger.rb
+- lib/sublayer/logging/null_logger.rb
 - lib/sublayer/providers/claude.rb
 - lib/sublayer/providers/gemini.rb
 - lib/sublayer/providers/open_ai.rb