roast-ai 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a8b9b5eb5427205d65f9e2d3eb989c53a0cd449aa83d2e8df712f3b06ae203
-  data.tar.gz: 29d8236ed59630399b69ddc7286d9f80428620158117a68bc14048c8ac0a1e78
+  metadata.gz: 1b30690bd6345f217ff752e69865abf269792917e6463bbb70745a812ec15a4b
+  data.tar.gz: de3732ccd3322fb8ff782d10e52168e0e4292fdb21596ff0eff7201532498c8d
 SHA512:
-  metadata.gz: 48fcaf3988124ce0d627ff22f11fc563a990b96eb92afa27b75294f4c21ed2341c240f5ecf1fcf2b618f87078b19876adaa5cc493419a6be3b05c6b2137abd58
-  data.tar.gz: 4df2dfb16ff49b3bfe53102d878de8c356330621e4267a07fbfd35642251b512eab974cbe4c3377fbdaf29933b4a36c91010abc741ccb6b11321fcc4decf191a
+  metadata.gz: ba81d35b6484ffbdb3bb5aaed1baacbbc684033e62df23131c6d0bcb7833bc0902600f84a462fb451213d56c43862e49e8db5bfd150fb4a7520b66cd1e078d85
+  data.tar.gz: 01b3d585d72528c5d8382a13edd379f6af249d75059564adb8eb33671b2dfb252749a09f8e2d8a551b09fad048b735960fcf8f2cf37d1c0f1d06aa758feee50d

data/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.6]
+
+### Added
+- Step retries
+
+### Fixed
+- Tokens containing whitespace
+
 ## [0.4.5]
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roast-ai (0.4.5)
+    roast-ai (0.4.6)
       activesupport (>= 7.0)
       cli-kit (~> 5.0)
       cli-ui (= 2.3.0)

data/examples/retry/workflow.yml

@@ -0,0 +1,23 @@
+description: Demonstrate retry functionality for steps
+
+# This example shows how to configure steps to automatically retry on failure
+# The 'retries' parameter specifies how many times to retry a failing step
+
+steps:
+  - check_network: "$(curl -f -s -o /dev/null -w '%{http_code}' https://httpstat.us/500)"
+  - process_data: "Process important data that might fail transiently"
+  - flaky_command: "$(./flaky_script.sh)"
+
+# Configuration for each step
+check_network:
+  retries: 3  # Will retry up to 3 times if it fails
+  exit_on_error: true  # Will exit workflow if all retries fail
+
+process_data:
+  model: gpt-4o-mini
+  retries: 2  # Will retry up to 2 times
+
+# Command with retries but won't exit on error after all retries fail
+flaky_command:
+  retries: 5
+  exit_on_error: false  # Continue workflow even after all retries fail

data/lib/roast/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Roast
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/lib/roast/workflow/error_handler.rb

@@ -10,8 +10,9 @@ module Roast
         # Use the Roast logger singleton
       end
 
-      def with_error_handling(step_name, resource_type: nil)
+      def with_error_handling(step_name, resource_type: nil, retries: 0, &block)
         start_time = Time.now
+        maximum_attempts = retries + 1
 
         ActiveSupport::Notifications.instrument("roast.step.start", {
           step_name: step_name,
@@ -19,7 +20,19 @@ module Roast
           workflow_name: @workflow&.name,
         })
 
-        result = yield
+        result = nil #: untyped?
+
+        maximum_attempts.times do |current_attempt|
+          # .times starts at 0 index, the math is easier to reason about if current_attempt matches normal description
+          current_attempt += 1
+          result = block.call
+          break
+        rescue StandardError => e
+          remaining_attempts = maximum_attempts - current_attempt
+          raise e if remaining_attempts == 0
+
+          handle_retry(e, step_name, resource_type, start_time, remaining_attempts)
+        end
 
         execution_time = Time.now - start_time
 
@@ -62,6 +75,23 @@ module Roast
 
       private
 
+      def handle_retry(error, step_name, resource_type, start_time, remaining_attempts)
+        execution_time = Time.now - start_time
+
+        ActiveSupport::Notifications.instrument("roast.step.error.retry", {
+          step_name: step_name,
+          resource_type: resource_type,
+          workflow_name: @workflow&.name,
+          error: error.class.name,
+          message: error.message,
+          execution_time: execution_time,
+          remaining_attempts: remaining_attempts,
+        })
+
+        log_warning("[#{step_name}] failed: #{error.message}")
+        log_warning("Retrying, #{remaining_attempts} attempts left")
+      end
+
       def handle_workflow_error(error, step_name, resource_type, start_time)
         execution_time = Time.now - start_time
 

data/lib/roast/workflow/step_executor_coordinator.rb

@@ -60,6 +60,10 @@ module Roast
         Thread.current[:current_step_name] = step_name if step_name
         Thread.current[:workflow_metadata] = @context.workflow.metadata
 
+        unless options[:retries]
+          options[:retries] = @context.config_hash[step_name]&.fetch("retries", 0) || 0
+        end
+
         case step_type
         when StepTypeResolver::COMMAND_STEP
           # Command steps should also go through interpolation
@@ -148,8 +152,9 @@ module Roast
         resource_type = @context.resource_type
         step_key = options[:step_key]
         display_name = step_key || step
+        retries = options.fetch(:retries, 0)
 
-        error_handler.with_error_handling(display_name, resource_type: resource_type) do
+        error_handler.with_error_handling(display_name, resource_type: resource_type, retries:) do
           $stderr.puts "Executing: #{display_name} (Resource type: #{resource_type || "unknown"})"
 
           begin
@@ -263,7 +268,8 @@ module Roast
           # Command step - execute directly, preserving any passed options including step_key
           exit_on_error = options.fetch(:exit_on_error, true)
           step_key = options[:step_key]
-          execute_command_step(interpolated_step, { exit_on_error:, step_key: })
+          retries = options[:retries] || 0
+          execute_command_step(interpolated_step, { exit_on_error:, step_key:, retries: })
         else
           exit_on_error = options.fetch(:exit_on_error, context.exit_on_error?(step))
           execute_standard_step(interpolated_step, options.merge(exit_on_error:))
@@ -286,8 +292,9 @@ module Roast
 
       def execute_custom_step(name, step_key: nil, **options)
         resource_type = @context.workflow.respond_to?(:resource) ? @context.workflow.resource&.type : nil
+        retries = options[:retries] || 0
 
-        error_handler.with_error_handling(name, resource_type: resource_type) do
+        error_handler.with_error_handling(name, resource_type: resource_type, retries:) do
           $stderr.puts "Executing: #{name} (Resource type: #{resource_type || "unknown"})"
 
           # Use step_key for loading if provided, otherwise use name

data/lib/roast/workflow/workflow_initializer.rb

@@ -29,6 +29,9 @@ module Roast
         # Only check if the workflow has steps that would need API access
         return if @configuration.steps.empty?
 
+        # Strip whitespace from existing Raix clients
+        strip_tokens_from_existing_clients
+
         # Check if Raix has been configured with the appropriate client
         case @configuration.api_provider
         when :openai
@@ -215,7 +218,7 @@ module Roast
 
       def client_options
         {
-          access_token: @configuration.api_token,
+          access_token: @configuration.api_token&.strip,
           uri_base: @configuration.uri_base&.to_s,
         }.compact
       end
@@ -265,6 +268,17 @@ module Roast
         end
         interpolated
       end
+
+      def strip_tokens_from_existing_clients
+        strip_token_in_client(Raix.configuration.openai_client)
+        strip_token_in_client(Raix.configuration.openrouter_client)
+      end
+
+      def strip_token_in_client(client)
+        return unless client.respond_to?(:access_token)
+
+        client.instance_variable_set(:@access_token, client.access_token&.strip)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roast-ai
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Shopify
@@ -397,6 +397,7 @@ files:
 - examples/pre_post_processing/validate_changes/prompt.md
 - examples/pre_post_processing/workflow.png
 - examples/pre_post_processing/workflow.yml
+- examples/retry/workflow.yml
 - examples/rspec_to_minitest/README.md
 - examples/rspec_to_minitest/analyze_spec/prompt.md
 - examples/rspec_to_minitest/create_minitest/prompt.md