sublayer 0.2.3 → 0.2.5

data/lib/sublayer/cli/commands/subcommand_base.rb

@@ -0,0 +1,13 @@
+module Sublayer
+  module Commands
+    class SubCommandBase < Thor
+      def self.banner(command, namespace = nil, subcommand = false)
+        "#{basename} #{subcommand_prefix} #{command.usage}"
+      end
+
+      def self.subcommand_prefix
+        self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/%project_name%.gemspec.tt

@@ -0,0 +1,35 @@
+require_relative "lib/<%= project_name.gsub("-", "_") %>/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "<%= project_name %>"
+  spec.version = <%= project_name.camelize %>::VERSION
+  spec.authors = ["Your Name"]
+  spec.email = ["your.email@example.com"]
+
+  spec.summary = "Summary of your project"
+  spec.description = "Longer description of your project"
+  spec.homepage = "https://github.com/yourusername/<%= project_name %>"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/yourusername/<%= project_name %>"
+  spec.metadata["changelog_uri"] = "https://github.com/yourusername/<%= project_name %>/blob/master/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = "bin"
+  spec.executables = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Add dependencies here
+  spec.add_dependency "sublayer", "~> <%= sublayer_version %>"
+  spec.add_dependency "thor", "~> 1.2"
+end

data/lib/sublayer/cli/templates/cli/.gitignore

@@ -0,0 +1,14 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/log/
+
+.rspec_status
+
+.DS_Store
+.DS_Store?

data/lib/sublayer/cli/templates/cli/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec
+
+group :development, :test do
+  gem "rspec", "~> 3.10"
+end

data/lib/sublayer/cli/templates/cli/README.md.tt

@@ -0,0 +1,22 @@
+# <%= project_name %>
+
+Welcome to your new Sublayer CLI project!
+
+## Installation
+
+Execute:
+
+    $ bundle install
+
+## Usage
+
+To run your CLI application:
+
+```
+$ bin/<%= project_name %>
+```
+
+Available commands:
+- `example`: Run the example generator
+- `help`: Display the help message
+

data/lib/sublayer/cli/templates/cli/bin/%project_name%.tt

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/<%= project_name %>"
+
+<%= project_name.camelize %>::CLI.start(ARGV)

data/lib/sublayer/cli/templates/cli/lib/%project_name%/actions/example_action.rb.tt

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module <%= project_name.camelize %>
+  module Actions
+    class ExampleAction < Sublayer::Actions::Base
+      def initialize(input:)
+        @input = input
+      end
+
+      def call
+        puts "Performing action with input: #{@input}"
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/agents/example_agent.rb.tt

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module <%= project_name.camelize %>
+  module Agents
+    class ExampleAgent < Sublayer::Agents::Base
+      trigger_on_files_changed { ["example_file.txt"] }
+
+      goal_condition { @goal_reached }
+
+      check_status do
+        @status_checked = true
+      end
+
+      step do
+        @step_taken = true
+        @goal_reached = true
+        puts "Example agent step executed"
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/cli.rb.tt

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module <%= project_name.camelize %>
+  class CLI < Thor
+    <%= project_name.camelize %>::Commands.constants.reject{ |command_class| command_class == :BaseCommand }.each do |command_class|
+      command = <%= project_name.camelize %>::Commands.const_get(command_class)
+      desc command.command_name, command.description
+      define_method(command.command_name) do |*args|
+        command.new(options).execute(*args)
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/commands/base_command.rb.tt

@@ -0,0 +1,21 @@
+module <%= project_name.camelize %>
+  module Commands
+    class BaseCommand
+      def self.command_name
+        name.split("::").last.gsub(/Command$/, '').downcase
+      end
+
+      def self.description
+        "Description for #{command_name}"
+      end
+
+      def initialize(options)
+        @options = options
+      end
+
+      def execute(*args)
+        raise NotImplementedError, "#{self.class} must implement #execute"
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/commands/example_command.rb.tt

@@ -0,0 +1,13 @@
+module <%= project_name.camelize %>
+  module Commands
+    class ExampleCommand < BaseCommand
+      def self.description
+        "An example command that generates a story based on the command line arguments."
+      end
+
+      def execute(*args)
+        puts <%= project_name.camelize %>::Generators::ExampleGenerator.new(input: args.join(" ")).generate
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/config.rb.tt

@@ -0,0 +1,19 @@
+module <%= project_name.camelize %>
+  module Config
+    def self.load
+      config_path = File.join(File.dirname(__FILE__), "config", "sublayer.yml")
+
+      if File.exist?(config_path)
+        config = YAML.load_file(config_path)
+
+        Sublayer.configure do |c|
+          c.ai_provider = Object.const_get("Sublayer::Providers::#{config[:ai_provider]}")
+          c.ai_model = config[:ai_model]
+          c.logger = Sublayer::Logging::JsonLogger.new(File.join(Dir.pwd, 'log', 'sublayer.log'))
+        end
+      else
+        puts "Warning: config/sublayer.yml not found. Using default configuration."
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/generators/example_generator.rb.tt

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module <%= project_name.camelize %>
+  module Generators
+    class ExampleGenerator < Sublayer::Generators::Base
+      llm_output_adapter type: :single_string,
+        name: "generated_text",
+        description: "A simple generated text"
+
+      def initialize(input:)
+        @input = input
+      end
+
+      def generate
+        super
+      end
+
+      def prompt
+        <<-PROMPT
+          Generate a simple story based on this input: #{@input}
+        PROMPT
+      end
+    end
+  end
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%/version.rb.tt

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module <%= project_name.camelize %>
+  VERSION = "0.0.1"
+end

data/lib/sublayer/cli/templates/cli/lib/%project_name%.rb.tt

@@ -0,0 +1,21 @@
+require "yaml"
+require "thor"
+require "sublayer"
+require_relative "<%= project_name.gsub("-", "_") %>/version"
+require_relative "<%= project_name.gsub("-", "_") %>/config"
+
+Dir[File.join(__dir__, "<%= project_name.gsub("-", "_") %>", "commands", "*.rb")].each { |file| require file }
+Dir[File.join(__dir__, "<%= project_name.gsub("-", "_") %>", "generators", "*.rb")].each { |file| require file }
+Dir[File.join(__dir__, "<%= project_name.gsub("-", "_") %>", "actions", "*.rb")].each { |file| require file }
+Dir[File.join(__dir__, "<%= project_name.gsub("-", "_") %>", "agents", "*.rb")].each { |file| require file }
+
+require_relative "<%= project_name.gsub("-", "_") %>/cli"
+
+module <%= project_name.camelize %>
+  class Error < StandardError; end
+  Config.load
+
+  def self.root
+    File.dirname __dir__
+  end
+end

data/lib/sublayer/cli/templates/quick_script/%project_name%.rb

@@ -0,0 +1,7 @@
+require "yaml"
+require "sublayer"
+
+# Load any Actions, Generators, and Agents
+Dir[File.join(__dir__, "actions", "*.rb")].each { |file| require file }
+Dir[File.join(__dir__, "generators", "*.rb")].each { |file| require file }
+Dir[File.join(__dir__, "agents", "*.rb")].each { |file| require file }

data/lib/sublayer/cli/templates/quick_script/README.md.tt

@@ -0,0 +1,16 @@
+# <%= project_name.camelize %>
+
+Welcome to your new Sublayer quick script project!
+
+There are example Agents, Generators, and Actions in the respective folders.
+
+## Usage
+
+Create your own custom agents, generators, and actions and use them in
+`<%= project_name %>.rb`
+
+Run your script:
+
+```
+$ ruby <%= project_name %>.rb
+```

data/lib/sublayer/cli/templates/quick_script/actions/example_action.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ExampleAction < Sublayer::Actions::Base
+  def initialize(input:)
+    @input = input
+  end
+
+  def call
+    puts "Performing action with input: #{@input}"
+  end
+end

data/lib/sublayer/cli/templates/quick_script/agents/example_agent.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ExampleAgent < Sublayer::Agents::Base
+  trigger_on_files_changed { ["example_file.txt"] }
+
+  goal_condition { @goal_reached }
+
+  check_status do
+    @status_checked = true
+  end
+
+  step do
+    @step_taken = true
+    @goal_reached = true
+    puts "Example agent step executed"
+  end
+end

data/lib/sublayer/cli/templates/quick_script/generators/example_generator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ExampleGenerator < Sublayer::Generators::Base
+  llm_output_adapter type: :single_string,
+    name: "generated_text",
+    description: "A simple generated text"
+
+  def initialize(input:)
+    @input = input
+  end
+
+  def generate
+    super
+  end
+
+  def prompt
+    <<-PROMPT
+          Generate a simple story based on this input: #{@input}
+    PROMPT
+  end
+end

data/lib/sublayer/cli.rb

@@ -0,0 +1,59 @@
+require "thor"
+
+require "sublayer"
+require "sublayer/version"
+require "yaml"
+require "fileutils"
+require "active_support/inflector"
+
+require_relative "cli/commands/subcommand_base"
+require_relative "cli/commands/new_project"
+require_relative "cli/commands/generator"
+require_relative "cli/commands/agent"
+require_relative "cli/commands/action"
+
+module Sublayer
+  class CLI < Thor
+
+    register(Sublayer::Commands::NewProject, "new", "new PROJECT_NAME", "Creates a new Sublayer project")
+
+    register(Sublayer::Commands::Generator, "generate:generator", "generate:generator", "Generates a new Sublayer::Generator subclass for your project")
+    register(Sublayer::Commands::Agent, "generate:agent", "generate:agent", "Generates a new Sublayer::Agent subclass for your project")
+    register(Sublayer::Commands::Action, "generate:action", "generate:action", "Generates a new Sublayer::Action subclass for your project")
+
+    desc "version", "Prints the Sublayer version"
+    def version
+      puts Sublayer::VERSION
+    end
+
+    desc "help [COMMAND]", "Describe available commands or one specific command"
+    def help(command = nil, subcommand = false)
+      if command.nil?
+        puts "Sublayer CLI"
+        puts
+        puts "Usage:"
+        puts "  sublayer COMMAND [OPTIONS]"
+        puts
+        puts "Commands:"
+        print_commands(self.class.commands.reject { |name, _| name == "help" || name == "version" })
+        puts
+        print_commands(self.class.commands.select { |name, _| name == "help" })
+        print_commands(self.class.commands.select { |name, _| name == "version" })
+        puts
+        puts "Run 'sublayer COMMAND --help' for more information on a command."
+      else
+        super
+      end
+    end
+
+    default_command :help
+
+    private
+
+    def print_commands(commands)
+      commands.each do |name, command|
+        puts "  #{name.ljust(15)} # #{command.description}"
+      end
+    end
+  end
+end

data/lib/sublayer/components/output_adapters/formattable.rb

@@ -33,6 +33,7 @@ module Sublayer
             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
+            result[:required] = property.properties.select(&:required).map(&:name) if property.properties
           end
 
           result

data/lib/sublayer/components/output_adapters/list_of_named_strings.rb

@@ -0,0 +1,48 @@
+module Sublayer
+  module Components
+    module OutputAdapters
+      class ListOfNamedStrings
+        attr_reader :name, :description, :attributes, :item_name
+
+        def initialize(options)
+          @name = options[:name]
+          @item_name = options[:item_name]
+          @description = options[:description]
+          @attributes = options[:attributes]
+        end
+
+        def properties
+          [
+            OpenStruct.new(
+              name: @name,
+              type: "array",
+              description: @description,
+              required: true,
+              items: OpenStruct.new(
+                type: "object",
+                description: "a single #{@item_name}",
+                name: @item_name,
+                properties: @attributes.map do |attribute|
+                  OpenStruct.new(
+                    type: "string",
+                    name: attribute[:name],
+                    description: attribute[:description],
+                    required: true
+                  )
+                end
+              )
+            )
+          ]
+        end
+
+        def materialize_result(raw_results)
+          raw_results.map do |raw_result|
+            OpenStruct.new(
+              @attributes.map { |attribute| [attribute[:name], raw_result[attribute[:name]]] }.to_h
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sublayer/components/output_adapters/named_strings.rb

@@ -17,7 +17,9 @@ module Sublayer
               type: "object",
               description: @description,
               required: true,
-              properties: @attributes.map { |attribute| OpenStruct.new(type: "string", description: attribute[:description], required: true, name: attribute[:name]) }
+              properties: @attributes.map { |attribute|
+                OpenStruct.new(type: "string", description: attribute[:description], required: true, name: attribute[:name]) 
+              }
             )
           ]
         end

data/lib/sublayer/components/output_adapters/single_integer.rb

@@ -0,0 +1,25 @@
+module Sublayer
+  module Components
+    module OutputAdapters
+      class SingleInteger
+        attr_reader :name, :description
+
+        def initialize(options)
+          @name = options[:name]
+          @description = options[:description]
+        end
+
+        def properties
+          [
+            OpenStruct.new(
+              name: @name,
+              type: 'integer',
+              description: @description,
+              required: true
+            )
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/sublayer/providers/gemini.rb

@@ -1,8 +1,5 @@
-# *UNSTABLE* Gemini function calling API is in beta.
-#            Provider is not recommended until API update.
-
 # Sublayer.configuration.ai_provider = Sublayer::Providers::Gemini
-# Sublayer.configuration.ai_model = "gemini-1.5-pro"
+# Sublayer.configuration.ai_model = "gemini-1.5-flash-latest"
 
 module Sublayer
   module Providers
@@ -26,23 +23,12 @@ module Sublayer
                 text: "#{prompt}"
               },
             },
-            tools: [{
-              function_declarations: [
-                {
-                  name: output_adapter.name,
-                  description: output_adapter.description,
-                  parameters: {
-                    type: "OBJECT",
-                    properties: output_adapter.format_properties,
-                    required: output_adapter.format_required
-                  }
-                }
-              ]
-            }],
-            tool_config: {
-              function_calling_config: {
-                mode: "ANY",
-                allowed_function_names: [output_adapter.name]
+            generationConfig: {
+              responseMimeType: "application/json",
+              responseSchema: {
+                type: "OBJECT",
+                properties: output_adapter.format_properties,
+                required: output_adapter.format_required
               }
             }
           }.to_json,
@@ -66,7 +52,9 @@ module Sublayer
 
         raise "Error generating with Gemini, error: #{response.body}" unless response.success?
 
-        argument = response.dig("candidates", 0, "content", "parts", 0, "functionCall", "args", output_adapter.name)
+        output = response.dig("candidates", 0, "content", "parts", 0, "text")
+
+        parsed_output = JSON.parse(output)[output_adapter.name]
       end
     end
   end

data/lib/sublayer/version.rb

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

data/lib/sublayer.rb

@@ -7,7 +7,6 @@ require 'active_support/inflector'
 require 'ostruct'
 require "httparty"
 require "openai"
-require "nokogiri"
 require "listen"
 require "securerandom"
 require "time"
@@ -16,6 +15,7 @@ require_relative "sublayer/version"
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect('open_ai' => 'OpenAI')
+loader.inflector.inflect("cli" => "CLI")
 loader.setup
 
 module Sublayer

data/sublayer.gemspec

@@ -29,18 +29,18 @@ Gem::Specification.new do |spec|
   end
 
   spec.require_paths = ["lib"]
+  spec.bindir = "bin"
+  spec.executables = ["sublayer"]
 
   spec.add_dependency "ruby-openai"
-  spec.add_dependency "colorize"
   spec.add_dependency "activesupport"
   spec.add_dependency "zeitwerk"
-  spec.add_dependency "nokogiri", "~> 1.16.5"
   spec.add_dependency "httparty"
   spec.add_dependency "listen"
+  spec.add_dependency "thor"
 
   spec.add_development_dependency "rspec", "~> 3.12"
   spec.add_development_dependency "pry", "~> 0.14"
   spec.add_development_dependency "vcr", "~> 6.0"
   spec.add_development_dependency "webmock", "~> 3"
-  spec.add_development_dependency "clag"
 end