ruby_llm-agents 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b3871f0304905337f724a7ac0d7b17f3dde4b5fc3e96e56c7a1fcc83aabfdb
-  data.tar.gz: b23ff14f78d9591ffb5272ffd99b2572a0b9464e51e22988f94134386bd77084
+  metadata.gz: b9c413f46174a6ad550e9ff2a676c92e116d6a8199cc3ff1c8ecb24e48b89b53
+  data.tar.gz: e4def5034b05f731418622879f15ee8e77be73534e239855612770874545da29
 SHA512:
-  metadata.gz: f16cb69fda0f4bf4da4b3e93544296ec7097aedfe1e4f1be9b012d1eb0d000dd935739ed167b8df7026f4abce3594ee0ac06423a6a60c90c45e3510d0476e2f1
-  data.tar.gz: 7a8866505977c8e2a42a69058f4f01967b7e836572daa76b189a3da56343f2c8e41a2c561a619ddcca72d5a1ad5818fe3f8da10cfe8dd56c4317b7c2a4ca1ff9
+  metadata.gz: 9926a9f54daef58388cc5f6fabbacaf3dbaf3d03f590ef97dc81d180dd3ccb53153f78ec54c8a32247d1abc18c19084a04bf2b31b1378109dd76d159e84bff6a
+  data.tar.gz: 225a42a4f27f25f41b84521df11464e1bdb64ddbbddc6d8c7476d2039bddc9ddaa9ad96078aeb9e13bddd79ef1ba88a1697b8abb82a9b6239b8b5d00a836e8c0

data/lib/ruby_llm/agents/instrumentation.rb

@@ -28,9 +28,12 @@ module RubyLLM
 
       # Wrap agent execution with metrics tracking
       # Creates execution record at start with 'running' status, updates on completion
+      # Uses ensure block to guarantee status is updated even if complete_execution fails
       def instrument_execution(&block)
         started_at = Time.current
         @last_response = nil
+        @execution_status_updated = false
+        original_error = nil
 
         # Create execution record immediately with running status
         execution = create_running_execution(started_at)
@@ -46,24 +49,34 @@ module RubyLLM
             status: "success",
             response: @last_response
           )
+          @execution_status_updated = true
 
           result
         rescue Timeout::Error => e
+          original_error = e
           complete_execution(
             execution,
             completed_at: Time.current,
             status: "timeout",
             error: e
           )
+          @execution_status_updated = true
           raise
         rescue => e
+          original_error = e
           complete_execution(
             execution,
             completed_at: Time.current,
             status: "error",
             error: e
           )
+          @execution_status_updated = true
           raise
+        ensure
+          # Guarantee execution is marked as error if complete_execution failed
+          unless @execution_status_updated
+            mark_execution_failed!(execution, error: original_error)
+          end
         end
       end
 
@@ -110,16 +123,11 @@ module RubyLLM
           status: status
         }
 
-        # Add response data if available
-        if response.is_a?(RubyLLM::Message)
-          update_data.merge!(
-            input_tokens: response.input_tokens,
-            output_tokens: response.output_tokens,
-            cached_tokens: response.cached_tokens || 0,
-            cache_creation_tokens: response.cache_creation_tokens || 0,
-            model_id: response.model_id || model,
-            response: serialize_response(response)
-          )
+        # Add response data if available (using safe extraction)
+        response_data = safe_extract_response_data(response)
+        if response_data.any?
+          update_data.merge!(response_data)
+          update_data[:model_id] ||= model
         end
 
         # Add error data if failed
@@ -134,11 +142,16 @@ module RubyLLM
 
         # Calculate costs if token data is available
         if execution.input_tokens && execution.output_tokens
-          execution.calculate_costs!
-          execution.save!
+          begin
+            execution.calculate_costs!
+            execution.save!
+          rescue StandardError => cost_error
+            Rails.logger.warn("[RubyLLM::Agents] Cost calculation failed: #{cost_error.message}")
+          end
         end
       rescue StandardError => e
         Rails.logger.error("[RubyLLM::Agents] Failed to update execution record: #{e.message}")
+        raise # Re-raise so ensure block can handle emergency update
       end
 
       # Fallback for when initial execution creation failed
@@ -158,15 +171,11 @@ module RubyLLM
           user_prompt: safe_user_prompt
         }
 
-        if response.is_a?(RubyLLM::Message)
-          execution_data.merge!(
-            input_tokens: response.input_tokens,
-            output_tokens: response.output_tokens,
-            cached_tokens: response.cached_tokens || 0,
-            cache_creation_tokens: response.cache_creation_tokens || 0,
-            model_id: response.model_id || model,
-            response: serialize_response(response)
-          )
+        # Add response data if available (using safe extraction)
+        response_data = safe_extract_response_data(response)
+        if response_data.any?
+          execution_data.merge!(response_data)
+          execution_data[:model_id] ||= model
         end
 
         if error
@@ -208,18 +217,6 @@ module RubyLLM
         end
       end
 
-      # Serialize full RubyLLM::Message response to JSON
-      def serialize_response(response)
-        {
-          content: response.content,
-          model_id: response.model_id,
-          input_tokens: response.input_tokens,
-          output_tokens: response.output_tokens,
-          cached_tokens: response.cached_tokens,
-          cache_creation_tokens: response.cache_creation_tokens
-        }.compact
-      end
-
       # Hook for subclasses to add custom metadata
       def execution_metadata
         {}
@@ -240,6 +237,58 @@ module RubyLLM
         Rails.logger.warn("[RubyLLM::Agents] Could not capture user_prompt: #{e.message}")
         nil
       end
+
+      # Safely extract a value from response, returning default if method doesn't exist
+      def safe_response_value(response, method, default = nil)
+        return default unless response.respond_to?(method)
+        response.public_send(method)
+      rescue StandardError
+        default
+      end
+
+      # Safely extract all response data with fallbacks
+      def safe_extract_response_data(response)
+        return {} unless response.is_a?(RubyLLM::Message)
+
+        {
+          input_tokens: safe_response_value(response, :input_tokens),
+          output_tokens: safe_response_value(response, :output_tokens),
+          cached_tokens: safe_response_value(response, :cached_tokens, 0),
+          cache_creation_tokens: safe_response_value(response, :cache_creation_tokens, 0),
+          model_id: safe_response_value(response, :model_id),
+          response: safe_serialize_response(response)
+        }.compact
+      end
+
+      # Safe version of serialize_response
+      def safe_serialize_response(response)
+        {
+          content: safe_response_value(response, :content),
+          model_id: safe_response_value(response, :model_id),
+          input_tokens: safe_response_value(response, :input_tokens),
+          output_tokens: safe_response_value(response, :output_tokens),
+          cached_tokens: safe_response_value(response, :cached_tokens, 0),
+          cache_creation_tokens: safe_response_value(response, :cache_creation_tokens, 0)
+        }.compact
+      end
+
+      # Emergency fallback - mark execution as error using update_columns
+      # Bypasses callbacks/validations to ensure status is always updated
+      def mark_execution_failed!(execution, error: nil)
+        return unless execution&.id
+        return unless execution.status == "running"
+
+        update_data = {
+          status: "error",
+          completed_at: Time.current,
+          error_class: error&.class&.name || "InstrumentationError",
+          error_message: (error&.message || "Execution status update failed").to_s.truncate(65535)
+        }
+
+        execution.class.where(id: execution.id, status: "running").update_all(update_data)
+      rescue StandardError => e
+        Rails.logger.error("[RubyLLM::Agents] CRITICAL: Failed emergency status update for execution #{execution&.id}: #{e.message}")
+      end
     end
   end
 end

data/lib/ruby_llm/agents/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLLM
   module Agents
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm-agents
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - adham90