@caoguo/maplibre-ai 0.0.4 → 0.0.6

package/dist/deepseek-rSUSDXri.d.ts

@@ -0,0 +1,81 @@
+/**
+ * DeepSeek LLM 客户端（PRD phase-0 §5.5 / §5.7 的 v1 后端能力）
+ *
+ * DeepSeek API 与 OpenAI Chat Completions 协议兼容：
+ *   base_url: https://api.deepseek.com
+ *   模型:     deepseek-chat（通用对话）/ deepseek-reasoner（深度推理）
+ *   鉴权:     Authorization: Bearer <API_KEY>
+ *
+ * 设计：
+ *   - 依赖注入的 fetch（浏览器/Node 均可运行，Node 18+ 原生 fetch）
+ *   - 自动重试（指数退避）
+ *   - 失败降级（可传入 fallback，规则引擎兜底）
+ *   - 支持流式（onChunk 回调）与 JSON 输出
+ */
+interface DeepSeekConfig {
+    /** API Key */
+    apiKey: string;
+    /** 基础地址，默认 https://api.deepseek.com */
+    baseUrl?: string;
+    /** 模型，默认 deepseek-chat */
+    model?: 'deepseek-chat' | 'deepseek-reasoner' | (string & {});
+    /** 温度 0-2 */
+    temperature?: number;
+    /** 最大 token */
+    maxTokens?: number;
+    /** 超时（ms），默认 30s */
+    timeoutMs?: number;
+    /** 重试次数，默认 2 */
+    retries?: number;
+    /** 注入 fetch（测试/Node 环境），默认 globalThis.fetch */
+    fetchImpl?: typeof fetch;
+}
+interface ChatMessage {
+    role: 'system' | 'user' | 'assistant';
+    content: string;
+}
+interface ChatOptions {
+    /** 是否启用 JSON 模式（要求模型返回纯 JSON） */
+    json?: boolean;
+    /** 流式回调 */
+    onChunk?: (delta: string) => void;
+}
+interface ChatResult {
+    /** 完整回复文本 */
+    content: string;
+    /** 消耗 token */
+    usage?: {
+        promptTokens: number;
+        completionTokens: number;
+        totalTokens: number;
+    };
+    /** 使用的模型 */
+    model: string;
+}
+/** 已解析的 JSON 回复 */
+interface JsonChatResult<T> {
+    /** 解析出的 JSON 对象 */
+    data: T;
+    /** 原始文本 */
+    raw: string;
+    model: string;
+}
+declare class DeepSeekClient {
+    private config;
+    private lastRequestId;
+    constructor(config: DeepSeekConfig);
+    /** 发起一次聊天补全 */
+    chat(messages: ChatMessage[], opts?: ChatOptions): Promise<ChatResult>;
+    /** 聊天 + JSON 解析 */
+    chatJson<T>(messages: ChatMessage[]): Promise<JsonChatResult<T>>;
+    private requestWithRetry;
+    private isRetryable;
+    private requestOnce;
+    /** 解析 SSE 流式响应 */
+    private parseStream;
+    private sleep;
+}
+/** 便捷工厂：创建默认配置的客户端 */
+declare function createDeepSeekClient(config: DeepSeekConfig): DeepSeekClient;
+
+export { type ChatMessage as C, DeepSeekClient as D, type JsonChatResult as J, type ChatOptions as a, type ChatResult as b, type DeepSeekConfig as c, createDeepSeekClient as d };

package/dist/index.cjs

@@ -1043,17 +1043,30 @@ function detectSpatial(text, geometryColumn = "geom") {
     if (/公里|km|千米/.test(nearby[2])) radius *= 1e3;
     return { relation: "dwithin", radius, geometryColumn };
   }
+  const point = detectReferencePoint(text);
   if (/缓冲区|缓冲|范围内|区域.{0,2}内/.test(text)) {
-    return { relation: "buffer", geometryColumn };
+    return { relation: "buffer", point, geometryColumn };
   }
-  if (/包含|覆盖.{0,2}内|在.{0,2}内/.test(text)) {
-    return { relation: "within", geometryColumn };
+  if (/包含|覆盖|涵盖|包围|圈住/.test(text)) {
+    return { relation: "contains", point, geometryColumn };
+  }
+  if (/在.{0,2}内|内部|以内|之中/.test(text)) {
+    return { relation: "within", point, geometryColumn };
   }
   if (/相交|叠加|重叠|交叉/.test(text)) {
-    return { relation: "intersects", geometryColumn };
+    return { relation: "intersects", point, geometryColumn };
   }
   return null;
 }
+function detectReferencePoint(text) {
+  const m = text.match(/([1-2]?\d{2,3}(?:\.\d+)?)\s*[,，]\s*(\d{1,3}(?:\.\d+)?)/);
+  if (m) {
+    const lng = parseFloat(m[1]);
+    const lat = parseFloat(m[2]);
+    if (lng >= -180 && lng <= 180 && lat >= -90 && lat <= 90) return [lng, lat];
+  }
+  return void 0;
+}
 function quoteValue(v) {
   return typeof v === "string" ? `'${v.replace(/'/g, "''")}'` : String(v);
 }
@@ -1063,14 +1076,26 @@ function buildWhere(conditions, spatial) {
     parts.push(`${c.field} ${c.operator} ${quoteValue(c.value)}`);
   }
   if (spatial) {
-    if (spatial.relation === "dwithin" && spatial.point && spatial.radius !== void 0) {
-      parts.push(`ST_DWithin(${spatial.geometryColumn}, ST_SetSRID(ST_MakePoint(${spatial.point[0]}, ${spatial.point[1]}), 4326), ${spatial.radius})`);
-    } else if (spatial.relation === "buffer") {
-      parts.push(`ST_Intersects(${spatial.geometryColumn}, ST_Buffer(${spatial.geometryColumn}, 0))`);
-    } else if (spatial.relation === "within") {
-      parts.push(`ST_Within(${spatial.geometryColumn}, ${spatial.geometryColumn})`);
-    } else if (spatial.relation === "intersects") {
-      parts.push(`ST_Intersects(${spatial.geometryColumn}, ${spatial.geometryColumn})`);
+    const col = spatial.geometryColumn;
+    const refGeom = spatial.referenceColumn ? spatial.referenceColumn : spatial.point ? `ST_Buffer(ST_SetSRID(ST_MakePoint(${spatial.point[0]}, ${spatial.point[1]}), 4326), ${spatial.radius ?? 0})` : null;
+    switch (spatial.relation) {
+      case "dwithin":
+        if (spatial.point && spatial.radius !== void 0) {
+          parts.push(`ST_DWithin(${col}, ST_SetSRID(ST_MakePoint(${spatial.point[0]}, ${spatial.point[1]}), 4326), ${spatial.radius})`);
+        }
+        break;
+      case "buffer":
+        if (refGeom) parts.push(`ST_Intersects(${col}, ${refGeom})`);
+        break;
+      case "within":
+        if (refGeom) parts.push(`ST_Within(${col}, ${refGeom})`);
+        break;
+      case "contains":
+        if (refGeom) parts.push(`ST_Contains(${refGeom}, ${col})`);
+        break;
+      case "intersects":
+        if (refGeom) parts.push(`ST_Intersects(${col}, ${refGeom})`);
+        break;
     }
   }
   return parts.length > 0 ? `WHERE ${parts.join(" AND ")}` : "";
@@ -1080,9 +1105,12 @@ function generatePostGISQuery(text, opts = {}) {
   const geometryColumn = opts.geometryColumn ?? "geom";
   const table = detectTable(text);
   const spatial = detectSpatial(text, geometryColumn);
-  if (spatial && spatial.relation === "dwithin" && !spatial.point) {
+  if (spatial && !spatial.point) {
     spatial.point = center;
   }
+  if (spatial && spatial.relation !== "dwithin" && spatial.radius === void 0) {
+    spatial.radius = 1e3;
+  }
   const conditions = [];
   const field = detectField(text);
   if (field) {
@@ -1450,6 +1478,168 @@ function createDeepSeekClient(config) {
   return new DeepSeekClient(config);
 }
 
+// src/llm/openaiCompatible.ts
+function normalizeError2(body, provider) {
+  const err = new Error(body || `${provider} API \u8BF7\u6C42\u5931\u8D25`);
+  err.name = `${provider}Error`;
+  return err;
+}
+var OpenAICompatibleClient = class {
+  apiKey;
+  baseUrl;
+  model;
+  temperature;
+  maxTokens;
+  timeoutMs;
+  retries;
+  fetchImpl;
+  authScheme;
+  extraHeaders;
+  providerLabel;
+  constructor(config) {
+    if (!config.apiKey) throw new Error("OpenAICompatibleClient: apiKey \u4E0D\u80FD\u4E3A\u7A7A");
+    if (!config.baseUrl) throw new Error("OpenAICompatibleClient: baseUrl \u4E0D\u80FD\u4E3A\u7A7A");
+    if (!config.model) throw new Error("OpenAICompatibleClient: model \u4E0D\u80FD\u4E3A\u7A7A");
+    this.apiKey = config.apiKey;
+    this.baseUrl = config.baseUrl.replace(/\/+$/, "");
+    this.model = config.model;
+    this.temperature = config.temperature ?? 0.3;
+    this.maxTokens = config.maxTokens ?? 2048;
+    this.timeoutMs = config.timeoutMs ?? 3e4;
+    this.retries = config.retries ?? 2;
+    this.fetchImpl = config.fetchImpl ?? (globalThis.fetch ?? fetch);
+    this.authScheme = config.authScheme ?? "Bearer";
+    this.extraHeaders = config.extraHeaders ?? {};
+    this.providerLabel = (() => {
+      try {
+        return new URL(this.baseUrl).hostname || "LLM";
+      } catch {
+        return "LLM";
+      }
+    })();
+  }
+  async chat(messages, opts = {}) {
+    return this.requestWithRetry(messages, opts);
+  }
+  async chatJson(messages) {
+    const result = await this.chat(messages, { json: true });
+    const raw = result.content.trim();
+    const cleaned = raw.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/, "");
+    let data;
+    try {
+      data = JSON.parse(cleaned);
+    } catch {
+      const match = cleaned.match(/\{[\s\S]*\}|\[[\s\S]*\]/);
+      if (match) {
+        data = JSON.parse(match[0]);
+      } else {
+        throw new Error(`${this.providerLabel} \u8FD4\u56DE\u4E86\u975E JSON \u5185\u5BB9: ${raw.slice(0, 200)}`);
+      }
+    }
+    return { data, raw, model: result.model };
+  }
+  async requestWithRetry(messages, opts) {
+    let lastError = null;
+    for (let attempt = 0; attempt <= this.retries; attempt++) {
+      try {
+        return await this.requestOnce(messages, opts);
+      } catch (e) {
+        lastError = e;
+        if (attempt < this.retries) {
+          await this.sleep(Math.min(1e3 * 2 ** attempt, 8e3));
+        }
+      }
+    }
+    throw lastError ?? new Error(`${this.providerLabel} \u8BF7\u6C42\u5931\u8D25`);
+  }
+  async requestOnce(messages, opts) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+    const body = {
+      model: this.model,
+      messages,
+      temperature: this.temperature,
+      max_tokens: this.maxTokens,
+      stream: Boolean(opts.onChunk)
+    };
+    if (opts.json) {
+      body.response_format = { type: "json_object" };
+    }
+    const headers = {
+      "Content-Type": "application/json",
+      ...this.extraHeaders
+    };
+    if (this.authScheme === "Bearer") {
+      headers.Authorization = `Bearer ${this.apiKey}`;
+    } else {
+      headers["X-Api-Key"] = this.apiKey;
+    }
+    try {
+      const res = await this.fetchImpl(`${this.baseUrl}/chat/completions`, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body),
+        signal: controller.signal
+      });
+      if (!res.ok) {
+        const text = await res.text().catch(() => "");
+        throw normalizeError2(`${this.providerLabel} HTTP ${res.status}: ${text}`, this.providerLabel);
+      }
+      if (opts.onChunk && res.body) {
+        return this.parseStream(res.body, opts.onChunk);
+      }
+      const json = await res.json();
+      const content = json.choices?.[0]?.message?.content ?? "";
+      return {
+        content,
+        model: json.model ?? this.model,
+        usage: json.usage ? {
+          promptTokens: json.usage.prompt_tokens,
+          completionTokens: json.usage.completion_tokens,
+          totalTokens: json.usage.prompt_tokens + json.usage.completion_tokens
+        } : void 0
+      };
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  async parseStream(body, onChunk) {
+    const reader = body.getReader();
+    const decoder = new TextDecoder();
+    let content = "";
+    let buffer = "";
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("data:")) continue;
+        const data = trimmed.slice(5).trim();
+        if (data === "[DONE]") continue;
+        try {
+          const json = JSON.parse(data);
+          const delta = json.choices?.[0]?.delta?.content ?? "";
+          if (delta) {
+            content += delta;
+            onChunk(delta);
+          }
+        } catch {
+        }
+      }
+    }
+    return { content, model: this.model };
+  }
+  sleep(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+  }
+};
+function createOpenAICompatibleClient(config) {
+  return new OpenAICompatibleClient(config);
+}
+
 exports.CARRIER_STYLES = CARRIER_STYLES;
 exports.CHINA_BOUNDS = CHINA_BOUNDS;
 exports.COLOR_NAMES = COLOR_NAMES;
@@ -1461,6 +1651,7 @@ exports.LOCAL_GEO_DB = LOCAL_GEO_DB;
 exports.LlmMapCopilot = LlmMapCopilot;
 exports.LlmNlpg = LlmNlpg;
 exports.MapCopilot = MapCopilot;
+exports.OpenAICompatibleClient = OpenAICompatibleClient;
 exports.PLACE_COORDINATES = PLACE_COORDINATES;
 exports.adjustBrightness = adjustBrightness;
 exports.analyzePerformance = analyzePerformance;
@@ -1468,6 +1659,7 @@ exports.analyzeTiles = analyzeTiles;
 exports.batchGeocode = batchGeocode;
 exports.classifyIntent = classifyIntent;
 exports.createDeepSeekClient = createDeepSeekClient;
+exports.createOpenAICompatibleClient = createOpenAICompatibleClient;
 exports.detectCRS = detectCRS;
 exports.detectField = detectField;
 exports.detectHeaders = detectHeaders;