-
Notifications
You must be signed in to change notification settings - Fork 65
feat: support workflow agents #85
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 all commits
Commits
Show all changes
4 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| name: Publish Tag to PyPI | ||
|
|
||
| on: push | ||
| on: | ||
| push: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
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
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,70 @@ | ||
| # 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. | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| from google.adk.agents import LoopAgent as GoogleADKLoopAgent | ||
| from google.adk.agents.base_agent import BaseAgent | ||
| from pydantic import ConfigDict, Field | ||
| from typing_extensions import Any | ||
|
|
||
| from veadk.agent import Agent | ||
| from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INSTRUCTION | ||
| from veadk.tracing.base_tracer import BaseTracer | ||
| from veadk.utils.logger import get_logger | ||
| from veadk.utils.patches import patch_asyncio | ||
|
|
||
| patch_asyncio() | ||
| logger = get_logger(__name__) | ||
|
|
||
|
|
||
| class LoopAgent(GoogleADKLoopAgent): | ||
| """Loop Agent with Volcengine capabilities.""" | ||
|
|
||
| model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow") | ||
| """The model config""" | ||
|
|
||
| name: str = "veLoopAgent" | ||
| """The name of the agent.""" | ||
|
|
||
| description: str = DEFAULT_DESCRIPTION | ||
| """The description of the agent. This will be helpful in A2A scenario.""" | ||
|
|
||
| instruction: str = DEFAULT_INSTRUCTION | ||
| """The instruction for the agent, such as principles of function calling.""" | ||
|
|
||
| sub_agents: list[BaseAgent] = Field(default_factory=list, exclude=True) | ||
| """The sub agents provided to agent.""" | ||
|
|
||
| tracers: list[BaseTracer] = [] | ||
| """The tracers provided to agent.""" | ||
|
|
||
| def set_sub_agents_tracer(self, tracer) -> None: | ||
| from veadk.agents.parallel_agent import ParallelAgent | ||
| from veadk.agents.sequential_agent import SequentialAgent | ||
|
|
||
| for sub_agent in self.sub_agents: | ||
| if isinstance(sub_agent, Agent): | ||
| tracer.do_hooks(sub_agent) | ||
| elif isinstance(sub_agent, (SequentialAgent, LoopAgent, ParallelAgent)): | ||
| sub_agent.set_sub_agents_tracer(tracer) | ||
|
|
||
| def model_post_init(self, __context: Any) -> None: | ||
| super().model_post_init(None) # for sub_agents init | ||
|
|
||
| if self.tracers: | ||
| for tracer in self.tracers: | ||
| self.set_sub_agents_tracer(tracer) | ||
|
|
||
| logger.info(f"{self.__class__.__name__} `{self.name}` init done.") |
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,73 @@ | ||
| # 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. | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| from google.adk.agents import ParallelAgent as GoogleADKParallelAgent | ||
| from google.adk.agents.base_agent import BaseAgent | ||
| from pydantic import ConfigDict, Field | ||
| from typing_extensions import Any | ||
|
|
||
| from veadk.agent import Agent | ||
| from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INSTRUCTION | ||
| from veadk.tracing.base_tracer import BaseTracer | ||
| from veadk.utils.logger import get_logger | ||
| from veadk.utils.patches import patch_asyncio | ||
|
|
||
| patch_asyncio() | ||
| logger = get_logger(__name__) | ||
|
|
||
|
|
||
| class ParallelAgent(GoogleADKParallelAgent): | ||
| """LLM-based Agent with Volcengine capabilities.""" | ||
|
|
||
| model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow") | ||
| """The model config""" | ||
|
|
||
| name: str = "veParallelAgent" | ||
| """The name of the agent.""" | ||
|
|
||
| description: str = DEFAULT_DESCRIPTION | ||
| """The description of the agent. This will be helpful in A2A scenario.""" | ||
|
|
||
| instruction: str = DEFAULT_INSTRUCTION | ||
| """The instruction for the agent, such as principles of function calling.""" | ||
|
|
||
| sub_agents: list[BaseAgent] = Field(default_factory=list, exclude=True) | ||
| """The sub agents provided to agent.""" | ||
|
|
||
| tracers: list[BaseTracer] = [] | ||
| """The tracers provided to agent.""" | ||
|
|
||
| def set_sub_agents_tracer(self, tracer) -> None: | ||
| from veadk.agents.loop_agent import LoopAgent | ||
| from veadk.agents.sequential_agent import SequentialAgent | ||
|
|
||
| for sub_agent in self.sub_agents: | ||
| if isinstance(sub_agent, Agent): | ||
| tracer.do_hooks(sub_agent) | ||
| elif isinstance(sub_agent, (SequentialAgent, LoopAgent, ParallelAgent)): | ||
| sub_agent.set_sub_agents_tracer(tracer) | ||
|
|
||
| def model_post_init(self, __context: Any) -> None: | ||
| super().model_post_init(None) # for sub_agents init | ||
|
|
||
| if self.tracers: | ||
| logger.warning( | ||
| "Enable tracing in ParallelAgent may cause OpenTelemetry context error. Issue see https://github.com/google/adk-python/issues/1670" | ||
| ) | ||
| for tracer in self.tracers: | ||
| self.set_sub_agents_tracer(tracer) | ||
|
|
||
| logger.info(f"{self.__class__.__name__} `{self.name}` init done.") |
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,70 @@ | ||
| # 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. | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| from google.adk.agents import SequentialAgent as GoogleADKSequentialAgent | ||
| from google.adk.agents.base_agent import BaseAgent | ||
| from pydantic import ConfigDict, Field | ||
| from typing_extensions import Any | ||
|
|
||
| from veadk.agent import Agent | ||
| from veadk.prompts.agent_default_prompt import DEFAULT_DESCRIPTION, DEFAULT_INSTRUCTION | ||
| from veadk.tracing.base_tracer import BaseTracer | ||
| from veadk.utils.logger import get_logger | ||
| from veadk.utils.patches import patch_asyncio | ||
|
|
||
| patch_asyncio() | ||
| logger = get_logger(__name__) | ||
|
|
||
|
|
||
| class SequentialAgent(GoogleADKSequentialAgent): | ||
| """Sequential Agent with Volcengine capabilities.""" | ||
|
|
||
| model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow") | ||
| """The model config""" | ||
|
|
||
| name: str = "veSequentialAgent" | ||
| """The name of the agent.""" | ||
|
|
||
| description: str = DEFAULT_DESCRIPTION | ||
| """The description of the agent. This will be helpful in A2A scenario.""" | ||
|
|
||
| instruction: str = DEFAULT_INSTRUCTION | ||
| """The instruction for the agent, such as principles of function calling.""" | ||
|
|
||
| sub_agents: list[BaseAgent] = Field(default_factory=list, exclude=True) | ||
| """The sub agents provided to agent.""" | ||
|
|
||
| tracers: list[BaseTracer] = [] | ||
| """The tracers provided to agent.""" | ||
|
|
||
| def set_sub_agents_tracer(self, tracer) -> None: | ||
| from veadk.agents.loop_agent import LoopAgent | ||
| from veadk.agents.parallel_agent import ParallelAgent | ||
|
|
||
| for sub_agent in self.sub_agents: | ||
| if isinstance(sub_agent, Agent): | ||
| tracer.do_hooks(sub_agent) | ||
| elif isinstance(sub_agent, (SequentialAgent, LoopAgent, ParallelAgent)): | ||
| sub_agent.set_sub_agents_tracer(tracer) | ||
|
|
||
| def model_post_init(self, __context: Any) -> None: | ||
| super().model_post_init(None) # for sub_agents init | ||
|
|
||
| if self.tracers: | ||
| for tracer in self.tracers: | ||
| self.set_sub_agents_tracer(tracer) | ||
|
|
||
| logger.info(f"{self.__class__.__name__} `{self.name}` init done.") |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
openai>=1.99.1