refactor(auth): update RAM data domains and endpoint logic

Update RAM data domains to support both agentrun-data and funagent-data-pre
endpoints, and refine the endpoint resolution logic for RAM authentication.

Improve code formatting and remove unnecessary config parameter
from get_base_url method.

更新 RAM 数据域以支持 agentrun-data 和 funagent-data-pre 端点，
并优化 RAM 认证的端点解析逻辑。

改进代码格式并从 get_base_url 方法中移除不必要的 config 参数。

Change-Id: I94555e7dda35fc7b40b232a456d074caacd97024
Co-authored-by: Copilot <copilot@github.com>
Signed-off-by: OhYee <oyohyee@oyohyee.com>

Author: OhYee

agentrun/integration/crewai/tool_adapter.py

@@ -19,8 +19,7 @@ def from_canonical(self, tools: List[CanonicalTool]) -> Any:
             from crewai.tools import tool
         except ImportError as e:
             raise ImportError(
-                "LangChain is not installed. "
-                "Install it with: pip install langchain-core"
+                "CrewAI is not installed. Install it with: pip install crewai"
             ) from e
 
         return [tool(t) for t in self.function_tools(tools)]

agentrun/utils/__data_api_async_template.py

@@ -75,17 +75,22 @@ def _use_ram_auth(self, config: Optional[Config] = None) -> bool:
         cfg = Config.with_configs(self.config, config)
         return bool(cfg.get_access_key_id() and cfg.get_access_key_secret())
 
+    _RAM_DATA_DOMAINS = ("agentrun-data", "funagent-data-pre")
+
     def _get_ram_data_endpoint(self, config: Optional[Config] = None) -> str:
-        """返回 RAM 鉴权用的 data endpoint（仅当默认 agentrun-data 域名时在 host 前加 -ram）。"""
+        """返回 RAM 鉴权用的 data endpoint（仅当 agentrun-data / funagent-data-pre 域名时在 host 前加 -ram）。"""
         cfg = Config.with_configs(self.config, config)
         base = cfg.get_data_endpoint()
         parsed = urlparse(base)
-        if not parsed.netloc or ".agentrun-data." not in parsed.netloc:
+        if not parsed.netloc or not any(
+            f".{domain}." in parsed.netloc for domain in self._RAM_DATA_DOMAINS
+        ):
             return base
         parts = parsed.netloc.split(".", 1)
         if len(parts) != 2:
             return base
         ram_netloc = parts[0] + "-ram." + parts[1]
+
         return urlunparse((
             parsed.scheme,
             ram_netloc,

agentrun/utils/data_api.py

@@ -85,17 +85,22 @@ def _use_ram_auth(self, config: Optional[Config] = None) -> bool:
         cfg = Config.with_configs(self.config, config)
         return bool(cfg.get_access_key_id() and cfg.get_access_key_secret())
 
+    _RAM_DATA_DOMAINS = ("agentrun-data", "funagent-data-pre")
+
     def _get_ram_data_endpoint(self, config: Optional[Config] = None) -> str:
-        """返回 RAM 鉴权用的 data endpoint（仅当默认 agentrun-data 域名时在 host 前加 -ram）。"""
+        """返回 RAM 鉴权用的 data endpoint（仅当 agentrun-data / funagent-data-pre 域名时在 host 前加 -ram）。"""
         cfg = Config.with_configs(self.config, config)
         base = cfg.get_data_endpoint()
         parsed = urlparse(base)
-        if not parsed.netloc or ".agentrun-data." not in parsed.netloc:
+        if not parsed.netloc or not any(
+            f".{domain}." in parsed.netloc for domain in self._RAM_DATA_DOMAINS
+        ):
             return base
         parts = parsed.netloc.split(".", 1)
         if len(parts) != 2:
             return base
         ram_netloc = parts[0] + "-ram." + parts[1]
+
         return urlunparse((
             parsed.scheme,
             ram_netloc,
@@ -105,35 +110,27 @@ def _get_ram_data_endpoint(self, config: Optional[Config] = None) -> str:
             parsed.fragment,
         ))
 
-    def get_base_url(self, config: Optional[Config] = None) -> str:
+    def get_base_url(self) -> str:
         """
         Get the base URL for API requests.
         当使用 RAM 鉴权时返回 RAM 端点（host 带 -ram）。
 
-        Args:
-            config: 可选，用于计算 base URL 的配置；未传时使用 self.config。
-
         Returns:
             The base URL string
         """
-        cfg = Config.with_configs(self.config, config)
-        if self._use_ram_auth(cfg):
-            return self._get_ram_data_endpoint(cfg)
-        return cfg.get_data_endpoint()
+        if self._use_ram_auth():
+            return self._get_ram_data_endpoint()
+        return self.config.get_data_endpoint()
 
     def with_path(
-        self,
-        path: str,
-        query: Optional[Dict[str, Any]] = None,
-        config: Optional[Config] = None,
+        self, path: str, query: Optional[Dict[str, Any]] = None
     ) -> str:
         """
         Construct full URL with the given path and query parameters.
 
         Args:
             path: API path (may include query string)
             query: Query parameters to add/merge
-            config: 可选，用于计算 base URL 的配置；未传时使用 self.config。
 
         Returns:
             Complete URL string with query parameters
@@ -153,7 +150,7 @@ def with_path(
         base_url = "/".join([
             part.strip("/")
             for part in [
-                self.get_base_url(config),
+                self.get_base_url(),
                 self.namespace,
                 path,
             ]
@@ -209,8 +206,7 @@ def auth(
         body: Optional[bytes] = None,
     ) -> tuple[str, Dict[str, str], Optional[Dict[str, Any]]]:
         """
-        Authentication: 仅使用 RAM 签名鉴权（Agentrun-Authorization）。
-        需在 config 中配置 AK/SK。
+        Authentication: 仅使用 RAM 签名鉴权（Agentrun-Authorization）。需在 config 中配置 AK/SK。
         """
         cfg = Config.with_configs(self.config, config)
 
@@ -232,9 +228,8 @@ def auth(
                     **(headers or {}),
                 }
                 logger.debug(
-                    "using RAM signature for data API request to %s, token %s",
+                    "using RAM signature for data API request to %s",
                     url[:80] + "..." if len(url) > 80 else url,
-                    signed,
                 )
             except ValueError as e:
                 logger.warning("RAM signing skipped (missing AK/SK): %s", e)
@@ -267,7 +262,6 @@ def _prepare_request(
         if headers:
             req_headers.update(headers)
 
-        # Build body bytes for RAM signing when applicable
         body_bytes: Optional[bytes] = None
         if data is not None:
             if isinstance(data, dict):