Merge pull request #19 from SergoHUH/feat/add-native-output-schemas

feat(llm): add native output schemas

Author: DenisDenis9331

README.md

@@ -51,9 +51,8 @@ LLM_CRITIQUE_TEMPERATURE=0
 REVIEW_LANGUAGE=ru
 ```
 
-Для других провайдеров используйте соответствующий ключ, например
-`OPENAI_API_KEY`, `OPENROUTER_API_KEY` или `ANTHROPIC_API_KEY`. Провайдеры и
-модели каждой стадии задаются через `LLM_GENERATE_PROVIDER`,
+На текущий момент поддерживаются только провайдеры `gemini` и `ollama`.
+Провайдеры и модели каждой стадии задаются через `LLM_GENERATE_PROVIDER`,
 `LLM_GENERATE_MODEL`, `LLM_CRITIQUE_PROVIDER` и `LLM_CRITIQUE_MODEL`.
 `LLM_PROVIDER` остаётся общим значением по умолчанию, если отдельный провайдер
 стадии не указан.

lib/aireview/config.rb

@@ -50,9 +50,6 @@ class Config
 
     PROVIDER_KEY_MAPPING = {
       'gemini' => 'GEMINI_API_KEY',
-      'openai' => 'OPENAI_API_KEY',
-      'openrouter' => 'OPENROUTER_API_KEY',
-      'anthropic' => 'ANTHROPIC_API_KEY',
       'ollama' => nil
     }.freeze
 

lib/aireview/output_schemas.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+require 'ruby_llm/schema'
+
+module Aireview
+  module OutputSchemaValues
+    CATEGORIES = %w[
+      task_mismatch
+      bug
+      regression
+      security
+      performance
+      data_loss
+      edge_case
+      test_gap
+      maintainability
+    ].freeze
+    SEVERITIES = %w[critical major minor].freeze
+    DECISIONS = %w[keep reject].freeze
+  end
+
+  class GenerateOutputSchema < RubyLLM::Schema
+    string :summary
+    array :candidates, max_items: 3 do
+      object do
+        string :id
+        string :file
+        any_of :line do
+          integer
+          null
+        end
+        string :quoted_code
+        string :problem
+        string :why
+        string :suggestion
+        string :category, enum: OutputSchemaValues::CATEGORIES
+        string :severity, enum: OutputSchemaValues::SEVERITIES
+      end
+    end
+  end
+
+  class CritiqueOutputSchema < RubyLLM::Schema
+    array :verdicts do
+      object do
+        string :id
+        string :decision, enum: OutputSchemaValues::DECISIONS
+        string :reason
+        object :refinement, required: false do
+          string :problem
+          string :why
+          string :suggestion
+          string :category, enum: OutputSchemaValues::CATEGORIES
+          string :severity, enum: OutputSchemaValues::SEVERITIES
+        end
+      end
+    end
+  end
+end

lib/aireview/reviewer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'errors'
+require_relative 'output_schemas'
 require_relative 'utils'
 require 'timeout'
 
@@ -27,7 +28,8 @@ def generate(system_prompt:, user_prompt:)
         options: {
           model: @config.generate_model,
           temperature: @config.generate_temperature,
-          provider: @config.generate_provider
+          provider: @config.generate_provider,
+          schema: GenerateOutputSchema
         }
       )
     end
@@ -40,7 +42,8 @@ def critique(system_prompt:, user_prompt:)
         options: {
           model: @config.critique_model,
           temperature: @config.critique_temperature,
-          provider: @config.critique_provider
+          provider: @config.critique_provider,
+          schema: CritiqueOutputSchema
         }
       )
     end
@@ -79,6 +82,7 @@ def perform_llm_request(context:, stage:, system:, user:, options:)
       @logger.info("LLM #{stage} request started (model=#{model}, temperature=#{temperature})")
       chat = build_chat(context: context, stage: stage, model: model, provider: options[:provider])
         .with_temperature(temperature.to_f)
+        .with_schema(options[:schema])
       chat.with_instructions(system)
       response = Timeout.timeout(@config.llm_timeout.to_f) { chat.ask(user) }
       @logger.info("LLM #{stage} request completed (model=#{model})")

spec/config_spec.rb

@@ -233,25 +233,6 @@
       end
     end
 
-    it 'validates API keys for generate and critique providers separately' do
-      Dir.mktmpdir do |dir|
-        config = described_class.load(
-          cwd: dir,
-          env: {
-            'LLM_GENERATE_PROVIDER' => 'gemini',
-            'LLM_GENERATE_MODEL' => 'gemini-2.5-pro',
-            'GEMINI_API_KEY' => 'gemini-secret',
-            'LLM_CRITIQUE_PROVIDER' => 'anthropic',
-            'LLM_CRITIQUE_MODEL' => 'claude-sonnet-4'
-          },
-          logger: Logger.new(nil)
-        )
-
-        expect { config.require_llm_configuration! }
-          .to raise_error(Aireview::ConfigError, /critique.*anthropic/)
-      end
-    end
-
     it 'requires a key only for the remote stage in a mixed configuration' do
       Dir.mktmpdir do |dir|
         config = described_class.load(
@@ -417,22 +398,5 @@
       end
     end
 
-    it 'loads OpenRouter API key from environment' do
-      Dir.mktmpdir do |dir|
-        config = described_class.load(
-          cwd: dir,
-          env: {
-            'LLM_PROVIDER' => 'openrouter',
-            'LLM_GENERATE_MODEL' => 'meta-llama/llama-3.3-70b-instruct:free',
-            'LLM_CRITIQUE_MODEL' => 'meta-llama/llama-3.3-70b-instruct:free',
-            'OPENROUTER_API_KEY' => 'sk-or-secret'
-          },
-          logger: Logger.new(nil)
-        )
-
-        expect(config.llm_provider).to eq('openrouter')
-        expect(config.provider_api_key).to eq('sk-or-secret')
-      end
-    end
   end
 end

spec/output_schemas_spec.rb

@@ -0,0 +1,48 @@
+require 'aireview/output_schemas'
+
+RSpec.describe 'Aireview output schemas' do
+  def schema_for(schema_class)
+    schema_class.new.to_json_schema.fetch(:schema)
+  end
+
+  it 'defines generate fields, enums, nullable line, and candidate limit' do
+    schema = schema_for(Aireview::GenerateOutputSchema)
+    candidates = schema.dig(:properties, :candidates)
+    candidate = candidates.fetch(:items)
+    properties = candidate.fetch(:properties)
+
+    expect(schema.fetch(:required)).to contain_exactly(:summary, :candidates)
+    expect(schema.fetch(:additionalProperties)).to be(false)
+    expect(schema.dig(:properties, :summary, :type)).to eq('string')
+    expect(candidates.fetch(:type)).to eq('array')
+    expect(candidates.fetch(:maxItems)).to eq(3)
+    expect(candidate.fetch(:required)).to contain_exactly(
+      :id, :file, :line, :quoted_code, :problem, :why, :suggestion, :category, :severity
+    )
+    expect(candidate.fetch(:additionalProperties)).to be(false)
+    expect(properties.values_at(:id, :file, :quoted_code, :problem, :why, :suggestion).map { |field| field[:type] })
+      .to all(eq('string'))
+    expect(properties.dig(:line, :anyOf).map { |type| type.fetch(:type) }).to contain_exactly('integer', 'null')
+    expect(properties.dig(:category, :enum)).to eq(Aireview::OutputSchemaValues::CATEGORIES)
+    expect(properties.dig(:severity, :enum)).to eq(Aireview::OutputSchemaValues::SEVERITIES)
+  end
+
+  it 'defines critique decision and optional refinement constraints' do
+    schema = schema_for(Aireview::CritiqueOutputSchema)
+    verdict = schema.dig(:properties, :verdicts, :items)
+    properties = verdict.fetch(:properties)
+    refinement = properties.fetch(:refinement)
+
+    expect(schema.fetch(:required)).to contain_exactly(:verdicts)
+    expect(schema.fetch(:additionalProperties)).to be(false)
+    expect(schema.dig(:properties, :verdicts, :type)).to eq('array')
+    expect(verdict.fetch(:required)).to contain_exactly(:id, :decision, :reason)
+    expect(verdict.fetch(:additionalProperties)).to be(false)
+    expect(properties.values_at(:id, :decision, :reason).map { |field| field[:type] }).to all(eq('string'))
+    expect(properties.dig(:decision, :enum)).to eq(Aireview::OutputSchemaValues::DECISIONS)
+    expect(refinement.fetch(:additionalProperties)).to be(false)
+    expect(refinement.fetch(:required)).to contain_exactly(:problem, :why, :suggestion, :category, :severity)
+    expect(refinement.dig(:properties, :category, :enum)).to eq(Aireview::OutputSchemaValues::CATEGORIES)
+    expect(refinement.dig(:properties, :severity, :enum)).to eq(Aireview::OutputSchemaValues::SEVERITIES)
+  end
+end

spec/reviewer_spec.rb

@@ -96,9 +96,11 @@
     end
 
     allow(generate_chat).to receive(:with_temperature).with(0.3).and_return(generate_chat)
+    allow(generate_chat).to receive(:with_schema).with(Aireview::GenerateOutputSchema).and_return(generate_chat)
     allow(generate_chat).to receive(:with_instructions).with('system prompt').and_return(generate_chat)
     allow(generate_chat).to receive(:ask).with('user prompt').and_return(generate_response)
     allow(critique_chat).to receive(:with_temperature).with(0.0).and_return(critique_chat)
+    allow(critique_chat).to receive(:with_schema).with(Aireview::CritiqueOutputSchema).and_return(critique_chat)
     allow(critique_chat).to receive(:with_instructions).with('system prompt').and_return(critique_chat)
     allow(critique_chat).to receive(:ask).with('user prompt').and_return(critique_response)
   end
@@ -123,6 +125,7 @@
       .to have_received(:chat)
       .with(model: 'gemini-2.5-pro', provider: :gemini)
     expect(generate_chat).to have_received(:with_temperature).with(0.3)
+    expect(generate_chat).to have_received(:with_schema).with(Aireview::GenerateOutputSchema)
   end
 
   it 'uses critique model and temperature for the critique pass' do
@@ -134,6 +137,7 @@
       .to have_received(:chat)
       .with(model: 'gemini-2.5-flash-lite', provider: :gemini)
     expect(critique_chat).to have_received(:with_temperature).with(0.0)
+    expect(critique_chat).to have_received(:with_schema).with(Aireview::CritiqueOutputSchema)
   end
 
   it 'creates one isolated context per stage' do
@@ -313,6 +317,8 @@
           expect(contexts.last)
             .to have_received(:chat)
             .with(model: 'gemini-2.5-flash-lite', provider: critique_value.to_sym)
+          expect(generate_chat).to have_received(:with_schema).with(Aireview::GenerateOutputSchema)
+          expect(critique_chat).to have_received(:with_schema).with(Aireview::CritiqueOutputSchema)
           expect(global_ruby_config.to_h).to eq(global_config_before)
         end
       end