-
Notifications
You must be signed in to change notification settings - Fork 64
feat: support nacos in agent update #427
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| # Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import json | ||
| import os | ||
|
|
||
| from v2.nacos import ClientConfig, NacosConfigService | ||
| from v2.nacos.config.model.config_param import ConfigParam | ||
|
|
||
| from veadk.agent import Agent | ||
| from veadk.consts import DEFAULT_NACOS_GROUP | ||
| from veadk.utils.logger import get_logger | ||
|
|
||
| logger = get_logger(__name__) | ||
|
|
||
|
|
||
| class DynamicConfigManager: | ||
| """ | ||
| DynamicConfigManager is responsible for creating and publishing dynamic config to nacos. | ||
| """ | ||
|
|
||
| def __init__(self, agents: list[Agent] | Agent, app_name: str = ""): | ||
| """ | ||
| Initialize DynamicConfigManager with agents and app_name. | ||
|
|
||
| Args: | ||
| agents (list[Agent] | Agent): The agent(s) to be included in the dynamic config. | ||
| app_name (str): The name of the application, used as the Nacos group id. Defaults to DEFAULT_NACOS_GROUP. | ||
| """ | ||
| if isinstance(agents, list): | ||
| self.agents = agents | ||
| else: | ||
| self.agents = [agents] | ||
|
|
||
| if not app_name: | ||
| logger.warning( | ||
| f"app_name is not provided, use default value {DEFAULT_NACOS_GROUP}. This may lead to unexpected behavior such as configuration override." | ||
| ) | ||
| self.app_name = app_name or DEFAULT_NACOS_GROUP | ||
|
|
||
| logger.debug( | ||
| f"DynamicConfigManager init with {len(self.agents)} agent(s) for app {self.app_name}" | ||
| ) | ||
|
|
||
| async def create_config(self, config: dict = {}): | ||
| client_config = ClientConfig( | ||
| server_addresses=os.getenv("NACOS_SERVER_ADDRESSES"), | ||
| namespace_id="", | ||
| username=os.getenv("NACOS_USERNAME"), | ||
|
yaozheng-fang marked this conversation as resolved.
Outdated
|
||
| password=os.getenv("NACOS_PASSWORD"), | ||
| ) | ||
|
|
||
| config_client = await NacosConfigService.create_config_service( | ||
| client_config=client_config | ||
| ) | ||
|
|
||
| configs = { | ||
| "agent": [ | ||
| { | ||
| "id": agent.id, | ||
| "name": agent.name, | ||
| "description": agent.description, | ||
| "model_name": agent.model_name, | ||
| "instruction": agent.instruction, | ||
|
yaozheng-fang marked this conversation as resolved.
Outdated
|
||
| } | ||
| for agent in self.agents | ||
| ] | ||
| } | ||
| response = await config_client.publish_config( | ||
| param=ConfigParam( | ||
| data_id="veadk", | ||
| group=self.app_name, | ||
| type="json", | ||
| content=json.dumps(configs), | ||
| ) | ||
| ) | ||
| assert response, "publish config to nacos failed" | ||
| logger.info("Publish config to nacos success") | ||
|
|
||
| await config_client.add_listener( | ||
| data_id="veadk", | ||
| group="VEADK_GROUP", | ||
| listener=self.handle_config_update, | ||
| ) | ||
| logger.info("Add config listener to nacos success") | ||
|
|
||
| return config_client | ||
|
|
||
| def register_agent(self, agent: list[Agent] | Agent): | ||
| if isinstance(agent, list): | ||
| self.agents.extend(agent) | ||
| else: | ||
| self.agents.append(agent) | ||
|
|
||
| def update_agent(self, configs: dict): | ||
| for agent in self.agents: | ||
| for config in configs["agent"]: | ||
| if agent.id == config["id"]: | ||
| logger.info(f"Update agent {agent.id} with config {config}") | ||
| name = config["name"] | ||
| description = config["description"] | ||
| model_name = config["model_name"] | ||
| instruction = config["instruction"] | ||
|
|
||
| agent.name = name | ||
| agent.description = description | ||
| if model_name != agent.model_name: | ||
| agent.update_model(model_name=model_name) | ||
| agent.instruction = instruction | ||
|
|
||
| async def handle_config_update(self, tenant, data_id, group, content) -> None: | ||
| logger.debug( | ||
| "listen, tenant:{} data_id:{} group:{} content:{}".format( | ||
| tenant, data_id, group, content | ||
| ) | ||
| ) | ||
| content = json.loads(content) | ||
| self.update_agent(content) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.