sublayer 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ad3ab932b7da063821a5f9047d6a58e895fb5db1b34ca71ef8a7742ccddd7dc
-  data.tar.gz: ef15f73fd28e091667f1316f60b5b0c882240d1897f57b806e001dc3c885e3cf
+  metadata.gz: 05adf0abb1924f82c0e60a66265331c2b9cfead17a39114fc0dd9c395e5e00ff
+  data.tar.gz: 20a1dfdfbdec1bb59356736150dfc48e623838fc8807e13e743a08205a8d6105
 SHA512:
-  metadata.gz: b606328f717c6312fde90b91b6bed4d58cacc0ae266199a6287b72f4da8aa0fcc3c01ffb28aff19043b81c2e7a3891e628db9c8f373cb14e359385e617e4bd76
-  data.tar.gz: b4fec2575647858bae068d41117e5842438e5ec8d1e8303a12a613cec913b11d6b8ff261fd84d276b874c19c4f1aea0fef3d94748bbebc443134ba0cb84c91e8
+  metadata.gz: 9bc8be69c42f61099bd35163d7b15661cee6244fd5d26a7b1ca0d2cb6b4932c08ed57721a88def4ba2168a27d04080242c19d3c5282d0d9724826de4c1fc9a77
+  data.tar.gz: 7b3e0f0948534ac8313568d8318db2fac51a60467fb8d879d648bccd900ca67ff1dcb7757330f9c5348e69ce463e4376684959d154007365095abd290eea9cda

data/README.md

@@ -1,16 +1,22 @@
 # Sublayer
 
-A model-agnostic Ruby Generative AI DSL and framework. Provides base classes for
+A model-agnostic Ruby AI Agent framework. Provides base classes for
 building Generators, Actions, Tasks, and Agents that can be used to build AI
 powered applications in Ruby.
 
+For more detailed documentation visit our documentation site: [https://docs.sublayer.com](https://docs.sublayer.com).
+
 ## Installation
 
 Install the gem by running the following commands:
 
-    $ bundle
-    $ gem build sublayer.gemspec
-    $ gem install sublayer-0.0.1.gem
+    $ gem install sublayer
+
+Or add this line to your application's Gemfile:
+
+```ruby
+gem 'sublayer'
+```
 
 ## Choose your AI Model
 

data/lib/sublayer/actions/base.rb

@@ -0,0 +1,6 @@
+module Sublayer
+  module Actions
+    class Base
+    end
+  end
+end

data/lib/sublayer/providers/claude.rb

@@ -44,10 +44,9 @@ module Sublayer
         raise "Error generating with Claude, error: #{response.body}" unless response.code == 200
 
         text_containing_xml = JSON.parse(response.body).dig("content", 0, "text")
-        xml = text_containing_xml.match(/\<response\>(.*?)\<\/response\>/m).to_s
-        response_xml = ::Nokogiri::XML(xml)
-        function_output = response_xml.at_xpath("//response/function_calls/invoke/parameters/#{output_adapter.name}").children.to_s
+        function_output = Nokogiri::HTML.parse(text_containing_xml.match(/\<#{output_adapter.name}\>(.*?)\<\/#{output_adapter.name}\>/m)[1]).text
 
+        raise "Claude did not format response, error: #{response.body}" unless function_output
         return function_output
       end
     end

data/lib/sublayer/providers/gemini.rb

@@ -5,21 +5,49 @@ 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>
+            #{output_adapter.to_xml}
+          </tool>
+        </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: {
-            tools: { function_declarations: [output_adapter.to_hash] },
-            contents: { role: "user", parts: { text: prompt } }
+            contents: { role: "user", parts: { text: "#{system_prompt}\n#{prompt}" } }
           }.to_json,
           headers: {
             "Content-Type" => "application/json"
-          })
+          }
+        )
+
+        raise "Error generating with Gemini, error: #{response.body}" unless response.success?
 
-        part = response.dig('candidates', 0, 'content', 'parts', 0)
-        raise "No function called" unless part['functionCall']
+        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
 
-        args = part['functionCall']['args']
-        args[output_adapter.name]
+        raise "Gemini did not format response, error: #{response.body}" unless tool_output
+        return tool_output
       end
     end
   end

data/lib/sublayer/providers/groq.rb

@@ -6,27 +6,27 @@ module Sublayer
     class Groq
       def self.call(prompt:, output_adapter:)
         system_prompt = <<-PROMPT
-        In this environment you have access to a set of tools you can use to answer the user's question.
+        You have access to a set of tools to answer the prompt.
 
-        You may call them like this:
-        <function_calls>
-        <invoke>
-          <tool_name>$TOOL_NAME</tool_name>
-          <parameters>
-          <#{output_adapter.name}>value</#{output_adapter.name}>
-          ...
-          </parameters>
-        </invoke>
-        </function_calls>
+        You may call tools like this:
+        <tool_calls>
+          <tool_call>
+            <tool_name>$TOOL_NAME</tool_name>
+            <parameters>
+              <#{output_adapter.name}>$VALUE</#{output_adapter.name}>
+              ...
+            </parameters>
+          </tool_call>
+        </tool_calls>
 
         Here are the tools available:
         <tools>
-        #{output_adapter.to_xml}
+          #{output_adapter.to_xml}
         </tools>
 
         Respond only with valid xml.
         The entire response should be wrapped in a <response> tag.
-        Any additional information not inside a tool call should go in a <scratch> tag.
+        Your response should call a tool inside a <tool_calls> tag.
         PROMPT
 
         response = HTTParty.post(
@@ -41,12 +41,11 @@ module Sublayer
           }.to_json
         )
 
-        text_containing_xml = JSON.parse(response.body).dig("choices", 0, "message", "content")
-        xml = text_containing_xml.match(/\<response\>(.*?)\<\/response\>/m).to_s
-        response_xml = ::Nokogiri::XML(xml)
-        function_output = response_xml.at_xpath("//response/function_calls/invoke/parameters/command").children.to_s
+        text_containing_xml = response.dig("choices", 0, "message", "content")
+        tool_output = Nokogiri::HTML.parse(text_containing_xml.match(/\<#{output_adapter.name}\>(.*?)\<\/#{output_adapter.name}\>/m)[1]).text
+        raise "Groq did not format response correctly, error: #{response.body}" unless tool_output
 
-        return function_output
+        return tool_output
       end
     end
   end

data/lib/sublayer/providers/local.rb

@@ -6,23 +6,23 @@ module Sublayer
     class Local
       def self.call(prompt:, output_adapter:)
         system_prompt = <<-PROMPT
-        You are a function calling AI agent
-        You can call only one function at a time
-        You are provided with function signatures within <tools></tools> XML tags.
+        You have access to a set of tools to respond to the prompt.
 
-        Please call a function and wait for results to be provided to you in the next iteration.
-        Don't make assumptions about what values to plug into function arguments.
+        You may call a tool with xml like this:
+        <parameters>
+          <#{output_adapter.name}>$VALUE</#{output_adapter.name}>
+          ...
+        </parameters>
 
-        Here are the available tools:
+        Here are descriptions of the available tools:
         <tools>
-        #{output_adapter.to_hash.to_json}
+          <tool>
+            #{output_adapter.to_xml}
+          </tool>
         </tools>
 
-        For the function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags as follows:
-
-        <tool_call>
-        {"arguments": <args-dict>, "name": <function-name>}
-        </tool_call>
+        Respond only with valid xml.
+        Your response should call a tool with xml inside a <parameters> tag.
         PROMPT
 
         response = HTTParty.post(
@@ -34,17 +34,16 @@ module Sublayer
           body: {
             "model": Sublayer.configuration.ai_model,
             "messages": [
-              { "role": "system", "content": system_prompt },
-              { "role": "user", "content": prompt }
+              { "role": "user", "content": "#{system_prompt}\n#{prompt}}" }
             ]
           }.to_json
         )
 
-        text_containing_xml = JSON.parse(response.body).dig("choices", 0, "message", "content")
-        results = JSON.parse(::Nokogiri::XML(text_containing_xml).at_xpath("//tool_call").children.to_s.strip)
-        function_output = results["arguments"][output_adapter.name]
+        text_containing_xml = response.dig("choices", 0, "message", "content")
+        tool_output = Nokogiri::HTML.parse(text_containing_xml.match(/\<#{output_adapter.name}\>(.*?)\<\/#{output_adapter.name}\>/m)[1]).text
+        raise "The response was not formatted correctly: #{response.body}" unless tool_output
 
-        return function_output
+        return tool_output
       end
     end
   end

data/lib/sublayer/version.rb

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

data/sublayer.gemspec

@@ -11,10 +11,12 @@ Gem::Specification.new do |spec|
 
   spec.summary = "A model-agnostic Ruby GenerativeAI DSL and Framework"
   spec.description = "A DSL and framework for building AI powered applications through the use of Generators, Actions, Tasks, and Agents"
-  spec.homepage = "https://www.sublayer.com"
+  spec.homepage = "https://docs.sublayer.com"
   spec.required_ruby_version = ">= 2.6.0"
 
-  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["homepage_uri"] = "https://docs.sublayer.com"
+  spec.metadata["documentation_uri"] = "https://docs.sublayer.com"
+  spec.metadata["bug_tracker_uri"] = "https://github.com/sublayerapp/sublayer/issues"
 
   # 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.
@@ -36,4 +38,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec", "~> 3.12"
   spec.add_development_dependency "pry", " ~> 0.14"
+  spec.add_development_dependency "clag"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sublayer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Scott Werner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: clag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A DSL and framework for building AI powered applications through the
   use of Generators, Actions, Tasks, and Agents
 email:
@@ -138,6 +152,7 @@ files:
 - examples/description_from_code_generator.rb
 - examples/invalid_to_valid_json_generator.rb
 - lib/sublayer.rb
+- lib/sublayer/actions/base.rb
 - lib/sublayer/components/output_adapters.rb
 - lib/sublayer/components/output_adapters/single_string.rb
 - lib/sublayer/generators/base.rb
@@ -148,11 +163,13 @@ files:
 - lib/sublayer/providers/open_ai.rb
 - lib/sublayer/version.rb
 - sublayer.gemspec
-homepage: https://www.sublayer.com
+homepage: https://docs.sublayer.com
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://www.sublayer.com
+  homepage_uri: https://docs.sublayer.com
+  documentation_uri: https://docs.sublayer.com
+  bug_tracker_uri: https://github.com/sublayerapp/sublayer/issues
 post_install_message:
 rdoc_options: []
 require_paths: