plugins: keep google provider policy lightweight

2026-04-12 01:31:08 +00:00 · 2026-04-09 01:48:40 +01:00
parent 1cd7ba88df
commit dcfb3ed4e3
6 changed files with 253 additions and 135 deletions
--- a/extensions/google/api.ts
+++ b/extensions/google/api.ts
@@ -1,147 +1,25 @@
 import {
-  resolveProviderEndpoint,
  resolveProviderHttpRequestConfig,
  type ProviderRequestTransportOverrides,
 } from "openclaw/plugin-sdk/provider-http";
-import type { ModelProviderConfig } from "openclaw/plugin-sdk/provider-model-shared";
 import {
  applyAgentDefaultModelPrimary,
  type OpenClawConfig,
 } from "openclaw/plugin-sdk/provider-onboard";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
-import { normalizeAntigravityModelId, normalizeGoogleModelId } from "./model-id.js";
 import { parseGoogleOauthApiKey } from "./oauth-token-shared.js";
-export { normalizeAntigravityModelId, normalizeGoogleModelId };
-
-type GoogleApiCarrier = {
-  api?: string | null;
-};
-
-type GoogleProviderConfigLike = GoogleApiCarrier & {
-  models?: ReadonlyArray<GoogleApiCarrier | null | undefined> | null;
-};
-
-export const DEFAULT_GOOGLE_API_BASE_URL = "https://generativelanguage.googleapis.com/v1beta";
-
-function trimTrailingSlashes(value: string): string {
-  return value.replace(/\/+$/, "");
-}
-
-function isCanonicalGoogleApiOriginShorthand(value: string): boolean {
-  return /^https:\/\/generativelanguage\.googleapis\.com\/?$/i.test(value);
-}
-
-export function normalizeGoogleApiBaseUrl(baseUrl?: string): string {
-  const raw = trimTrailingSlashes(normalizeOptionalString(baseUrl) || DEFAULT_GOOGLE_API_BASE_URL);
-  try {
-    const url = new URL(raw);
-    url.hash = "";
-    url.search = "";
-    if (
-      resolveProviderEndpoint(url.toString()).endpointClass === "google-generative-ai" &&
-      trimTrailingSlashes(url.pathname || "") === ""
-    ) {
-      url.pathname = "/v1beta";
-    }
-    return trimTrailingSlashes(url.toString());
-  } catch {
-    if (isCanonicalGoogleApiOriginShorthand(raw)) {
-      return DEFAULT_GOOGLE_API_BASE_URL;
-    }
-    return raw;
-  }
-}
-
-export function isGoogleGenerativeAiApi(api?: string | null): boolean {
-  return api === "google-generative-ai";
-}
-
-export function normalizeGoogleGenerativeAiBaseUrl(baseUrl?: string): string | undefined {
-  return baseUrl ? normalizeGoogleApiBaseUrl(baseUrl) : baseUrl;
-}
-
-export function resolveGoogleGenerativeAiTransport<TApi extends string | null | undefined>(params: {
-  api: TApi;
-  baseUrl?: string;
-}): { api: TApi; baseUrl?: string } {
-  return {
-    api: params.api,
-    baseUrl: isGoogleGenerativeAiApi(params.api)
-      ? normalizeGoogleGenerativeAiBaseUrl(params.baseUrl)
-      : params.baseUrl,
-  };
-}
-
-export function resolveGoogleGenerativeAiApiOrigin(baseUrl?: string): string {
-  return normalizeGoogleApiBaseUrl(baseUrl).replace(/\/v1beta$/i, "");
-}
-
-export function shouldNormalizeGoogleGenerativeAiProviderConfig(
-  providerKey: string,
-  provider: GoogleProviderConfigLike,
-): boolean {
-  if (providerKey === "google" || providerKey === "google-vertex") {
-    return true;
-  }
-  if (isGoogleGenerativeAiApi(provider.api)) {
-    return true;
-  }
-  return provider.models?.some((model) => isGoogleGenerativeAiApi(model?.api)) ?? false;
-}
-
-export function shouldNormalizeGoogleProviderConfig(
-  providerKey: string,
-  provider: GoogleProviderConfigLike,
-): boolean {
-  return (
-    providerKey === "google-antigravity" ||
-    shouldNormalizeGoogleGenerativeAiProviderConfig(providerKey, provider)
-  );
-}
-
-function normalizeProviderModels(
-  provider: ModelProviderConfig,
-  normalizeId: (id: string) => string,
-): ModelProviderConfig {
-  const models = provider.models;
-  if (!Array.isArray(models) || models.length === 0) {
-    return provider;
-  }
-
-  let mutated = false;
-  const nextModels = models.map((model) => {
-    const nextId = normalizeId(model.id);
-    if (nextId === model.id) {
-      return model;
-    }
-    mutated = true;
-    return { ...model, id: nextId };
-  });
-
-  return mutated ? { ...provider, models: nextModels } : provider;
-}
-
-export function normalizeGoogleProviderConfig(
-  providerKey: string,
-  provider: ModelProviderConfig,
-): ModelProviderConfig {
-  let nextProvider = provider;
-
-  if (shouldNormalizeGoogleGenerativeAiProviderConfig(providerKey, nextProvider)) {
-    const modelNormalized = normalizeProviderModels(nextProvider, normalizeGoogleModelId);
-    const normalizedBaseUrl = normalizeGoogleGenerativeAiBaseUrl(modelNormalized.baseUrl);
-    nextProvider =
-      normalizedBaseUrl !== modelNormalized.baseUrl
-        ? { ...modelNormalized, baseUrl: normalizedBaseUrl ?? modelNormalized.baseUrl }
-        : modelNormalized;
-  }
-
-  if (providerKey === "google-antigravity") {
-    nextProvider = normalizeProviderModels(nextProvider, normalizeAntigravityModelId);
-  }
-
-  return nextProvider;
-}
+import { DEFAULT_GOOGLE_API_BASE_URL, normalizeGoogleApiBaseUrl } from "./provider-policy.js";
+export { normalizeAntigravityModelId, normalizeGoogleModelId } from "./model-id.js";
+export {
+  DEFAULT_GOOGLE_API_BASE_URL,
+  isGoogleGenerativeAiApi,
+  normalizeGoogleApiBaseUrl,
+  normalizeGoogleGenerativeAiBaseUrl,
+  normalizeGoogleProviderConfig,
+  resolveGoogleGenerativeAiApiOrigin,
+  resolveGoogleGenerativeAiTransport,
+  shouldNormalizeGoogleGenerativeAiProviderConfig,
+  shouldNormalizeGoogleProviderConfig,
+} from "./provider-policy.js";

 export function parseGeminiAuth(apiKey: string): { headers: Record<string, string> } {
  const parsed = apiKey.startsWith("{") ? parseGoogleOauthApiKey(apiKey) : null;
--- a/extensions/google/provider-policy-api.test.ts
+++ b/extensions/google/provider-policy-api.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+import { normalizeConfig } from "./provider-policy-api.js";
+
+describe("google provider policy public artifact", () => {
+  it("normalizes Google provider config without loading the full provider plugin", () => {
+    expect(
+      normalizeConfig({
+        provider: "google",
+        providerConfig: {
+          baseUrl: "https://generativelanguage.googleapis.com",
+          api: "google-generative-ai",
+          apiKey: "GEMINI_API_KEY",
+          models: [
+            {
+              id: "gemini-3-pro",
+              name: "Gemini 3 Pro",
+              reasoning: true,
+              input: ["text", "image"],
+              cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+              contextWindow: 1_048_576,
+              maxTokens: 65_536,
+            },
+          ],
+        },
+      }),
+    ).toMatchObject({
+      baseUrl: "https://generativelanguage.googleapis.com/v1beta",
+      models: [{ id: "gemini-3-pro-preview" }],
+    });
+  });
+});
--- a/extensions/google/provider-policy-api.ts
+++ b/extensions/google/provider-policy-api.ts
@@ -0,0 +1,6 @@
+import type { ModelProviderConfig } from "openclaw/plugin-sdk/provider-model-types";
+import { normalizeGoogleProviderConfig } from "./provider-policy.js";
+
+export function normalizeConfig(params: { provider: string; providerConfig: ModelProviderConfig }) {
+  return normalizeGoogleProviderConfig(params.provider, params.providerConfig);
+}
--- a/extensions/google/provider-policy.ts
+++ b/extensions/google/provider-policy.ts
@@ -0,0 +1,139 @@
+import type { ModelProviderConfig } from "openclaw/plugin-sdk/provider-model-types";
+import { normalizeAntigravityModelId, normalizeGoogleModelId } from "./model-id.js";
+
+type GoogleApiCarrier = {
+  api?: string | null;
+};
+
+type GoogleProviderConfigLike = GoogleApiCarrier & {
+  models?: ReadonlyArray<GoogleApiCarrier | null | undefined> | null;
+};
+
+export const DEFAULT_GOOGLE_API_BASE_URL = "https://generativelanguage.googleapis.com/v1beta";
+
+function normalizeOptionalString(value: unknown): string | undefined {
+  return typeof value === "string" && value.trim() ? value.trim() : undefined;
+}
+
+function trimTrailingSlashes(value: string): string {
+  return value.replace(/\/+$/, "");
+}
+
+function isCanonicalGoogleApiOriginShorthand(value: string): boolean {
+  return /^https:\/\/generativelanguage\.googleapis\.com\/?$/i.test(value);
+}
+
+function isGoogleGenerativeAiUrl(url: URL): boolean {
+  return (
+    url.protocol === "https:" && url.hostname.toLowerCase() === "generativelanguage.googleapis.com"
+  );
+}
+
+export function normalizeGoogleApiBaseUrl(baseUrl?: string): string {
+  const raw = trimTrailingSlashes(normalizeOptionalString(baseUrl) || DEFAULT_GOOGLE_API_BASE_URL);
+  try {
+    const url = new URL(raw);
+    url.hash = "";
+    url.search = "";
+    if (isGoogleGenerativeAiUrl(url) && trimTrailingSlashes(url.pathname || "") === "") {
+      url.pathname = "/v1beta";
+    }
+    return trimTrailingSlashes(url.toString());
+  } catch {
+    if (isCanonicalGoogleApiOriginShorthand(raw)) {
+      return DEFAULT_GOOGLE_API_BASE_URL;
+    }
+    return raw;
+  }
+}
+
+export function isGoogleGenerativeAiApi(api?: string | null): boolean {
+  return api === "google-generative-ai";
+}
+
+export function normalizeGoogleGenerativeAiBaseUrl(baseUrl?: string): string | undefined {
+  return baseUrl ? normalizeGoogleApiBaseUrl(baseUrl) : baseUrl;
+}
+
+export function resolveGoogleGenerativeAiTransport<TApi extends string | null | undefined>(params: {
+  api: TApi;
+  baseUrl?: string;
+}): { api: TApi; baseUrl?: string } {
+  return {
+    api: params.api,
+    baseUrl: isGoogleGenerativeAiApi(params.api)
+      ? normalizeGoogleGenerativeAiBaseUrl(params.baseUrl)
+      : params.baseUrl,
+  };
+}
+
+export function resolveGoogleGenerativeAiApiOrigin(baseUrl?: string): string {
+  return normalizeGoogleApiBaseUrl(baseUrl).replace(/\/v1beta$/i, "");
+}
+
+export function shouldNormalizeGoogleGenerativeAiProviderConfig(
+  providerKey: string,
+  provider: GoogleProviderConfigLike,
+): boolean {
+  if (providerKey === "google" || providerKey === "google-vertex") {
+    return true;
+  }
+  if (isGoogleGenerativeAiApi(provider.api)) {
+    return true;
+  }
+  return provider.models?.some((model) => isGoogleGenerativeAiApi(model?.api)) ?? false;
+}
+
+export function shouldNormalizeGoogleProviderConfig(
+  providerKey: string,
+  provider: GoogleProviderConfigLike,
+): boolean {
+  return (
+    providerKey === "google-antigravity" ||
+    shouldNormalizeGoogleGenerativeAiProviderConfig(providerKey, provider)
+  );
+}
+
+function normalizeProviderModels(
+  provider: ModelProviderConfig,
+  normalizeId: (id: string) => string,
+): ModelProviderConfig {
+  const models = provider.models;
+  if (!Array.isArray(models) || models.length === 0) {
+    return provider;
+  }
+
+  let mutated = false;
+  const nextModels = models.map((model) => {
+    const nextId = normalizeId(model.id);
+    if (nextId === model.id) {
+      return model;
+    }
+    mutated = true;
+    return { ...model, id: nextId };
+  });
+
+  return mutated ? { ...provider, models: nextModels } : provider;
+}
+
+export function normalizeGoogleProviderConfig(
+  providerKey: string,
+  provider: ModelProviderConfig,
+): ModelProviderConfig {
+  let nextProvider = provider;
+
+  if (shouldNormalizeGoogleGenerativeAiProviderConfig(providerKey, nextProvider)) {
+    const modelNormalized = normalizeProviderModels(nextProvider, normalizeGoogleModelId);
+    const normalizedBaseUrl = normalizeGoogleGenerativeAiBaseUrl(modelNormalized.baseUrl);
+    nextProvider =
+      normalizedBaseUrl !== modelNormalized.baseUrl
+        ? { ...modelNormalized, baseUrl: normalizedBaseUrl ?? modelNormalized.baseUrl }
+        : modelNormalized;
+  }
+
+  if (providerKey === "google-antigravity") {
+    nextProvider = normalizeProviderModels(nextProvider, normalizeAntigravityModelId);
+  }
+
+  return nextProvider;
+}
--- a/src/agents/models-config.providers.policy.lookup.test.ts
+++ b/src/agents/models-config.providers.policy.lookup.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from "vitest";
+import { resolveProviderPluginLookupKey } from "./models-config.providers.policy.lookup.js";
+
+describe("resolveProviderPluginLookupKey", () => {
+  it("routes Google Generative AI custom providers to the google policy artifact", () => {
+    expect(
+      resolveProviderPluginLookupKey("google-paid", {
+        baseUrl: "https://generativelanguage.googleapis.com/v1beta",
+        api: "google-generative-ai",
+        models: [],
+      }),
+    ).toBe("google");
+  });
+
+  it("routes model-level Google Generative AI providers to the google policy artifact", () => {
+    expect(
+      resolveProviderPluginLookupKey("custom-google", {
+        baseUrl: "https://generativelanguage.googleapis.com/v1beta",
+        models: [
+          {
+            id: "gemini-3-pro",
+            name: "Gemini 3 Pro",
+            api: "google-generative-ai",
+            reasoning: true,
+            input: ["text", "image"],
+            cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+            contextWindow: 1_048_576,
+            maxTokens: 65_536,
+          },
+        ],
+      }),
+    ).toBe("google");
+  });
+
+  it("routes google-antigravity to the google policy artifact", () => {
+    expect(
+      resolveProviderPluginLookupKey("google-antigravity", {
+        baseUrl: "https://generativelanguage.googleapis.com/v1beta",
+        models: [],
+      }),
+    ).toBe("google");
+  });
+
+  it("routes google-vertex to the google policy artifact", () => {
+    expect(
+      resolveProviderPluginLookupKey("google-vertex", {
+        baseUrl: "https://aiplatform.googleapis.com",
+        models: [],
+      }),
+    ).toBe("google");
+  });
+});
--- a/src/agents/models-config.providers.policy.lookup.ts
+++ b/src/agents/models-config.providers.policy.lookup.ts
@@ -14,6 +14,18 @@ export function resolveProviderPluginLookupKey(
  provider?: ProviderConfig,
 ): string {
  const api = normalizeOptionalString(provider?.api) ?? "";
+  if (
+    providerKey === "google-antigravity" ||
+    providerKey === "google-vertex" ||
+    api === "google-generative-ai"
+  ) {
+    return "google";
+  }
+  if (
+    provider?.models?.some((model) => normalizeOptionalString(model.api) === "google-generative-ai")
+  ) {
+    return "google";
+  }
  if (
    api &&
    MODEL_APIS.includes(api as (typeof MODEL_APIS)[number]) &&