omniai-tools 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc814f27a50bb0ecceaff25eb4153aed6ade80ca24f7abcb74198e0a31afe627
-  data.tar.gz: c68820e0b080dc4812cd15871c8da74963d27b20960dd9e9e254b214bb313dfa
+  metadata.gz: 92931cd23e47e41ef1be07da377a47cf0e9af2456f58974f8a384597f9c2d6c6
+  data.tar.gz: 9adf44825839528ca308915cf6f58f5d5ef86b052f5dd7f4e5abfbef8fd98a6b
 SHA512:
-  metadata.gz: 6ad4b2eb6e1cee4bbfd6b34f1957bb663de22785f4b2071de5323d38d5614c9438f813bbab9b98b9a232335a43243e82191103e59aca054400323f6137f5886e
-  data.tar.gz: faf87bbacaf66022c34beb835674deda75b359e937bc4a734918b8f2cc28985438eba994b40ac0553c8fb1ab7bfa433532cd4cbe0d6dffa3fa5298fa904565dd
+  metadata.gz: b02dcd4125e9198e30c4ade51a6b942d9bc945ee03be946c0fb93328ffc3a7b3a29c2a4a10a3a5dfa98f003402d9e73de900e0015aed3e07969243cf16edc742
+  data.tar.gz: 4c4fa96c08aa45a8d0b76401602050e241a18a4eae4e5af6c59771a522fdb791c4bcc7771bf4bbd02e12f1c63e6d4945278030c8991bd56b35823a238b841abe

data/Gemfile

@@ -6,11 +6,13 @@ gemspec
 
 gem "factory_bot"
 gem "irb"
+gem "macos"
 gem "nokogiri"
 gem "omniai-anthropic"
 gem "omniai-google"
 gem "omniai-mistral"
 gem "omniai-openai"
+gem "pg"
 gem "rake"
 gem "redcarpet"
 gem "rspec"

data/README.md

@@ -10,7 +10,7 @@
 
 ## Browser
 
-Database tools are focused on running SQL statements:
+Browser tools allow you to interact with any website (e.g. visit a page, click on a button, fill in some text, etc):
 
 ```ruby
 require "omniai/openai"
@@ -53,6 +53,72 @@ Here are the top 5 posts on Hacker News right now:
 ...
 ```
 
+## Computer
+
+A computer tool grants the ability to manage a computer via an LLM:
+
+```ruby
+require "omniai/openai"
+require "omniai/tools"
+
+require "macos"
+
+client = OmniAI::OpenAI::Client.new
+logger = Logger.new($stdout)
+logger.formatter = proc { |_, _, _, message| "[computer] #{message}\n" }
+
+driver = OmniAI::Tools::Computer::MacDriver.new
+tools = [OmniAI::Tools::ComputerTool.new(driver:, logger:)]
+
+puts "Type 'exit' or 'quit' to leave."
+
+loop do
+  print "# "
+  text = gets.strip
+  break if %w[exit quit].include?(text)
+
+  driver.screenshot do |file|
+    client.chat(stream: $stdout, tools:) do |prompt|
+      prompt.system <<~TEXT
+        Assist the user with tasks related to the use their computer.
+
+        1. The display is #{driver.display_width}px (w) × #{driver.display_height}px (h).
+        2. Attached find a screenshot of the display that may be inspected to determine the state of the computer.
+        3. The computer is using MacOS with all the expected applications (e.g. Finder, Safari, etc).
+        4. Any coordinates used for clicking must be scaled for the bounds of the display.
+        5. Whenever possible prefer to navigate using keyboard shortcuts rather than mouse clicks.
+      TEXT
+
+      prompt.user do |message|
+        message.text(text)
+        message.file(file.path, "image/png")
+      end
+    end
+  end
+end
+```
+
+```
+Type 'exit' or 'quit' to leave.
+
+# What do you see on my screen?
+
+Here's what I see on your screen:
+- You are using a Mac with a display resolution of 2560×1440 pixels.
+- The Terminal app is open at the very top, with a command prompt in a directory related to "omnial-tools" and "computer".
+- Below the Terminal, Visual Studio Code (VS Code) is open showing a project directory named "omnial-tools", specifically in a folder like /examples/computer.
+
+# Please open Safari
+
+[computer] action="mouse_click" coordinate={x: 484, y: 1398} mouse_button="left"
+Safari is being opened now. Let me know if you need to visit a specific website or perform any other actions in Safari!
+
+# What is the current position of my mouse?
+
+[computer] action="mouse_position"
+Your mouse is currently positioned at approximately (484, 1398) on your screen.
+```
+
 ## Database
 
 Database tools are focused on running SQL statements:
@@ -64,13 +130,12 @@ require "omniai/tools"
 require "sqlite3"
 
 db = SQLite3::Database.new(":memory:")
+driver = OmniAI::Tools::Database::SqliteDriver.new(db:)
 
 client = OmniAI::OpenAI::Client.new
 logger = Logger.new($stdout)
 
-tools = [
-  OmniAI::Tools::Database::SqliteTool.new(logger:, db:),
-]
+tools = [OmniAI::Tools::DatabaseTool.new(logger:, driver:)]
 
 puts "Type 'exit' or 'quit' to leave."
 

data/lib/omniai/tools/browser/watir_driver.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "watir"
-
 module OmniAI
   module Tools
     module Browser

data/lib/omniai/tools/browser_tool.rb

@@ -104,7 +104,7 @@ module OmniAI
         * `#{Action::LINK_CLICK}`: Click a link element
         * `#{Action::ELEMENT_CLICK}`: Click any clickable element
         * `#{Action::TEXT_FIELD_SET}`: Enter text in input fields or text areas
-        * `#{Action::SCREENSHOT}`: Take a screenshot of the page or specific element
+        * `#{Action::SCREENSHOT}`: Take a screenshot of the current page
       TEXT
 
       parameter :url, :string, description: <<~TEXT

data/lib/omniai/tools/computer/base_driver.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+require "sqlite3"
+
+module OmniAI
+  module Tools
+    module Computer
+      # A tool for interacting with a computer. Be careful with using as it can perform actions on your computer!
+      #
+      # @example
+      #   class SomeDriver < BaseDriver
+      #     @param text [String]
+      #     def key(text:)
+      #       # TODO
+      #     end
+      #
+      #     # @param text [String]
+      #     # @param duration [Integer]
+      #     def hold_key(text:, duration:)
+      #       # TODO
+      #     end
+      #
+      #     # @return [Hash<{ x: Integer, y: Integer }>]
+      #     def mouse_position
+      #       # TODO
+      #     end
+      #
+      #     # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+      #     # @param button [String] e.g. "left", "middle", "right"
+      #     def mouse_move(coordinate:)
+      #       # TODO
+      #     end
+      #
+      #     # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+      #     # @param button [String] e.g. "left", "middle", "right"
+      #     def mouse_click(coordinate:, button:)
+      #       # TODO
+      #     end
+      #
+      #     # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+      #     # @param button [String] e.g. "left", "middle", "right"
+      #     def mouse_down(coordinate:, button:)
+      #       # TODO
+      #     end
+      #
+      #     # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+      #     # @param button [String] e.g. "left", "middle", "right"
+      #     def mouse_up(coordinate:, button:)
+      #       # TODO
+      #     end
+      #
+      #     # @param text [String]
+      #     def type(text:)
+      #       # TODO
+      #     end
+      #
+      #     # @param amount [Integer]
+      #     # @param direction [String] e.g. "up", "down", "left", "right"
+      #     def scroll(amount:, direction:)
+      #       # TODO
+      #     end
+      #
+      #     # @yield [file]
+      #     # @yieldparam file [File]
+      #     def screenshot
+      #       # TODO
+      #     end
+      #   end
+      class BaseDriver
+        DEFAULT_MOUSE_BUTTON = "left"
+        DEFAULT_DISPLAY_SCALE = 2
+
+        # @!attr_accessor :display_height
+        #   @return [Integer] the height of the display in pixels
+        attr_accessor :display_width
+
+        # @!attr_accessor :display_height
+        #   @return [Integer] the height of the display in pixels
+        attr_accessor :display_height
+
+        # @!attr_accessor :display_number
+        #   @return [Integer] the display number
+        attr_accessor :display_number
+
+        # @param display_width [Integer] the width of the display in pixels
+        # @param display_height [Integer] the height of the display in pixels
+        # @param display_number [Integer] the display number
+        def initialize(display_width:, display_height:, display_number:)
+          @display_width = display_width
+          @display_height = display_height
+
+          @display_number = display_number
+        end
+
+        # @param text [String]
+        def key(text:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param text [String]
+        # @param duration [Integer]
+        def hold_key(text:, duration:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @return [Hash<{ x: Integer, y: Integer }>]
+        def mouse_position
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_move(coordinate:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_click(coordinate:, button:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_down(coordinate:, button:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_up(coordinate:, button:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_drag(coordinate:, button: DEFAULT_MOUSE_BUTTON)
+          mouse_down(coordinate: mouse_position, button:)
+          mouse_move(coordinate:, button:)
+          mouse_up(coordinate:, button:)
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_double_click(coordinate:, button:)
+          2.times { mouse_click(coordinate:, button:) }
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_triple_click(coordinate:, button:)
+          3.times { mouse_click(coordinate:, button:) }
+        end
+
+        # @param text [String]
+        def type(text:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param amount [Integer]
+        # @param direction [String] e.g. "up", "down", "left", "right"
+        def scroll(amount:, direction:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @yield [file]
+        # @yieldparam file [File]
+        def screenshot
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @param duration [Integer]
+        def wait(duration:)
+          Kernel.sleep(duration)
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/computer/mac_driver.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Tools
+    module Computer
+      # A driver for interacting with a Mac. Be careful with using as it can perform actions on your computer!
+      class MacDriver < BaseDriver
+        def initialize(keyboard: MacOS.keyboard, mouse: MacOS.mouse, display: MacOS.display)
+          @keyboard = keyboard
+          @mouse = mouse
+          @display = display
+
+          super(display_width: display.wide, display_height: display.high, display_number: display.id)
+        end
+
+        # @param text [String]
+        def key(text:)
+          @keyboard.keys(text)
+        end
+
+        # @param text [String]
+        # @param duration [Integer]
+        def hold_key(text:, duration:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @return [Hash<{ x: Integer, y: Integer }>]
+        def mouse_position
+          position = @mouse.position
+          x = position.x
+          y = position.y
+
+          {
+            x:,
+            y:,
+          }
+        end
+
+        def mouse_move(coordinate:)
+          x = coordinate[:x]
+          y = coordinate[:y]
+
+          @mouse.move(x:, y:)
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_click(coordinate:, button:)
+          x = coordinate[:x]
+          y = coordinate[:y]
+
+          case button
+          when "left" then @mouse.left_click(x:, y:)
+          when "middle" then @mouse.middle_click(x:, y:)
+          when "right" then @mouse.right_click(x:, y:)
+          end
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        def mouse_down(coordinate:, button: DEFAULT_MOUSE_BUTTON)
+          x = coordinate[:x]
+          y = coordinate[:y]
+
+          case button
+          when "left" then @mouse.left_down(x:, y:)
+          when "middle" then @mouse.middle_down(x:, y:)
+          when "right" then @mouse.right_down(x:, y:)
+          end
+        end
+
+        # @param coordinate [Hash<{ x: Integer, y: Integer }>]
+        # @param button [String] e.g. "left", "middle", "right"
+        def mouse_up(coordinate:, button: DEFAULT_MOUSE_BUTTON)
+          x = coordinate[:x]
+          y = coordinate[:y]
+
+          case button
+          when "left" then @mouse.left_up(x:, y:)
+          when "middle" then @mouse.middle_up(x:, y:)
+          when "right" then @mouse.right_up(x:, y:)
+          end
+        end
+
+        # @param text [String]
+        def type(text:)
+          @keyboard.type(text)
+        end
+
+        # @param amount [Integer]
+        # @param direction [String] e.g. "up", "down", "left", "right"
+        def scroll(amount:, direction:)
+          raise NotImplementedError, "#{self.class.name}##{__method__} undefined"
+        end
+
+        # @yield [file]
+        # @yieldparam file [File]
+        def screenshot(&)
+          @display.screenshot(&)
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/computer_tool.rb

@@ -0,0 +1,189 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Tools
+    # A tool for interacting with a computer. Be careful with using as it can perform actions on your computer!
+    #
+    # @example
+    #   computer = OmniAI::Tools::Computer::MacTool.new
+    #   computer.display # { "width": 2560, "height": 1440, "scale": 1 }
+    #   computer.screenshot
+    class ComputerTool < OmniAI::Tool
+      description "A tool for interacting with a computer."
+
+      module Action
+        KEY = "key" # press a key
+        HOLD_KEY = "hold_key" # hold a key
+        MOUSE_POSITION = "mouse_position" # get the current (x, y) pixel coordinate of the cursor on the screen
+        MOUSE_MOVE = "mouse_move" # move the cursor to a specific (x, y) pixel coordinate on the screen
+        MOUSE_CLICK = "mouse_click" # click at a specific x / y coordinate
+        MOUSE_DOWN = "mouse_down" # press the mouse button down
+        MOUSE_DRAG = "mouse_drag" # drag the mouse to a specific x / y coordinate
+        MOUSE_UP = "mouse_up" # release the mouse button
+        MOUSE_DOUBLE_CLICK = "mouse_double_click" # double click at a specific x / y coordinate
+        MOUSE_TRIPLE_CLICK = "mouse_triple_click" # triple click at a specific x / y coordinate
+        TYPE = "type" # type a string
+        SCROLL = "scroll"
+        WAIT = "wait"
+      end
+
+      module MouseButton
+        LEFT = "left"
+        MIDDLE = "middle"
+        RIGHT = "right"
+      end
+
+      module ScrollDirection
+        UP = "up"
+        DOWN = "down"
+        LEFT = "left"
+        RIGHT = "right"
+      end
+
+      ACTIONS = [
+        Action::KEY,
+        Action::HOLD_KEY,
+        Action::MOUSE_POSITION,
+        Action::MOUSE_MOVE,
+        Action::MOUSE_CLICK,
+        Action::MOUSE_DOWN,
+        Action::MOUSE_DRAG,
+        Action::MOUSE_UP,
+        Action::TYPE,
+        Action::SCROLL,
+        Action::WAIT,
+      ].freeze
+
+      MOUSE_BUTTON_OPTIONS = [
+        MouseButton::LEFT,
+        MouseButton::MIDDLE,
+        MouseButton::RIGHT,
+      ].freeze
+
+      SCROLL_DIRECTION_OPTIONS = [
+        ScrollDirection::UP,
+        ScrollDirection::DOWN,
+        ScrollDirection::LEFT,
+        ScrollDirection::RIGHT,
+      ].freeze
+
+      parameter :action, :string, enum: ACTIONS, description: <<~TEXT
+        Options:
+        * `#{Action::KEY}`: Press a single key / combination of keys on the keyboard:
+          - supports xdotool's `key` syntax (e.g. "alt+Tab", "Return", "ctrl+s", etc)
+        * `#{Action::HOLD_KEY}`: Hold down a key or multiple keys for a specified duration (in seconds):
+          - supports xdotool's `key` syntax (e.g. "alt+Tab", "Return", "ctrl+s", etc)
+        * `#{Action::MOUSE_POSITION}`: Get the current (x,y) pixel coordinate of the cursor on the screen.
+        * `#{Action::MOUSE_MOVE}`: Move the cursor to a specified (x,y) pixel coordinate on the screen.
+        * `#{Action::MOUSE_CLICK}`: Click the mouse button at the specified (x,y) pixel coordinate on the screen.
+        * `#{Action::MOUSE_DOUBLE_CLICK}`: Double click at the specified (x,y) pixel coordinate on the screen.
+        * `#{Action::MOUSE_TRIPLE_CLICK}`: Triple click at the specified (x,y) pixel coordinate on the screen.
+        * `#{Action::MOUSE_DOWN}`: Press the mouse button at the specified (x,y) pixel coordinate on the screen.
+        * `#{Action::MOUSE_DRAG}`: Click and drag the cursor to a specified (x, y) pixel coordinate on the screen.
+        * `#{Action::MOUSE_UP}`: Release the mouse button at the specified (x,y) pixel coordinate on the screen.
+        * `#{Action::TYPE}`: Type a string of text on the keyboard.
+        * `#{Action::SCROLL}`: Scroll the screen in a specified direction by a specified amount of clicks of the scroll wheel.
+        * `#{Action::WAIT}`: Wait for a specified duration (in seconds).
+      TEXT
+
+      parameter :coordinate, :object, properties: {
+        x: OmniAI::Schema.integer(description: "The x position in pixels"),
+        y: OmniAI::Schema.integer(description: "The y position in pixels"),
+      }, required: %i[x y], description: <<~TEXT
+        An (x,y) coordinate. Required for the following actions:
+        * `#{Action::MOUSE_MOVE}`
+        * `#{Action::MOUSE_CLICK}`
+        * `#{Action::MOUSE_DOWN}`
+        * `#{Action::MOUSE_DRAG}`
+        * `#{Action::MOUSE_UP}`
+        * `#{Action::MOUSE_DOUBLE_CLICK}`
+        * `#{Action::MOUSE_TRIPLE_CLICK}`
+      TEXT
+
+      parameter :text, :string, description: <<~TEXT
+        The text to type. Required for the following actions:
+        * `#{Action::KEY}`
+        * `#{Action::HOLD_KEY}`
+        * `#{Action::TYPE}`
+      TEXT
+
+      parameter :duration, :integer, description: <<~TEXT
+        A duration in seconds. Required for the following actions:
+        * `#{Action::HOLD_KEY}`
+        * `#{Action::WAIT}`
+      TEXT
+
+      parameter :mouse_button, :string, enum: MOUSE_BUTTON_OPTIONS, description: <<~TEXT
+        The mouse button to use. Required for the following actions:
+        * `#{Action::MOUSE_CLICK}`
+        * `#{Action::MOUSE_DOWN}`
+        * `#{Action::MOUSE_DRAG}`
+        * `#{Action::MOUSE_UP}`
+        * `#{Action::MOUSE_DOUBLE_CLICK}`
+        * `#{Action::MOUSE_TRIPLE_CLICK}`
+      TEXT
+
+      parameter :scroll_direction, :string, enum: SCROLL_DIRECTION_OPTIONS, description: <<~TEXT
+        The direction to scroll. Required for the following actions:
+        * `#{Action::SCROLL}`
+      TEXT
+
+      parameter :scroll_amount, :integer, description: <<~TEXT
+        The amount of clicks to scroll. Required for the following actions:
+        * `#{Action::SCROLL}`
+      TEXT
+
+      required %i[action]
+
+      # @param driver [Computer::Driver]
+      def initialize(driver:, logger: Logger.new(IO::NULL))
+        @driver = driver
+        @logger = logger
+        super()
+      end
+
+      # @param action [String]
+      # @param coordinate [Hash<{ width: Integer, height: Integer }>] the (x,y) coordinate
+      # @param text [String]
+      # @param duration [Integer] the duration in seconds
+      # @param mouse_button [String] e.g. "left", "middle", "right"
+      # @param scroll_direction [String] e.g. "up", "down", "left", "right"
+      # @param scroll_amount [Integer] the amount of clicks to scroll
+      def execute(
+        action:,
+        coordinate: nil,
+        text: nil,
+        duration: nil,
+        mouse_button: nil,
+        scroll_direction: nil,
+        scroll_amount: nil
+      )
+        @logger.info({
+          action:,
+          coordinate:,
+          text:,
+          duration:,
+          mouse_button:,
+          scroll_direction:,
+          scroll_amount:,
+        }.compact.map { |key, value| "#{key}=#{value.inspect}" }.join(" "))
+
+        case action
+        when Action::KEY then @driver.key(text:)
+        when Action::HOLD_KEY then @driver.hold_key(text:, duration:)
+        when Action::MOUSE_POSITION then @driver.mouse_position
+        when Action::MOUSE_MOVE then @driver.mouse_move(coordinate:)
+        when Action::MOUSE_CLICK then @driver.mouse_click(coordinate:, button: mouse_button)
+        when Action::MOUSE_DOUBLE_CLICK then @driver.mouse_double_click(coordinate:, button: mouse_button)
+        when Action::MOUSE_TRIPLE_CLICK then @driver.mouse_triple_click(coordinate:, button: mouse_button)
+        when Action::MOUSE_DOWN then @driver.mouse_down(coordinate:, button: mouse_button)
+        when Action::MOUSE_UP then @driver.mouse_up(coordinate:, button: mouse_button)
+        when Action::MOUSE_DRAG then @driver.mouse_drag(coordinate:, button: mouse_button)
+        when Action::TYPE then @driver.type(text:)
+        when Action::SCROLL then @driver.scroll(amount: scroll_amount, direction: scroll_direction)
+        when Action::WAIT then @driver.wait(duration:)
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/database/base_driver.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Tools
+    module Database
+      # Base class for database drivers (e.g. sqlite, postgres, mysql, etc).
+      class BaseDriver
+        # @param statement [String] e.g. "SELECT * FROM people"
+        #
+        # @return [Hash] e.g. { status: :ok, result: [["id", "name"], [1, "John"], [2, "Paul"], ...] }
+        def perform(statement:)
+          raise NotImplementedError, "#{self.class}##{__method__} undefined"
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/database/postgres_driver.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Tools
+    module Database
+      # @example
+      #   connection = PG.connect(dbname: "testdb")
+      #   driver = OmniAI::Tools::Database::PostgresDriver.new
+      #   driver.perform(statement: "SELECT * FROM people")
+      class PostgresDriver < BaseDriver
+        # @param connection [Sqlite3::Database]
+        def initialize(connection:)
+          super()
+          @connection = connection
+        end
+
+        # @param statement [String]
+        #
+        # @return [Hash]
+        def perform(statement:)
+          @connection.exec(statement) do |result|
+            { status: :ok, result: [result.fields] + result.values }
+          end
+        rescue ::PG::Error => e
+          { status: :error, message: e.message }
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/database/sqlite_driver.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Tools
+    module Database
+      # @example
+      #   driver = OmniAI::Tools::Database::SqliteDriver.new
+      #   driver.perform(statement: "SELECT * FROM people")
+      class SqliteDriver < BaseDriver
+        # @param db [Sqlite3::Database]
+        def initialize(db:)
+          super()
+          @db = db
+        end
+
+        # @param statement [String]
+        #
+        # @return [Hash]
+        def perform(statement:)
+          result = @db.execute2(statement)
+
+          { status: :ok, result: }
+        rescue ::SQLite3::Exception => e
+          { status: :error, message: e.message }
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/database_tool.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Tools
+    # @example
+    #   db = Sqlite3::Database.new("./db.sqlite")
+    #   driver = OmniAI::Tools::Database::Sqlite.new(db:)
+    #   tool = OmniAI::Tools::DatabaseTool.new(driver:)
+    #   tool.execute(statements: ["SELECT * FROM people"])
+    class DatabaseTool < OmniAI::Tool
+      description <<~TEXT
+        Executes SQL commands (INSERT / UPDATE / SELECT / etc) on a database.
+
+        Example:
+
+        STATEMENTS:
+
+            [
+              'CREATE TABLE people (id INTEGER PRIMARY KEY, name TEXT NOT NULL)',
+              'INSERT INTO people (name) VALUES ('John')',
+              'INSERT INTO people (name) VALUES ('Paul')',
+              'SELECT * FROM people',
+              'DROP TABLE people'
+            ]
+
+        RESULT:
+
+            [
+              {
+                "status": "OK",
+                "statement": "CREATE TABLE people (id INTEGER PRIMARY KEY, name TEXT NOT NULL)",
+                "result": "..."
+              },
+              {
+                "status": "OK",
+                "statement": "INSERT INTO people (name) VALUES ('John')"
+                "result": "..."
+              },
+              {
+                "status": "OK",
+                "statement": "INSERT INTO people (name) VALUES ('Paul')",
+                "result": "..."
+              },
+              {
+                "status": "OK",
+                "statement": "SELECT * FROM people",
+                "result": "..."
+              },
+              {
+                "status": "OK",
+                "statement": "DROP TABLE people",
+                "result": "..."
+              }
+            ]
+      TEXT
+
+      parameter(
+        :statements,
+        :array,
+        description: "A list of SQL statements to run sequentially.",
+        items: OmniAI::Schema.string(description: 'A SQL statement to run (e.g. "SELECT * FROM ...").')
+      )
+
+      required %i[statements]
+
+      # @param driver [OmniAI::Tools::Database::BaseDriver]
+      # @param logger [IO] An optional logger for debugging executed commands.
+      def initialize(driver:, logger: Logger.new(IO::NULL))
+        super()
+        @driver = driver
+        @logger = logger
+      end
+
+      # @example
+      #   tool = OmniAI::Tools::Database::BaseTool.new
+      #   tool.execute(statements: ["SELECT * FROM people"])
+      #
+      # @param statements [Array<String>]
+      #
+      # @return [Array<Hash>]
+      def execute(statements:)
+        [].tap do |executions|
+          statements.map do |statement|
+            execution = perform(statement:).merge(statement:)
+            executions << execution
+            break unless execution[:status].eql?(:ok)
+          end
+        end
+      end
+
+      def perform(statement:)
+        @logger&.info("#perform statement=#{statement.inspect}")
+
+        @driver.perform(statement:).tap do |result|
+          @logger&.info(JSON.generate(result))
+        end
+      end
+    end
+  end
+end

data/lib/omniai/tools/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Tools
-    VERSION = "0.5.1"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: omniai-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Kevin Sylvestre
 bindir: exe
 cert_chain: []
-date: 2025-05-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniai
@@ -76,8 +76,13 @@ files:
 - lib/omniai/tools/browser/visit_tool.rb
 - lib/omniai/tools/browser/watir_driver.rb
 - lib/omniai/tools/browser_tool.rb
-- lib/omniai/tools/database/base_tool.rb
-- lib/omniai/tools/database/sqlite_tool.rb
+- lib/omniai/tools/computer/base_driver.rb
+- lib/omniai/tools/computer/mac_driver.rb
+- lib/omniai/tools/computer_tool.rb
+- lib/omniai/tools/database/base_driver.rb
+- lib/omniai/tools/database/postgres_driver.rb
+- lib/omniai/tools/database/sqlite_driver.rb
+- lib/omniai/tools/database_tool.rb
 - lib/omniai/tools/disk/base_tool.rb
 - lib/omniai/tools/disk/directory_create_tool.rb
 - lib/omniai/tools/disk/directory_delete_tool.rb
@@ -113,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A set of tools built for usage with OmniAI.
 test_files: []

data/lib/omniai/tools/database/base_tool.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require "sqlite3"
-
-module OmniAI
-  module Tools
-    module Database
-      # @example
-      #   tool = OmniAI::Tools::Database::SqliteTool.new
-      #   tool.execute(path: "./foo/bar")
-      class BaseTool < OmniAI::Tool
-        # @param logger [IO] An optional logger for debugging executed commands.
-        def initialize(logger: Logger.new(IO::NULL))
-          super()
-          @logger = logger
-        end
-
-        # @example
-        #   tool = OmniAI::Tools::Database::BaseTool.new
-        #   tool.execute(statements: ["SELECT * FROM people"])
-        #
-        # @param statements [Array<String>]
-        #
-        # @return [Array<Hash>]
-        def execute(statements:)
-          [].tap do |executions|
-            statements.map do |statement|
-              execution = perform(statement:)
-              executions << execution
-              break unless execution[:status].eql?(:ok)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/omniai/tools/database/sqlite_tool.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-require "sqlite3"
-
-module OmniAI
-  module Tools
-    module Database
-      # @example
-      #   tool = OmniAI::Tools::Database::SqliteTool.new
-      #   tool.execute(path: "./foo/bar")
-      class SqliteTool < BaseTool
-        description <<~TEXT
-          Executes SQL commands (INSERT / UPDATE / SELECT / etc) on a database.
-
-          Example:
-
-          STATEMENTS:
-
-              [
-                'CREATE TABLE people (id INTEGER PRIMARY KEY, name TEXT NOT NULL)',
-                'INSERT INTO people (name) VALUES ('John')',
-                'INSERT INTO people (name) VALUES ('Paul')',
-                'SELECT * FROM people',
-                'DROP TABLE people'
-              ]
-
-          RESULT:
-
-              [
-                {
-                  "status": "OK",
-                  "statement": "CREATE TABLE people (id INTEGER PRIMARY KEY, name TEXT NOT NULL)",
-                  "result": "..."
-                },
-                {
-                  "status": "OK",
-                  "statement": "INSERT INTO people (name) VALUES ('John')"
-                  "result": "..."
-                },
-                {
-                  "status": "OK",
-                  "statement": "INSERT INTO people (name) VALUES ('Paul')",
-                  "result": "..."
-                },
-                {
-                  "status": "OK",
-                  "statement": "SELECT * FROM people",
-                  "result": "..."
-                },
-                {
-                  "status": "OK",
-                  "statement": "DROP TABLE people",
-                  "result": "..."
-                }
-              ]
-        TEXT
-
-        parameter(
-          :statements,
-          :array,
-          description: "A list of SQL statements to run sequentially.",
-          items: OmniAI::Schema.string(description: 'A SQL statement to run (e.g. "SELECT * FROM ...").')
-        )
-
-        required %i[statements]
-
-        # @param logger [IO] An optional logger for debugging executed commands.
-        # @param db [SQLite3::Database] A sqlite database.
-        def initialize(db:, logger: Logger.new(IO::NULL))
-          super(logger:)
-          @db = db
-        end
-
-        # @example
-        #   tool = OmniAI::Tools::Database::BaseTool.new
-        #   tool.execute(statements: ["SELECT * FROM people"])
-        #
-        # @param statements [Array<String>]
-        #
-        # @return [Array<Hash>]
-        def execute(statements:)
-          @logger.info("#{self.class.name}#{__method__} statements=#{statements.inspect}")
-
-          [].tap do |executions|
-            statements.map do |statement|
-              execution = perform(statement:)
-              executions << execution
-              break unless execution[:status].eql?(:ok)
-            end
-          end
-        end
-
-      protected
-
-        # @param statement [String]
-        #
-        # @return [Hash]
-        def perform(statement:)
-          result = @db.execute2(statement)
-
-          { status: :ok, statement:, result: }
-        rescue ::SQLite3::Exception => e
-          @logger.warn("ERROR: #{e.message}")
-
-          { status: :error, statement:, result: e.message }
-        end
-      end
-    end
-  end
-end