ask-agent 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1ea1b84a7139944acf9787cfdd3e5a9fad739b759fc4501f59f68bdd3c0b77
-  data.tar.gz: 37733f0982e0d991e284d46c9202fe5846fff67a433acae0385a703912c7f898
+  metadata.gz: f9b59871c0216de559acd011a9553c650ca4f3714150c7e71811b375a92f2a48
+  data.tar.gz: edb6f7137010f1c448da22ca99a7cf2c90dda29f70d210db4c2e18d5f4079568
 SHA512:
-  metadata.gz: 8e4ff593f7856c2fe0da46dfe8091ad38217e29b27aa343e95f6f939ab741b8c249217dbaa397ad609c21b9b4f39e09a781738a556368e69307fa01329fb00d9
-  data.tar.gz: fc45d3ae62bc2e325a22dedab88625f312d3e9b07188d9614c5cb2ddfa9683ed31e2bb8473f10344d73ac18f7cef202fcf53cd68272affbab54c208770017dde
+  metadata.gz: c3c7ddc41ed53e2978b9860814ed802b9bae305f81fe442dc3b123b8f34786f4bd16a1f9fa90ff6069cae4570aba8033f135a4187e39806745b16f33fef976b4
+  data.tar.gz: dafe52d28098ac72a45557547818bcea55c609d1db0856d6c67ea7fd330a837ed80ded9145cc6d0d3cc3f45818f268db5c4faca7cb38b9220a63ccc3a84457b9

data/lib/ask/agent/chat.rb

@@ -26,8 +26,11 @@ module Ask
     # internal usage (Hash of { id => ToolCallInfo }).
     class Chat
       # @return [String] model ID (e.g. "gpt-4o")
-      attr_reader :model
-
+        attr_reader :model_id
+      # @return [String] model ID (e.g. "gpt-4o")
+      def model
+        @model_id
+      end
       # @return [Array<Ask::Message>] all messages in the conversation
       attr_reader :messages
 
@@ -35,13 +38,17 @@ module Ask
       # @param tools [Array<Ask::Tool>] tool instances available to the chat
       # @param temperature [Float, nil] sampling temperature
       # @param schema [Ask::Schema, Hash, nil] structured output schema
-      def initialize(model:, tools: [], temperature: nil, schema: nil, **)
+      # @param assume_model_exists [Boolean] whether to skip model catalog lookup
+      # @param provider [String, Symbol, nil] provider slug to use (overrides model catalog)
+      def initialize(model:, tools: [], temperature: nil, schema: nil,
+                     assume_model_exists: false, provider: nil, **)
         @model_id = model.respond_to?(:id) ? model.id : model.to_s
-        @model_info = resolve_model(@model_id)
+        @model_info = resolve_model(@model_id) unless assume_model_exists
         @tools = tools
         @temperature = temperature
         @schema = schema
         @messages = []
+        @provider_override = provider
         @provider = nil
       end
 
@@ -59,7 +66,7 @@ module Ask
         # Accumulator for tool calls during streaming (keyed by index)
         calls_acc = {}
 
-        result = provider.chat(
+        result = provider.chat(@extra_params || {}, 
           @messages.map(&:to_h),
           model: @model_id,
           tools: tool_defs,
@@ -123,6 +130,24 @@ module Ask
         self
       end
 
+      # Set the structured output schema and return self.
+      #
+      # @param schema [Ask::Schema, Hash] structured output schema
+      # @return [self]
+  # Set additional parameters for the provider call and return self.
+  #
+  # @param params [Hash] extra parameters passed to the provider
+  # @return [self]
+  def with_params(**params)
+    @extra_params = (@extra_params || {}).merge(params)
+    self
+  end
+
+      def with_schema(schema)
+        @schema = schema.respond_to?(:to_json_schema) ? schema.to_json_schema : schema
+        self
+      end
+
       # Clear all messages from the conversation.
       def reset_messages!
         @messages.clear
@@ -143,19 +168,19 @@ module Ask
       end
 
       def build_provider
-        slug = @model_info&.provider || "openai"
+        slug = @provider_override&.to_s || @model_info&.provider || "openai"
         klass = Ask::Provider.resolve(slug)
         klass.new(provider_config(slug))
       end
 
       def provider_config(slug, extra_keys: {})
-          env_key = "#{slug.upcase}_API_KEY"
-          key = ENV[env_key] || ENV["OPENCODE_API_KEY"] || ENV["OPENAI_API_KEY"]
-          base = ENV["#{slug.upcase}_API_BASE"] || ENV["OPENCODE_API_BASE"]
-          config = { api_key: key }
-          config[:"#{slug}_api_key"] = key
-          config[:"#{slug}_api_base"] = base if base
-          Ask::LLM::Config.new(config)
+        env_key = "#{slug.upcase}_API_KEY"
+        key = ENV[env_key] || ENV["OPENCODE_API_KEY"] || ENV["OPENAI_API_KEY"]
+        base = ENV["#{slug.upcase}_API_BASE"] || ENV["OPENCODE_API_BASE"]
+        config = { api_key: key }
+        config[:"#{slug}_api_key"] = key
+        config[:"#{slug}_api_base"] = base if base
+        Ask::LLM::Config.new(config)
       end
 
       # Accumulate partial tool calls from streaming chunks.

data/lib/ask/agent/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module Agent
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Kaka Ruto
@@ -147,7 +147,6 @@ files:
 - lib/ask/agent/persistence/in_memory.rb
 - lib/ask/agent/reflector.rb
 - lib/ask/agent/session.rb
-- lib/ask/agent/session_backup.rb
 - lib/ask/agent/telemetry.rb
 - lib/ask/agent/tool_abort_controller.rb
 - lib/ask/agent/tool_executor.rb

data/lib/ask/agent/session_backup.rb

@@ -1,237 +0,0 @@
-# frozen_string_literal: true
-
-require "securerandom"
-require "time"
-
-module Ask
-  module Agent
-    class Session
-      attr_reader :id, :chat, :tools, :turn_count, :created_at, :messages
-      attr_reader :tool_calls_made
-
-      def reflection_count
-        @reflector&.reflection_count || 0
-      end
-
-
-      # @return [Ask::Skills::Registry, nil] auto-discovered skills registry
-      attr_reader :skills_registry
-      attr_reader :meta_agent_results
-      # @return [Ask::Skills::Registry, nil] auto-discovered skills registry
-      attr_reader :skills_registry
-
-      def initialize(model:, tools: [], max_turns: 25, max_tool_retries: 3,
-                     compactor: nil, hooks: {}, persistence: nil,
-                     id: nil, system_prompt: nil, parallel_tools: true,
-                     reflector: nil, telemetry: true, meta_agent: nil, **chat_options)
-        @id = id || SecureRandom.uuid
-        @max_turns = max_turns
-        @max_tool_retries = max_tool_retries
-        @parallel_tools = parallel_tools
-        @event_handlers = { all: [] }
-        @running = false
-        @deleted = false
-        @abort_requested = false
-        @turn_count = 0
-        @created_at = Time.now
-        @_no_tools_instructed = false
-
-        @telemetry = telemetry.is_a?(Telemetry) ? telemetry : Telemetry.new(enabled: !!telemetry)
-
-        @chat = build_chat(model, system_prompt, tools, **chat_options)
-        @tools = resolve_tools(tools)
-        @loop = Loop.new(max_turns: max_turns)
-        @tool_executor = ToolExecutor.new(max_retries: max_tool_retries, parallel: parallel_tools)
-
-        # Auto-discover skills and inject into system prompt
-        @skills_registry = Ask::Skills.discover rescue nil
-        if @skills_registry && !@skills_registry.names.empty?
-          skill_text = @skills_registry.format_for_prompt
-          if !skill_text.empty? && @chat.messages.any? { |m| m.role == :system }
-            current = @chat.messages.find { |m| m.role == :system }.content.to_s
-            @chat.with_instructions(current + skill_text)
-          end
-        end
-        @compactor = compactor ? build_compactor(compactor) : nil
-        @hooks = Hooks.new(hooks)
-
-        # Auto-discover skills and inject into system prompt
-        @skills_registry = Ask::Skills.discover rescue nil
-        if @skills_registry && !@skills_registry.names.empty?
-          skill_text = @skills_registry.format_for_prompt
-          if !skill_text.empty? && @chat.messages.any? { |m| m.role == :system }
-            current = @chat.messages.find { |m| m.role == :system }.content.to_s
-            @chat.with_instructions(current + skill_text)
-          end
-        end
-        @persistence = persistence
-
-        reflector_opts = reflector.is_a?(Hash) ? reflector : {}
-        @reflector = if reflector
-          Reflector.new(
-            model: @chat,
-            max_reflections: reflector_opts[:max_reflections] || 1
-          )
-        end
-
-        @meta_agent_config = meta_agent
-        @meta_agent_results = nil
-
-
-        # Auto-discover skills and inject into system prompt
-        @skills_registry = Ask::Skills.discover rescue nil
-        if @skills_registry && !@skills_registry.names.empty?
-          skill_text = @skills_registry.format_for_prompt
-          if !skill_text.empty? && @chat.messages.any? { |m| m.role == :system }
-            current = @chat.messages.find { |m| m.role == :system }.content.to_s
-            @chat.with_instructions(current + skill_text)
-          end
-        end
-        @compactor&.chat = @chat
-      end
-
-      def run(message, tools: nil)
-        raise "Session deleted" if @deleted
-        raise "Session already running" if @running
-
-        @running = true
-        @abort_requested = false
-        @turn_count = 0
-        @loop.reset!
-
-        emit(Events::SessionStart.new)
-
-        active_tools = resolve_tools(tools || [])
-        active_tools = @tools if active_tools.empty?
-
-        if active_tools.empty? && !@_no_tools_instructed
-          @chat.add_message(role: :system, content: "You have no tools available. Do not claim you can look up information or use tools of any kind. Just respond based on your existing knowledge.")
-          @_no_tools_instructed = true
-        end
-
-        begin
-          @tool_executor.telemetry = @telemetry
-
-          response = @loop.run_turn(
-            chat: @chat,
-            message: message,
-            tools: active_tools,
-            tool_executor: @tool_executor,
-            compactor: @compactor,
-            hooks: @hooks,
-            event_emitter: self,
-            session_id: @id
-          )
-        rescue MaxTurnsExceeded => e
-          emit(Events::MaxTurnsExceeded.new(max_turns: @max_turns))
-          @telemetry.log(:max_turns_exceeded, session_id: @id, max_turns: @max_turns)
-          response = last_content
-        rescue LoopDetected => e
-          emit(Events::LoopDetected.new(tool_name: e.message, repeated_count: 3))
-          @telemetry.log(:loop_detected, session_id: @id, tool_name: e.message, repeated_count: 3)
-          response = last_content
-        rescue Ask::ContextLengthExceeded
-          if @compactor && !@compactor.overflow_recovered?
-            @compactor.recover_from_overflow
-            retry
-          end
-          response = "I'm sorry, the conversation has grown too long. Please start a new session."
-        rescue StandardError => e
-          emit(Events::Error.new(error: e.message, recoverable: true))
-          raise
-        ensure
-          @running = false
-          persist! if @persistence
-        end
-
-        @tool_calls_made = @tool_executor.total_executions
-
-        if @reflector && @reflector.reflect?(@tool_calls_made) && !@abort_requested
-          eval_result = @reflector.evaluate(response: response, event_emitter: self)
-          @telemetry.log(:reflection_end, session_id: @id, decision: eval_result[:decision], feedback: eval_result[:feedback])
-
-          if eval_result[:decision] == :improve && !@abort_requested
-            @chat.add_message(
-              role: :system,
-              content: "Improve your last response: #{eval_result[:feedback]}"
-            )
-
-            response = @loop.run_turn(
-              chat: @chat,
-              message: "",
-              tools: active_tools,
-              tool_executor: @tool_executor,
-              compactor: @compactor,
-              hooks: @hooks,
-              event_emitter: self,
-              session_id: @id
-            )
-          end
-        end
-
-        if @meta_agent_config
-          @telemetry.increment_session_count!
-          try_auto_meta_agent
-        end
-
-        emit(Events::SessionEnd.new(result: response, turn_count: @turn_count, tool_calls_made: @tool_calls_made))
-        @messages = @chat.messages.dup
-
-        response
-      end
-
-      def on_event(&block)
-        @event_handlers[:all] << block
-        self
-      end
-
-      def on(type, &block)
-        @event_handlers[type] ||= []
-        @event_handlers[type] << block
-        self
-      end
-
-      def emit(event)
-        @event_handlers[:all].each { |h| h.call(event) }
-        handlers = @event_handlers[event.class]
-        handlers&.each { |h| h.call(event) }
-      end
-
-      def running? = @running
-      def deleted? = @deleted
-
-      def save
-        persist! if @persistence
-      end
-
-      def self.load(id, adapter:)
-        data = adapter.load(id)
-        return nil unless data
-
-        session = new(
-          id: data[:id],
-          model: data.dig(:metadata, :model),
-          tools: data.dig(:metadata, :tools)&.map(&:constantize) || [],
-          persistence: adapter
-        )
-
-        data[:messages].each do |msg|
-          session.chat.add_message(
-            role: msg[:role].to_sym,
-            content: msg[:content],
-            tool_call_id: msg[:tool_call_id]
-          )
-        end
-
-        session
-      end
-
-      def delete
-        @deleted = true
-        @persistence&.delete(@id)
-      end
-
-      def abort
-        @abort_requested = true
-      end
-