sublayer 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0266ca3b856c768f521cf65a907ebe9d411f5420f83bfb62455912075253820
-  data.tar.gz: 1b32e201baa8f26e8caa3a124b4ebe9aeeb652b31745ec0fe6b06ab0cee57da2
+  metadata.gz: 0a5a558f063c63cab9aca167a16ae3ac31300614e1a042097c544cc6361e3775
+  data.tar.gz: 59eb567e5ccecc071e204685fbe81f8b10fee384dadd4a04ba96275b38e9235f
 SHA512:
-  metadata.gz: 417a853211fb739887936804948c5758d3880431b2b8252df5e3fc58beb6464f44d6f3e1efb0945b0e72a4f80b7135eec8b9813fbffbe9a6cfbe0c4a1d4bf63a
-  data.tar.gz: 4ee873c4e5edbe289211320573847cd58273b959e001ad3db8fadf68fdedc0bdc9e957b103573c3d31080acc69886dd58d0146906122192bd75fce1e24724d49
+  metadata.gz: a0006db5e1aaacc819cc883ac16094d66c9e99b17b3069c19f5d43af59803ab8e032f07c900a7225b66a3ae91c14f49229742240676a74e9ce0548e5b423daeb
+  data.tar.gz: 3072682126490797db51ba03dde2c8accaccb869f7c861338cb5a1019152701079709d26340096cc1685318119716683842ca2b15d9d37833746835dfa89b34b

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: {
@@ -27,13 +36,34 @@ module Sublayer
                 }
               }
             ],
+            tool_choice: { type: "tool", name: output_adapter.name },
             messages: [{ "role": "user", "content": prompt }]
           }.to_json
         )
+
         raise "Error generating with Claude, error: #{response.body}" unless response.code == 200
 
-        function_input = JSON.parse(response.body).dig("content").find {|content| content['type'] == 'tool_use'}.dig("input")
-        function_input[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
     end
   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,15 +41,31 @@ 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"].length > 0
+        raise "No function called" unless message["tool_calls"]
 
         function_body = message.dig("tool_calls", 0, "function", "arguments")
-        JSON.parse(function_body)[output_adapter.name]
+
+        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
     end
   end

data/lib/sublayer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sublayer
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 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.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Scott Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -198,6 +198,10 @@ files:
 - 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
@@ -229,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A model-agnostic Ruby GenerativeAI DSL and Framework