rager 0.5.0 → 0.6.0

data/lib/rager/utils/replicate.rb

@@ -1,9 +1,10 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "sorbet-runtime"
 require "json"
 
+require "sorbet-runtime"
+
 module Rager
   module Utils
     module Replicate
@@ -15,8 +16,6 @@ module Rager
         return nil if download_url.nil?
 
         Rager::Utils::Http.download_binary(download_url)
-      rescue
-        nil
       end
 
       sig { params(prediction_url: String, key: T.nilable(String), path: String, http_adapter: T.nilable(Rager::Http::Adapters::Abstract)).returns(T.nilable(String)) }
@@ -25,14 +24,12 @@ module Rager
         return nil if download_url.nil?
 
         Rager::Utils::Http.download_file(download_url, path)
-      rescue
-        nil
       end
 
       sig { params(prediction_url: String, key: T.nilable(String), http_adapter: T.nilable(Rager::Http::Adapters::Abstract)).returns(T.nilable(String)) }
       def self.get_download_url(prediction_url, key = nil, http_adapter: nil)
         api_key = ENV["REPLICATE_API_KEY"]
-        raise Rager::Errors::MissingCredentialsError.new("Replicate", "REPLICATE_API_KEY") if api_key.nil?
+        raise Rager::Errors::CredentialsError.new("Replicate", env_var: ["REPLICATE_API_KEY"]) if api_key.nil?
 
         adapter = http_adapter || Rager.config.http_adapter
         response = adapter.make_request(
@@ -42,14 +39,14 @@ module Rager
           )
         )
 
-        raise Rager::Errors::HttpError.new(adapter, response.status, T.cast(response.body, T.nilable(String))) unless response.success?
+        raise Rager::Errors::HttpError.new(adapter, prediction_url, response.status, body: response.body&.to_s) unless response.success?
 
         data = JSON.parse(T.cast(T.must(response.body), String))
         return nil if ["starting", "processing"].include?(data["status"])
 
         if data["status"] == "failed"
           error_msg = data["error"] || "Prediction failed"
-          raise Rager::Errors::HttpError.new(adapter, 422, "Prediction failed: #{error_msg}")
+          raise Rager::Errors::HttpError.new(adapter, prediction_url, 422, body: error_msg)
         end
 
         return nil unless data["status"] == "succeeded"
@@ -70,11 +67,7 @@ module Rager
         return nil if download_url.nil? || download_url.empty?
         download_url
       rescue JSON::ParserError => e
-        raise Rager::Errors::ParseError.new("Failed to parse prediction response", e.message)
-      rescue Rager::Errors::HttpError, Rager::Errors::ParseError, Rager::Errors::MissingCredentialsError
-        raise
-      rescue
-        nil
+        raise Rager::Errors::ParseError.new("Failed to parse prediction response", details: e.message)
       end
 
       sig { params(prediction_url: String, key: T.nilable(String), path: T.nilable(String), max_attempts: Integer, sleep_interval: Integer, http_adapter: T.nilable(Rager::Http::Adapters::Abstract)).returns(T.nilable(String)) }
@@ -86,11 +79,15 @@ module Rager
             download_prediction(prediction_url, key, http_adapter: http_adapter)
           end
           return result unless result.nil?
-          sleep(sleep_interval)
+          Rager::Utils::Http.sleep(sleep_interval)
         end
 
-        adapter = http_adapter || Rager.config.http_adapter
-        raise Rager::Errors::HttpError.new(adapter, 408, "Prediction polling timed out after #{max_attempts} attempts")
+        raise Rager::Errors::TimeoutError.new(
+          "Replicate prediction polling",
+          timeout_seconds: max_attempts * sleep_interval,
+          attempts: max_attempts,
+          details: "Prediction at #{prediction_url} did not complete within #{max_attempts} attempts"
+        )
       end
     end
   end

data/lib/rager/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Rager
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rager
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - mvkvc
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +60,6 @@ files:
 - LICENSE.md
 - README.md
 - lib/rager.rb
-- lib/rager/chat.rb
 - lib/rager/chat/message.rb
 - lib/rager/chat/message_content.rb
 - lib/rager/chat/message_content_image_type.rb
@@ -87,49 +72,44 @@ files:
 - lib/rager/chat/schema.rb
 - lib/rager/config.rb
 - lib/rager/context.rb
-- lib/rager/embed.rb
 - lib/rager/embed/options.rb
 - lib/rager/embed/providers/abstract.rb
 - lib/rager/embed/providers/openai.rb
 - lib/rager/error.rb
+- lib/rager/errors/credentials_error.rb
+- lib/rager/errors/dependency_error.rb
 - lib/rager/errors/http_error.rb
-- lib/rager/errors/missing_credentials_error.rb
 - lib/rager/errors/options_error.rb
 - lib/rager/errors/parse_error.rb
 - lib/rager/errors/template_error.rb
-- lib/rager/errors/unknown_provider_error.rb
+- lib/rager/errors/timeout_error.rb
 - lib/rager/http/adapters/abstract.rb
 - lib/rager/http/adapters/async_http.rb
 - lib/rager/http/adapters/mock.rb
+- lib/rager/http/adapters/net_http.rb
 - lib/rager/http/request.rb
 - lib/rager/http/response.rb
 - lib/rager/http/verb.rb
-- lib/rager/image_gen.rb
 - lib/rager/image_gen/options.rb
 - lib/rager/image_gen/output_format.rb
 - lib/rager/image_gen/providers/abstract.rb
 - lib/rager/image_gen/providers/replicate.rb
 - lib/rager/logger.rb
-- lib/rager/mesh_gen.rb
 - lib/rager/mesh_gen/options.rb
 - lib/rager/mesh_gen/providers/abstract.rb
 - lib/rager/mesh_gen/providers/replicate.rb
 - lib/rager/operation.rb
 - lib/rager/options.rb
-- lib/rager/rerank.rb
+- lib/rager/providers.rb
 - lib/rager/rerank/options.rb
+- lib/rager/rerank/output.rb
 - lib/rager/rerank/providers/abstract.rb
 - lib/rager/rerank/providers/cohere.rb
-- lib/rager/rerank/query.rb
-- lib/rager/rerank/result.rb
 - lib/rager/result.rb
-- lib/rager/search.rb
 - lib/rager/search/options.rb
+- lib/rager/search/output.rb
 - lib/rager/search/providers/abstract.rb
-- lib/rager/search/providers/brave.rb
-- lib/rager/search/result.rb
-- lib/rager/template.rb
-- lib/rager/template/input.rb
+- lib/rager/search/providers/jina.rb
 - lib/rager/template/options.rb
 - lib/rager/template/providers/abstract.rb
 - lib/rager/template/providers/erb.rb
@@ -157,5 +137,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.7
 specification_version: 4
-summary: Build continuously improving AI applications.
+summary: Build continuously improving generative workflows.
 test_files: []

data/lib/rager/chat.rb

@@ -1,35 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Chat
-    extend T::Sig
-
-    sig do
-      params(
-        messages: Rager::Types::ChatInput,
-        options: Rager::Chat::Options
-      ).returns(Rager::Types::ChatOutput)
-    end
-    def self.chat(messages, options = Rager::Chat::Options.new)
-      provider = get_provider(options.provider)
-      provider.chat(messages, options)
-    end
-
-    sig do
-      params(
-        key: String
-      ).returns(Rager::Chat::Providers::Abstract)
-    end
-    def self.get_provider(key)
-      case key.downcase
-      when "openai"
-        Rager::Chat::Providers::Openai.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::Chat, key)
-      end
-    end
-  end
-end

data/lib/rager/embed.rb

@@ -1,35 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Embed
-    extend T::Sig
-
-    sig do
-      params(
-        text: Rager::Types::EmbedInput,
-        options: Rager::Embed::Options
-      ).returns(Rager::Types::EmbedOutput)
-    end
-    def self.embed(text, options = Rager::Embed::Options.new)
-      provider = get_provider(options.provider)
-      provider.embed(text, options)
-    end
-
-    sig do
-      params(
-        key: String
-      ).returns(Rager::Embed::Providers::Abstract)
-    end
-    def self.get_provider(key)
-      case key.downcase
-      when "openai"
-        Rager::Embed::Providers::Openai.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::Embed, key)
-      end
-    end
-  end
-end

data/lib/rager/errors/missing_credentials_error.rb

@@ -1,19 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Errors
-    class MissingCredentialsError < Rager::Error
-      extend T::Sig
-
-      sig { params(provider_name: String, env_var: T.nilable(String)).void }
-      def initialize(provider_name, env_var = nil)
-        message = "Missing credentials for provider #{provider_name}"
-        message += " -- attempted lookup with #{env_var}" if env_var
-        super(message)
-      end
-    end
-  end
-end

data/lib/rager/errors/unknown_provider_error.rb

@@ -1,17 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Errors
-    class UnknownProviderError < Rager::Error
-      extend T::Sig
-
-      sig { params(operation: Rager::Operation, key: String).void }
-      def initialize(operation, key)
-        super("Unknown provider #{key} for operation #{operation.serialize}")
-      end
-    end
-  end
-end

data/lib/rager/image_gen.rb

@@ -1,31 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module ImageGen
-    extend T::Sig
-
-    sig do
-      params(
-        prompt: Rager::Types::ImageGenInput,
-        options: Rager::ImageGen::Options
-      ).returns(Rager::Types::ImageGenOutput)
-    end
-    def self.image_gen(prompt, options = Rager::ImageGen::Options.new)
-      provider = get_provider(options.provider)
-      provider.image_gen(prompt, options)
-    end
-
-    sig { params(key: String).returns(Rager::ImageGen::Providers::Abstract) }
-    def self.get_provider(key)
-      case key.downcase
-      when "replicate"
-        Rager::ImageGen::Providers::Replicate.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::ImageGen, key)
-      end
-    end
-  end
-end

data/lib/rager/mesh_gen.rb

@@ -1,31 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module MeshGen
-    extend T::Sig
-
-    sig do
-      params(
-        image_url: Rager::Types::MeshGenInput,
-        options: Rager::MeshGen::Options
-      ).returns(Rager::Types::MeshGenOutput)
-    end
-    def self.mesh_gen(image_url, options = Rager::MeshGen::Options.new)
-      provider = get_provider(options.provider)
-      provider.mesh_gen(image_url, options)
-    end
-
-    sig { params(key: String).returns(Rager::MeshGen::Providers::Abstract) }
-    def self.get_provider(key)
-      case key.downcase
-      when "replicate"
-        Rager::MeshGen::Providers::Replicate.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::MeshGen, key)
-      end
-    end
-  end
-end

data/lib/rager/rerank/result.rb

@@ -1,13 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Rerank
-    class Result < T::Struct
-      const :score, Float
-      const :index, Integer
-    end
-  end
-end

data/lib/rager/rerank.rb

@@ -1,35 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Rerank
-    extend T::Sig
-
-    sig do
-      params(
-        query: Rager::Types::RerankInput,
-        options: Rager::Rerank::Options
-      ).returns(Rager::Types::RerankOutput)
-    end
-    def self.rerank(query, options = Rager::Rerank::Options.new)
-      provider = get_provider(options.provider)
-      provider.rerank(query, options)
-    end
-
-    sig do
-      params(
-        key: String
-      ).returns(Rager::Rerank::Providers::Abstract)
-    end
-    def self.get_provider(key)
-      case key.downcase
-      when "cohere"
-        Rager::Rerank::Providers::Cohere.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::Rerank, key)
-      end
-    end
-  end
-end

data/lib/rager/search/providers/brave.rb

@@ -1,59 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "json"
-require "uri"
-require "sorbet-runtime"
-
-module Rager
-  module Search
-    module Providers
-      class Brave < Rager::Search::Providers::Abstract
-        extend T::Sig
-
-        sig do
-          override.params(
-            query: String,
-            options: Rager::Search::Options
-          ).returns(Rager::Types::SearchOutput)
-        end
-        def search(query, options)
-          api_key = options.api_key || ENV["BRAVE_API_KEY"]
-          raise Rager::Errors::MissingCredentialsError.new("Brave", "BRAVE_API_KEY") if api_key.nil?
-
-          params = {"q" => query}.tap do |p|
-            p["count"] = options.n.to_s if options.n
-          end
-
-          request = Rager::Http::Request.new(
-            verb: Rager::Http::Verb::Get,
-            url: "https://api.search.brave.com/res/v1/web/search?#{URI.encode_www_form(params)}",
-            headers: {
-              "Accept" => "application/json",
-              "Accept-Encoding" => "gzip",
-              "x-subscription-token" => api_key
-            }
-          )
-
-          response = Rager.config.http_adapter.make_request(request)
-          response_body = T.cast(T.must(response.body), String)
-
-          raise Rager::Errors::HttpError.new(Rager.config.http_adapter, response.status, response_body) if response.status != 200
-
-          parsed_response = JSON.parse(response_body)
-          web_results = parsed_response.dig("web", "results") || []
-
-          web_results.filter_map do |result|
-            next unless result["title"] && result["url"] && result["description"]
-
-            Rager::Search::Result.new(
-              title: result["title"],
-              url: result["url"],
-              description: result["description"]
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rager/search/result.rb

@@ -1,14 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Search
-    class Result < T::Struct
-      const :title, String
-      const :url, String
-      const :description, String
-    end
-  end
-end

data/lib/rager/search.rb

@@ -1,35 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Search
-    extend T::Sig
-
-    sig do
-      params(
-        query: Rager::Types::SearchInput,
-        options: Rager::Search::Options
-      ).returns(Rager::Types::SearchOutput)
-    end
-    def self.search(query, options = Rager::Search::Options.new)
-      provider = get_provider(options.provider)
-      provider.search(query, options)
-    end
-
-    sig do
-      params(
-        key: String
-      ).returns(Rager::Search::Providers::Abstract)
-    end
-    def self.get_provider(key)
-      case key.downcase
-      when "brave"
-        Rager::Search::Providers::Brave.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::Search, key)
-      end
-    end
-  end
-end

data/lib/rager/template/input.rb

@@ -1,11 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-module Rager
-  module Template
-    class Input < T::Struct
-      const :template, String
-      const :variables, T::Hash[Symbol, T.untyped]
-    end
-  end
-end

data/lib/rager/template.rb

@@ -1,35 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "sorbet-runtime"
-
-module Rager
-  module Template
-    extend T::Sig
-
-    sig do
-      params(
-        input: Rager::Types::TemplateInput,
-        options: Rager::Template::Options
-      ).returns(Rager::Types::TemplateOutput)
-    end
-    def self.template(input, options = Rager::Template::Options.new)
-      provider = get_provider(options.provider)
-      provider.template(input, options)
-    end
-
-    sig do
-      params(
-        key: String
-      ).returns(Rager::Template::Providers::Abstract)
-    end
-    def self.get_provider(key)
-      case key.downcase
-      when "erb"
-        Rager::Template::Providers::Erb.new
-      else
-        raise Rager::Errors::UnknownProviderError.new(Rager::Operation::Template, key)
-      end
-    end
-  end
-end