sublayer 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8254634ae1c2de3daa2f3a1fddf102df81ee82e79e345c1ef4a9256ea35553e2
-  data.tar.gz: 7a2eb512a983ae642858af5c395d3651b69449359204975be9468b30736c6c40
+  metadata.gz: 9c0626295be488d2a39cfbe94652d3e1238b5885c24c5d4d130e0659939387fd
+  data.tar.gz: e21ee3e2177caff3a1125de4ba07672db13df661c5888e031d84148f4bfa0a01
 SHA512:
-  metadata.gz: ea8183fce2be4f378a581d079a124df8c82b03165186575b6152576e76ca26fd93a925df6a108d1e348bdd393a71206d3e79ce832b000c9607224c9ea5fc46df
-  data.tar.gz: a52f4942386fabe647fe97ee060747fa02e6f93c1261a33336bb14012383907419ad92e385c7fe4973df313dad8cc818f772063c8637ca81e318ba0b273430bb
+  metadata.gz: 8b2a17ca1598e68b7da6a0caf07d61d53f99c6de561f03bbd4f4a74a4bf05ad30ebb1c9261f34320297a1af88c4b82e35163a7711a3d260d97732d2b34b87f1a
+  data.tar.gz: adcb0094652bdd477f5cbbf3346037bbfa1b2b62a7c54a148ddd0d4cb440bef8d7c994487a8ef47aee30c0039d3bad7ddfafee587c3fa6c688c6e51f0e89d26e

data/README.md

@@ -14,12 +14,18 @@ for new features and bug fixes.
 
 To maintain stability in your application, we recommend pinning the version of
 Sublayer in your Gemfile to a specific minor version. For example, to pin to
-version 0.1.x, you would add the following line to your Gemfile:
+version 0.2.x, you would add the following line to your Gemfile:
 
 ```ruby
-gem 'sublayer', '~> 0.1'
+gem 'sublayer', '~> 0.2'
 ```
 
+## Notes on 0.2
+
+New default model update: gpt 4 turbo -> gpt 4o
+
+Gemini: Updates include the use of beta API function calling features. Experimental and unstable.
+
 ## Installation
 
 Install the gem by running the following commands:
@@ -29,12 +35,12 @@ Install the gem by running the following commands:
 Or add this line to your application's Gemfile:
 
 ```ruby
-gem 'sublayer', '~> 0.1'
+gem 'sublayer', '~> 0.2'
 ```
 
 ## Choose your AI Model
 
-Sublayer is model-agnostic and can be used with any AI model. Below are the
+Sublayer is model-agnostic and can be used with any AI model. Below are the supported LLM Providers. Check out our [docs](https://docs.sublayer.com) to add your own custom Provider.
 
 ### OpenAI (Default)
 
@@ -45,10 +51,12 @@ Visit [OpenAI](https://openai.com/product) to get an API key.
 Usage:
 ```ruby
 Sublayer.configuration.ai_provider = Sublayer::Providers::OpenAI
-Sublayer.configuration.ai_model = "gpt-4-turbo-preview"
+Sublayer.configuration.ai_model = "gpt-4o"
 ```
 
-### Gemini
+### Gemini [UNSTABLE]
+
+(Gemini's function calling API is in beta. Not recommended for production use.)
 
 Expects you to have a Gemini API key set in the `GEMINI_API_KEY` environment variable.
 
@@ -57,7 +65,7 @@ Visit [Google AI Studio](https://ai.google.dev/) to get an API key.
 Usage:
 ```ruby
 Sublayer.configuration.ai_provider = Sublayer::Providers::Gemini
-Sublayer.configuration.ai_model = "gemini-pro"
+Sublayer.configuration.ai_model = "gemini-1.5-pro"
 ```
 
 ### Claude
@@ -70,7 +78,7 @@ Visit [Anthropic](https://anthropic.com/) to get an API key.
 Usage:
 ```ruby
 Sublayer.configuration.ai_provider = Sublayer::Providers::Claude
-Sublayer.configuration.ai_model ="claude-3-opus-20240229"
+Sublayer.configuration.ai_model ="claude-3-5-sonnet-20240620"
 ```
 
 ## Concepts
@@ -81,49 +89,46 @@ Generators are responsible for generating specific outputs based on input data.
 They focus on a single generation task and do not perform any actions or complex
 decision-making. Generators are the building blocks of the Sublayer framework.
 
-Examples (in the `/lib/sublayer/generators/examples` directory):
-- `CodeFromDescriptionGenerator`: Generates code based on a description and the
-  technologies used.
-- `DescriptionFromCodeGenerator`: Generates a description of the code passed in to
-  it.
-- `CodeFromBlueprintGenerator`: Generates code based on a blueprint, a blueprint
-  description, and a description of the desired code.
+Examples (in the `/spec/generators/examples` directory):
+- [CodeFromDescriptionGenerator](https://github.com/sublayerapp/sublayer/blob/main/spec/generators/examples/code_from_description_generator.rb):
+  Generates code based on a description and the technologies used.
+- [DescriptionFromCodeGenerator](https://github.com/sublayerapp/sublayer/blob/main/spec/generators/description_from_code_generator_spec.rb):
+  Generates a description of the code passed in to it.
+- [CodeFromBlueprintGenerator](https://github.com/sublayerapp/sublayer/blob/main/spec/generators/examples/code_from_blueprint_generator.rb):
+  Generates code based on a blueprint, a blueprint description, and a description of the desired code.
 
 
-### Actions (Coming Soon)
+### Actions
 
-Actions are responsible for performing specific operations to get inputs for a
-Generator or based on the generated output from a Generator. They encapsulate a
-single action and do not involve complex decision-making. Actions are  the
-executable units that bring the generated inputs to life.
+Actions perform specific operations to either get inputs for a Generator or use
+the generated output from a Generator. Actions do not involve complex decision making.
 
 Examples:
-- SaveToFileAction: Saves generated output to a file.
-- RunCommandLineCommandAction: Runs a generated command line command.
+- [WriteFileAction](https://github.com/sublayerapp/tddbot/blob/43297c5da9445bd6c8882d5e3876cff5fc6b2650/lib/tddbot/sublayer/actions/write_file_action.rb):
+  Saves generated output to a file.
+- [RunTestCommandAction](https://github.com/sublayerapp/tddbot/blob/43297c5da9445bd6c8882d5e3876cff5fc6b2650/lib/tddbot/sublayer/actions/run_test_command_action.rb):
+  Runs a generated command line command.
 
-### Tasks (Coming Soon)
+### Agents
 
-Tasks combine Generators and Actions to accomplish a specific goal. They involve
-a sequence of generation and action steps that may include basic decision-making
-and flow control. Tasks are the high-level building blocks that define the
-desired outcome.
+Sublayer Agents are autonomous entities designed to perform specific
+tasks or monitor systems.
 
 Examples:
-- ModifyFileContentsTask: Generates new file contents based on the existing
-  contents and a set of rules, and then saves the new contents to the file.
+- [RSpecAgent](https://github.com/sublayerapp/sublayer/blob/main/spec/agents/examples/rspec_agent.rb):
+  Runs tests whenever a file is changed. If the tests fail the code is changed
+  by the agent to pass the tests.
 
-### Agents (Coming Soon)
+### Triggers
 
-Agents are high-level entities that coordinate and orchestrate multiple Tasks to
-achieve a broader goal. They involve complex decision-making, monitoring, and
-adaptation based on the outcomes of the Tasks. Agents are the intelligent
-supervisors that manage the overall workflow.
+Sublayer Triggers are used in agents. Triggers decide when an agent is activated
+and performs its task
 
 Examples:
-- CustomerSupportAgent: Handles customer support inquiries by using various
-  Tasks such as understanding the customer's issue, generating appropriate
-responses, and performing actions like sending emails or creating support
-tickets.
+- [FileChange](https://github.com/sublayerapp/sublayer/blob/main/lib/sublayer/triggers/file_change.rb):
+  This built in sublayer trigger, listens for file changes
+- [TimeInterval](https://docs.sublayer.com/docs/guides/build-a-custom-trigger)
+  This custom trigger tutorial shows how to create your own trigger, this one activates on a time interval
 
 ## Usage Examples
 

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

@@ -0,0 +1,29 @@
+module Sublayer
+  module Components
+    module OutputAdapters
+      module Formattable
+        def format_properties
+          formatted_properties = {}
+          self.properties.each do |prop|
+            property = {
+              type: prop.type,
+              description: prop.description
+            }
+
+            property[:enum] = prop.enum if prop.respond_to?(:enum) && prop.enum
+            property[:default] = prop.default if prop.respond_to?(:default) && !prop.default.nil?
+            property[:minimum] = prop.minimum if prop.respond_to?(:minimum) && !prop.minimum.nil?
+            property[:maximum] = prop.maximum if prop.respond_to?(:maximum) && !prop.maximum.nil?
+            property[:items] = prop.items if prop.respond_to?(:items) && prop.items
+            formatted_properties[prop.name.to_sym] = property
+          end
+          formatted_properties
+        end
+
+        def format_required
+          self.properties.select(&:required).map(&:name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Sublayer
+  module Components
+    module OutputAdapters
+      class ListOfStrings
+        attr_reader :name, :description
+
+        def initialize(options)
+          @name = options[:name]
+          @description = options[:description]
+        end
+
+        def properties
+          [
+            OpenStruct.new(
+              name: @name,
+              type: 'array',
+              description: @description,
+              required: true,
+              items: {
+                type: 'string'
+              }
+            )
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/sublayer/components/output_adapters.rb

@@ -18,6 +18,9 @@ module Sublayer
         else
           raise "Output adapter must be specified with :class or :type"
         end
+
+        options[:name] = options[:name].to_s if options[:name].is_a?(Symbol)
+
         klass.new(options)
       end
     end

data/lib/sublayer/generators/base.rb

@@ -4,7 +4,7 @@ module Sublayer
       attr_reader :results
 
       def self.llm_output_adapter(options)
-        output_adapter = Sublayer::Components::OutputAdapters.create(options)
+        output_adapter = Sublayer::Components::OutputAdapters.create(options).extend(Sublayer::Components::OutputAdapters::Formattable)
         const_set(:OUTPUT_ADAPTER, output_adapter)
       end
 

data/lib/sublayer/providers/claude.rb

@@ -1,5 +1,5 @@
 # Sublayer.configuration.ai_provider = Sublayer::Providers::Claude
-# Sublayer.configuration.ai_model ="claude-3-opus-20240229"
+# Sublayer.configuration.ai_model ="claude-3-5-sonnet-20240620"
 
 module Sublayer
   module Providers
@@ -22,32 +22,23 @@ module Sublayer
                 description: output_adapter.description,
                 input_schema: {
                   type: "object",
-                  properties: format_properties(output_adapter),
-                  required: output_adapter.properties.select(&:required).map(&:name)
+                  properties: output_adapter.format_properties,
+                  required: output_adapter.format_required
                 }
               }
             ],
+            tool_choice: { type: "tool", name: output_adapter.name },
             messages: [{ "role": "user", "content": prompt }]
           }.to_json
         )
+
         raise "Error generating with Claude, error: #{response.body}" unless response.code == 200
 
-        function_input = JSON.parse(response.body).dig("content").find {|content| content['type'] == 'tool_use'}.dig("input")
-        function_input[output_adapter.name]
-      end
+        tool_use = JSON.parse(response.body).dig("content").find { |content| content['type'] == 'tool_use' && content['name'] == output_adapter.name }
 
-      private
-      def self.format_properties(output_adapter)
-        output_adapter.properties.each_with_object({}) do |property, hash|
-          hash[property.name] = {
-            type: property.type,
-            description: property.description
-          }
+        raise "Error generating with Claude, error: No function called. If the answer is in the response, try rewording your prompt or output adapter name to be from the perspective of the model. Response: #{response.body}" unless tool_use
 
-          if property.enum
-            hash[property.name][:enum] = property.enum
-          end
-        end
+        tool_use.dig("input")[output_adapter.name]
       end
     end
   end

data/lib/sublayer/providers/gemini.rb

@@ -1,44 +1,41 @@
+# *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-pro"
+# Sublayer.configuration.ai_model = "gemini-1.5-pro"
 
 module Sublayer
   module Providers
     class Gemini
       def self.call(prompt:, output_adapter:)
-        system_prompt = <<-PROMPT
-        You have access to a set of tools to answer the prompt.
-
-        You may call tools like this:
-        <tool_calls>
-          <tool_call>
-            <tool_name>$TOOL_NAME</tool_name>
-            <parameters>
-              <$PARAMETER_NAME>$VALUE</$PARAMETER_NAME>
-              ...
-            </parameters>
-          </tool_call>
-        </tool_calls>
-
-        Here are the tools available:
-        <tools>
-          <tool_description>
-            <tool_name>#{output_adapter.name}</tool_name>
-            <tool_description>#{output_adapter.description}</tool_description>
-            <parameters>
-              #{format_properties(output_adapter)}
-            </parameters>
-          </tool_description>
-        </tools>
-
-        Respond only with valid xml.
-        The entire response should be wrapped in a <response> tag.
-        Your response should call a tool inside a <tool_calls> tag.
-        PROMPT
-
         response = HTTParty.post(
           "https://generativelanguage.googleapis.com/v1beta/models/#{Sublayer.configuration.ai_model}:generateContent?key=#{ENV['GEMINI_API_KEY']}",
           body: {
-            contents: { role: "user", parts: { text: "#{system_prompt}\n#{prompt}" } }
+            contents: {
+              role: "user",
+              parts: {
+                text: "#{prompt}"
+              },
+            },
+            tools: {
+              functionDeclarations: [
+                {
+                  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]
+              }
+            }
           }.to_json,
           headers: {
             "Content-Type" => "application/json"
@@ -47,22 +44,7 @@ module Sublayer
 
         raise "Error generating with Gemini, error: #{response.body}" unless response.success?
 
-        text_containing_xml = response.dig('candidates', 0, 'content', 'parts', 0, 'text')
-        tool_output = Nokogiri::HTML.parse(text_containing_xml.match(/\<#{output_adapter.name}\>(.*?)\<\/#{output_adapter.name}\>/m)[1]).text
-
-        raise "Gemini did not format response, error: #{response.body}" unless tool_output
-        return tool_output
-      end
-
-      private
-      def self.format_properties(output_adapter)
-        output_adapter.properties.each_with_object("") do |property, xml|
-          xml << "<name>#{property.name}</name>"
-          xml << "<type>#{property.type}</type>"
-          xml << "<description>#{property.description}</description>"
-          xml << "<required>#{property.required}</required>"
-          xml << "<enum>#{property.enum}</enum>" if property.enum
-        end
+        argument = response.dig("candidates", 0, "content", "parts", 0, "functionCall", "args", output_adapter.name)
       end
     end
   end

data/lib/sublayer/providers/open_ai.rb

@@ -1,5 +1,5 @@
 # Sublayer.configuration.ai_provider = Sublayer::Providers::OpenAI
-# Sublayer.configuration.ai_model = "gpt-4-turbo-preview"
+# Sublayer.configuration.ai_model = "gpt-4o"
 
 module Sublayer
   module Providers
@@ -25,9 +25,9 @@ module Sublayer
                   description: output_adapter.description,
                   parameters: {
                     type: "object",
-                    properties: OpenAI.format_properties(output_adapter)
+                    properties: output_adapter.format_properties
                   },
-                  required: [output_adapter.properties.select(&:required).map(&:name)]
+                  required: output_adapter.format_required
                 }
               }
             ]
@@ -36,24 +36,13 @@ module Sublayer
 
         message = response.dig("choices", 0, "message")
 
-        raise "No function called" unless message["tool_calls"].length > 0
+        raise "No function called" unless message["tool_calls"]
 
         function_body = message.dig("tool_calls", 0, "function", "arguments")
-        JSON.parse(function_body)[output_adapter.name]
-      end
 
-      private
-      def self.format_properties(output_adapter)
-        output_adapter.properties.each_with_object({}) do |property, hash|
-          hash[property.name] = {
-            type: property.type,
-            description: property.description
-          }
-
-          if property.enum
-            hash[property.name][:enum] = property.enum
-          end
-        end
+        raise "Error generating with OpenAI. Empty response. Try rewording your output adapter params to be from the perspective of the model. Full Response: #{response}" if function_body == "{}"
+
+        results = JSON.parse(function_body)[output_adapter.name]
       end
     end
   end

data/lib/sublayer/version.rb

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

data/lib/sublayer.rb

@@ -22,7 +22,7 @@ module Sublayer
   def self.configuration
     @configuration ||= OpenStruct.new(
       ai_provider: Sublayer::Providers::OpenAI,
-      ai_model: "gpt-4-turbo-preview"
+      ai_model: "gpt-4o"
     )
   end
 

data/sublayer.gemspec

@@ -41,6 +41,6 @@ Gem::Specification.new do |spec|
   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.0"
+  spec.add_development_dependency "webmock", "~> 3"
   spec.add_development_dependency "clag"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sublayer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Scott Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: clag
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,8 @@ files:
 - lib/sublayer/actions/base.rb
 - lib/sublayer/agents/base.rb
 - lib/sublayer/components/output_adapters.rb
+- lib/sublayer/components/output_adapters/formattable.rb
+- lib/sublayer/components/output_adapters/list_of_strings.rb
 - lib/sublayer/components/output_adapters/single_string.rb
 - lib/sublayer/components/output_adapters/string_selection_from_list.rb
 - lib/sublayer/generators/base.rb