anthropic 1.80.0 → 2.3.0

data/lib/anthropic/helpers/google_cloud/client.rb

@@ -3,24 +3,32 @@
 module Anthropic
   module Helpers
     module GoogleCloud
-      # Client for Claude Platform on Google Cloud — the first-party Anthropic
-      # API served through the Google Cloud gateway.
+      # Client for Claude Models on Google Cloud (Anthropic managed) — the
+      # first-party Anthropic API served through the Google Cloud gateway.
       #
       # This is distinct from {Anthropic::VertexClient}, which targets the
       # `:rawPredict` publisher-model API (publisher model IDs, messages
       # only). This client speaks the full first-party Anthropic API: requests
       # pass through the gateway unchanged — standard `/v1/*` paths, standard
-      # model names, the complete API surface. The deprecated text Completions
-      # endpoint is intentionally not exposed.
+      # model names.
       class Client < Anthropic::Client
         # OAuth2 scope required to call the gateway.
         SCOPE = "https://www.googleapis.com/auth/cloud-platform"
 
+        LOCATION_URL_TEMPLATE =
+          "https://claude.googleapis.com/v1/projects/%<project>s/locations/%<location>s"
+
         # Gateway base URL template; override via `base_url` or
         # `ANTHROPIC_GOOGLE_CLOUD_BASE_URL`.
-        URL_TEMPLATE =
-          "https://claude.googleapis.com/v1alpha" \
-          "/projects/%<project>s/locations/%<location>s/workspaces/%<workspace_id>s/invoke"
+        URL_TEMPLATE = "#{LOCATION_URL_TEMPLATE}/workspaces/%<workspace_id>s/invoke".freeze
+
+        # Gateway base URL template for organization-level routes, which are
+        # served from a base with no workspace in it.
+        ORGANIZATION_URL_TEMPLATE = "#{LOCATION_URL_TEMPLATE}/claudeOrganization/invoke".freeze
+
+        ORGANIZATION_PATH_PATTERN = %r{\A/v1/(?:organizations/|user_profiles(?:/|\z))}
+
+        private_constant :LOCATION_URL_TEMPLATE, :ORGANIZATION_PATH_PATTERN
 
         # @return [String, nil]
         attr_reader :project
@@ -53,12 +61,15 @@ module Anthropic
         #   explicit `nil` falls back to the same defaults.
         #
         # @param workspace_id [String, nil] Defaults to
-        #   `ENV["ANTHROPIC_GOOGLE_CLOUD_WORKSPACE_ID"]`. Required unless
-        #   `skip_auth` is true and an explicit `base_url` is given.
+        #   `ENV["ANTHROPIC_GOOGLE_CLOUD_WORKSPACE_ID"]`. Required when the base
+        #   URL is derived, except for organization-level routes
+        #   (`/v1/organizations/` and `/v1/user_profiles`), which need no
+        #   workspace ID.
         #
-        # @param base_url [String, nil] Override the gateway base URL. Defaults to
-        #   `ENV["ANTHROPIC_GOOGLE_CLOUD_BASE_URL"]`, otherwise derived from
-        #   `project`, `location`, and `workspace_id` via {URL_TEMPLATE}.
+        # @param base_url [String, nil] Override the gateway base URL for every
+        #   route. Defaults to `ENV["ANTHROPIC_GOOGLE_CLOUD_BASE_URL"]`, otherwise
+        #   derived from `project`, `location`, and `workspace_id` via
+        #   {URL_TEMPLATE}.
         #
         # @param google_credentials [#apply, nil] A `googleauth`-compatible
         #   credentials object. Mutually exclusive with `skip_auth`.
@@ -67,10 +78,9 @@ module Anthropic
         #   token string. Takes precedence over `google_credentials`. Mutually
         #   exclusive with `skip_auth`.
         #
-        # @param skip_auth [Boolean] When true, no token is attached and
-        #   `workspace_id` is only required when the base URL must be derived.
-        #   For callers fronting with their own authenticated proxy. Mutually
-        #   exclusive with `token_provider` and `google_credentials`.
+        # @param skip_auth [Boolean] When true, no token is attached. For callers
+        #   fronting with their own authenticated proxy. Mutually exclusive with
+        #   `token_provider` and `google_credentials`.
         #
         # @param max_retries [Integer] Max number of retries to attempt after a
         #   failed retryable request.
@@ -132,23 +142,20 @@ module Anthropic
           # so nil can't reach the derived URL (matches the other SDKs).
           @location = location || ENV["ANTHROPIC_GOOGLE_CLOUD_LOCATION"] || "global"
 
-          if workspace_id.nil? && !skip_auth
-            raise ArgumentError.new(
-              "No workspace ID was given. Set the `workspace_id` argument or the " \
-              "`ANTHROPIC_GOOGLE_CLOUD_WORKSPACE_ID` environment variable."
-            )
-          end
           @workspace_id = workspace_id
 
           base_url = nil if base_url.to_s.empty?
-          base_url ||= derive_base_url
+          unless base_url
+            @organization_base_url = URI.parse(derive_base_url(ORGANIZATION_URL_TEMPLATE))
+            # Without a workspace ID there is no workspace base to derive, so
+            # `base_url` is the organization base.
+            base_url = @workspace_id.nil? ? @organization_base_url.to_s : derive_base_url(URL_TEMPLATE)
+          end
 
           # No first-party credential is ever passed up, and
           # {#resolve_default_credentials?} keeps the parent from discovering
           # one; `base_url` is always resolved by this point, so the parent's
-          # `ANTHROPIC_BASE_URL` fallback never applies. The parent wires up
-          # every resource; {#completions} withholds the one the gateway does
-          # not serve.
+          # `ANTHROPIC_BASE_URL` fallback never applies.
           super(
             base_url: base_url,
             timeout: timeout,
@@ -166,20 +173,73 @@ module Anthropic
         # @see Anthropic::Client#resolve_default_credentials?
         private def resolve_default_credentials? = false
 
-        # The deprecated text Completions endpoint is not supported on the
-        # Google Cloud gateway.
+        # @api private
         #
-        # @raise [NotImplementedError]
-        def completions
-          raise NotImplementedError.new(
-            "The deprecated text Completions API is not supported on the Google Cloud gateway."
-          )
+        # @param req [Hash{Symbol=>Object}] .
+        #
+        #   @option req [Symbol] :method
+        #
+        #   @option req [String, Array<String>] :path
+        #
+        #   @option req [Hash{String=>Array<String>, String, nil}, nil] :query
+        #
+        #   @option req [Hash{String=>String, Integer, Array<String, Integer, nil>, nil}, nil] :headers
+        #
+        #   @option req [Object, nil] :body
+        #
+        #   @option req [Symbol, Integer, Array<Symbol, Integer>, Proc, nil] :unwrap
+        #
+        #   @option req [Class<Anthropic::Internal::Type::BasePage>, nil] :page
+        #
+        #   @option req [Class<Anthropic::Internal::Type::BaseStream>, nil] :stream
+        #
+        #   @option req [Anthropic::Internal::Type::Converter, Class, nil] :model
+        #
+        # @param opts [Hash{Symbol=>Object}] .
+        #
+        #   @option opts [String, nil] :idempotency_key
+        #
+        #   @option opts [Hash{String=>Array<String>, String, nil}, nil] :extra_query
+        #
+        #   @option opts [Hash{String=>String, nil}, nil] :extra_headers
+        #
+        #   @option opts [Object, nil] :extra_body
+        #
+        #   @option opts [Integer, nil] :max_retries
+        #
+        #   @option opts [Float, nil] :timeout
+        #
+        # @raise [ArgumentError]
+        # @return [Hash{Symbol=>Object}]
+        private def build_request(req, opts)
+          request = super
+          return request if @organization_base_url.nil?
+
+          url = request.fetch(:url)
+          under_base_url =
+            url.path.start_with?("#{base_url.path}/") &&
+            Anthropic::Internal::Util.uri_origin(url) == Anthropic::Internal::Util.uri_origin(base_url)
+          return request unless under_base_url
+
+          path = url.path.delete_prefix(base_url.path)
+          if path.match?(ORGANIZATION_PATH_PATTERN)
+            url = url.dup
+            url.path = "#{@organization_base_url.path}#{path}"
+            {**request, url: url}
+          elsif @workspace_id.nil?
+            raise ArgumentError.new(
+              "No workspace ID was given. Set the `workspace_id` argument or the " \
+              "`ANTHROPIC_GOOGLE_CLOUD_WORKSPACE_ID` environment variable."
+            )
+          else
+            request
+          end
         end
 
         # @api private
         #
-        # Hard guarantee that no first-party `X-Api-Key` / `Authorization`
-        # header from static credentials reaches the wire; auth is the GCP
+        # Hard guarantee that no first-party `Authorization` header from
+        # static credentials reaches the wire; auth is the GCP
         # bearer token attached in {#provider_middleware}.
         #
         # @return [Hash{String=>String}]
@@ -230,9 +290,10 @@ module Anthropic
 
         # @api private
         #
+        # @param template [String]
         # @return [String]
         # @raise [ArgumentError]
-        private def derive_base_url
+        private def derive_base_url(template)
           if @project.nil?
             raise ArgumentError.new(
               "No project found. Set the `project` argument, set the " \
@@ -240,13 +301,7 @@ module Anthropic
               "application default credentials with a project."
             )
           end
-          if @workspace_id.nil?
-            raise ArgumentError.new(
-              "No workspace ID was given. Set the `workspace_id` argument or the " \
-              "`ANTHROPIC_GOOGLE_CLOUD_WORKSPACE_ID` environment variable."
-            )
-          end
-          format(URL_TEMPLATE, project: @project, location: @location, workspace_id: @workspace_id)
+          format(template, project: @project, location: @location, workspace_id: @workspace_id)
         end
 
         # @api private

data/lib/anthropic/helpers/refusal_fallback.rb

@@ -225,8 +225,7 @@ module Anthropic
       return false unless req.method == :post
       return false unless req.body.is_a?(Hash)
       return false unless req.url.path&.end_with?("/v1/messages")
-      query = URI.decode_www_form(req.url.query.to_s).to_h
-      query["beta"] == "true"
+      req.metadata.dig(:qualifiers, :beta) == "true"
     end
 
     # @return [Anthropic::APIRequest] `req` with `@betas` appended to the

data/lib/anthropic/helpers/stainless_helper_header.rb

@@ -18,13 +18,15 @@ module Anthropic
       # hyphenated lowercase.
       BETA_TOOL_RUNNER = "BetaToolRunner"
       FALLBACK_REFUSAL_MIDDLEWARE = "fallback-refusal-middleware"
+      MESSAGE_THREAD = "message-thread"
 
       class << self
         # The {HEADER} value to set after appending `value` to whatever is
         # already present in `headers` — existing tags keep their position, the
         # new tag goes at the end, duplicates are dropped, joined as one
-        # comma-separated string. The backend logs the header as one opaque
-        # string, so a second header line or a clobbered value loses data.
+        # comma-separated string. The new tag is merged into the existing value
+        # rather than replacing it, because a second header line or a clobbered
+        # value loses data.
         #
         # @param headers [Hash{String => String}]
         # @param value [String]