update

__init__.py

@@ -1 +0,0 @@
-print('\n\n\n\n\n\n\n\n\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&')

bak/get_weather/.env.example

@@ -1,4 +0,0 @@
-SUPABASE_URL=https://bbvyxjvleoizsipxydsm.supabase.co
-SUPABASE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImJidnl4anZsZW9penNpcHh5ZHNtIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDQ1MzkwNjIsImV4cCI6MjA2MDExNTA2Mn0.cbUNhiCHXqIaW4leU_vGTKVI51gLVvsFOVWYS_vJrA4
-GOOGLE_GENAI_USE_VERTEXAI=FALSE
-GOOGLE_API_KEY=AIzaSyBYPwMLibOIoM-SQHuWjZ-V4LLmmMxqhm8

bak/get_weather/__init__.py

@@ -1 +0,0 @@
-from . import agent 

bak/get_weather/agent.py

@@ -1,53 +0,0 @@
-### adk web ./teams
-from google.adk.agents import Agent
-from .tools.get_current_time import get_current_time
-from .tools.get_weather import get_weather
-from .cache import get_api_key
-# from .team import init_team, get_team
-import os
-
-def my_before_model_callback(callback_context, **kwargs):
-    os.environ["GOOGLE_API_KEY"] = get_api_key()  # 直接设置环境变量
-print('888888888888888888888888888888888888888888888')
-
-greeting_agent = Agent(
-    name="greeting_agent",
-    model="gemini-2.5-flash-preview-04-17",
-    instruction="You are the Greeting Agent. Your ONLY task is to provide a friendly greeting to the user. "
-                "Do not engage in any other conversation or tasks."
-                "before you answer, you should say your name: 'I am greeting_agent'",
-    description="Handles simple greetings and hellos",
-    before_model_callback=my_before_model_callback
-)
-
-farewell_agent = Agent(
-    name="farewell_agent",
-    model="gemini-2.5-flash-preview-04-17",
-    instruction="You are the Farewell Agent. Your ONLY task is to provide a polite goodbye message. "
-                "If not about goodbye, just transfer to weather_time_agent"
-                "Do not perform any other actions."
-                "before you answer, you should say your name: 'I am farewell_agent'",
-    before_model_callback=my_before_model_callback,
-    description="Handles simple farewells and goodbyes",
-)
-
-print("\n\n\n\n\n\n\n\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\nroot_agent init")
-root_agent=Agent(
-    name="weather_time_agent",
-    model="gemini-2.5-flash-preview-04-17",
-    description=(
-        "Agent to answer questions about the time and weather in a city."
-    ),
-    instruction=(
-        "You are a helpful agent who can answer user questions about the time and weather in a city."
-        "before you answer, you should say your name: 'I am weather_time_agent'"
-    ),
-    # global_instruction = '请在每一句回答里都加上：“我的主人”',
-    tools=[get_weather, get_current_time], 
-    sub_agents=[greeting_agent, farewell_agent], 
-    before_model_callback=my_before_model_callback
-)
-
-import pprint
-print('\n\n\n\n*************************************\n\nroot_agent dict: \n')
-pprint.pprint(root_agent.__dict__) # 尝试打印对象的字典表示

bak/get_weather/readme.md

@@ -1,19 +0,0 @@
-## 默认约定
-
-### 目录结构
-
-ADK-TEAMS          # 项目根目录
-    |- teams             # 包含多个团队的目录代码，每一个子目录为一个团队
-    |    |- get_weather  # 团队目录。示例：获取天气信息团队
-    |        |- agents     # agents 目录。处理从数据库加载 agents 的代码
-    |        |- tools     # tools 目录。处理从数据库加载 tools 的代码
-    |        |- __init__.py    # 初始化代码
-    |        |- .env    # 环境变量文件
-    |        |- agent.py    # 团队的 agent 入口代码
-    |        |- readme.md    # 团队的 README 文件（当前文件）
-    |        |- tools.py    # 团队的 tools 入口代码
-    |- .gitattributes #  Git 属性文件
-    |- .gitignore    #  Git 忽略文件
-    |- Dockerfile    #  Dockerfile 文件
-    |- README.md    # 项目的 README 文件
-    |- requirements.txt    # 项目的依赖文件

bak/get_weather/team.py

@@ -1,33 +0,0 @@
-import sys, os
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..')))
-from team_framework.load_team_config import load_team_config
-from team_framework.load_tools import load_tools
-from team_framework.load_agents import load_agents, load_root_agent
-from google.adk.agents import Agent
-
-_team = {}
-
-def init_team():
-    global _team 
-    _team= {}
-    _team_config = load_team_config()
-    print('\n\n\n\n\n***************************\n_team_config')
-    print(_team_config)
-    _team["tools"] = load_tools(_team_config['tools'])
-    _team["agents"] = load_agents(_team_config['agents'])
-
-    _team["root_agent"] = load_root_agent(_team_config['root_agent'])
-    _team["root_agent"].tools = [] ## 为 root_agent 添加工具
-    for item in _team_config['root_agent']['tools']:
-        # print('\n\n\n\n|||||||||||||||||| item',item)
-        _team["root_agent"].tools.append(_team['tools'][item])
-    _team["root_agent"].sub_agents=[]
-    for item in _team_config['root_agent']['sub_agents']:
-        print('\n\n\n\n|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| \nitem',item)
-        print(_team['agents'][item])
-        _team["root_agent"].sub_agents.append(_team['agents'][item])
-        # _team["root_agent"].agents.append(_team['agents'][item])
-
-def get_team():
-    global _team
-    return _team

bak/get_weather/tool.py.copy

@@ -1,23 +0,0 @@
-import importlib
-
-def load_tools_from_array(arr:list):
-    ret = {}
-    for item in arr:
-        # 构建正确的模块路径，使用 __name__ 动态获取当前模块的父路径（此处正好为团队名称），并加上 .tools 子目录和工具名称
-        parent_module_path = '.'.join(__name__.split('.')[:-1])
-        module_path = f'{parent_module_path}.tools.{item}'
-        try:
-            module = importlib.import_module(module_path)
-            # 函数名预期与工具名称相同
-            func = getattr(module, item)
-            ret[item] = func
-            print(f"成功从模块 '{module_path}' 导入函数 '{item}'")
-        except ImportError as e:
-            print(f"导入模块 {module_path} 时出错: {e}")
-        except AttributeError as e:
-            print(f"在模块 {module_path} 中找不到函数 '{item}': {e}")
-    return ret
-
-def load_tools_from_db():
-    tool_arr = ["get_weather", "get_current_time"]
-    return load_tools_from_array(tool_arr)

bak/get_weather/tools/get_current_time.py

@@ -1,28 +0,0 @@
-import datetime
-from zoneinfo import ZoneInfo
-def get_current_time(city: str) -> dict:
-    """Returns the current time in a specified city.
-
-    Args:
-        city (str): The name of the city for which to retrieve the current time.
-
-    Returns:
-        dict: status and result or error msg.
-    """
-
-    if city.lower() == "new york":
-        tz_identifier = "America/New_York"
-    else:
-        return {
-            "status": "error",
-            "error_message": (
-                f"Sorry, I don't have timezone information for {city}."
-            ),
-        }
-
-    tz = ZoneInfo(tz_identifier)
-    now = datetime.datetime.now(tz)
-    report = (
-        f'The current time in {city} is {now.strftime("%Y-%m-%d %H:%M:%S %Z%z")}'
-    )
-    return {"status": "success", "report": report}

bak/get_weather/tools/get_weather.py

@@ -1,22 +0,0 @@
-def get_weather(city: str) -> dict:
-    """Retrieves the current weather report for a specified city.
-
-    Args:
-        city (str): The name of the city for which to retrieve the weather report.
-
-    Returns:
-        dict: status and result or error msg.
-    """
-    if city.lower() == "new york":
-        return {
-            "status": "success",
-            "report": (
-                "The weather in New York is sunny with a temperature of 25 degrees"
-                " Celsius (77 degrees Fahrenheit)."
-            ),
-        }
-    else:
-        return {
-            "status": "error",
-            "error_message": f"Weather information for '{city}' is not available.",
-        }

read.me.md

@@ -1,5 +1,11 @@
-conda - google-adk
-supabase 
-    site - http://supabase.com
-    username - tanbushi@qq.com
-    project - rzwl2024
+环境：
+conda： google-adk
+hugging-face: tanbushi
+
+数据库：
+supabase
+    site： http://supabase.com
+    username： tanbushi@qq.com
+    project： rzwl2024
+
+运行：adk web ./teams

requirements.txt

@@ -1,3 +1,4 @@
 google-adk
 supabase
 litellm
+python-dotenv

team_framework/__init__.py

@@ -1 +0,0 @@
-# from . import load_team_config

bak/get_weather/cache.py → team_framework/api_key_manager.py

@@ -1,27 +1,21 @@
 import os
-from supabase import create_client, Client
 import time
+from dotenv import load_dotenv
+from .supabase_cli import get_supabase_client # Import from the existing supabase_cli
+
+load_dotenv()
 
 # Simple in-memory cache
 api_key_cache = {}
 last_loaded_time = 0
 CACHE_TTL = 300 # Cache time-to-live in seconds (5 minutes)
 
-def get_supabase_client() -> Client:
-    """Initializes and returns a Supabase client."""
-    url: str = os.environ.get("SUPABASE_URL")
-    key: str = os.environ.get("SUPABASE_KEY")
-    if not url or not key:
-        print("Supabase URL or Key not found in environment variables.")
-        return None
-    return create_client(url, key)
-
 def load_api_keys_from_db():
     """Loads API keys from the database into the cache."""
     global api_key_cache
 
     print("Loading API keys from database...")
-    supabase: Client = get_supabase_client()
+    supabase = get_supabase_client() # Use the imported function
     if not supabase:
         return {}
 
@@ -31,7 +25,7 @@ def load_api_keys_from_db():
         #   {
         #       'config': {
         #           'api_keys': [
-        #               {'api_key': 'xxxxx', 'can_use_at': 0}, 
+        #               {'api_key': 'xxxxx', 'can_use_at': 0},
         #               {'api_key': 'yyyyy', 'can_use_at': 0}
         #           ]
         #       }
@@ -56,7 +50,6 @@ def load_api_keys_from_db():
     except Exception as e:
         print(f"Error loading API keys from database: {e}")
         api_key_cache = {} # Clear cache on error
-
     return api_key_cache
 
 def get_api_key():
@@ -70,10 +63,9 @@ def get_api_key():
         load_api_keys_from_db()
     # api_key_cache={'xxxxx': 1, 'yyyyy': 0}
     # print('api_key_cache',api_key_cache)
-    
+
     # Sort available keys by their 'can_use_at' timestamp in ascending order
     sorted_key_cache = sorted(api_key_cache, key=lambda key: api_key_cache.get(key, float('inf')))
-    # print('\n\n\n\n\n\n\n\n\nsorted_key_cache',sorted_key_cache)
 
     # Select the key with the smallest 'can_use_at' value
     selected_key = sorted_key_cache[0]

team_framework/init.py

@@ -0,0 +1,5 @@
+from . import store
+import os
+
+def init(PROJECT_ROOT):
+    store.PROJECT_ROOT = PROJECT_ROOT

team_framework/load_agents.py

@@ -1,32 +0,0 @@
-from google.adk.agents import Agent
-import os
-
-def my_before_model_callback(callback_context, **kwargs):
-    os.environ["GOOGLE_API_KEY"]='AIzaSyBYPwMLibOIoM-SQHuWjZ-V4LLmmMxqhm8'
-#     os.environ["GOOGLE_API_KEY"] = get_api_key()  # 直接设置环境变量
-
-def load_agent(item):
-    print(f"\nload_agent item: {item['name']}", item)
-    _agent = Agent(
-        name = item['name'],
-        model = item['model'],
-        instruction = item['instruction'],
-        description = item['description'],
-        before_model_callback=my_before_model_callback
-    )
-    return _agent
-
-def load_agents(agents_dict:dict):
-    print("\n\n\n######## load_agents\nagents_dict: ", agents_dict)
-    ret_agents = {}
-    for item  in agents_dict:
-        ret_agents[item['name']] = load_agent(item)
-        # ret_agents.append(load_agent(item))
-    print("\n\n\n@@@@@@@@@@@@@@@@@@@@@\nload_agents\nret_agents.greeting_agent: ", ret_agents['greeting_agent'])
-    print("\n\n\n@@@@@@@@@@@@@@@@@@@@@\nload_agents\nret_agents[farewell_agent]: ", ret_agents['farewell_agent'])
-    return ret_agents
-
-def load_root_agent(_root_agent):
-    ret_agent = load_agent(_root_agent)
-    print("\n\n\n######## load_root_agent\nret_agent: ", ret_agent)
-    return ret_agent

team_framework/load_team_config.py

@@ -1,93 +0,0 @@
-from .supabase_cli import get_supabase_client
-from supabase import Client
-from google.adk.agents import Agent
-
-def load_agent_config(db_item):
-    # print('\nload_agent_config...')
-    # print('\n\n\n\n\n***************************\ndb_item',db_item)
-    agent_config={
-        "name": db_item['name'],
-        "model": db_item['model'],
-        "instruction": db_item['instruction'],
-        "tools": db_item['tools'],
-        "sub_agents": db_item['sub_agents'],
-        "description": db_item['description']
-    }
-    tools_config=[]
-    if db_item['tools']:
-        agent_config['tools'] = db_item['tools']
-        tools_config = list(set(tools_config + db_item['tools']))
-    return { 'agent_config': agent_config, 'tools_config': tools_config}
-
-def creat_agent() -> Agent:
-    pass
-def load_team_config():
-    a_team_config = {
-        "agents":[],
-        "root_agent": None,
-        "tools":[]
-    }
-
-    print("Loading team_config from database...")
-    supabase: Client = get_supabase_client()
-    if not supabase:
-        return {}
-    try:
-        response = supabase.from_("team_get_weather").select("*").order("sort_id").execute()
-        for item in response.data:
-            if item['is_root']:
-                _agent_config = load_agent_config(item)
-                print('_agent_config',_agent_config)
-                a_team_config['root_agent'] = _agent_config['agent_config']
-                a_team_config['tools'] = list(set(a_team_config['tools'] + _agent_config['tools_config']))
-            else:
-                _agent_config = load_agent_config(item)
-                a_team_config['agents'].append(_agent_config['agent_config'])
-                a_team_config['tools'] = list(set(a_team_config['tools'] + _agent_config['tools_config']))
-        # print('\n\na_team_config',a_team_config)
-    except Exception as e:
-        print(f"Error loading API keys from database: {e}")
-        a_team_config = {} # Clear cache on error
-    return a_team_config
-
-"""
-a_team_config
-{
-    'agents': [
-        {
-            'name': 'farewell_agent', 
-            'model': 'gemini-2.5-flash-preview-04-17', 
-            'instruction': "You are the Farewell Agent. Your ONLY task is to provide a polite goodbye message.\nIf not about goodbye, just transfer to weather_time_agent.\nDo not perform any other actions.\nBefore you answer, you should say your name: 'I am farewell_agent'", 
-            'tools': None, 
-            'sub_agents': None, 
-            'description': 'Handles simple farewells and goodbyes'
-        }, 
-        {
-            'name': 'greeting_agent', 
-            'model': 'gemini-2.5-flash-preview-04-17', 
-            'instruction': "You are the Greeting Agent. Your ONLY task is to provide a friendly greeting to the user. \nDo not engage in any other conversation or tasks.\nBefore you answer, you should say your name: 'I am greeting_agent'", 
-            'tools': None, 
-            'sub_agents': None, 
-            'description': 'Handles simple greetings and hellos'
-        }
-    ], 
-    'root_agent': {
-        'name': 'weather_time_agent', 
-        'model': 'gemini-2.5-flash-preview-04-17', '
-        instruction': "You are a helpful agent who can answer user questions about the time and weather in a city.\nBefore you answer, you should say your name: 'I am weather_time_agent'", 
-        'tools': [
-            'get_weather', 
-            'get_current_time'
-        ], 
-        'sub_agents': [
-            'greeting_agent', 
-            'farewell_agent'
-        ], 
-        'description': 'Agent to answer questions about the time and weather in a city.'
-    }, 
-    'tools': [
-        'get_weather', 
-        'get_current_time'
-    ]    
-}
-"""

team_framework/load_tools.py

@@ -1,30 +0,0 @@
-import importlib
-
-def load_tools_from_array(arr:list):
-    ret = {}
-    for item in arr:
-        # 构建正确的模块路径，使用 __name__ 动态获取当前模块的父路径（此处正好为团队名称），并加上 .tools 子目录和工具名称
-        # parent_module_path = '.'.join(__name__.split('.')[:-1])
-        # module_path = f'{parent_module_path}.tools.{item}'
-        module_path = f'teams.get_weather.tools.{item}'
-        try:
-            module = importlib.import_module(module_path)
-            # 函数名预期与工具名称相同
-            func = getattr(module, item)
-            ret[item] = func
-            print(f"成功从模块 '{module_path}' 导入函数 '{item}'")
-        except ImportError as e:
-            print(f"导入模块 {module_path} 时出错: {e}")
-        except AttributeError as e:
-            print(f"在模块 {module_path} 中找不到函数 '{item}': {e}")
-    return ret
-
-# def load_tools_from_db():
-#     tool_arr = ["get_weather", "get_current_time"]
-#     return load_tools_from_array(tool_arr)
-
-def load_tools(tools_dict:dict):
-    print("\n\n\n######## load_tools\ntools_dict: ", tools_dict)
-    # load_tools_from_array(tools_dict)
-    return load_tools_from_array(tools_dict)
-    return tools_dict

team_framework/store.py

@@ -0,0 +1,8 @@
+global _store
+_store = {}
+
+def get_store(key:str):
+    return _store.get(key)
+
+def set_store(key:str, value) -> None:
+    _store[key] = value

teams/ai_quant/agent.py

@@ -1,148 +1,111 @@
-import os
-from google.adk.agents import Agent
-from supabase import create_client, Client
-from .tools.get_current_time import get_current_time
-from .tools.get_weather import get_weather
-from .cache import get_api_key
+# 多MCP示例，参考：https://google.github.io/adk-docs/tools/mcp-tools/#step-1-attach-the-mcp-server-to-your-adk-agent-via-mcptoolset
+# # ./adk_agent_samples/mcp_agent/agent.py
+from google.adk.agents.llm_agent import LlmAgent
+from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset, StdioServerParameters
+from google.adk.tools import google_search
+import importlib,pprint
+import os, sys
+from contextlib import ExitStack, AsyncExitStack
+PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..'))
+if not PROJECT_ROOT in sys.path:
+    sys.path.append(PROJECT_ROOT)
+from team_framework.init import init
+init(PROJECT_ROOT)
+from  dotenv import load_dotenv
+load_dotenv()
+from google.adk.tools.agent_tool import AgentTool
+from team_framework.api_key_manager import get_api_key
+
+# 定义 before_model_callback 函数
 def my_before_model_callback(callback_context, **kwargs):
     os.environ["GOOGLE_API_KEY"] = get_api_key()  # 直接设置环境变量
 
-# 从环境变量获取 Supabase 配置
-# 建议将敏感信息通过环境变量传递，而不是直接硬编码或从文件中读取
-# 这里为了演示，直接使用了从 .env 文件读取到的值
-# 在实际生产环境中，请确保通过安全的方式加载配置
-SUPABASE_URL = os.environ.get("SUPABASE_URL", "https://bbvyxjvleoizsipxydsm.supabase.co")
-SUPABASE_KEY = os.environ.get("SUPABASE_KEY", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImJidnl4anZsZW9изsipxydsmIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDQ1MzkwNjIsImV4cCI6MjA2MDExNTA2Mn0.cbUNhiCHXqIaW4leU_vGTKVI51gLVvsFOVWYS_vJrA4")
-DB_TABLE_NAME = os.environ.get("DB_TABLE_NAME", "team_quant")
-
-# 初始化 Supabase 客户端
-supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
-
-def get_all_agents_from_db() -> dict:
-    """
-    从 Supabase 数据库中提取所有 agent 记录，并形成字典。
-    """
-    try:
-        # 从指定的表中查询所有数据
-        response = supabase.table(DB_TABLE_NAME).select("*").order('sort_id', desc=False).execute()
-
-        # 检查响应是否成功
-        if response.data:
-            # 将查询结果转换为字典，这里假设每条记录都有一个唯一的 'id' 或其他键
-            # 如果没有合适的唯一键，可能需要调整字典的构建方式
-            agents_dict = {record.get("id"): record for record in response.data}
-            return agents_dict
-        else:
-            print("从数据库提取 agent 记录失败或没有记录。")
-            return {}
-    except Exception as e:
-        print(f"提取 agent 记录时发生错误: {e}")
-        return {}
-
-# 示例用法 (可选，根据需要决定是否保留)
-# if __name__ == "__main__":
-#     all_agents = get_all_agents_from_db()
-#     print("提取到的 agent 字典:")
-#     print(all_agents)
-
-# 从数据库加载所有 agents 数据 (字典形式)
-all_agents_data_dict = get_all_agents_from_db()
-
-# 将字典值转换为列表并按 sort_id 排序
-agent_records = sorted(all_agents_data_dict.values(), key=lambda x: x.get("sort_id", float('inf')))
-
-# 初始化 root_ageint_idx 变量
-root_ageint_idx = -1
-
-# 查找 root agent 的索引
-if agent_records:
-    for index, agent_data in enumerate(agent_records):
-        if agent_data.get("is_root", False): # 假设数据库记录包含 is_root 字段
-            root_ageint_idx = index
-            print(f"找到 root agent 的索引: {root_ageint_idx}")
-            break # 假设只有一个 root agent
-
-# 创建 Agent 对象并存储到按名称索引的字典中
-agents_by_name = {}
-loaded_agents_list = [] # Keep a list for the final output if needed
-if agent_records:
-    for agent_data in agent_records:
-        try:
-            # 假设数据库记录包含 name, model, instruction, description, sub_agents, sort_id, is_root 字段
-            agent_name = agent_data.get("name", f"agent_{agent_data.get('id', 'unknown')}")
-            global_instruction=agent_data.get("global_instruction", "")
-            if (global_instruction == None):
-                global_instruction = ""
-            agent = Agent(
-                name=agent_name,
-                model=agent_data.get("model", "gemini-2.0-flash-exp"),
-                instruction=agent_data.get("instruction", ""),
-                description=agent_data.get("description", ""),
-                global_instruction=global_instruction,
-                # global_instruction=agent_data.get("global_instruction", ""),
-                # sub_agents will be added in the next step
-                # callbacks etc. can be added here if present in data
-            )
-            # Map tool names from database to actual tool functions
-            tool_map = {"get_weather": get_weather, "get_current_time": get_current_time}
-            tools_list = [tool_map.get(tool_name) for tool_name in agent_data.get("tools") or [] if tool_name in tool_map]
-            agent.tools = tools_list # Use the mapped tool functions
-
-            agents_by_name[agent_name] = agent
-            loaded_agents_list.append(agent) # Add to list if needed later
-            print(f"成功创建 agent 对象: {agent.name}")
-        except Exception as e:
-            print(f"创建 agent 对象时发生错误 (数据: {agent_data}): {e}")
-
-# 处理 sub_agents 引用
-if agent_records:
-    for agent_data in agent_records:
-        agent_name = agent_data.get("name", f"agent_{agent_data.get('id', 'unknown')}")
-        current_agent = agents_by_name.get(agent_name)
-        if current_agent and "sub_agents" in agent_data and isinstance(agent_data["sub_agents"], list):
-            current_agent.sub_agents = []
-            for sub_agent_name in agent_data["sub_agents"]:
-                sub_agent = agents_by_name.get(sub_agent_name)
-                if sub_agent:
-                    current_agent.sub_agents.append(sub_agent)
-                    print(f"为 agent '{current_agent.name}' 添加 sub-agent: '{sub_agent.name}'")
-                else:
-                    print(f"警告: 未找到 sub-agent '{sub_agent_name}' (被 agent '{current_agent.name}' 引用)")
-
-print(f"总共加载并关联了 {len(agents_by_name)} 个 agents。")
-
-# 您现在可以使用 agents_by_name 字典或 loaded_agents_list 列表中的 Agent 对象
-# 例如，如果您需要一个列表：
-loaded_agents = loaded_agents_list
-
-# 根据找到的索引设置 root_agent
-root_agent = None
-if 0 <= root_ageint_idx < len(loaded_agents_list):
-    root_agent = loaded_agents_list[root_ageint_idx]
-    # root_agent.before_model_callback=my_before_model_callback
-    # print(f"\n\n\n\n\n已设置 root_agent 为: {root_agent.name}")
-else:
-    print("警告: 未找到 root agent 或索引无效，使用默认 root_agent。")
-    # 如果没有找到 root agent，可以考虑使用一个默认的 root_agent 或者抛出错误
-    root_agent = Agent(
-        name="default_root_agent",
-        model="gemini-2.0-flash-exp",
-        instruction="You are a helpful assistant.",
-        description="You are a helpful assistant.",
-        # before_model_callback=my_before_model_callback,
-        tools=[]
-    )
-
-# 轮询 loaded_agents_list
-for agent in loaded_agents_list:
-    agent.before_model_callback=my_before_model_callback
-    if agent.sub_agents:
-        for sub_agent in agent.sub_agents:
-            sub_agent.parent_agent = agent
-
-# import pprint
-# print('\n\n\n\n*************************************\n\nroot_agent dict: \n')
-# pprint.pprint(root_agent.__dict__) # 尝试打印对象的字典表示
-
-
-
+agents_config={}
+
+ai_quant_researcher = LlmAgent(
+    name = "ai_quant_researcher",
+    description = "AI金融量化研究员/分析师 (AI Quantitative Researcher/Analyst）",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction = """你是AI金融量化研究员/分析师 (AI Quantitative Researcher/Analyst): 这是核心角色。
+负责：
+- 开发和测试股票分析模型，例如价值投资模型、动量模型、技术分析模型等。
+- 利用统计学、计量经济学等方法分析股票数据，发现投资机会。
+- 对股票进行估值分析，评估其投资价值。
+- 监控市场风险，提出风险控制建议。""",
+    before_model_callback=my_before_model_callback
+)
+
+ai_quant_developer = LlmAgent(
+    name = "ai_quant_developer",
+    description = "AI金融量化开发工程师（AI Quantitative Developer/Engineer）",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction = """你是AI金融量化开发工程师 (AI Quantitative Developer/Engineer):负责将研究成果转化为可执行的代码和系统。
+职责：
+- 将量化研究员开发的策略模型转化为程序代码实现。
+- 构建和维护策略回测平台。
+- 开发和维护自动化交易执行系统。
+- 处理和管理交易所需的数据（数据清洗、存储、获取）。
+- 负责交易系统的日常运行和维护。
+- 协助实现风险控制的技术逻辑。""",
+    before_model_callback=my_before_model_callback
+)
+
+ai_quant_trader = LlmAgent(
+    name = "ai_quant_trader",
+    description = "AI金融量化交易员（AI Quantitative Trader）",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction = """你是AI金融量化交易员 (AI Quantitative Trader) 或 交易执行/监控专员: 负责交易策略的实际执行、监控和管理。
+在自动化量化交易中，这个角色的职责通常包括：
+- 启动和监控自动化交易系统。
+- 管理交易头寸和资金分配。
+- 实时监控市场和系统运行状态。
+- 处理交易中的异常情况和错误。
+- 执行实时的风险控制措施。
+- 与研究员和开发工程师沟通系统表现和市场反馈。""",
+    before_model_callback=my_before_model_callback
+)
+
+ai_data_scientist = LlmAgent(
+    name = "ai_data_scientist",
+    description = "AI金融量化数据科学家（AI Data Scientist）",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction = """你是AI金融量化数据科学家 (AI Data Scientist): 专注于数据基础设施、数据处理和高级数据分析。
+职责：
+- 负责更复杂、更多样化数据源的收集、清洗、转换和管理（包括非结构化数据、另类数据等）。
+- 构建高效的数据管道和数据湖/仓库。
+- 应用机器学习、深度学习等高级统计和建模技术来发现数据中的模式和信号。
+- 支持量化研究员进行更深入的数据探索和特征工程。
+- 可能负责数据质量监控和数据治理。""",
+    before_model_callback=my_before_model_callback
+)
+
+agent_tool_google_search = LlmAgent(
+    name = "agent_tool_google_search",
+    description = "Google搜索代理工具",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction = """你是一个Google搜索代理工具，你的主要工作是搜索互联网上的信息，并返回搜索结果。""",
+    tools = [google_search],
+    before_model_callback=my_before_model_callback
+)
+
+google_search_agent = LlmAgent(
+    name = "google_search_agent",
+    description = "具有 Google 搜索能力的代理",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction = """你是一个Google搜索代理，专门负责处理其他代理发来的搜索请求。当你收到一个搜索请求时，你将使用你的内置工具 `agent_tool_google_search` 来执行网络搜索。完成搜索后，你必须将获取到的搜索结果准确地传递回发起请求的代理。""",
+    tools = [AgentTool(agent_tool_google_search)],
+    before_model_callback=my_before_model_callback
+)
+
+root_agent = LlmAgent(
+    name = "ai_dispatcher",
+    description = "AI金融量化交易团队的调度员（AI Dispatcher）",
+    model = "gemini-2.5-flash-preview-04-17",
+    instruction="""你是AI金融量化交易团队的调度员（AI Dispatcher）
+- 你的主要工作是调配好整个金融量化交易团队的分工协作
+- 除了分配调度不要做其他具体工作
+- 如果你的团队成员都无法进行的工作，你就委婉告诉用户说你无法解答""",
+    global_instruction = """AI金融量化交易团队有个响亮的名字：“AI金融量化梦之队”，你是该团队的成员，当agent回答时，请带上你的角色名，比如：我是xxx（角色名），当用户问起你是谁，你就说出你的角色名称，比如我是：量化研究员""",
+    sub_agents = [ai_quant_researcher, ai_quant_developer, ai_quant_trader, ai_data_scientist, google_search_agent],
+    before_model_callback=my_before_model_callback
+)

teams/ai_quant/tools/get_current_time.py

@@ -1,28 +0,0 @@
-import datetime
-from zoneinfo import ZoneInfo
-def get_current_time(city: str) -> dict:
-    """Returns the current time in a specified city.
-
-    Args:
-        city (str): The name of the city for which to retrieve the current time.
-
-    Returns:
-        dict: status and result or error msg.
-    """
-
-    if city.lower() == "new york":
-        tz_identifier = "America/New_York"
-    else:
-        return {
-            "status": "error",
-            "error_message": (
-                f"Sorry, I don't have timezone information for {city}."
-            ),
-        }
-
-    tz = ZoneInfo(tz_identifier)
-    now = datetime.datetime.now(tz)
-    report = (
-        f'The current time in {city} is {now.strftime("%Y-%m-%d %H:%M:%S %Z%z")}'
-    )
-    return {"status": "success", "report": report}

teams/ai_quant/tools/get_weather.py

@@ -1,22 +0,0 @@
-def get_weather(city: str) -> dict:
-    """Retrieves the current weather report for a specified city.
-
-    Args:
-        city (str): The name of the city for which to retrieve the weather report.
-
-    Returns:
-        dict: status and result or error msg.
-    """
-    if city.lower() == "new york":
-        return {
-            "status": "success",
-            "report": (
-                "The weather in New York is sunny with a temperature of 25 degrees"
-                " Celsius (77 degrees Fahrenheit)."
-            ),
-        }
-    else:
-        return {
-            "status": "error",
-            "error_message": f"Weather information for '{city}' is not available.",
-        }

test.py

@@ -1,5 +0,0 @@
-d=1
-a={"b":{"c":d}}
-print(a["b"]["c"])
-d=2
-print(a["b"]["c"])

utils.py.willdel

@@ -1,122 +0,0 @@
-from google.adk.agents import Agent
-from google.adk.agents.invocation_context import InvocationContext
-from google.adk.tools import google_search
-from supabase import create_client, Client
-
-import logging # 导入 logging 模块
-import os,json
-
-# 配置日志
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(name)s - %(message)s')
-logger = logging.getLogger(__name__)
-
-class Base_Agent(Agent):
-    def __init__(self, agent_id: str):
-        logger.info("Base_Agent __init__ started.")
-
-        # 从环境变量加载 Supabase URL 和 Key
-        url: str = os.environ.get("SUPABASE_URL")
-        key: str = os.environ.get("SUPABASE_KEY") # 从环境变量获取 Supabase Key
-
-        if not url or not key:
-            logger.error("Supabase URL or Key not set in environment variables.")
-            # 如果环境变量未设置，可以使用默认配置
-            logger.warning("Supabase URL and Key not set. Using default agent configuration.")
-            super().__init__(
-                name="基础助手",
-                model="gemini-2.0-flash-exp",
-                instruction="执行基本指令",
-                tools=[google_search],
-                description="一个执行基本通用命令的基础助手"
-            )
-            logger.info("Base_Agent initialized with default configuration.")
-            return # Exit __init__ if using default config
-
-        logger.info("Supabase URL and Key loaded from environment variables.")
-
-        # 创建 Supabase 客户端
-        try:
-            supabase: Client = create_client(url, key)
-            logger.info("Supabase client created successfully.")
-        except Exception as e:
-            logger.error(f"Error creating Supabase client: {e}")
-            # 如果创建客户端失败，使用默认配置
-            logger.warning("Error creating Supabase client. Using default agent configuration.")
-            super().__init__(
-                name="基础助手",
-                model="gemini-2.0-flash-exp",
-                instruction="执行基本指令",
-                tools=[google_search],
-                description="一个执行基本通用命令的基础助手"
-            )
-            return # Exit __init__ if using default config
-
-        # 从数据库加载 agent 配置信息
-        try:
-            logger.info(f"Attempting to load agent configuration from Supabase for id: {agent_id}")
-            # 查询 airs_agents 表，获取对应的 agent 配置
-            data, count = supabase.table('airs_agents').select('*').eq('id', agent_id).execute()
-
-            if not data or not data[0]:
-                logger.error(f"Agent configuration for id '{self.agent_id}' not found in Supabase table 'airs_agents'.")
-                # 如果配置未找到，使用默认配置
-                logger.warning("Agent configuration not found. Using default agent configuration.")
-                super().__init__(
-                    name="基础助手",
-                    model="gemini-2.0-flash-exp",
-                    instruction="执行基本指令",
-                    tools=[google_search],
-                    description="一个执行基本通用命令的基础助手"
-                )
-                return # Exit __init__ if using default config
-            print('\n\n\n\ndata',data)
-            print('**************************')
-            print('data[0]',data[0])
-            print('data[1]',data[1])
-            print('data[1][0]',data[1][0])
-
-            config = data[1][0] # 假设查询结果是列表中的第一个字典
-            logger.info("Agent configuration data fetched from Supabase. config: ",)
-
-            # 解析 tools 字段（假设存储为 JSONB）
-            tools_list = []
-            if config.get("tools"):
-                logger.info("Processing tools field.")
-                try:
-                    stored_tools = json.loads(config["tools"]) if isinstance(config["tools"], str) else config["tools"]
-                    # 示例：如果存储的是工具名称列表，查找对应的工具对象
-                    available_tools = {"google_search": google_search} # 假设可用的工具映射
-                    tools_list = [available_tools.get(tool_name) for tool_name in stored_tools if available_tools.get(tool_name)]
-                    print('\n\n\n\ntools_list',tools_list)
-                    # logger.info(f"Tools processed: {[tool.__name__ for tool in tools_list if tool]}")
-                except Exception as tool_e:
-                    logger.error(f"Error parsing or mapping tools: {tool_e}")
-                    # 如果解析或映射工具失败，可以使用默认工具或空列表
-                    tools_list = [google_search] # 默认使用 google_search
-                    logger.warning("Using default tool: google_search")
-
-            # 使用从数据库获取的配置初始化 Base_Agent 实例自身
-            print('\n\n\n\nconfig: ',config)
-            super().__init__(
-                name=config.get("name", "基础助手"),
-                model=config.get("model", "gemini-2.0-flash-exp"),
-                instruction=config.get("instruction", "执行基本指令"),
-                tools=tools_list, # 使用从数据库加载并解析的工具列表
-                description=config.get("description", "一个执行基本通用命令的基础助手")
-            )
-            logger.info("Base_Agent initialized successfully with Supabase configuration.")
-
-        except Exception as e:
-            logger.error(f"Error loading agent configuration from Supabase: {e}")
-            # 如果从数据库加载失败，使用默认配置
-            logger.warning("Error loading agent configuration from Supabase. Using default agent configuration.")
-            super().__init__(
-                name="基础助手",
-                model="gemini-2.0-flash-exp",
-                instruction="执行基本指令",
-                tools=[google_search],
-                description="一个执行基本通用命令的基础助手"
-            )
-
-        logger.info("Base_Agent __init__ finished.")
-