rach 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6def772228179c4cb7342ba70486cf07d0438805dd1595f6e40bfaf60d71a5c4
-  data.tar.gz: f356a968c75213658a27063713c66b12afcfa7584d27bfe517bf3191851a52c1
+  metadata.gz: d38fee5588b8410bd344b1848429f4cd5534dbfc46bdb3c7c55193156b3f78b5
+  data.tar.gz: 8a8b353426c367c4b0a7663d66a0a82a91c594a23384f12ed17f3484513aa105
 SHA512:
-  metadata.gz: 5e8898c1990f62bd29e807a84f9a5ae9dd3a1482c31169e5c82fc80b5e9eae86674005ef94ed867db71f6336cf6829189333beccb4eb20eb062fbece5e510e98
-  data.tar.gz: 9407df8d6215c215109e9ae221f166641d3385353ca76662719a7b9c0f6953f09327419aebb4977a493049341c502a280f6037fb300435b7379425d7acfc4baf
+  metadata.gz: 0c963bd5389c85b39ac2f2fb8ef94f3e35167bd265e2dfa77c6a63642ae42d156954e9d151fbea994b3c12fe5d5a7db15f2671501449a74df17e4e26a1e3383d
+  data.tar.gz: 8f3e9700244b3fc29414a512b1cbf84818b72d73cc44d60a6dc581835a77d680f0616008477bbaf54f68e2fcf2dbfa540fc104aa346cd3882c47826c578a90d9

data/README.md

@@ -41,26 +41,32 @@ require 'rach'
 
 client = Rach::Client.new(access_token: YOUR_OPENAI_API_KEY, model: "gpt-4o")
 convo = Rach::Conversation.new
-convo.system "You teach the German language."
-convo.user "Translate: There are two birds singing outside my window."
 
+convo.system "You are a helpful historian."
+
+# 1. First user question
+convo.user "When was the Statue of Liberty dedicated? Provide only the year."
 response = client.chat(convo)
-response.content
-# => "Es gibt zwei Vögel, die draußen vor meinem Fenster singen."
+puts response.content
+# => "1886"
 
-# Continue the conversation...
+# 2. Add the response to the conversation
 convo.add_response(response)
-convo.user "What are the verbs in your translation?"
+
+# 3. Continue the conversation (the answer references the original fact: 1886)
+convo.user "Name a major city that was incorporated in that year"
 response = client.chat(convo)
-response.content
-# => "The verbs in the translation \"Es gibt zwei Vögel, die vor meinem Fenster singen\" are \"gibt\" and \"singen.\""
+puts response.content
+# => "Vancouver"
 
-# Remove the last message from the conversation history and continue
+# 4. Remove the most recent user message ("Name a major city...")
 convo.pop
-convo.user "Explain the structure of your translation."
+
+# 5. Ask a new question that references the Statue of Liberty, not Vancouver
+convo.user "Why was it built?"
 response = client.chat(convo)
-response.content
-# => "Your last message to me was: \"Translate: There are two birds singing outside my window.\""
+puts response.content
+# => "The Statue of Liberty was built to commemorate the 100th anniversary of the signing of the Declaration of Independence."
 ```
 
 ### Response Formatting
@@ -148,6 +154,29 @@ response = client.chat("Hi there!", model: "claude-3-5-sonnet-20241022")
 puts response.content
 ```
 
+Rach uses the gems `ruby-openai` and `anthropic` to make API calls to each provider. You can configure the providers separately in the `providers` hash, and they will be used in the respective clients:
+
+```ruby
+client = Rach::Client.new(
+  providers: {
+    openai: {
+      access_token: YOUR_OPENAI_API_KEY,
+      uri_base: "https://oai.hconeai.com/",
+       extra_headers: {
+        "X-Proxy-TTL" => "43200",
+        "X-Proxy-Refresh": "true",
+        "Helicone-Auth": "Bearer HELICONE_API_KEY",
+        "helicone-stream-force-format" => "true",
+      }
+    },
+    anthropic: {
+      access_token: YOUR_ANTHROPIC_API_KEY,
+      request_timeout: 240
+    }
+  }
+)
+```
+
 ### Logging
 
 Rach supports logging of API calls and their parameters. You can provide any logger that responds to the `info` method:

data/lib/rach/provider/anthropic.rb

@@ -83,11 +83,13 @@ module Rach
 
       private
 
-      def create_client(access_token, **kwargs)
-        ::Anthropic::Client.new(
-          access_token: access_token,
-          **kwargs
-        )
+      def create_client(access_token, **config)
+        client_config = {
+          access_token: access_token
+        }
+        client_config.merge!(config)
+
+        ::Anthropic::Client.new(**client_config)
       end
 
       def convert_tools(functions)

data/lib/rach/provider/base.rb

@@ -1,8 +1,11 @@
 module Rach
   module Provider
     class Base
-      def initialize(access_token, **kwargs)
-        @client = create_client(access_token, **kwargs)
+      attr_reader :client, :logger
+
+      def initialize(access_token: nil, logger: nil, **config)
+        @logger = logger
+        @client = create_client(access_token, **config)
       end
 
       def self.key
@@ -19,7 +22,7 @@ module Rach
 
       private
 
-      def create_client(access_token, **kwargs)
+      def create_client(access_token, **config)
         raise NotImplementedError
       end
     end

data/lib/rach/provider/google.rb

@@ -0,0 +1,77 @@
+require 'gemini-ai'
+
+module Rach
+  module Provider
+    class Google < Base
+
+      def initialize(access_token: nil, logger: nil, **kwargs)
+        @client = create_client(access_token, **kwargs)
+        @logger = logger
+      end
+
+      def chat(**parameters)
+        messages = parameters.dig(:parameters, :messages) || []
+        system_message = messages.find { |msg| msg[:role] == "system" }
+        messages = messages.reject { |msg| msg[:role] == "system" } if system_message
+
+        # Convert messages to Gemini format
+        contents = messages.map do |msg|
+          {
+            role: msg[:role] == "assistant" ? "model" : "user",
+            parts: { text: msg[:content] }
+          }
+        end
+
+        # If there's a system message, prepend it to user's first message
+        if system_message
+          first_user_message = contents.find { |msg| msg[:role] == "user" }
+          if first_user_message
+            first_user_message[:parts][:text] = "#{system_message[:content]}\n\n#{first_user_message[:parts][:text]}"
+          end
+        end
+
+        if @logger
+          @logger.info("Making API call to Google Gemini")
+          @logger.info("Request parameters: #{contents.inspect}")
+        end
+
+        raw_response = @client.generate_content({ contents: contents })
+
+        if @logger
+          @logger.info("Response: #{raw_response.inspect}")
+        end
+
+        Response.new(
+          id: raw_response["candidates"][0]["content"]["parts"][0]["text"],
+          model: raw_response["modelVersion"],
+          content: raw_response["candidates"][0]["content"]["parts"][0]["text"],
+          usage: {
+            "prompt_tokens" => raw_response["usageMetadata"]["promptTokenCount"],
+            "completion_tokens" => raw_response["usageMetadata"]["candidatesTokenCount"],
+            "total_tokens" => raw_response["usageMetadata"]["totalTokenCount"]
+          },
+          raw_response: raw_response
+        )
+      end
+
+      def self.supports?(model)
+        model.start_with?("gemini")
+      end
+
+      private
+
+      def create_client(access_token, **config)
+        client_config = {
+          credentials: {
+            service: 'generative-language-api',
+            api_key: access_token
+          },
+          options: { model: 'gemini-pro' }
+        }
+        client_config[:options].merge!(config)
+
+        ::Gemini.new(**client_config)
+      end
+    end
+  end
+end 

data/lib/rach/provider/openai.rb

@@ -34,12 +34,14 @@ module Rach
 
       private
 
-      def create_client(access_token, **kwargs)
-        ::OpenAI::Client.new(
+      def create_client(access_token, **config)
+        client_config = {
           access_token: access_token,
-          log_errors: true,
-          **kwargs
-        )
+          log_errors: true
+        }
+        client_config.merge!(config)
+
+        ::OpenAI::Client.new(**client_config)
       end
 
       def convert_params(parameters)

data/lib/rach/provider.rb

@@ -3,7 +3,8 @@ module Rach
 
     AVAILABLE_PROVIDERS = [
       Provider::OpenAI,
-      Provider::Anthropic
+      Provider::Anthropic,
+      Provider::Google
     ].to_h { |p| [p.key, p] }.freeze
 
     def self.for(model)

data/lib/rach/response.rb

@@ -19,14 +19,19 @@ module Rach
       !tool_calls.nil? && !tool_calls.empty?
     end
 
-    def function_name
-      return nil unless function_call?
-      tool_calls.first.dig("function", "name")
+    def function_name(tool_call)
+      tool_call.dig("function", "name")
     end
 
-    def function_arguments
+    def each_tool_call
       return nil unless function_call?
-      JSON.parse(tool_calls.first.dig("function", "arguments"))
+      tool_calls.each do |tool_call|
+        yield tool_call
+      end
+    end
+
+    def function_arguments(tool_call)
+      JSON.parse(tool_call.dig("function", "arguments"))
     rescue JSON::ParserError
       raise ParseError, "Function arguments are not valid JSON"
     end
@@ -46,12 +51,15 @@ module Rach
     def on_function(function_class = nil, &block)
       return self unless function_call?
 
-      function = function_class.new
-      return self unless function.function_name == function_name
+      each_tool_call do |tool_call|
+        function = function_class.new
+        next unless function.function_name == function_name(tool_call)
+
+        args = function_arguments(tool_call).transform_keys(&:to_sym)
+        function.validate_arguments!(args)
+        block.call(function, args)
+      end
 
-      args = function_arguments.transform_keys(&:to_sym)
-      function.validate_arguments!(args)
-      block.call(function, args)
       self
     end
 

data/lib/rach/version.rb

@@ -1,4 +1,4 @@
 module Rach
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
 end
 

data/lib/rach.rb

@@ -14,6 +14,7 @@ require_relative "rach/function"
 require_relative "rach/provider/base"
 require_relative "rach/provider/openai"
 require_relative "rach/provider/anthropic"
+require_relative "rach/provider/google"
 require_relative "rach/provider"
 require_relative "rach/prompt"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rach
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Roger Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-26 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.3'
+- !ruby/object:Gem::Dependency
+  name: gemini-ai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 description: Rach is a lightweight framework for orchestrating AI agents
 email:
 - rach@rogergarcia.me
@@ -119,6 +133,7 @@ files:
 - lib/rach/provider.rb
 - lib/rach/provider/anthropic.rb
 - lib/rach/provider/base.rb
+- lib/rach/provider/google.rb
 - lib/rach/provider/openai.rb
 - lib/rach/response.rb
 - lib/rach/response_format.rb
@@ -143,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Orchestrate AI agents like a virtuoso