completion-kit 0.26.3 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd4ab63494debc29d699a8cc14a9f5fc2a30c52f3d85e7c1afeedb8566eb55b
-  data.tar.gz: 46ad64c09d27c95c98f284efb3ab8fc1b9790c8c84d85a38461ed5fb67cc42fe
+  metadata.gz: c296e624ff4313d1e4f4804cf902cce88ac7e5eee95deccefec8ff69241ff89d
+  data.tar.gz: 6f0c48e6efaa5fd65c23e07656687de56031f6c3634593d1a44cf9b40b560c11
 SHA512:
-  metadata.gz: 56277125c6b63a340796b7b409ca7f6307d2e8ad35ff751ef9e1f01a2a61706b72e8e43960dc43b2d167f370a3cbb95b140ca6f7cc3607e2c74cb499f6e940bf
-  data.tar.gz: b57d0ba59815c246c48f704cc75d5a6e91b301c7783b518e3a98f0acd6b413b1026318f762a1e6595c3726f803007b55c5e920699382c461ffa8176b85a7bec5
+  metadata.gz: b4d0c20a2c591456cb9d7def96f8bd01ea143b66c3cbb678a10e6a68c5310e40a6bf8b69cc547b3c5e802905b31e4b741dcff5c2a6fb110d652ceb363a03548b
+  data.tar.gz: 58a03c4e699a33193dfe2cfaed23a3913cd0b1b2819a79beaca2559d38016c0c131e0cf0817b97a9c50651dc92a717d0146986d015065f588327cc63d075c7dc

data/app/models/completion_kit/provider_credential.rb

@@ -26,7 +26,6 @@ module CompletionKit
     validates :provider, presence: true, inclusion: { in: PROVIDERS }
     validates :provider, tenant_scoped_uniqueness: true
     validates :api_endpoint, presence: true, if: :azure_foundry?
-    validates :api_version, presence: true, if: :azure_foundry?
     validate :api_endpoint_not_internal
 
     after_save :enqueue_discovery

data/app/services/completion_kit/azure_foundry_client.rb

@@ -49,7 +49,7 @@ module CompletionKit
       return [] unless configured?
       return [] unless ProviderEndpoint.safe?(api_endpoint)
 
-      response = build_connection(azure_base_url).get("/openai/deployments?api-version=#{api_version}") do |req|
+      response = build_connection(azure_base_url).get(models_path) do |req|
         req.headers["api-key"] = api_key
       end
       return [] unless response.success?
@@ -67,7 +67,6 @@ module CompletionKit
       errors = []
       errors << "Azure endpoint is not configured" if api_endpoint.blank?
       errors << "Azure API key is not configured" if api_key.blank?
-      errors << "Azure api-version is not configured" if api_version.blank?
       errors
     end
 
@@ -89,12 +88,21 @@ module CompletionKit
       api_endpoint.to_s.strip.delete_suffix("/")
     end
 
+    def v1_mode?
+      api_version.blank?
+    end
+
+    def models_path
+      v1_mode? ? "/openai/v1/models" : "/openai/deployments?api-version=#{api_version}"
+    end
+
     def post_chat(model:, prompt:, max_tokens:, temperature:)
       body = { messages: [{ role: "user", content: prompt }], max_tokens: max_tokens }
+      body[:model] = model if v1_mode?
       body[:temperature] = temperature unless temperature.nil?
 
       build_connection(azure_base_url, timeout: 30, open_timeout: 5).post do |req|
-        req.url "/openai/deployments/#{model}/chat/completions?api-version=#{api_version}"
+        req.url(v1_mode? ? "/openai/v1/chat/completions" : "/openai/deployments/#{model}/chat/completions?api-version=#{api_version}")
         req.headers["Content-Type"] = "application/json"
         req.headers["api-key"] = api_key
         req.body = body.to_json

data/app/services/completion_kit/model_discovery_service.rb

@@ -133,7 +133,7 @@ module CompletionKit
     def custom_endpoint_404_message
       message = "No OpenAI-compatible model list was found at #{custom_endpoint_host}/v1/models (404). Check that the base URL is correct."
       return message unless azure_custom_host?
-      "#{message} This looks like an Azure endpoint; add it with the Azure AI Foundry provider, which uses an api-version and an api-key header."
+      "#{message} This looks like an Azure endpoint; add it with the Azure AI Foundry provider."
     end
 
     def with_detail(message, detail)
@@ -155,22 +155,31 @@ module CompletionKit
 
     def fetch_azure_foundry_models
       raise DiscoveryError, "An Azure endpoint URL is required." if @api_endpoint.blank?
-      raise DiscoveryError, "An Azure api-version is required." if @api_version.blank?
 
-      response = fetch_connection(azure_base_url).get("/openai/deployments?api-version=#{@api_version}") do |req|
+      response = fetch_connection(azure_base_url).get(azure_models_path) do |req|
         req.headers["api-key"] = @api_key
       end
       raise DiscoveryError, azure_error_message(response) unless response.success?
       JSON.parse(response.body).fetch("data", []).map { |e| { id: e["id"], display_name: e["id"] } }
     end
 
+    def azure_v1_mode?
+      @api_version.blank?
+    end
+
+    def azure_models_path
+      azure_v1_mode? ? "/openai/v1/models" : "/openai/deployments?api-version=#{@api_version}"
+    end
+
     def azure_base_url
       @api_endpoint.to_s.strip.delete_suffix("/")
     end
 
     def azure_error_message(response)
       detail = extract_provider_error_message(response.body)
-      with_detail("Azure did not return a deployments list at /openai/deployments (#{response.status}). Check the endpoint base URL and api-version.", detail)
+      hint = azure_v1_mode? ? "Check the endpoint base URL." : "Check the endpoint base URL and api-version."
+      path = azure_v1_mode? ? "/openai/v1/models" : "/openai/deployments"
+      with_detail("Azure did not return a model list at #{path} (#{response.status}). #{hint}", detail)
     end
 
     def reconcile(discovered)
@@ -428,11 +437,13 @@ module CompletionKit
         f.request :retry, max: 1, interval: 0.5
         f.adapter Faraday.default_adapter
       end
+      body = { messages: [{ role: "user", content: input }], max_tokens: max_tokens }
+      body[:model] = model_id if azure_v1_mode?
       conn.post do |req|
-        req.url "/openai/deployments/#{model_id}/chat/completions?api-version=#{@api_version}"
+        req.url(azure_v1_mode? ? "/openai/v1/chat/completions" : "/openai/deployments/#{model_id}/chat/completions?api-version=#{@api_version}")
         req.headers["Content-Type"] = "application/json"
         req.headers["api-key"] = @api_key
-        req.body = { messages: [{ role: "user", content: input }], max_tokens: max_tokens }.to_json
+        req.body = body.to_json
       end
     end
   end

data/app/views/completion_kit/provider_credentials/_form.html.erb

@@ -37,6 +37,7 @@
       <%= form.label :api_version, "API version", class: "ck-label" %>
       <%= form.text_field :api_version, class: "ck-input", placeholder: "e.g. 2024-10-21", **ck_field_aria(form, :api_version) %>
       <%= ck_field_error(form, :api_version) %>
+      <p class="ck-field-hint">Optional. Leave blank to use Azure's v1 API, or set a dated version for the legacy API (which also lists your deployments during discovery).</p>
     </div>
 
     <div class="ck-actions">

data/lib/completion_kit/version.rb

@@ -1,3 +1,3 @@
 module CompletionKit
-  VERSION = "0.26.3"
+  VERSION = "0.26.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completion-kit
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.4
 platform: ruby
 authors:
 - Damien Bastin