sublayer 0.2.4 → 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/{templates/cli/PROJECT_NAME.gemspec → cli/templates/cli/%project_name%.gemspec.tt}

@@ -1,22 +1,22 @@
-require_relative "lib/PROJECT_NAME/version"
+require_relative "lib/<%= project_name.gsub("-", "_") %>/version"
 
 Gem::Specification.new do |spec|
-  spec.name = "PROJECT_NAME"
-  spec.version = ProjectName::VERSION
+  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.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"
+  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.
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Add dependencies here
-  spec.add_dependency "sublayer", "~> SUBLAYER_VERSION"
+  spec.add_dependency "sublayer", "~> <%= sublayer_version %>"
   spec.add_dependency "thor", "~> 1.2"
 end

data/lib/sublayer/{templates/cli/README.md → cli/templates/cli/README.md.tt}

@@ -1,4 +1,4 @@
-# ProjectName
+# <%= project_name %>
 
 Welcome to your new Sublayer CLI project!
 
@@ -13,7 +13,7 @@ Execute:
 To run your CLI application:
 
 ```
-$ bin/PROJECT_NAME
+$ bin/<%= project_name %>
 ```
 
 Available commands:

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/{templates/cli/lib/PROJECT_NAME/actions/example_action.rb → cli/templates/cli/lib/%project_name%/actions/example_action.rb.tt}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ProjectName
+module <%= project_name.camelize %>
   module Actions
     class ExampleAction < Sublayer::Actions::Base
       def initialize(input:)

data/lib/sublayer/{templates/cli/lib/PROJECT_NAME/agents/example_agent.rb → cli/templates/cli/lib/%project_name%/agents/example_agent.rb.tt}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ProjectName
+module <%= project_name.camelize %>
   module Agents
     class ExampleAgent < Sublayer::Agents::Base
       trigger_on_files_changed { ["example_file.txt"] }

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/{templates/cli/lib/PROJECT_NAME/commands/base_command.rb → cli/templates/cli/lib/%project_name%/commands/base_command.rb.tt}

@@ -1,4 +1,4 @@
-module ProjectName
+module <%= project_name.camelize %>
   module Commands
     class BaseCommand
       def self.command_name

data/lib/sublayer/{templates/cli/lib/PROJECT_NAME/commands/example_command.rb → cli/templates/cli/lib/%project_name%/commands/example_command.rb.tt}

@@ -1,4 +1,4 @@
-module ProjectName
+module <%= project_name.camelize %>
   module Commands
     class ExampleCommand < BaseCommand
       def self.description
@@ -6,7 +6,7 @@ module ProjectName
       end
 
       def execute(*args)
-        puts ProjectName::Generators::ExampleGenerator.new(input: args.join(" ")).generate
+        puts <%= project_name.camelize %>::Generators::ExampleGenerator.new(input: args.join(" ")).generate
       end
     end
   end

data/lib/sublayer/{templates/cli/lib/PROJECT_NAME/config.rb → cli/templates/cli/lib/%project_name%/config.rb.tt}

@@ -1,4 +1,4 @@
-module ProjectName
+module <%= project_name.camelize %>
   module Config
     def self.load
       config_path = File.join(File.dirname(__FILE__), "config", "sublayer.yml")

data/lib/sublayer/{templates/cli/lib/PROJECT_NAME/generators/example_generator.rb → cli/templates/cli/lib/%project_name%/generators/example_generator.rb.tt}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ProjectName
+module <%= project_name.camelize %>
   module Generators
     class ExampleGenerator < Sublayer::Generators::Base
       llm_output_adapter type: :single_string,

data/lib/sublayer/{templates/cli/lib/PROJECT_NAME/version.rb → cli/templates/cli/lib/%project_name%/version.rb.tt}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module ProjectName
+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/{templates/quick_script/project_name.rb → cli/templates/quick_script/%project_name%.rb}

@@ -1,7 +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__, "agents", "*.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/{templates/quick_script/README.md → cli/templates/quick_script/README.md.tt}

@@ -1,4 +1,4 @@
-# ProjectName
+# <%= project_name.camelize %>
 
 Welcome to your new Sublayer quick script project!
 
@@ -7,10 +7,10 @@ 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`
+`<%= project_name %>.rb`
 
 Run your script:
 
 ```
-$ ruby project_name.rb
+$ ruby <%= project_name %>.rb
 ```

data/lib/sublayer/cli.rb

@@ -1,191 +1,59 @@
-require "tty-prompt"
-require "tty-progressbar"
-require "tty-command"
-require "tty-file"
-require "fileutils"
-require "yaml"
-require "sublayer/version"
-
-module Sublayer
-  class CLI
-    PLACEHOLDERS = {
-      "PROJECT_NAME" => { gsub: true, camelcase: false },
-      "ProjectName" => { gsub: true, camelcase: true },
-      "project_name" => { gsub: true, camelcase: false, underscore: true }
-    }
-
-    def self.start(args)
-      new.run(args)
-    end
-
-    def run(args)
-      command = args.shift
-
-      case command
-      when "new"
-        create_new_project(args.first)
-      when "help", nil
-        display_help
-      else
-        puts "Unknown command: #{command}"
-        display_help
-      end
-    end
-
-    private
-
-    def create_new_project(project_name)
-      prompt = TTY::Prompt.new
-
-      project_name ||= prompt.ask("What is the name of your project?")
-
-      project_type = prompt.select("Select a project template: ", ["CLI", "Quick Script"])
-      ai_provider = prompt.select("Select an AI provider:", ["OpenAI", "Claude", "Gemini"])
-
-      ai_model = if ai_provider == "OpenAI"
-                   prompt.select("Which OpenAI model would you like to use?", ["gpt-4o", "gpt-4o-mini", "gpt-4-turbo", "gpt-4", "gpt-3.5-turbo"])
-                 elsif ai_provider == "Claude"
-                   prompt.select("Which Anthropic model would you like to use?", ["claude-3-5-sonnet-20240620", "claude-3-opus-20240229", "claude-3-haiku-20240307"])
-                 elsif ai_provider == "Gemini"
-                   prompt.select("Which Gemini model would you like to use?", ["gemini-1.5-pro-latest", "gemini-1.5-flash-latest"])
-                 end
-
-      create_project(project_name, project_type, ai_provider, ai_model)
-    end
-
-    def create_project(project_name, project_type, ai_provider, ai_model)
-      project_path = File.join(Dir.pwd, project_name)
-
-      progress_bar = TTY::ProgressBar.new("Creating project [:bar] :percent", total: 8)
-
-      progress_bar.advance(1, log: "Creating project directory")
-      FileUtils.mkdir_p(project_path)
-
-      progress_bar.advance(1, log: "Copying template files")
-      copy_template_files(project_path, project_type)
-
-      progress_bar.advance(1, log: "Replacing placeholders")
-      replace_placeholders(project_path, project_name)
-
-      progress_bar.advance(1, log: "Generating configuration")
-      generate_config_file(project_path, project_name, project_type, ai_provider, ai_model)
-
-      progress_bar.advance(1, log: "Finalizing project")
-      finalize_project(project_path, project_type)
-
-      puts "\nSublayer project '#{project_name}' created successfully!"
-    end
-
-    def copy_template_files(project_path, project_type)
-      template_dir = project_type == "CLI" ? "cli" : "quick_script"
-      source_path = File.join(File.dirname(__FILE__), "templates", template_dir)
-      FileUtils.cp_r("#{source_path}/.", project_path)
+require "thor"
 
-      FileUtils.mkdir_p(File.join(project_path, "log")) if should_add_log_folder(project_type)
-    end
-
-    def should_add_log_folder(project_type)
-      project_type == "CLI"
-    end
-
-    def generate_config_file(project_path, project_name, project_type, ai_provider, ai_model)
-      config = {
-        project_name: project_name,
-        project_type: project_type,
-        ai_provider: ai_provider,
-        ai_model: ai_model
-      }
+require "sublayer"
+require "sublayer/version"
+require "yaml"
+require "fileutils"
+require "active_support/inflector"
 
-      TTY::File.create_file(File.join(project_path, "lib", project_name, "config", "sublayer.yml"), YAML.dump(config)) if project_type == "CLI"
+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"
 
-      if project_type == "Quick Script"
-        config_lines = <<~CONFIG
-          Sublayer.configuration.ai_provider = Sublayer::Providers::#{config[:ai_provider]}
-          Sublayer.configuration.ai_model = "#{config[:ai_model]}"
-        CONFIG
-        project_file = File.join(project_path, "#{project_name}.rb")
-        File.write(project_file, File.read(project_file) + config_lines)
-      end
-    end
-
-    def project_type_instructions(project_type)
-      if project_type == "CLI"
-        "Run your CLI application:\n   ```\n   ruby bin/#{File.basename(project_path)}\n   ```"
+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
-        "Start your web server:\n   ```\n   ruby app.rb\n   ```\n   Then visit http://localhost:4567 in your browser."
+        super
       end
     end
 
-    def replace_placeholders(project_path, project_name)
-      # First rename the lib/PROJECT_NAME directory to lib/project_name
-      FileUtils.mv(File.join(project_path, "lib", "PROJECT_NAME"), File.join(project_path, "lib", project_name.gsub("-", "_").downcase)) if File.directory?(File.join(project_path, "lib", "PROJECT_NAME"))
-
-      # Then walk through each file in the project and replace the placeholder content and filenames
-      Dir.glob("#{project_path}/**/*", File::FNM_DOTMATCH).each do |file_path|
-        next if File.directory?(file_path)
-        next if file_path.include?(".git/")
-
-        content = File.read(file_path)
-        PLACEHOLDERS.each do |placeholder, options|
-          replacement = if options[:camelcase]
-                          project_name.split(/[_-]/).map(&:capitalize).join
-                        elsif options[:underscore]
-                          project_name.gsub("-", "_").downcase
-                        else
-                          project_name
-                        end
-          content.gsub!(placeholder, replacement) if options[:gsub]
-        end
-
-        File.write(file_path, content)
-
+    default_command :help
 
-        if file_path.include?('PROJECT_NAME')
-          new_path = file_path.gsub("PROJECT_NAME", project_name.gsub("-", "_").downcase)
-
-          FileUtils.mkdir_p(File.dirname(new_path))
-          FileUtils.mv(file_path, new_path)
-        end
-
-        if file_path.include?('project_name')
-          new_path = file_path.gsub("project_name", project_name.gsub("-", "_").downcase)
-
-          FileUtils.mkdir_p(File.dirname(new_path))
-          FileUtils.mv(file_path, new_path)
-        end
-      end
-
-      # replace the sublayer version in the gemspec file with Sublayer::VERSION
-      if File.exist?(File.join(project_path, "#{project_name}.gemspec"))
-        gemspec_path = File.join(project_path, "#{project_name}.gemspec")
-        gemspec_content = File.read(gemspec_path)
-        gemspec_content.gsub!("SUBLAYER_VERSION", Sublayer::VERSION)
-        File.write(gemspec_path, gemspec_content)
-      end
-    end
-
-    def finalize_project(project_path, project_type)
-      cmd = TTY::Command.new(printer: :null)
-
-      if TTY::Prompt.new.yes?("Initialize a git repository?")
-        cmd.run("git init", chdir: project_path)
-      end
+    private
 
-      if TTY::Prompt.new.yes?("Install dependencies now?")
-        cmd.run("bundle install", chdir: project_path)
+    def print_commands(commands)
+      commands.each do |name, command|
+        puts "  #{name.ljust(15)} # #{command.description}"
       end
-
-      puts "To get started, run:"
-      puts "  cd #{File.basename(project_path)}"
-      puts "  ./bin/#{File.basename(project_path)}" if project_type == "CLI"
-      puts "  ruby #{File.basename(project_path)}.rb" if project_type == "Quick Script"
-    end
-
-    def display_help
-      puts "Usage: sublayer [command] [arguments]"
-      puts "Commands:"
-      puts "  new PROJECT_NAME   Create a new Sublayer project"
-      puts "  help               Display this help message"
     end
   end
 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.4"
+  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"

data/sublayer.gemspec

@@ -33,21 +33,14 @@ Gem::Specification.new do |spec|
   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 "tty-prompt", "~> 0.23"
-  spec.add_dependency "tty-progressbar", "~> 0.18"
-  spec.add_dependency "tty-command", "~> 0.10"
-  spec.add_dependency "tty-file", "~> 0.10"
   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