maplibre-gl-geoagent 0.4.0 → 0.4.2

package/README.md

@@ -131,6 +131,7 @@ Converse model ID, and set the AWS region. The default Bedrock model is
 | `defaultProvider`              | `GeoAgentProviderId`                                           | `'openai-responses'`  |
 | `defaultModel`                 | `string \| Partial<Record<GeoAgentProviderId, string>>`        | provider default      |
 | `storagePrefix`                | `string`                                                       | `'geoagent.maplibre'` |
+| `apiKeys`                      | `Partial<Record<GeoAgentProviderId, string>>`                  | `undefined`           |
 | `allowCodeExecutionDefault`    | `boolean`                                                      | `true`                |
 | `allowDestructiveToolsDefault` | `boolean`                                                      | `true`                |
 | `showPermissionToggles`        | `boolean`                                                      | `false`               |
@@ -154,6 +155,27 @@ The Earth Engine integration uses browser OAuth through the official
 not supported in this browser-only package. Use a backend proxy if your
 deployment needs service account access.
 
+Host applications that already authenticate Earth Engine outside the browser
+can provide a short-lived OAuth access token instead of launching browser
+OAuth:
+
+```typescript
+new GeoAgentControl({
+  earthEngine: {
+    accessToken: "SHORT_LIVED_EARTH_ENGINE_ACCESS_TOKEN",
+    tokenType: "Bearer",
+    tokenExpiresIn: 3600,
+    projectId: "your-earth-engine-project",
+    includeCommunityCatalog: true,
+  },
+});
+```
+
+Access tokens are passed to the browser JavaScript runtime and should be
+short-lived. Do not persist them in page source, notebooks, local storage, or
+session storage. For untrusted users or production deployments, prefer a
+backend proxy.
+
 ## Browser Credentials
 
 This package runs model SDKs directly in the browser. API keys entered in the
@@ -162,6 +184,24 @@ are sent directly from the page to the selected model provider. Use this for
 local development, trusted internal apps, or apps that intentionally expose a
 browser-compatible credential path.
 
+Host applications can prefill the panel with initial API keys:
+
+```typescript
+new GeoAgentControl({
+  apiKeys: {
+    "openai-responses": "OPENAI_API_KEY_VALUE",
+    "openai-chat": "OPENAI_API_KEY_VALUE",
+    anthropic: "ANTHROPIC_API_KEY_VALUE",
+    google: "GOOGLE_API_KEY_VALUE",
+    bedrock: "AWS_BEARER_TOKEN_BEDROCK_VALUE",
+  },
+});
+```
+
+Saved `sessionStorage` values take precedence over `apiKeys`. Initial keys are
+kept in browser memory and are not written to storage unless the user edits the
+API key field.
+
 For Amazon Bedrock, this browser-only control uses Bedrock API-key bearer-token
 authentication. Do not enter AWS access key IDs, secret access keys, or session
 tokens in this UI. For production Bedrock deployments, prefer a backend proxy

package/dist/{GeoAgentControl-C0NqjEWe.js → GeoAgentControl-CM-lWHhd.js}

@@ -3518,7 +3518,7 @@ class HttpProtocol extends SerdeContext {
     });
   }
   async loadEventStreamCapability() {
-    const { EventStreamSerde } = await import("./index-Bi9NrqmL.js");
+    const { EventStreamSerde } = await import("./index-DMcVy720.js");
     return new EventStreamSerde({
       marshaller: this.getEventStreamMarshaller(),
       serializer: this.serializer,
@@ -42584,6 +42584,10 @@ function normalizeOptionalString(value) {
   const text2 = String(value ?? "").trim();
   return text2 ? text2 : void 0;
 }
+function normalizeTokenExpiresIn(value) {
+  const seconds = Number(value);
+  return Number.isFinite(seconds) && seconds > 0 ? seconds : 3600;
+}
 class EarthEngineService {
   constructor(options = {}) {
     __publicField(this, "eePromise", null);
@@ -42598,10 +42602,12 @@ class EarthEngineService {
   updateOptions(options) {
     const previousOauthClientId = normalizeOptionalString(this.options.oauthClientId);
     const previousProjectId = normalizeOptionalString(this.options.projectId);
+    const previousAccessToken = normalizeOptionalString(this.options.accessToken);
     const nextOauthClientId = normalizeOptionalString(options.oauthClientId);
     const nextProjectId = normalizeOptionalString(options.projectId);
+    const nextAccessToken = normalizeOptionalString(options.accessToken);
     this.options = { ...this.options, ...options };
-    if (previousOauthClientId !== nextOauthClientId || previousProjectId !== nextProjectId) {
+    if (previousOauthClientId !== nextOauthClientId || previousProjectId !== nextProjectId || previousAccessToken !== nextAccessToken) {
       this.initialized = false;
       this.initializedProjectId = void 0;
       this.tileUrlCache.clear();
@@ -42658,7 +42664,7 @@ class EarthEngineService {
   }
   async loadEe() {
     if (!this.eePromise) {
-      this.eePromise = import("./browser-6nQo2Odo.js").then((n) => n.b).then((module) => {
+      this.eePromise = import("./browser-CRRVT6sN.js").then((n) => n.b).then((module) => {
         const imported = "default" in module ? module.default : module;
         const ee = imported;
         const scope2 = globalThis;
@@ -42722,6 +42728,11 @@ class EarthEngineService {
   }
   async ensureAuthenticated(ee, oauthClientId) {
     var _a3, _b3, _c3, _d2, _e2, _f2;
+    const configuredAccessToken = normalizeOptionalString(this.options.accessToken);
+    if (configuredAccessToken) {
+      await this.applyAccessToken(ee, oauthClientId, configuredAccessToken);
+      return;
+    }
     const token = (_b3 = (_a3 = ee.data) == null ? void 0 : _a3.getAuthToken) == null ? void 0 : _b3.call(_a3);
     const currentAuthClientId = normalizeOptionalString((_d2 = (_c3 = ee.data) == null ? void 0 : _c3.getAuthClientId) == null ? void 0 : _d2.call(_c3));
     if (token) {
@@ -42766,6 +42777,32 @@ class EarthEngineService {
     });
     return this.authPromise;
   }
+  async applyAccessToken(ee, oauthClientId, accessToken) {
+    var _a3;
+    if (!((_a3 = ee.data) == null ? void 0 : _a3.setAuthToken)) {
+      throw new Error("Earth Engine token authentication is unavailable.");
+    }
+    const clientId = oauthClientId ?? "";
+    const tokenType = normalizeOptionalString(this.options.tokenType) ?? "Bearer";
+    const expiresIn = normalizeTokenExpiresIn(this.options.tokenExpiresIn);
+    await new Promise((resolve2, reject) => {
+      var _a4, _b3;
+      try {
+        (_b3 = (_a4 = ee.data) == null ? void 0 : _a4.setAuthToken) == null ? void 0 : _b3.call(
+          _a4,
+          clientId,
+          tokenType,
+          accessToken,
+          expiresIn,
+          [],
+          resolve2,
+          false
+        );
+      } catch (error) {
+        reject(new Error(eeErrorMessage(error)));
+      }
+    });
+  }
   async catalog(includeCommunity = this.options.includeCommunityCatalog ?? true) {
     const key = includeCommunity ? "all" : "official";
     const ttl = this.options.catalogCacheTtlMs ?? DEFAULT_CATALOG_CACHE_TTL_MS;
@@ -46006,6 +46043,7 @@ class GeoAgentControl {
       allowDestructiveToolsDefault: options.allowDestructiveToolsDefault ?? true,
       showPermissionToggles: options.showPermissionToggles ?? false,
       defaultModel: options.defaultModel,
+      apiKeys: options.apiKeys,
       basemaps: options.basemaps,
       earthEngine: options.earthEngine
     };
@@ -46370,7 +46408,7 @@ class GeoAgentControl {
     }
   }
   setupEarthEngineControls() {
-    var _a3, _b3;
+    var _a3, _b3, _c3;
     if (!this.ui) {
       return;
     }
@@ -46382,13 +46420,14 @@ class GeoAgentControl {
     const oauthClientId = firstValue(
       (_a3 = this.options.earthEngine) == null ? void 0 : _a3.oauthClientId
     );
+    const accessToken = firstValue((_b3 = this.options.earthEngine) == null ? void 0 : _b3.accessToken);
     const projectId = firstValue(
       storageGet(this.earthEngineProjectIdStorageKey()),
-      (_b3 = this.options.earthEngine) == null ? void 0 : _b3.projectId
+      (_c3 = this.options.earthEngine) == null ? void 0 : _c3.projectId
     );
     this.ui.earthEngineClientIdInput.value = oauthClientId;
     this.ui.earthEngineProjectIdInput.value = projectId;
-    this.ui.earthEngineDetails.open = !oauthClientId || !projectId;
+    this.ui.earthEngineDetails.open = !oauthClientId && !accessToken || !projectId;
     this.applyEarthEngineSettings();
   }
   applyEarthEngineSettings() {
@@ -46413,15 +46452,16 @@ class GeoAgentControl {
     this.emit("statechange");
   }
   updateEarthEngineStatus() {
-    var _a3;
+    var _a3, _b3, _c3;
     if (!this.ui || this.ui.earthEngineDetails.hidden) {
       return;
     }
     const oauthClientId = this.ui.earthEngineClientIdInput.value.trim();
+    const accessToken = (_b3 = (_a3 = this.options.earthEngine) == null ? void 0 : _a3.accessToken) == null ? void 0 : _b3.trim();
     const projectId = this.ui.earthEngineProjectIdInput.value.trim();
-    const earthEngine = (_a3 = this.state.data) == null ? void 0 : _a3.earthEngine;
-    if (!oauthClientId) {
-      this.ui.earthEngineStatus.textContent = "OAuth Client ID is not configured by this app. Set VITE_GEE_OAUTH_CLIENT_ID before running Earth Engine tools.";
+    const earthEngine = (_c3 = this.state.data) == null ? void 0 : _c3.earthEngine;
+    if (!oauthClientId && !accessToken) {
+      this.ui.earthEngineStatus.textContent = "OAuth Client ID or access token is not configured by this app. Set VITE_GEE_OAUTH_CLIENT_ID or provide earthEngine.accessToken before running Earth Engine tools.";
       return;
     }
     if (!projectId) {
@@ -46672,16 +46712,18 @@ class GeoAgentControl {
     return this.providerConfig(this.currentProviderId());
   }
   loadProviderSettings() {
+    var _a3, _b3;
     if (!this.ui) {
       return;
     }
     const provider = this.currentProviderConfig();
+    const initialApiKey = ((_b3 = (_a3 = this.options.apiKeys) == null ? void 0 : _a3[provider.id]) == null ? void 0 : _b3.trim()) ?? "";
     this.state.providerId = provider.id;
     this.state.modelId = storageGet(this.modelStorageKey(provider.id)) || provider.defaultModel;
     this.ui.providerSelect.value = provider.id;
     this.ui.apiKeyLabel.textContent = provider.keyLabel;
     this.ui.apiKeyInput.placeholder = provider.keyPlaceholder;
-    this.ui.apiKeyInput.value = storageGet(provider.storageKey) || "";
+    this.ui.apiKeyInput.value = storageGet(provider.storageKey) || initialApiKey;
     this.ui.modelIdInput.value = this.state.modelId;
     this.ui.modelIdInput.placeholder = provider.defaultModel;
     this.state.bedrockRegion = this.initialBedrockRegion();
@@ -46802,7 +46844,7 @@ ${markdown.trim()}`;
   }
   async createProviderModel(providerId, modelId, apiKey, bedrockRegion) {
     if (providerId === "openai-responses" || providerId === "openai-chat") {
-      const { OpenAIModel } = await import("./index-DZcJF5D6.js");
+      const { OpenAIModel } = await import("./index-CCdoSNb8.js");
       return new OpenAIModel({
         api: providerId === "openai-responses" ? "responses" : "chat",
         modelId,
@@ -46813,7 +46855,7 @@ ${markdown.trim()}`;
       });
     }
     if (providerId === "anthropic") {
-      const { AnthropicModel } = await import("./anthropic-B3q8CswR.js");
+      const { AnthropicModel } = await import("./anthropic-qn30x05g.js");
       return new AnthropicModel({
         modelId,
         apiKey,
@@ -46823,7 +46865,7 @@ ${markdown.trim()}`;
       });
     }
     if (providerId === "google") {
-      const { GoogleModel } = await import("./index-CBRcDJl6.js");
+      const { GoogleModel } = await import("./index-nbt2E_lW.js");
       return new GoogleModel({
         modelId,
         apiKey
@@ -47048,4 +47090,4 @@ export {
   toJsonValue as t,
   warnOnce as w
 };
-//# sourceMappingURL=GeoAgentControl-C0NqjEWe.js.map
+//# sourceMappingURL=GeoAgentControl-CM-lWHhd.js.map