Merge remote-tracking branch 'main/main' into dev/home_animation

Author: sunpenghui1012

.prettierignore

@@ -1,23 +1,6 @@
-node_modules
-dist
-build
-*.min.js
-*.min.css
-coverage
-.next
-.nuxt
-.vuepress/dist
-.serverless
-.fusebox
-.dynamodb
-.tern-port
-*.log
-*.lock
-package-lock.json
-yarn.lock
-pnpm-lock.yaml
-__pycache__
-*.pyc
-.git
-.vscode
-.idea
+node_modules/**
+dist/**
+build/**
+.vitepress/**
+docs/.vitepress/cache/**
+docs/.vitepress/dist/**

eslint.config.mjs

@@ -15,6 +15,9 @@ export default tseslint.config(
             '.next/**',
             '.nuxt/**',
             '.vuepress/dist/**',
+            '.vitepress/**',
+            'docs/.vitepress/cache/**',
+            'docs/.vitepress/dist/**',
             '.serverless/**',
             '.fusebox/**',
             '.dynamodb/**',

packages/app/friday/args.py

@@ -1,7 +1,21 @@
 # -*- coding: utf-8 -*-
+import json
 from argparse import ArgumentParser, Namespace
 
 
+def json_type(value: str) -> dict:
+    """Parse a JSON string into a dictionary."""
+    if not value or value == "":
+        return {}
+    try:
+        result = json.loads(value)
+        if not isinstance(result, dict):
+            raise ValueError("JSON must be an object/dictionary")
+        return result
+    except json.JSONDecodeError as e:
+        raise ValueError(f"Invalid JSON string: {e}")
+
+
 def get_args() -> Namespace:
     """Get the command line arguments for the script."""
     parser = ArgumentParser(description="Arguments for friday")
@@ -36,9 +50,16 @@ def get_args() -> Namespace:
         required=True,
     )
     parser.add_argument(
-        "--baseUrl",
-        type=str,
-        required=False,
+        "--clientKwargs",
+        type=json_type,
+        default={},
+        help="A JSON string representing a dictionary of keyword arguments to pass to the LLM client.",
+    )
+    parser.add_argument(
+        "--generateKwargs",
+        type=json_type,
+        default={},
+        help="A JSON string representing a dictionary of keyword arguments to pass to the LLM generate method.",
     )
     args = parser.parse_args()
     return args

packages/app/friday/main.py

@@ -89,7 +89,7 @@ async def main():
     )
 
     # get model from args
-    model = get_model(args.llmProvider, args.modelName, args.apiKey, args.baseUrl)
+    model = get_model(args.llmProvider, args.modelName, args.apiKey, args.clientKwargs, args.generateKwargs)
     formatter = get_formatter(args.llmProvider)
 
     # Create the ReAct agent
@@ -108,7 +108,6 @@ async def main():
 # Workflow Process
 1. Analyze user query and make a plan
 2. Carry out your plan step by step
-3. Call `{finish_function}` with your final response
 
 # Response Guidelines
 - Be concise and focused on user's specific context
@@ -129,7 +128,6 @@ async def main():
 - Current date and time: {current_time}""".format(
             current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
             max_turns=20,
-            finish_function="generate_response",
         ),
         model=model,
         formatter=formatter,

packages/app/friday/model.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """Get the formatter and model based on the model provider."""
+import re
+import agentscope
 from agentscope.formatter import (
     DashScopeChatFormatter,
     OpenAIChatFormatter,
@@ -18,6 +20,29 @@
 )
 
 
+def is_agentscope_version_ge(target_version: tuple) -> bool:
+    """
+    Check if the current agentscope version is greater than or equal to the target version.
+
+    Args:
+        target_version: A tuple of (major, minor, patch) version numbers.
+
+    Returns:
+        True if current version >= target version, False otherwise.
+
+    Example:
+        >>> is_agentscope_version_ge((1, 0, 9))  # Works with "1.0.9" or "1.0.9dev"
+        True
+    """
+    version_str = agentscope.__version__
+    version_match = re.match(r'^(\d+)\.(\d+)\.(\d+)', version_str)
+    if version_match:
+        major, minor, patch = map(int, version_match.groups())
+        current_version = (major, minor, patch)
+        return current_version >= target_version
+    return False
+
+
 def get_formatter(llmProvider: str) -> FormatterBase:
     """Get the formatter based on the model provider."""
     match llmProvider.lower():
@@ -36,7 +61,13 @@ def get_formatter(llmProvider: str) -> FormatterBase:
                 f"Unsupported model provider: {llmProvider}. "
             )
 
-def get_model(llmProvider:str, modelName: str, apiKey: str, baseUrl: str = None) -> ChatModelBase:
+def get_model(
+    llmProvider: str,
+    modelName: str,
+    apiKey: str,
+    client_kwargs: dict = {},
+    generate_kwargs: dict = {},
+) -> ChatModelBase:
     """Get the model instance based on the input arguments."""
 
     match llmProvider.lower():
@@ -45,34 +76,47 @@ def get_model(llmProvider:str, modelName: str, apiKey: str, baseUrl: str = None)
                 model_name=modelName,
                 api_key=apiKey,
                 stream=True,
+                generate_kwargs=generate_kwargs,
             )
         case "openai":
-            client_args = {}
-            if baseUrl:
-                client_args["base_url"] = baseUrl
             return OpenAIChatModel(
                 model_name=modelName,
                 api_key=apiKey,
                 stream=True,
-                client_args=client_args,
+                client_kwargs=client_kwargs,
+                generate_kwargs=generate_kwargs,
             )
         case "ollama":
-            return OllamaChatModel(
-                model_name=modelName,
-                stream=True,
-                host=baseUrl,
-            )
+            if is_agentscope_version_ge((1, 0, 9)):
+                # For agentscope >= 1.0.9
+                return OllamaChatModel(
+                    model_name=modelName,
+                    stream=True,
+                    client_kwargs=client_kwargs,
+                    generate_kwargs=generate_kwargs,
+                )
+            else:
+                # For agentscope < 1.0.9
+                return OllamaChatModel(
+                    model_name=modelName,
+                    stream=True,
+                    **client_kwargs,
+                )
         case "gemini":
             return GeminiChatModel(
                 model_name=modelName,
                 api_key=apiKey,
                 stream=True,
+                client_kwargs=client_kwargs,
+                generate_kwargs=generate_kwargs,
             )
         case "anthropic":
             return AnthropicChatModel(
                 model_name=modelName,
                 api_key=apiKey,
                 stream=True,
+                client_kwargs=client_kwargs,
+                generate_kwargs=generate_kwargs,
             )
         case _:
             raise ValueError(

packages/client/src/i18n/en.json

@@ -114,12 +114,22 @@
     "help": {
         "friday": {
             "api-key": "The {{llmProvider}} API key, used to access the LLM API provider",
+            "base-url": "The base URL for the LLM API provider",
+            "base-url-placeholder": "e.g. https://api.openai.com/v1,http://localhost:11434",
+            "client-kwargs": "The keyword arguments for the API client initialization, e.g. \"base_url\" for OpenAI client",
+            "generate-kwargs": "The keyword arguments passed when actually calling the LLM API, e.g. \"temperature\", \"max_tokens\", etc.",
             "llm-provider": "Select the LLM API provider",
             "model-name": "The {{llmProvider}} model used to generate response",
             "python-env": "Absolute path to your Python env (3.10+), e.g. /usr/bin/python",
             "write-permission": "Whether allow Friday to modify your local files. If allowed, Friday will equip a tool to write text files",
-            "base-url": "The base URL for the LLM API provider",
-            "base-url-placeholder": "e.g. https://api.openai.com/v1,http://localhost:11434"
+            "key-name": "Key Name",
+            "missing-key-name": "Missing key name",
+            "type-name": "Type Name",
+            "missing-type-name": "Missing type name",
+            "value-name": "Value Name",
+            "missing-value-name": "Missing value name",
+            "check-only-number": "Only numbers can be entered",
+            "add-form-list-btn": "Add keyword argument"
         }
     },
     "hint": {

packages/client/src/i18n/zh.json

@@ -114,12 +114,22 @@
     "help": {
         "friday": {
             "api-key": "用于访问 {{llmProvider}} LLM API 的密钥",
+            "base-url": "LLM API 提供商的基础 URL",
+            "base-url-placeholder": "例如 https://api.openai.com/v1,http://localhost:11434",
+            "client-kwargs": "API client 初始化的关键字参数，例如 OpenAI 客户端的 \"base_url\" 字段",
+            "generate-kwargs": "实际调用 LLM API 时传入的关键字参数，例如 \"temperature\"、\"max_tokens\" 等",
             "llm-provider": "选择 LLM API 提供商",
             "model-name": "用于生成回复的{{llmProvider}}模型",
             "python-env": "Python 环境的绝对路径（3.10+），例如 /usr/bin/python",
             "write-permission": "是否允许 Friday 修改你的本地文件，如果允许，Friday 将会装备一个写文件的工具",
-            "base-url": "LLM API 提供商的基础 URL",
-            "base-url-placeholder": "例如 https://api.openai.com/v1,http://localhost:11434"
+            "key-name": "Key 名称",
+            "missing-key-name": "缺少 Key 名称",
+            "type-name": "类型名称",
+            "missing-type-name": "缺少类型",
+            "value-name": "值名称",
+            "missing-value-name": "缺少值名称",
+            "check-only-number": "只能输入数字",
+            "add-form-list-btn": "添加关键字参数"
         }
     },
     "hint": {