omniai-google 3.21.0 → 3.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce2434a17917341984b99049670ef65083443c2c04b8937d2b8d4af688a5b631
-  data.tar.gz: 6c22fa11d66efc7df6ca393bc7f167c5f682ac0398a934a6b25a8674920a6905
+  metadata.gz: 5b5542c78680371ff3d0e4268303377d97e71867bb1116811852ee7ef7e6c397
+  data.tar.gz: ea3ee571ac27dca8d87c75b314961e2ac23b5ef0bc860c3aab84c0f1d4680e87
 SHA512:
-  metadata.gz: f935566b3cae177f1bd445f19e2a2b87ae32d9acc274d5a5a4cb470b867c36d3e2382d9ca945f5b8e5a00a617806a1c1d4399905b642c716b2c10e9bf6dfd568
-  data.tar.gz: b183524e4139f0a2470749fde7bb0fb837dc32cd0ca9f810af1559d44a2fbef4e62a3e5fe98e8b385de4f66559b55026a643a04371477f909ffd9bb1d45adaca
+  metadata.gz: 777e0f53cd5943ef85795e2a141164bc3206db3ba9a340d0001bdc95a296b2ffa88ef5f786ee7c1f15c3500dab679f8878253956ad38879518aa82a9226fa54a
+  data.tar.gz: 341ab1bf0279b58e7ff94d62a36243598f86b3a5766cb3490913d7e1e6beb9509defe80f28540c9b2371a04d630a56324532b7d16e3dcb1ee6be3efe294b4d04

data/README.md

@@ -58,6 +58,30 @@ OmniAI::Google.configure do |config|
 end
 ```
 
+#### Vertex Locations per Model
+
+No single Vertex location serves every model. To route each model to its own location, set `locations`; the host is
+derived from the location the way Google's SDKs do it (`global`, the `us` / `eu` multi-regions, or a single region):
+
+```ruby
+OmniAI::Google.configure do |config|
+  config.credentials = File.open("./credentials.json")
+  config.project_id = '...'
+  config.locations = {
+    'gemini-3.8-flash' => 'us',              # https://aiplatform.us.rep.googleapis.com
+    'gemini-2.5-flash' => 'us-central1',     # https://us-central1-aiplatform.googleapis.com
+    'gemini-embedding-001' => 'us-central1',
+    'chirp_3' => 'us',
+  }
+end
+```
+
+- Applies to chat (including streaming), embed, transcribe and live. A mapped location is used as given.
+- A model missing from the map raises `OmniAI::Google::UnknownLocationError` (with `#model`) before any request.
+  List every model you call, including any default you rely on (`Chat::DEFAULT_MODEL`, `Embed::DEFAULT_MODEL`,
+  `Transcribe::DEFAULT_MODEL`).
+- A client built with an explicit `host:` or `location_id:` ignores the map.
+
 **Note for Transcription**: When using transcription features, ensure your service account has the necessary permissions for Google Cloud Speech-to-Text API and Google Cloud Storage (for automatic file uploads). See the [GCS Setup](#gcs-setup-for-transcription) section below for detailed configuration.
 
 Credentials may be configured using:

data/lib/omniai/google/chat.rb

@@ -76,6 +76,11 @@ module OmniAI
         context.deserializers[:thinking] = ThinkingSerializer.method(:deserialize)
       end
 
+      # `client` is swapped for `client.for_model(model)`, so `locations` routes the request.
+      def initialize(prompt = nil, client:, model:, **, &)
+        super(prompt, client: client.for_model(model), model:, **, &)
+      end
+
     protected
 
       # @return [Context]

data/lib/omniai/google/client.rb

@@ -20,6 +20,10 @@ module OmniAI
     #
     #   client = OmniAI::Google::Client.new
     class Client < OmniAI::Client
+      # Marks `host` / `location_id` as not passed, so an explicit value can take precedence over `locations`.
+      UNSET = Object.new.freeze
+      private_constant :UNSET
+
       # @!attribute [rw] version
       #   @return [String, nil]
       attr_accessor :version
@@ -32,28 +36,56 @@ module OmniAI
       # @param version [String] default is `OmniAI::Google.config.version`
       # @param logger [Logger] default is `OmniAI::Google.config.logger`
       # @param timeout [Integer] default is `OmniAI::Google.config.timeout`
+      # @param locations [Hash{String => String}, nil] default is `OmniAI::Google.config.locations`; ignored when
+      #   `host` or `location_id` is passed
       def initialize(
         api_key: OmniAI::Google.config.api_key,
         project_id: OmniAI::Google.config.project_id,
-        location_id: OmniAI::Google.config.location_id,
+        location_id: UNSET,
         credentials: OmniAI::Google.config.credentials,
         logger: OmniAI::Google.config.logger,
-        host: OmniAI::Google.config.host,
+        host: UNSET,
         version: nil,
-        timeout: OmniAI::Google.config.timeout
+        timeout: OmniAI::Google.config.timeout,
+        locations: OmniAI::Google.config.locations
       )
         if api_key.nil? && credentials.nil?
           raise(ArgumentError, "either an `api_key` or `credentials` must be provided")
         end
 
+        pinned = !(UNSET.equal?(host) && UNSET.equal?(location_id))
+        @locations = locations unless pinned
+        host = OmniAI::Google.config.host if UNSET.equal?(host)
+        location_id = OmniAI::Google.config.location_id if UNSET.equal?(location_id)
+
         super(api_key:, host:, logger:, timeout:)
 
         @project_id = project_id
         @location_id = location_id
         @credentials = Credentials.parse(credentials)
+        @version_override = version
         @version = version || default_version
       end
 
+      # A copy of this client pointed at the model's location in `locations`, or this client when no map applies.
+      #
+      # @param model [String]
+      #
+      # @raise [UnknownLocationError] when the map has no entry for the model
+      #
+      # @return [Client]
+      def for_model(model)
+        return self if @locations.nil?
+
+        location_id = @locations.fetch(model) { raise UnknownLocationError, model }
+        dup.tap { |client| client.locate!(location_id) }
+      end
+
+      # @return [Boolean] true for a client returned by `#for_model`
+      def located?
+        @located || false
+      end
+
       # @raise [OmniAI::Error]
       #
       # @param messages [String] optional
@@ -155,6 +187,16 @@ module OmniAI
         false
       end
 
+    protected
+
+      # @param location_id [String]
+      def locate!(location_id)
+        @location_id = location_id
+        @host = Vertex.host(location_id)
+        @version = @version_override || Config::Version::STABLE
+        @located = true
+      end
+
     private
 
       # Vertex AI serves `v1`; the Gemini API serves `v1beta`. `OmniAI::Google.config.version` derives from the

data/lib/omniai/google/config.rb

@@ -19,6 +19,12 @@ module OmniAI
       #   @return [String, nil]
       attr_accessor :location_id
 
+      # @!attribute [rw] locations
+      #   Vertex location per model, e.g. `{ "gemini-3.8-flash" => "us" }`. When set, each request derives its host
+      #   from the model's location, and a model missing from the map raises `UnknownLocationError`.
+      #   @return [Hash{String => String}, nil]
+      attr_accessor :locations
+
       # @param api_key [String, nil] optional - defaults to `ENV['GOOGLE_API_KEY']`
       # @param project_id [String, nil] optional - defaults to `ENV['GOOGLE_PROJECT_ID']`
       # @param location_id [String, nil] optional - defaults to `ENV['GOOGLE_LOCATION_ID']`

data/lib/omniai/google/embed.rb

@@ -15,7 +15,10 @@ module OmniAI
         TEXT_EMBEDDING_005 = "text-embedding-005"
         TEXT_MULTILINGUAL_EMBEDDING_002 = "text-multilingual-embedding-002"
         GEMINI_EMBEDDING_001 = "gemini-embedding-001"
+        # Preview of GEMINI_EMBEDDING_2.
         GEMINI_EMBEDDING_2_PREVIEW = "gemini-embedding-2-preview"
+        # Vertex serves it at global, us and eu only.
+        GEMINI_EMBEDDING_2 = "gemini-embedding-2"
         EMBEDDING = TEXT_EMBEDDING_004
         MULTILINGUAL_EMBEDDING = TEXT_MULTILINGUAL_EMBEDDING_002
       end
@@ -72,10 +75,15 @@ module OmniAI
         context.deserializers[:usage] = USAGE_METADATA_DESERIALIZER
       end
 
+      # `client` is swapped for `client.for_model(model)`, so `locations` routes the request.
+      def initialize(input, client:, model:, **)
+        super(input, client: client.for_model(model), model:, **)
+      end
+
     protected
 
       # Determines which endpoint to use based on client and model configuration.
-      # Routes gemini-embedding-2-* models to embedContent on Vertex, as Google's
+      # Routes gemini-embedding-2* models to embedContent on Vertex, as Google's
       # Vertex AI requires this endpoint for newer multimodal embedding models.
       #
       # @return [Symbol] :embed_content, :predict, or :batch_embed_contents
@@ -108,7 +116,7 @@ module OmniAI
         end
       end
 
-      # Builds payload for the Vertex embedContent endpoint (gemini-embedding-2-* models).
+      # Builds payload for the Vertex embedContent endpoint (gemini-embedding-2* models).
       # @return [Hash]
       def embed_content_payload
         raise ArgumentError, "embedContent does not support batch input" if @input.is_a?(Array) && @input.length > 1

data/lib/omniai/google/live.rb

@@ -76,7 +76,7 @@ module OmniAI
       # @yieldparam event [Live::Event::*]
       def initialize(client:, model: DEFAULT_MODEL, system: nil, tools: nil, tool_behavior: :blocking, voice: nil,
         transcription: true, vad: nil, compression: false, resumption: nil, write_timeout: WRITE_TIMEOUT, &handler)
-        @client = client
+        @client = client.for_model(model)
         @model = model
         @system = system
         @tools = tools || []

data/lib/omniai/google/transcribe/gemini.rb

@@ -54,7 +54,7 @@ module OmniAI
         def initialize(io, client:, model:, language: nil, format: nil, diarization: false, word_timestamps: false,
           vocabulary: nil)
           @io = io
-          @client = client
+          @client = client.for_model(model)
           @model = model
           @language = language
           @format = format || OmniAI::Transcribe::Format::JSON
@@ -92,8 +92,12 @@ module OmniAI
         # Served from the global endpoint and the us/eu multi-regions, never a single region, so a zonal Vertex
         # location_id maps to its multi-region (same rule as Chirp 3); `us` is the default.
         #
-        # @return [String] "global", "us" or "eu"
+        # A location from `locations` is used as given.
+        #
+        # @return [String] "global", "us" or "eu", unless mapped
         def gemini_location_id
+          return @client.instance_variable_get(:@location_id) if @client.located?
+
           case @client.instance_variable_get(:@location_id)
           when "global" then "global"
           when /\A(eu|europe)/i then "eu"
@@ -103,8 +107,7 @@ module OmniAI
 
         # @return [String]
         def host
-          location = gemini_location_id
-          location == "global" ? "https://aiplatform.googleapis.com" : "https://aiplatform.#{location}.rep.googleapis.com"
+          Vertex.host(gemini_location_id)
         end
 
         # @return [String]

data/lib/omniai/google/transcribe.rb

@@ -49,6 +49,11 @@ module OmniAI
         super
       end
 
+      # `client` is swapped for `client.for_model(model)`, so `locations` routes the request.
+      def initialize(io, client:, model:, **)
+        super(io, client: client.for_model(model), model:, **)
+      end
+
       # @raise [HTTPError]
       #
       # @return [OmniAI::Transcribe::Transcription]

data/lib/omniai/google/transcribe_helpers.rb

@@ -12,8 +12,12 @@ module OmniAI
           raise(ArgumentError, "project_id is required for transcription")
       end
 
+      # A location from `locations` is used as given; otherwise it is derived per model.
+      #
       # @return [String]
       def location_id
+        return @client.instance_variable_get(:@location_id) if @client.located?
+
         case @model
         when "chirp_2"
           "us-central1"

data/lib/omniai/google/unknown_location_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    # Raised before any request when `locations` is configured but has no entry for the model.
+    class UnknownLocationError < OmniAI::Error
+      # @return [String]
+      attr_reader :model
+
+      # @param model [String]
+      def initialize(model)
+        @model = model
+        super("no location configured for model #{model.inspect}")
+      end
+    end
+  end
+end

data/lib/omniai/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Google
-    VERSION = "3.21.0"
+    VERSION = "3.23.0"
   end
 end

data/lib/omniai/google/vertex.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module OmniAI
+  module Google
+    # Vertex AI endpoints.
+    module Vertex
+      MULTI_REGIONS = %w[us eu].freeze
+
+      # The host serving a location, derived the way Google's own SDKs do (google-genai, vertexai).
+      #
+      # @param location_id [String] e.g. "global", "us" or "us-central1"
+      #
+      # @return [String]
+      def self.host(location_id)
+        if location_id.eql?("global")
+          "https://aiplatform.googleapis.com"
+        elsif MULTI_REGIONS.include?(location_id)
+          "https://aiplatform.#{location_id}.rep.googleapis.com"
+        else
+          "https://#{location_id}-aiplatform.googleapis.com"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniai-google
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.23.0
 platform: ruby
 authors:
 - Kevin Sylvestre
@@ -144,9 +144,11 @@ files:
 - lib/omniai/google/transcribe.rb
 - lib/omniai/google/transcribe/gemini.rb
 - lib/omniai/google/transcribe_helpers.rb
+- lib/omniai/google/unknown_location_error.rb
 - lib/omniai/google/upload.rb
 - lib/omniai/google/upload/file.rb
 - lib/omniai/google/version.rb
+- lib/omniai/google/vertex.rb
 homepage: https://github.com/ksylvest/omniai-google
 licenses:
 - MIT