ox-ai-workers 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ef23635cb8c4a085d92a6891d5a7b42ea4a2421c31566b2e0a0c64019ffde4
-  data.tar.gz: d3ee3406e6408da1f4abf1327e0b327cfdc9d70cab53368167a0074e995c0ac7
+  metadata.gz: fdbdf2dc16b6418e99209c8ff4710fedb25f01eec2b5980b8cc5562e3523d680
+  data.tar.gz: 33f8d2543e2167be860002296cb45736c4be5fac651be37244be5a0b5ba47ab2
 SHA512:
-  metadata.gz: 4ce35c11d98add4706ac5202f0ba93017f4563cc0c1340b159fa5218a6fa98e2fd1f2c4523a70963656e8ace51509c5a994aac6974e682f04984ab7836ddb4e0
-  data.tar.gz: ad68072b8c05b903c84f225d0978014a9f8d4f2bf36404b5ef2d6a9956405035f1c4e61287c58fd0e25b6500426eb2a2dcf758741a3437088cf03e15caa253e6
+  metadata.gz: 2f341be677a58fe8959bb86c8c6944769b77ae2d58a1cdae6800caf1ed5981d9c6532ad89549a6b5cb9189305049b123163754b5315a5e30369380a954c3c175
+  data.tar.gz: 616972852f978d9b6c8c014dd0295d1f338cdda7737db09358a3a5ab11b1e8d120cdc54c91a88618c068b81ff5ec7e16ffc26db11a6ce1bbd176698986f4d1d5

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 
-## [0.3.1] - 2024-07-30
+## [0.4.0] - 2024-07-30
+
+- Added tools: `file_system`, `database`
+- Added assistant: `coder`
+
+## [0.3.2] - 2024-07-30
 
 - Friendly I18n
 

data/exe/oxaiworkers

@@ -14,7 +14,6 @@ if ARGV.first == 'init'
     puts "Error: The #{dir} directory already exists."
   else
     FileUtils.mkdir_p "#{dir}/locales"
-    # FileUtils.copy_entry "#{source}/locales", "#{dest}/locales"
     if ARGV.last == 'full'
       FileUtils.copy_entry "#{source}/template", dest.to_s
     else

data/lib/ox-ai-workers.rb

@@ -19,10 +19,14 @@ require_relative 'oxaiworkers/delayed_request'
 require_relative 'oxaiworkers/dependency_helper'
 require_relative 'oxaiworkers/iterator'
 require_relative 'oxaiworkers/request'
+
 require_relative 'oxaiworkers/tool/eval'
+require_relative 'oxaiworkers/tool/database'
+require_relative 'oxaiworkers/tool/file_system'
 
 require_relative 'oxaiworkers/assistant/module_base'
 require_relative 'oxaiworkers/assistant/sysop'
+require_relative 'oxaiworkers/assistant/coder'
 
 module OxAiWorkers
   DEFAULT_MODEL = 'gpt-4o-mini'

data/lib/oxaiworkers/assistant/coder.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module OxAiWorkers
+  module Assistant
+    class Coder
+      include OxAiWorkers::Assistant::ModuleBase
+
+      def initialize(delayed: false, model: nil, language: 'ruby')
+        @iterator = Iterator.new(
+          worker: initWorker(delayed: delayed, model: model),
+          role: format(I18n.t('oxaiworkers.assistant.coder.role'), language),
+          tools: [Tool::Eval.new, Tool::FileSystem.new],
+          on_inner_monologue: ->(text:) { puts Rainbow("monologue: #{text}").yellow },
+          on_outer_voice: ->(text:) { puts Rainbow("voice: #{text}").green },
+          on_action_request: ->(text:) { puts Rainbow("action: #{text}").red },
+          on_pack_history: ->(text:) { puts Rainbow("summary: #{text}").blue }
+        )
+      end
+    end
+  end
+end

data/lib/oxaiworkers/assistant/module_base.rb

@@ -1,22 +1,22 @@
 module OxAiWorkers
   module Assistant
     module ModuleBase
-    	attr_accessor :iterator
-    	
-			def setTask task
-				@iterator.cleanup()
-				@iterator.addTask task
-			end
+      attr_accessor :iterator
 
-			def addResponse text
-				@iterator.addTask text
-			end
+      def setTask(task)
+        @iterator.cleanup
+        @iterator.addTask task
+      end
 
-			def initWorker delayed:, model:
-				worker = delayed ? OxAiWorkers::DelayedRequest.new : OxAiWorkers::Request.new
-	      worker.model = model || OxAiWorkers.configuration.model
-	      worker
-			end
+      def addResponse(text)
+        @iterator.addTask text
+      end
+
+      def initWorker(delayed:, model:)
+        worker = delayed ? DelayedRequest.new : Request.new
+        worker.model = model || OxAiWorkers.configuration.model
+        worker
+      end
     end
   end
-end
+end

data/lib/oxaiworkers/assistant/sysop.rb

@@ -6,10 +6,10 @@ module OxAiWorkers
       include OxAiWorkers::Assistant::ModuleBase
 
       def initialize(delayed: false, model: nil)
-        @iterator = OxAiWorkers::Iterator.new(
+        @iterator = Iterator.new(
           worker: initWorker(delayed: delayed, model: model),
           role: I18n.t('oxaiworkers.assistant.sysop.role'),
-          tools: [OxAiWorkers::Tool::Eval.new],
+          tools: [Tool::Eval.new],
           on_inner_monologue: ->(text:) { puts Rainbow("monologue: #{text}").yellow },
           on_outer_voice: ->(text:) { puts Rainbow("voice: #{text}").green },
           on_action_request: ->(text:) { puts Rainbow("action: #{text}").red },

data/lib/oxaiworkers/load_i18n.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'i18n'
-I18n.load_path += Dir["#{File.expand_path('locales')}/*.yml"]
+I18n.load_path += Dir["#{File.expand_path('../../locales', __dir__)}/*.yml"]

data/lib/oxaiworkers/module_request.rb

@@ -6,7 +6,7 @@ module OxAiWorkers
                   :tool_calls_raw, :tool_calls
 
     def initializeRequests(model: nil, max_tokens: nil, temperature: nil)
-      puts "call: ModuleRequest::#{__method__}"
+      # puts "call: ModuleRequest::#{__method__}"
       @max_tokens = max_tokens || OxAiWorkers.configuration.max_tokens
       @custom_id = SecureRandom.uuid
       @model = model || OxAiWorkers.configuration.model
@@ -23,7 +23,7 @@ module OxAiWorkers
     end
 
     def cleanup
-      puts "call: ModuleRequest::#{__method__}"
+      # puts "call: ModuleRequest::#{__method__}"
       @client ||= OpenAI::Client.new(
         access_token: OxAiWorkers.configuration.access_token,
         log_errors: true # Highly recommended in development, so you can see what errors OpenAI is returning. Not recommended in production because it could leak private data to your logs.

data/lib/oxaiworkers/tool/database.rb

@@ -0,0 +1,119 @@
+module OxAiWorkers
+  module Tool
+    #
+    # Connects to a database, executes SQL queries, and outputs DB schema for Agents to use
+    #
+    # Gem requirements:
+    #     gem "sequel", "~> 5.68.0"
+    #
+    # Usage:
+    #     database = OxAiWorkers::Tool::Database.new(connection_string: "postgres://user:password@localhost:5432/db_name")
+    #
+    class Database
+      extend OxAiWorkers::ToolDefinition
+      include OxAiWorkers::DependencyHelper
+
+      define_function :list_tables,
+                      description: I18n.t('oxaiworkers.tool.database_tool.list_tables.description')
+
+      define_function :describe_tables,
+                      description: I18n.t('oxaiworkers.tool.database_tool.describe_tables.description') do
+        property :tables, type: 'string',
+                          description: I18n.t('oxaiworkers.tool.database_tool.describe_tables.tables'),
+                          required: true
+      end
+
+      define_function :dump_schema,
+                      description: I18n.t('oxaiworkers.tool.database_tool.dump_schema.description')
+
+      define_function :execute,
+                      description: I18n.t('oxaiworkers.tool.database_tool.execute.description') do
+        property :input, type: 'string',
+                         description: I18n.t('oxaiworkers.tool.database_tool.execute.input'),
+                         required: true
+      end
+
+      attr_reader :db, :requested_tables, :excluded_tables
+
+      # Establish a database connection
+      #
+      # @param connection_string [String] Database connection info, e.g. 'postgres://user:password@localhost:5432/db_name'
+      # @param tables [Array<Symbol>] The tables to use. Will use all if empty.
+      # @param except_tables [Array<Symbol>] The tables to exclude. Will exclude none if empty.
+      # @return [Database] Database object
+      def initialize(connection_string:, tables: [], exclude_tables: [])
+        depends_on 'sequel'
+
+        raise StandardError, 'connection_string parameter cannot be blank' if connection_string.empty?
+
+        @db = Sequel.connect(connection_string)
+        @requested_tables = tables
+        @excluded_tables = exclude_tables
+      end
+
+      # Database Tool: Returns a list of tables in the database
+      def list_tables
+        db.tables
+      end
+
+      # Database Tool: Returns the schema for a list of tables
+      #
+      # @param tables [String] The tables to describe.
+      # @return [String] Database schema for the tables
+      def describe_tables(tables:)
+        schema = ''
+        tables.split(',').each do |table|
+          describe_table(table, schema)
+        end
+        schema
+      end
+
+      # Database Tool: Returns the database schema
+      #
+      # @return [String] Database schema
+      def dump_schema
+        puts('Dumping schema tables and keys', for: self.class)
+        schema = ''
+        db.tables.each do |table|
+          describe_table(table, schema)
+        end
+        schema
+      end
+
+      def describe_table(table, schema)
+        primary_key_columns = []
+        primary_key_column_count = db.schema(table).count { |column| column[1][:primary_key] == true }
+
+        schema << "CREATE TABLE #{table}(\n"
+        db.schema(table).each do |column|
+          schema << "#{column[0]} #{column[1][:type]}"
+          if column[1][:primary_key] == true
+            schema << ' PRIMARY KEY' if primary_key_column_count == 1
+          else
+            primary_key_columns << column[0]
+          end
+          schema << ",\n" unless column == db.schema(table).last && primary_key_column_count == 1
+        end
+        schema << "PRIMARY KEY (#{primary_key_columns.join(',')})" if primary_key_column_count > 1
+        db.foreign_key_list(table).each do |fk|
+          schema << ",\n" if fk == db.foreign_key_list(table).first
+          schema << "FOREIGN KEY (#{fk[:columns][0]}) REFERENCES #{fk[:table]}(#{fk[:key][0]})"
+          schema << ",\n" unless fk == db.foreign_key_list(table).last
+        end
+        schema << ");\n"
+      end
+
+      # Database Tool: Executes a SQL query and returns the results
+      #
+      # @param input [String] SQL query to be executed
+      # @return [Array] Results from the SQL query
+      def execute(input:)
+        puts("Executing \"#{input}\"", for: self.class)
+
+        db[input].to_a
+      rescue Sequel::DatabaseError => e
+        e.message
+      end
+    end
+  end
+end

data/lib/oxaiworkers/tool/eval.rb

@@ -8,18 +8,18 @@ module OxAiWorkers
       extend OxAiWorkers::ToolDefinition
       include OxAiWorkers::DependencyHelper
 
-      define_function :ruby, description: I18n.t('oxaiworkers.tool.eval.ruby.description') do
-        property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.ruby.input'), required: true
-      end
+      # define_function :ruby, description: I18n.t('oxaiworkers.tool.eval.ruby.description') do
+      #   property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.ruby.input'), required: true
+      # end
 
       define_function :sh, description: I18n.t('oxaiworkers.tool.eval.sh.description') do
         property :input, type: 'string', description: I18n.t('oxaiworkers.tool.eval.sh.input'), required: true
       end
 
-      def ruby(input:)
-        puts Rainbow("Executing ruby: \"#{input}\"").red
-        eval(input)
-      end
+      # def ruby(input:)
+      #   puts Rainbow("Executing ruby: \"#{input}\"").red
+      #   eval(input)
+      # end
 
       def sh(input:)
         puts Rainbow("Executing sh: \"#{input}\"").red

data/lib/oxaiworkers/tool/file_system.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module OxAiWorkers
+  module Tool
+    #
+    # A tool that wraps the Ruby file system classes.
+    #
+    # Usage:
+    #    file_system = OxAiWorkers::Tool::FileSystem.new
+    #
+    class FileSystem
+      extend OxAiWorkers::ToolDefinition
+
+      define_function :list_directory,
+                      description: I18n.t('oxaiworkers.tool.file_system.list_directory.description') do
+        property :directory_path, type: 'string',
+                                  description: I18n.t('oxaiworkers.tool.file_system.list_directory.directory_path'),
+                                  required: true
+      end
+
+      define_function :read_file, description: I18n.t('oxaiworkers.tool.file_system.read_file.description') do
+        property :file_path, type: 'string', description: I18n.t('oxaiworkers.tool.file_system.read_file.file_path'),
+                             required: true
+      end
+
+      define_function :write_to_file, description: I18n.t('oxaiworkers.tool.file_system.write_to_file.description') do
+        property :file_path, type: 'string',
+                             description: I18n.t('oxaiworkers.tool.file_system.write_to_file.file_path'), required: true
+        property :content, type: 'string', description: I18n.t('oxaiworkers.tool.file_system.write_to_file.content'),
+                           required: true
+      end
+
+      def list_directory(directory_path:)
+        puts "Listing directory: #{directory_path}"
+        Dir.entries(directory_path)
+      rescue Errno::ENOENT
+        "No such directory: #{directory_path}"
+      end
+
+      def read_file(file_path:)
+        puts "Reading file: #{file_path}"
+        File.read(file_path).to_s
+      rescue Errno::ENOENT
+        "No such file: #{file_path}"
+      end
+
+      def write_to_file(file_path:, content:)
+        puts "Writing to file: #{file_path}"
+        File.write(file_path, content)
+        "Content was successfully written to the file: #{file_path}"
+      rescue Errno::EACCES
+        "Permission denied: #{file_path}"
+      end
+    end
+  end
+end

data/lib/oxaiworkers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OxAiWorkers
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/locales/en.assistant.yml

@@ -2,4 +2,6 @@ en:
   oxaiworkers:
     assistant:
       sysop:
-        role: "You are a software agent inside my computer"
+        role: "You are a software agent inside my computer"
+      coder:
+        role: "You are a professional %s programmer inside my computer"

data/locales/en.tool.yml

@@ -7,4 +7,26 @@ en:
           input: "Ruby source code"
         sh:
           description: "Execute a sh command and get the result (stdout + stderr)"
-          input: "Source command"
+          input: "Source command"
+      file_system:
+        list_directory:
+          description: 'File System Tool: Lists out the content of a specified directory'
+          directory_path: 'Directory path to list'
+        read_file:
+          description: 'File System Tool: Reads the contents of a file'
+          file_path: 'Path to the file to read from'
+        write_to_file:
+          description: 'File System Tool: Write content to a file'
+          file_path: 'Path to the file to write'
+          content: 'Content to write to the file'
+      database_tool:
+        list_tables:
+          description: 'Database Tool: Returns a list of tables in the database'
+        describe_tables:
+          description: 'Database Tool: Returns the schema for a list of tables'
+          tables: 'The tables to describe'
+        dump_schema:
+          description: 'Database Tool: Returns the database schema'
+        execute:
+          description: 'Database Tool: Executes a SQL query and returns the results'
+          input: 'SQL query to be executed'

data/locales/ru.assistant.yml

@@ -3,3 +3,5 @@ ru:
     assistant:
       sysop:
         role: Ты программный агент внутри моего компьютера
+      coder:
+        role: "Ты профессиональный программист на %s внутри моего компьютера"

data/locales/ru.tool.yml

@@ -8,3 +8,25 @@ ru:
         sh:
           description: Выполнить sh-команду и получить результат (stdout + stderr)
           input: Исходная команда
+      file_system:
+        list_directory:
+          description: 'Инструмент файловой системы: Выводит содержимое указанного каталога'
+          directory_path: 'Путь к каталогу для вывода содержимого'
+        read_file:
+          description: 'Инструмент файловой системы: Считывает содержимое файла'
+          file_path: 'Путь к файлу для считывания'
+        write_to_file:
+          description: 'Инструмент файловой системы: Записывает содержимое в файл'
+          file_path: 'Путь к файлу для записи'
+          content: 'Содержимое для записи в файл'
+      database_tool:
+        list_tables:
+          description: 'Инструмент базы данных: Возвращает список таблиц в базе данных'
+        describe_tables:
+          description: 'Инструмент базы данных: Возвращает схему для списка таблиц'
+          tables: 'Таблицы для описания'
+        dump_schema:
+          description: 'Инструмент базы данных: Возвращает схему базы данных'
+        execute:
+          description: 'Инструмент базы данных: Выполняет SQL-запрос и возвращает результаты'
+          input: 'SQL-запрос для выполнения'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox-ai-workers
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Denis Smolev
@@ -120,6 +120,7 @@ files:
 - exe/oxaiworkers
 - exe/start
 - lib/ox-ai-workers.rb
+- lib/oxaiworkers/assistant/coder.rb
 - lib/oxaiworkers/assistant/module_base.rb
 - lib/oxaiworkers/assistant/sysop.rb
 - lib/oxaiworkers/compatibility.rb
@@ -133,7 +134,9 @@ files:
 - lib/oxaiworkers/state_batch.rb
 - lib/oxaiworkers/state_helper.rb
 - lib/oxaiworkers/state_tools.rb
+- lib/oxaiworkers/tool/database.rb
 - lib/oxaiworkers/tool/eval.rb
+- lib/oxaiworkers/tool/file_system.rb
 - lib/oxaiworkers/tool_definition.rb
 - lib/oxaiworkers/version.rb
 - lib/ruby/ox-ai-workers.rb