Merge branch 'main' into main

Author: etcherfx

.env.example

@@ -10,6 +10,10 @@ OPENROUTER_API_KEY=""
 DEEPSEEK_API_KEY=""
 
 
+# Kimi Config (Moonshot OpenAI-compatible API)
+KIMI_API_KEY=""
+
+
 # LM Studio Config (local provider, no API key required)
 LM_STUDIO_BASE_URL="http://localhost:1234/v1"
 
@@ -24,7 +28,7 @@ OLLAMA_BASE_URL="http://localhost:11434"
 
 # All Claude model requests are mapped to these models, plain model is fallback
 # Format: provider_type/model/name
-# Valid providers: "nvidia_nim" | "open_router" | "deepseek" | "lmstudio" | "llamacpp" | "ollama"
+# Valid providers: "nvidia_nim" | "open_router" | "deepseek" | "lmstudio" | "llamacpp" | "ollama" | "kimi"
 MODEL_OPUS=
 MODEL_SONNET=
 MODEL_HAIKU=
@@ -39,6 +43,7 @@ FCC_SMOKE_MODEL_DEEPSEEK=
 FCC_SMOKE_MODEL_LMSTUDIO=
 FCC_SMOKE_MODEL_LLAMACPP=
 FCC_SMOKE_MODEL_OLLAMA=
+FCC_SMOKE_MODEL_KIMI=
 
 
 # Thinking output
@@ -56,6 +61,7 @@ NVIDIA_NIM_PROXY=""
 OPENROUTER_PROXY=""
 LMSTUDIO_PROXY=""
 LLAMACPP_PROXY=""
+KIMI_PROXY=""
 
 PROVIDER_RATE_LIMIT=1
 PROVIDER_RATE_WINDOW=3

config/provider_catalog.py

@@ -13,6 +13,7 @@
 
 # Default upstream base URLs (also re-exported via :mod:`providers.defaults`)
 NVIDIA_NIM_DEFAULT_BASE = "https://integrate.api.nvidia.com/v1"
+KIMI_DEFAULT_BASE = "https://api.moonshot.ai/v1"
 # DeepSeek Anthropic-compatible Messages API (not OpenAI ``/v1`` chat completions).
 DEEPSEEK_ANTHROPIC_DEFAULT_BASE = "https://api.deepseek.com/anthropic"
 # Historical export name: DeepSeek upstream is the native Anthropic path above.
@@ -102,6 +103,16 @@ class ProviderDescriptor:
             "local",
         ),
     ),
+    "kimi": ProviderDescriptor(
+        provider_id="kimi",
+        transport_type="openai_chat",
+        credential_env="KIMI_API_KEY",
+        credential_url="https://platform.moonshot.cn/console/api-keys",
+        credential_attr="kimi_api_key",
+        default_base_url=KIMI_DEFAULT_BASE,
+        proxy_attr="kimi_proxy",
+        capabilities=("chat", "streaming", "tools"),
+    ),
 }
 
 # Order matches docs / historical error text; must match PROVIDER_CATALOG keys.

config/settings.py

@@ -112,6 +112,9 @@ class Settings(BaseSettings):
     # ==================== DeepSeek Config ====================
     deepseek_api_key: str = Field(default="", validation_alias="DEEPSEEK_API_KEY")
 
+    # ==================== Kimi Config ====================
+    kimi_api_key: str = Field(default="", validation_alias="KIMI_API_KEY")
+
     # ==================== Messaging Platform Selection ====================
     # Valid: "telegram" | "discord" | "none"
     messaging_platform: str = Field(
@@ -161,6 +164,7 @@ class Settings(BaseSettings):
     open_router_proxy: str = Field(default="", validation_alias="OPENROUTER_PROXY")
     lmstudio_proxy: str = Field(default="", validation_alias="LMSTUDIO_PROXY")
     llamacpp_proxy: str = Field(default="", validation_alias="LLAMACPP_PROXY")
+    kimi_proxy: str = Field(default="", validation_alias="KIMI_PROXY")
 
     # ==================== Provider Rate Limiting ====================
     provider_rate_limit: int = Field(default=40, validation_alias="PROVIDER_RATE_LIMIT")

providers/defaults.py

@@ -3,6 +3,7 @@
 from config.provider_catalog import (
     DEEPSEEK_ANTHROPIC_DEFAULT_BASE,
     DEEPSEEK_DEFAULT_BASE,
+    KIMI_DEFAULT_BASE,
     LLAMACPP_DEFAULT_BASE,
     LMSTUDIO_DEFAULT_BASE,
     NVIDIA_NIM_DEFAULT_BASE,
@@ -13,6 +14,7 @@
 __all__ = (
     "DEEPSEEK_ANTHROPIC_DEFAULT_BASE",
     "DEEPSEEK_DEFAULT_BASE",
+    "KIMI_DEFAULT_BASE",
     "LLAMACPP_DEFAULT_BASE",
     "LMSTUDIO_DEFAULT_BASE",
     "NVIDIA_NIM_DEFAULT_BASE",

providers/kimi/__init__.py

@@ -0,0 +1,10 @@
+"""Kimi (Moonshot) provider exports."""
+
+from providers.defaults import KIMI_DEFAULT_BASE
+
+from .client import KimiProvider
+
+__all__ = [
+    "KIMI_DEFAULT_BASE",
+    "KimiProvider",
+]

providers/kimi/client.py

@@ -0,0 +1,31 @@
+"""Kimi (Moonshot) provider implementation."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from providers.base import ProviderConfig
+from providers.defaults import KIMI_DEFAULT_BASE
+from providers.openai_compat import OpenAIChatTransport
+
+from .request import build_request_body
+
+
+class KimiProvider(OpenAIChatTransport):
+    """Kimi provider using the OpenAI-compatible chat completions API."""
+
+    def __init__(self, config: ProviderConfig):
+        super().__init__(
+            config,
+            provider_name="KIMI",
+            base_url=config.base_url or KIMI_DEFAULT_BASE,
+            api_key=config.api_key,
+        )
+
+    def _build_request_body(
+        self, request: Any, thinking_enabled: bool | None = None
+    ) -> dict:
+        return build_request_body(
+            request,
+            thinking_enabled=self._is_thinking_enabled(request, thinking_enabled),
+        )

providers/kimi/request.py

@@ -0,0 +1,33 @@
+"""Request builder for Kimi (Moonshot) provider."""
+
+from typing import Any
+
+from loguru import logger
+
+from core.anthropic import ReasoningReplayMode, build_base_request_body
+from core.anthropic.conversion import OpenAIConversionError
+from providers.exceptions import InvalidRequestError
+
+
+def build_request_body(request_data: Any, *, thinking_enabled: bool) -> dict:
+    """Build OpenAI-format request body from Anthropic request."""
+    logger.debug(
+        "KIMI_REQUEST: conversion start model={} msgs={}",
+        getattr(request_data, "model", "?"),
+        len(getattr(request_data, "messages", [])),
+    )
+    try:
+        body = build_base_request_body(
+            request_data,
+            reasoning_replay=ReasoningReplayMode.DISABLED,
+        )
+    except OpenAIConversionError as exc:
+        raise InvalidRequestError(str(exc)) from exc
+
+    logger.debug(
+        "KIMI_REQUEST: conversion done model={} msgs={} tools={}",
+        body.get("model"),
+        len(body.get("messages", [])),
+        len(body.get("tools", [])),
+    )
+    return body

providers/registry.py

@@ -68,13 +68,20 @@ def _create_ollama(config: ProviderConfig, _settings: Settings) -> BaseProvider:
     return OllamaProvider(config)
 
 
+def _create_kimi(config: ProviderConfig, _settings: Settings) -> BaseProvider:
+    from providers.kimi import KimiProvider
+
+    return KimiProvider(config)
+
+
 PROVIDER_FACTORIES: dict[str, ProviderFactory] = {
     "nvidia_nim": _create_nvidia_nim,
     "open_router": _create_open_router,
     "deepseek": _create_deepseek,
     "lmstudio": _create_lmstudio,
     "llamacpp": _create_llamacpp,
     "ollama": _create_ollama,
+    "kimi": _create_kimi,
 }
 
 if set(PROVIDER_DESCRIPTORS) != set(SUPPORTED_PROVIDER_IDS) or set(