diff --git a/dotnet/test/Microsoft.AutoGen.Agents.Tests/AgentBaseTests.cs b/dotnet/test/Microsoft.AutoGen.Agents.Tests/AgentBaseTests.cs index a349705fb8fb..e58fdb00f0a0 100644 --- a/dotnet/test/Microsoft.AutoGen.Agents.Tests/AgentBaseTests.cs +++ b/dotnet/test/Microsoft.AutoGen.Agents.Tests/AgentBaseTests.cs @@ -57,7 +57,6 @@ await client.PublishMessageAsync(new TextMessage() /// /// The test agent is a simple agent that is used for testing purposes. /// - [TopicSubscription(nameof(AgentBaseTests.ItDelegateMessageToTestAgentAsync))] public class TestAgent : AgentBase, IHandle, IHandle, IHandle { public TestAgent( diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py index 989c6f62c760..7e502498f9b6 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py @@ -126,7 +126,8 @@ async def main() -> None: The following example demonstrates how to create an assistant agent with - a model client and a tool, and generate a stream of messages for a task. + a model client and a tool, generate a stream of messages for a task, and + print the messages to the console. .. code-block:: python @@ -134,6 +135,7 @@ async def main() -> None: from autogen_ext.models import OpenAIChatCompletionClient from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.messages import TextMessage + from autogen_agentchat.task import Console from autogen_core.base import CancellationToken @@ -145,13 +147,12 @@ async def main() -> None: model_client = OpenAIChatCompletionClient(model="gpt-4o") agent = AssistantAgent(name="assistant", model_client=model_client, tools=[get_current_time]) - stream = agent.on_messages_stream( - [TextMessage(content="What is the current time?", source="user")], CancellationToken() + await Console( + agent.on_messages_stream( + [TextMessage(content="What is the current time?", source="user")], CancellationToken() + ) ) - async for message in stream: - print(message) - asyncio.run(main()) @@ -165,7 +166,7 @@ def __init__( tools: List[Tool | Callable[..., Any] | Callable[..., Awaitable[Any]]] | None = None, handoffs: List[Handoff | str] | None = None, description: str = "An agent that provides assistance with ability to use tools.", - system_message: str = "You are a helpful AI assistant. Solve tasks using your tools. Reply with 'TERMINATE' when the task has been completed.", + system_message: str = "You are a helpful AI assistant. Solve tasks using your tools. Reply with TERMINATE when the task has been completed.", ): super().__init__(name=name, description=description) self._model_client = model_client diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_base_chat_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_base_chat_agent.py index 5fd4c1854cfd..622a4d491c97 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_base_chat_agent.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_base_chat_agent.py @@ -4,7 +4,7 @@ from autogen_core.base import CancellationToken from ..base import ChatAgent, Response, TaskResult -from ..messages import AgentMessage, ChatMessage, MultiModalMessage, TextMessage +from ..messages import AgentMessage, ChatMessage, HandoffMessage, MultiModalMessage, StopMessage, TextMessage class BaseChatAgent(ChatAgent, ABC): @@ -54,7 +54,7 @@ async def on_messages_stream( async def run( self, *, - task: str | TextMessage | MultiModalMessage | None = None, + task: str | ChatMessage | None = None, cancellation_token: CancellationToken | None = None, ) -> TaskResult: """Run the agent with the given task and return the result.""" @@ -62,13 +62,17 @@ async def run( cancellation_token = CancellationToken() input_messages: List[ChatMessage] = [] output_messages: List[AgentMessage] = [] - if isinstance(task, str): + if task is None: + pass + elif isinstance(task, str): text_msg = TextMessage(content=task, source="user") input_messages.append(text_msg) output_messages.append(text_msg) - elif isinstance(task, TextMessage | MultiModalMessage): + elif isinstance(task, TextMessage | MultiModalMessage | StopMessage | HandoffMessage): input_messages.append(task) output_messages.append(task) + else: + raise ValueError(f"Invalid task type: {type(task)}") response = await self.on_messages(input_messages, cancellation_token) if response.inner_messages is not None: output_messages += response.inner_messages @@ -78,7 +82,7 @@ async def run( async def run_stream( self, *, - task: str | TextMessage | MultiModalMessage | None = None, + task: str | ChatMessage | None = None, cancellation_token: CancellationToken | None = None, ) -> AsyncGenerator[AgentMessage | TaskResult, None]: """Run the agent with the given task and return a stream of messages @@ -87,15 +91,19 @@ async def run_stream( cancellation_token = CancellationToken() input_messages: List[ChatMessage] = [] output_messages: List[AgentMessage] = [] - if isinstance(task, str): + if task is None: + pass + elif isinstance(task, str): text_msg = TextMessage(content=task, source="user") input_messages.append(text_msg) output_messages.append(text_msg) yield text_msg - elif isinstance(task, TextMessage | MultiModalMessage): + elif isinstance(task, TextMessage | MultiModalMessage | StopMessage | HandoffMessage): input_messages.append(task) output_messages.append(task) yield task + else: + raise ValueError(f"Invalid task type: {type(task)}") async for message in self.on_messages_stream(input_messages, cancellation_token): if isinstance(message, Response): yield message.chat_message diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_code_executor_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_code_executor_agent.py index 7f5447fb5cc1..7abe68132d9d 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_code_executor_agent.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_code_executor_agent.py @@ -9,7 +9,52 @@ class CodeExecutorAgent(BaseChatAgent): - """An agent that executes code snippets and report the results.""" + """An agent that extracts and executes code snippets found in received messages and returns the output. + + It is typically used within a team with another agent that generates code snippets to be executed. + + .. note:: + + It is recommended that the `CodeExecutorAgent` agent uses a Docker container to execute code. This ensures that model-generated code is executed in an isolated environment. To use Docker, your environment must have Docker installed and running. + Follow the installation instructions for `Docker `_. + + In this example, we show how to set up a `CodeExecutorAgent` agent that uses the + :py:class:`~autogen_ext.code_executors.DockerCommandLineCodeExecutor` + to execute code snippets in a Docker container. The `work_dir` parameter indicates where all executed files are first saved locally before being executed in the Docker container. + + .. code-block:: python + + + from autogen_agentchat.agents import CodeExecutorAgent + from autogen_ext.code_executors import DockerCommandLineCodeExecutor + + + async def run_code_executor_agent() -> None: + # Create a code executor agent that uses a Docker container to execute code. + code_executor = DockerCommandLineCodeExecutor(work_dir="coding") + await code_executor.start() + code_executor_agent = CodeExecutorAgent("code_executor", code_executor=code_executor) + + # Run the agent with a given code snippet. + task = TextMessage( + content='''Here is some code + ```python + print('Hello world') + ``` + ''', + source="user", + ) + response = await code_executor_agent.on_messages([task], CancellationToken()) + print(response.chat_message) + + # Stop the code executor. + await code_executor.stop() + + + # Use asyncio.run(run_code_executor_agent()) when running in a script. + await run_code_executor_agent() + + """ def __init__( self, diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/base/_task.py b/python/packages/autogen-agentchat/src/autogen_agentchat/base/_task.py index 0a5e37dce26b..d2cb39eb6fd2 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/base/_task.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/base/_task.py @@ -3,7 +3,7 @@ from autogen_core.base import CancellationToken -from ..messages import AgentMessage, MultiModalMessage, TextMessage +from ..messages import AgentMessage, ChatMessage @dataclass @@ -23,7 +23,7 @@ class TaskRunner(Protocol): async def run( self, *, - task: str | TextMessage | MultiModalMessage | None = None, + task: str | ChatMessage | None = None, cancellation_token: CancellationToken | None = None, ) -> TaskResult: """Run the task and return the result. @@ -36,7 +36,7 @@ async def run( def run_stream( self, *, - task: str | TextMessage | MultiModalMessage | None = None, + task: str | ChatMessage | None = None, cancellation_token: CancellationToken | None = None, ) -> AsyncGenerator[AgentMessage | TaskResult, None]: """Run the task and produces a stream of messages and the final result diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/task/_console.py b/python/packages/autogen-agentchat/src/autogen_agentchat/task/_console.py index 7e4d1cab9879..3c6464b1f07f 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/task/_console.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/task/_console.py @@ -1,17 +1,38 @@ +import os import sys import time from typing import AsyncGenerator, List +from autogen_core.components import Image from autogen_core.components.models import RequestUsage -from autogen_agentchat.base import TaskResult +from autogen_agentchat.base import Response, TaskResult from autogen_agentchat.messages import AgentMessage, MultiModalMessage -async def Console(stream: AsyncGenerator[AgentMessage | TaskResult, None]) -> None: - """Consume the stream from :meth:`~autogen_agentchat.teams.Team.run_stream` - and print the messages to the console.""" +def _is_running_in_iterm() -> bool: + return os.getenv("TERM_PROGRAM") == "iTerm.app" + +def _is_output_a_tty() -> bool: + return sys.stdout.isatty() + + +async def Console( + stream: AsyncGenerator[AgentMessage | TaskResult, None] | AsyncGenerator[AgentMessage | Response, None], + *, + no_inline_images: bool = False, +) -> None: + """Consume the stream from :meth:`~autogen_agentchat.base.Team.run_stream` + or :meth:`~autogen_agentchat.base.ChatAgent.on_messages_stream` + and print the messages to the console. + + Args: + stream (AsyncGenerator[AgentMessage | TaskResult, None] | AsyncGenerator[AgentMessage | Response, None]): Stream to render + no_inline_images (bool, optional): If terminal is iTerm2 will render images inline. Use this to disable this behavior. Defaults to False. + """ + + render_image_iterm = _is_running_in_iterm() and _is_output_a_tty() and not no_inline_images start_time = time.time() total_usage = RequestUsage(prompt_tokens=0, completion_tokens=0) async for message in stream: @@ -26,8 +47,32 @@ async def Console(stream: AsyncGenerator[AgentMessage | TaskResult, None]) -> No f"Duration: {duration:.2f} seconds\n" ) sys.stdout.write(output) + elif isinstance(message, Response): + duration = time.time() - start_time + + # Print final response. + output = f"{'-' * 10} {message.chat_message.source} {'-' * 10}\n{_message_to_str(message.chat_message, render_image_iterm=render_image_iterm)}\n" + if message.chat_message.models_usage: + output += f"[Prompt tokens: {message.chat_message.models_usage.prompt_tokens}, Completion tokens: {message.chat_message.models_usage.completion_tokens}]\n" + total_usage.completion_tokens += message.chat_message.models_usage.completion_tokens + total_usage.prompt_tokens += message.chat_message.models_usage.prompt_tokens + sys.stdout.write(output) + + # Print summary. + if message.inner_messages is not None: + num_inner_messages = len(message.inner_messages) + else: + num_inner_messages = 0 + output = ( + f"{'-' * 10} Summary {'-' * 10}\n" + f"Number of inner messages: {num_inner_messages}\n" + f"Total prompt tokens: {total_usage.prompt_tokens}\n" + f"Total completion tokens: {total_usage.completion_tokens}\n" + f"Duration: {duration:.2f} seconds\n" + ) + sys.stdout.write(output) else: - output = f"{'-' * 10} {message.source} {'-' * 10}\n{_message_to_str(message)}\n" + output = f"{'-' * 10} {message.source} {'-' * 10}\n{_message_to_str(message, render_image_iterm=render_image_iterm)}\n" if message.models_usage: output += f"[Prompt tokens: {message.models_usage.prompt_tokens}, Completion tokens: {message.models_usage.completion_tokens}]\n" total_usage.completion_tokens += message.models_usage.completion_tokens @@ -35,14 +80,23 @@ async def Console(stream: AsyncGenerator[AgentMessage | TaskResult, None]) -> No sys.stdout.write(output) -def _message_to_str(message: AgentMessage) -> str: +# iTerm2 image rendering protocol: https://iterm2.com/documentation-images.html +def _image_to_iterm(image: Image) -> str: + image_data = image.to_base64() + return f"\033]1337;File=inline=1:{image_data}\a\n" + + +def _message_to_str(message: AgentMessage, *, render_image_iterm: bool = False) -> str: if isinstance(message, MultiModalMessage): result: List[str] = [] for c in message.content: if isinstance(c, str): result.append(c) else: - result.append("") + if render_image_iterm: + result.append(_image_to_iterm(c)) + else: + result.append("") return "\n".join(result) else: return f"{message.content}" diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py index c41ebaf461bf..fbca2644920a 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py @@ -12,13 +12,12 @@ AgentType, CancellationToken, MessageContext, - TopicId, ) from autogen_core.components import ClosureAgent, TypeSubscription from ... import EVENT_LOGGER_NAME from ...base import ChatAgent, TaskResult, Team, TerminationCondition -from ...messages import AgentMessage, MultiModalMessage, TextMessage +from ...messages import AgentMessage, ChatMessage, HandoffMessage, MultiModalMessage, StopMessage, TextMessage from ._chat_agent_container import ChatAgentContainer from ._events import GroupChatMessage, GroupChatReset, GroupChatStart, GroupChatTermination from ._sequential_routed_agent import SequentialRoutedAgent @@ -164,7 +163,7 @@ async def collect_output_messages( async def run( self, *, - task: str | TextMessage | MultiModalMessage | None = None, + task: str | ChatMessage | None = None, cancellation_token: CancellationToken | None = None, ) -> TaskResult: """Run the team and return the result. The base implementation uses @@ -215,7 +214,7 @@ async def main() -> None: async def run_stream( self, *, - task: str | TextMessage | MultiModalMessage | None = None, + task: str | ChatMessage | None = None, cancellation_token: CancellationToken | None = None, ) -> AsyncGenerator[AgentMessage | TaskResult, None]: """Run the team and produces a stream of messages and the final result @@ -253,6 +252,16 @@ async def main() -> None: asyncio.run(main()) """ + # Create the first chat message if the task is a string or a chat message. + first_chat_message: ChatMessage | None = None + if task is None: + pass + elif isinstance(task, str): + first_chat_message = TextMessage(content=task, source="user") + elif isinstance(task, TextMessage | MultiModalMessage | StopMessage | HandoffMessage): + first_chat_message = task + else: + raise ValueError(f"Invalid task type: {type(task)}") if self._is_running: raise ValueError("The team is already running, it cannot run again until it is stopped.") @@ -265,17 +274,6 @@ async def main() -> None: if not self._initialized: await self._init(self._runtime) - # Run the team by publishing the start message. - first_chat_message: TextMessage | MultiModalMessage | None = None - if isinstance(task, str): - first_chat_message = TextMessage(content=task, source="user") - elif isinstance(task, TextMessage | MultiModalMessage): - first_chat_message = task - await self._runtime.publish_message( - GroupChatStart(message=first_chat_message), - topic_id=TopicId(type=self._group_topic_type, source=self._team_id), - ) - # Start a coroutine to stop the runtime and signal the output message queue is complete. async def stop_runtime() -> None: await self._runtime.stop_when_idle() @@ -283,24 +281,37 @@ async def stop_runtime() -> None: shutdown_task = asyncio.create_task(stop_runtime()) - # Collect the output messages in order. - output_messages: List[AgentMessage] = [] - # Yield the messsages until the queue is empty. - while True: - message = await self._output_message_queue.get() - if message is None: - break - yield message - output_messages.append(message) - - # Wait for the shutdown task to finish. - await shutdown_task - - # Yield the final result. - yield TaskResult(messages=output_messages, stop_reason=self._stop_reason) - - # Indicate that the team is no longer running. - self._is_running = False + try: + # Run the team by sending the start message to the group chat manager. + # The group chat manager will start the group chat by relaying the message to the participants + # and the closure agent. + await self._runtime.send_message( + GroupChatStart(message=first_chat_message), + recipient=AgentId(type=self._group_chat_manager_topic_type, key=self._team_id), + ) + # Collect the output messages in order. + output_messages: List[AgentMessage] = [] + # Yield the messsages until the queue is empty. + while True: + message = await self._output_message_queue.get() + if message is None: + break + yield message + output_messages.append(message) + + # Yield the final result. + yield TaskResult(messages=output_messages, stop_reason=self._stop_reason) + + finally: + # Wait for the shutdown task to finish. + await shutdown_task + + # Clear the output message queue. + while not self._output_message_queue.empty(): + self._output_message_queue.get_nowait() + + # Indicate that the team is no longer running. + self._is_running = False async def reset(self) -> None: """Reset the team and its participants to their initial state. @@ -352,19 +363,26 @@ async def main() -> None: # Start the runtime. self._runtime.start() - # Send a reset message to the group chat. - await self._runtime.publish_message( - GroupChatReset(), - topic_id=TopicId(type=self._group_topic_type, source=self._team_id), - ) - - # Stop the runtime. - await self._runtime.stop_when_idle() + try: + # Send a reset messages to all participants. + for participant_topic_type in self._participant_topic_types: + await self._runtime.send_message( + GroupChatReset(), + recipient=AgentId(type=participant_topic_type, key=self._team_id), + ) + # Send a reset message to the group chat manager. + await self._runtime.send_message( + GroupChatReset(), + recipient=AgentId(type=self._group_chat_manager_topic_type, key=self._team_id), + ) + finally: + # Stop the runtime. + await self._runtime.stop_when_idle() - # Reset the output message queue. - self._stop_reason = None - while not self._output_message_queue.empty(): - self._output_message_queue.get_nowait() + # Reset the output message queue. + self._stop_reason = None + while not self._output_message_queue.empty(): + self._output_message_queue.get_nowait() - # Indicate that the team is no longer running. - self._is_running = False + # Indicate that the team is no longer running. + self._is_running = False diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat_manager.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat_manager.py index e28f46a8c89d..d2a2b917690b 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat_manager.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat_manager.py @@ -2,10 +2,10 @@ from typing import Any, List from autogen_core.base import MessageContext -from autogen_core.components import DefaultTopicId, event +from autogen_core.components import DefaultTopicId, event, rpc from ...base import TerminationCondition -from ...messages import AgentMessage, StopMessage +from ...messages import AgentMessage, ChatMessage, StopMessage from ._events import ( GroupChatAgentResponse, GroupChatRequestPublish, @@ -55,7 +55,7 @@ def __init__( self._max_turns = max_turns self._current_turn = 0 - @event + @rpc async def handle_start(self, message: GroupChatStart, ctx: MessageContext) -> None: """Handle the start of a group chat by selecting a speaker to start the conversation.""" @@ -70,10 +70,16 @@ async def handle_start(self, message: GroupChatStart, ctx: MessageContext) -> No # Stop the group chat. return + # Validate the group state given the start message. + await self.validate_group_state(message.message) + if message.message is not None: # Log the start message. await self.publish_message(message, topic_id=DefaultTopicId(type=self._output_topic_type)) + # Relay the start message to the participants. + await self.publish_message(message, topic_id=DefaultTopicId(type=self._group_topic_type)) + # Append the user message to the message thread. self._message_thread.append(message.message) @@ -137,11 +143,16 @@ async def handle_agent_response(self, message: GroupChatAgentResponse, ctx: Mess speaker_topic_type = await self.select_speaker(self._message_thread) await self.publish_message(GroupChatRequestPublish(), topic_id=DefaultTopicId(type=speaker_topic_type)) - @event + @rpc async def handle_reset(self, message: GroupChatReset, ctx: MessageContext) -> None: # Reset the group chat manager. await self.reset() + @abstractmethod + async def validate_group_state(self, message: ChatMessage | None) -> None: + """Validate the state of the group chat given the start message. This is executed when the group chat manager receives a GroupChatStart event.""" + ... + @abstractmethod async def select_speaker(self, thread: List[AgentMessage]) -> str: """Select a speaker from the participants and return the diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_chat_agent_container.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_chat_agent_container.py index d249676fda06..315708032865 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_chat_agent_container.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_chat_agent_container.py @@ -1,7 +1,7 @@ from typing import Any, List from autogen_core.base import MessageContext -from autogen_core.components import DefaultTopicId, event +from autogen_core.components import DefaultTopicId, event, rpc from ...base import ChatAgent, Response from ...messages import ChatMessage @@ -38,7 +38,7 @@ async def handle_agent_response(self, message: GroupChatAgentResponse, ctx: Mess """Handle an agent response event by appending the content to the buffer.""" self._message_buffer.append(message.agent_response.chat_message) - @event + @rpc async def handle_reset(self, message: GroupChatReset, ctx: MessageContext) -> None: """Handle a reset event by resetting the agent.""" self._message_buffer.clear() diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py index 5410673ebde2..ae1567a7daec 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py @@ -2,7 +2,7 @@ from typing import Any, List from autogen_core.base import MessageContext -from autogen_core.components import DefaultTopicId, Image, event +from autogen_core.components import DefaultTopicId, Image, event, rpc from autogen_core.components.models import ( AssistantMessage, ChatCompletionClient, @@ -102,7 +102,7 @@ def _get_task_ledger_plan_update_prompt(self, team: str) -> str: def _get_final_answer_prompt(self, task: str) -> str: return ORCHESTRATOR_FINAL_ANSWER_PROMPT.format(task=task) - @event + @rpc async def handle_start(self, message: GroupChatStart, ctx: MessageContext) -> None: """Handle the start of a group chat by selecting a speaker to start the conversation.""" assert message is not None and message.message is not None @@ -145,7 +145,7 @@ async def handle_agent_response(self, message: GroupChatAgentResponse, ctx: Mess self._message_thread.append(message.agent_response.chat_message) await self._orchestrate_step() - @event + @rpc async def handle_reset(self, message: GroupChatReset, ctx: MessageContext) -> None: # Reset the group chat manager. await self.reset() diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_round_robin_group_chat.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_round_robin_group_chat.py index 8e3a262a85da..f5c128a6cc27 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_round_robin_group_chat.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_round_robin_group_chat.py @@ -1,7 +1,7 @@ from typing import Callable, List from ...base import ChatAgent, TerminationCondition -from ...messages import AgentMessage +from ...messages import AgentMessage, ChatMessage from ._base_group_chat import BaseGroupChat from ._base_group_chat_manager import BaseGroupChatManager @@ -28,6 +28,9 @@ def __init__( ) self._next_speaker_index = 0 + async def validate_group_state(self, message: ChatMessage | None) -> None: + pass + async def reset(self) -> None: self._current_turn = 0 self._message_thread.clear() @@ -68,7 +71,7 @@ class RoundRobinGroupChat(BaseGroupChat): from autogen_ext.models import OpenAIChatCompletionClient from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.teams import RoundRobinGroupChat - from autogen_agentchat.task import TextMentionTermination + from autogen_agentchat.task import TextMentionTermination, Console async def main() -> None: @@ -84,9 +87,7 @@ async def get_weather(location: str) -> str: ) termination = TextMentionTermination("TERMINATE") team = RoundRobinGroupChat([assistant], termination_condition=termination) - stream = team.run_stream("What's the weather in New York?") - async for message in stream: - print(message) + await Console(team.run_stream(task="What's the weather in New York?")) asyncio.run(main()) @@ -99,7 +100,7 @@ async def get_weather(location: str) -> str: from autogen_ext.models import OpenAIChatCompletionClient from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.teams import RoundRobinGroupChat - from autogen_agentchat.task import TextMentionTermination + from autogen_agentchat.task import TextMentionTermination, Console async def main() -> None: @@ -109,9 +110,7 @@ async def main() -> None: agent2 = AssistantAgent("Assistant2", model_client=model_client) termination = TextMentionTermination("TERMINATE") team = RoundRobinGroupChat([agent1, agent2], termination_condition=termination) - stream = team.run_stream("Tell me some jokes.") - async for message in stream: - print(message) + await Console(team.run_stream(task="Tell me some jokes.")) asyncio.run(main()) diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_selector_group_chat.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_selector_group_chat.py index f618c0d3832c..e21e99e0f934 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_selector_group_chat.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_selector_group_chat.py @@ -8,6 +8,7 @@ from ...base import ChatAgent, TerminationCondition from ...messages import ( AgentMessage, + ChatMessage, HandoffMessage, MultiModalMessage, StopMessage, @@ -53,6 +54,9 @@ def __init__( self._allow_repeated_speaker = allow_repeated_speaker self._selector_func = selector_func + async def validate_group_state(self, message: ChatMessage | None) -> None: + pass + async def reset(self) -> None: self._current_turn = 0 self._message_thread.clear() @@ -204,7 +208,7 @@ class SelectorGroupChat(BaseGroupChat): from autogen_ext.models import OpenAIChatCompletionClient from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.teams import SelectorGroupChat - from autogen_agentchat.task import TextMentionTermination + from autogen_agentchat.task import TextMentionTermination, Console async def main() -> None: @@ -243,9 +247,7 @@ async def book_trip() -> str: model_client=model_client, termination_condition=termination, ) - stream = team.run_stream("Book a 3-day trip to new york.") - async for message in stream: - print(message) + await Console(team.run_stream(task="Book a 3-day trip to new york.")) asyncio.run(main()) @@ -258,7 +260,7 @@ async def book_trip() -> str: from autogen_ext.models import OpenAIChatCompletionClient from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.teams import SelectorGroupChat - from autogen_agentchat.task import TextMentionTermination + from autogen_agentchat.task import TextMentionTermination, Console async def main() -> None: @@ -299,9 +301,7 @@ def selector_func(messages): termination_condition=termination, ) - stream = team.run_stream("What is 1 + 1?") - async for message in stream: - print(message) + await Console(team.run_stream(task="What is 1 + 1?")) asyncio.run(main()) diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_swarm_group_chat.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_swarm_group_chat.py index 651367169b67..0e658ab75237 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_swarm_group_chat.py +++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_swarm_group_chat.py @@ -3,7 +3,7 @@ from ... import EVENT_LOGGER_NAME from ...base import ChatAgent, TerminationCondition -from ...messages import AgentMessage, HandoffMessage +from ...messages import AgentMessage, ChatMessage, HandoffMessage from ._base_group_chat import BaseGroupChat from ._base_group_chat_manager import BaseGroupChatManager @@ -32,6 +32,31 @@ def __init__( ) self._current_speaker = participant_topic_types[0] + async def validate_group_state(self, message: ChatMessage | None) -> None: + """Validate the start message for the group chat.""" + # Check if the start message is a handoff message. + if isinstance(message, HandoffMessage): + if message.target not in self._participant_topic_types: + raise ValueError( + f"The target {message.target} is not one of the participants {self._participant_topic_types}. " + "If you are resuming Swarm with a new HandoffMessage make sure to set the target to a valid participant as the target." + ) + return + # Check if there is a handoff message in the thread that is not targeting a valid participant. + for existing_message in reversed(self._message_thread): + if isinstance(existing_message, HandoffMessage): + if existing_message.target not in self._participant_topic_types: + raise ValueError( + f"The existing handoff target {existing_message.target} is not one of the participants {self._participant_topic_types}. " + "If you are resuming Swarm with a new task make sure to include in your task " + "a HandoffMessage with a valid participant as the target. For example, if you are " + "resuming from a HandoffTermination, make sure the new task is a HandoffMessage " + "with a valid participant as the target." + ) + # The latest handoff message should always target a valid participant. + # Do not look past the latest handoff message. + return + async def reset(self) -> None: self._current_turn = 0 self._message_thread.clear() @@ -47,13 +72,8 @@ async def select_speaker(self, thread: List[AgentMessage]) -> str: for message in reversed(thread): if isinstance(message, HandoffMessage): self._current_speaker = message.target - if self._current_speaker not in self._participant_topic_types: - raise ValueError( - f"The target {self._current_speaker} in the handoff message " - f"is not one of the participants {self._participant_topic_types}. " - "If you are resuming the Swarm with a new task make sure to include in your task " - "a handoff message with a valid participant as the target." - ) + # The latest handoff message should always target a valid participant. + assert self._current_speaker in self._participant_topic_types return self._current_speaker return self._current_speaker @@ -72,7 +92,7 @@ class Swarm(BaseGroupChat): Without a termination condition, the group chat will run indefinitely. max_turns (int, optional): The maximum number of turns in the group chat before stopping. Defaults to None, meaning no limit. - Examples: + Basic example: .. code-block:: python @@ -99,11 +119,49 @@ async def main() -> None: termination = MaxMessageTermination(3) team = Swarm([agent1, agent2], termination_condition=termination) - stream = team.run_stream("What is bob's birthday?") + stream = team.run_stream(task="What is bob's birthday?") async for message in stream: print(message) + asyncio.run(main()) + + + Using the :class:`~autogen_agentchat.task.HandoffTermination` for human-in-the-loop handoff: + + .. code-block:: python + + import asyncio + from autogen_ext.models import OpenAIChatCompletionClient + from autogen_agentchat.agents import AssistantAgent + from autogen_agentchat.teams import Swarm + from autogen_agentchat.task import HandoffTermination, Console, MaxMessageTermination + from autogen_agentchat.messages import HandoffMessage + + + async def main() -> None: + model_client = OpenAIChatCompletionClient(model="gpt-4o") + + agent = AssistantAgent( + "Alice", + model_client=model_client, + handoffs=["user"], + system_message="You are Alice and you only answer questions about yourself, ask the user for help if needed.", + ) + termination = HandoffTermination(target="user") | MaxMessageTermination(3) + team = Swarm([agent], termination_condition=termination) + + # Start the conversation. + await Console(team.run_stream(task="What is bob's birthday?")) + + # Resume with user feedback. + await Console( + team.run_stream( + task=HandoffMessage(source="user", target="Alice", content="Bob's birthday is on 1st January.") + ) + ) + + asyncio.run(main()) """ diff --git a/python/packages/autogen-agentchat/tests/test_group_chat.py b/python/packages/autogen-agentchat/tests/test_group_chat.py index db8bfa9d4167..b6c4f4bfdc7b 100644 --- a/python/packages/autogen-agentchat/tests/test_group_chat.py +++ b/python/packages/autogen-agentchat/tests/test_group_chat.py @@ -24,7 +24,7 @@ ToolCallMessage, ToolCallResultMessage, ) -from autogen_agentchat.task import MaxMessageTermination, TextMentionTermination +from autogen_agentchat.task import HandoffTermination, MaxMessageTermination, TextMentionTermination from autogen_agentchat.teams import ( RoundRobinGroupChat, SelectorGroupChat, @@ -815,3 +815,56 @@ async def test_swarm_pause_and_resume() -> None: result = await team.run() assert len(result.messages) == 1 assert result.messages[0].content == "Transferred to second_agent." + + +@pytest.mark.asyncio +async def test_swarm_with_handoff_termination() -> None: + first_agent = _HandOffAgent("first_agent", description="first agent", next_agent="second_agent") + second_agent = _HandOffAgent("second_agent", description="second agent", next_agent="third_agent") + third_agent = _HandOffAgent("third_agent", description="third agent", next_agent="first_agent") + + # Handoff to an existing agent. + termination = HandoffTermination(target="third_agent") + team = Swarm([second_agent, first_agent, third_agent], termination_condition=termination) + # Start + result = await team.run(task="task") + assert len(result.messages) == 2 + assert result.messages[0].content == "task" + assert result.messages[1].content == "Transferred to third_agent." + # Resume existing. + result = await team.run() + assert len(result.messages) == 3 + assert result.messages[0].content == "Transferred to first_agent." + assert result.messages[1].content == "Transferred to second_agent." + assert result.messages[2].content == "Transferred to third_agent." + # Resume new task. + result = await team.run(task="new task") + assert len(result.messages) == 4 + assert result.messages[0].content == "new task" + assert result.messages[1].content == "Transferred to first_agent." + assert result.messages[2].content == "Transferred to second_agent." + assert result.messages[3].content == "Transferred to third_agent." + + # Handoff to a non-existing agent. + third_agent = _HandOffAgent("third_agent", description="third agent", next_agent="non_existing_agent") + termination = HandoffTermination(target="non_existing_agent") + team = Swarm([second_agent, first_agent, third_agent], termination_condition=termination) + # Start + result = await team.run(task="task") + assert len(result.messages) == 3 + assert result.messages[0].content == "task" + assert result.messages[1].content == "Transferred to third_agent." + assert result.messages[2].content == "Transferred to non_existing_agent." + # Attempt to resume. + with pytest.raises(ValueError): + await team.run() + # Attempt to resume with a new task. + with pytest.raises(ValueError): + await team.run(task="new task") + # Resume with a HandoffMessage + result = await team.run(task=HandoffMessage(content="Handoff to first_agent.", target="first_agent", source="user")) + assert len(result.messages) == 4 + assert result.messages[0].content == "Handoff to first_agent." + assert result.messages[1].content == "Transferred to second_agent." + assert result.messages[2].content == "Transferred to third_agent." + assert result.messages[3].content == "Transferred to non_existing_agent." diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/agents.ipynb b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/agents.ipynb index b39c6c8296a3..a4c92c8da3a3 100644 --- a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/agents.ipynb +++ b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/agents.ipynb @@ -29,7 +29,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -107,31 +107,55 @@ "### Stream Messages\n", "\n", "We can also stream each message as it is generated by the agent by using the\n", - "{py:meth}`~autogen_agentchat.agents.AssistantAgent.on_messages_stream` method." + "{py:meth}`~autogen_agentchat.agents.AssistantAgent.on_messages_stream` method,\n", + "and use {py:class}`~autogen_agentchat.task.Console` to print the messages\n", + "as they appear to the console." ] }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 2, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "source='assistant' models_usage=RequestUsage(prompt_tokens=61, completion_tokens=15) content=[FunctionCall(id='call_fXhM4PeZsodhhUOlNiFkoBXF', arguments='{\"query\":\"AutoGen\"}', name='web_search')]\n", - "source='assistant' models_usage=None content=[FunctionExecutionResult(content='AutoGen is a programming framework for building multi-agent applications.', call_id='call_fXhM4PeZsodhhUOlNiFkoBXF')]\n", - "Response(chat_message=TextMessage(source='assistant', models_usage=RequestUsage(prompt_tokens=92, completion_tokens=31), content='AutoGen is a programming framework designed for building multi-agent applications. If you need more specific information about its features or usage, feel free to ask!'), inner_messages=[ToolCallMessage(source='assistant', models_usage=RequestUsage(prompt_tokens=61, completion_tokens=15), content=[FunctionCall(id='call_fXhM4PeZsodhhUOlNiFkoBXF', arguments='{\"query\":\"AutoGen\"}', name='web_search')]), ToolCallResultMessage(source='assistant', models_usage=None, content=[FunctionExecutionResult(content='AutoGen is a programming framework for building multi-agent applications.', call_id='call_fXhM4PeZsodhhUOlNiFkoBXF')])])\n" + "---------- assistant ----------\n", + "[FunctionCall(id='call_fSp5iTGVm2FKw5NIvfECSqNd', arguments='{\"query\":\"AutoGen information\"}', name='web_search')]\n", + "[Prompt tokens: 61, Completion tokens: 16]\n", + "---------- assistant ----------\n", + "[FunctionExecutionResult(content='AutoGen is a programming framework for building multi-agent applications.', call_id='call_fSp5iTGVm2FKw5NIvfECSqNd')]\n", + "---------- assistant ----------\n", + "AutoGen is a programming framework designed for building multi-agent applications. If you need more detailed information or specific aspects about AutoGen, feel free to ask!\n", + "[Prompt tokens: 93, Completion tokens: 32]\n", + "---------- Summary ----------\n", + "Number of inner messages: 2\n", + "Total prompt tokens: 154\n", + "Total completion tokens: 48\n", + "Duration: 4.30 seconds\n" ] } ], "source": [ + "from autogen_agentchat.task import Console\n", + "\n", + "\n", "async def assistant_run_stream() -> None:\n", - " async for message in agent.on_messages_stream(\n", - " [TextMessage(content=\"Find information on AutoGen\", source=\"user\")],\n", - " cancellation_token=CancellationToken(),\n", - " ):\n", - " print(message)\n", + " # Option 1: read each message from the stream.\n", + " # async for message in agent.on_messages_stream(\n", + " # [TextMessage(content=\"Find information on AutoGen\", source=\"user\")],\n", + " # cancellation_token=CancellationToken(),\n", + " # ):\n", + " # print(message)\n", + "\n", + " # Option 2: use Console to print all messages as they appear.\n", + " await Console(\n", + " agent.on_messages_stream(\n", + " [TextMessage(content=\"Find information on AutoGen\", source=\"user\")],\n", + " cancellation_token=CancellationToken(),\n", + " )\n", + " )\n", "\n", "\n", "# Use asyncio.run(assistant_run_stream()) when running in a script.\n", @@ -158,6 +182,28 @@ "For more information on tool calling, refer to the documentation from [OpenAI](https://platform.openai.com/docs/guides/function-calling) and [Anthropic](https://docs.anthropic.com/en/docs/build-with-claude/tool-use)." ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Other Preset Agents\n", + "\n", + "The following preset agents are available:\n", + "\n", + "- {py:class}`~autogen_agentchat.agents.CodeExecutorAgent`: An agent that can execute code.\n", + "- {py:class}`~autogen_ext.agents.MultimodalWebSurfer`: A multi-modal agent that can search the web and visit web pages for information." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Next Step\n", + "\n", + "Now we have discussed how to use the {py:class}`~autogen_agentchat.agents.AssistantAgent`,\n", + "we can move on to the next section to learn how to use the teams feature of AgentChat." + ] + }, { "cell_type": "markdown", "metadata": {}, @@ -186,246 +232,6 @@ ")\n", "print(result) -->" ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## CodeExecutorAgent\n", - "\n", - "The {py:class}`~autogen_agentchat.agents.CodeExecutorAgent`\n", - "preset extracts and executes code snippets found in received messages and returns the output. It is typically used within a team with another agent that generates code snippets to be executed.\n", - "\n", - "```{note}\n", - "It is recommended that the {py:class}`~autogen_agentchat.agents.CodeExecutorAgent` agent\n", - "uses a Docker container to execute code. This ensures that model-generated code is executed in an isolated environment. To use Docker, your environment must have Docker installed and running. \n", - "Follow the installation instructions for [Docker](https://docs.docker.com/get-docker/).\n", - "```\n", - "\n", - "In this example, we show how to set up a {py:class}`~autogen_agentchat.agents.CodeExecutorAgent` agent that uses the \n", - "{py:class}`~autogen_ext.code_executors.DockerCommandLineCodeExecutor` \n", - "to execute code snippets in a Docker container. The `work_dir` parameter indicates where all executed files are first saved locally before being executed in the Docker container." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "source='code_executor' models_usage=None content='Hello world\\n'\n" - ] - } - ], - "source": [ - "from autogen_agentchat.agents import CodeExecutorAgent\n", - "from autogen_ext.code_executors import DockerCommandLineCodeExecutor\n", - "\n", - "\n", - "async def run_code_executor_agent() -> None:\n", - " # Create a code executor agent that uses a Docker container to execute code.\n", - " code_executor = DockerCommandLineCodeExecutor(work_dir=\"coding\")\n", - " await code_executor.start()\n", - " code_executor_agent = CodeExecutorAgent(\"code_executor\", code_executor=code_executor)\n", - "\n", - " # Run the agent with a given code snippet.\n", - " task = TextMessage(\n", - " content=\"\"\"Here is some code\n", - "```python\n", - "print('Hello world')\n", - "```\n", - "\"\"\",\n", - " source=\"user\",\n", - " )\n", - " response = await code_executor_agent.on_messages([task], CancellationToken())\n", - " print(response.chat_message)\n", - "\n", - " # Stop the code executor.\n", - " await code_executor.stop()\n", - "\n", - "\n", - "# Use asyncio.run(run_code_executor_agent()) when running in a script.\n", - "await run_code_executor_agent()" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "This example shows the agent executing a code snippet that prints \"Hello world\".\n", - "The agent then returns the output of the code execution." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Build Your Own Agents\n", - "\n", - "You may have agents with behaviors that do not fall into a preset. \n", - "In such cases, you can build custom agents.\n", - "\n", - "All agents in AgentChat inherit from {py:class}`~autogen_agentchat.agents.BaseChatAgent` \n", - "class and implement the following abstract methods and attributes:\n", - "\n", - "- {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages`: The abstract method that defines the behavior of the agent in response to messages. This method is called when the agent is asked to provide a response in {py:meth}`~autogen_agentchat.agents.BaseChatAgent.run`. It returns a {py:class}`~autogen_agentchat.base.Response` object.\n", - "- {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_reset`: The abstract method that resets the agent to its initial state. This method is called when the agent is asked to reset itself.\n", - "- {py:attr}`~autogen_agentchat.agents.BaseChatAgent.produced_message_types`: The list of possible {py:class}`~autogen_agentchat.messages.ChatMessage` message types the agent can produce in its response.\n", - "\n", - "Optionally, you can implement the the {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages_stream` method to stream messages as they are generated by the agent. If this method is not implemented, the agent\n", - "uses the default implementation of {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages_stream`\n", - "that calls the {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages` method and\n", - "yields all messages in the response." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### CounterDownAgent\n", - "\n", - "In this example, we create a simple agent that counts down from a given number to zero,\n", - "and produces a stream of messages with the current count." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "3...\n", - "2...\n", - "1...\n", - "Done!\n" - ] - } - ], - "source": [ - "from typing import AsyncGenerator, List, Sequence\n", - "\n", - "from autogen_core.base import CancellationToken\n", - "from autogen_agentchat.agents import BaseChatAgent\n", - "from autogen_agentchat.base import Response\n", - "from autogen_agentchat.messages import AgentMessage, ChatMessage, TextMessage\n", - "\n", - "\n", - "class CountDownAgent(BaseChatAgent):\n", - " def __init__(self, name: str, count: int = 3):\n", - " super().__init__(name, \"A simple agent that counts down.\")\n", - " self._count = count\n", - "\n", - " @property\n", - " def produced_message_types(self) -> List[type[ChatMessage]]:\n", - " return [TextMessage]\n", - "\n", - " async def on_messages(self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken) -> Response:\n", - " # Calls the on_messages_stream.\n", - " response: Response | None = None\n", - " async for message in self.on_messages_stream(messages, cancellation_token):\n", - " if isinstance(message, Response):\n", - " response = message\n", - " assert response is not None\n", - " return response\n", - "\n", - " async def on_messages_stream(\n", - " self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken\n", - " ) -> AsyncGenerator[AgentMessage | Response, None]:\n", - " inner_messages: List[AgentMessage] = []\n", - " for i in range(self._count, 0, -1):\n", - " msg = TextMessage(content=f\"{i}...\", source=self.name)\n", - " inner_messages.append(msg)\n", - " yield msg\n", - " # The response is returned at the end of the stream.\n", - " # It contains the final message and all the inner messages.\n", - " yield Response(chat_message=TextMessage(content=\"Done!\", source=self.name), inner_messages=inner_messages)\n", - "\n", - " async def on_reset(self, cancellation_token: CancellationToken) -> None:\n", - " pass\n", - "\n", - "\n", - "async def run_countdown_agent() -> None:\n", - " # Create a countdown agent.\n", - " countdown_agent = CountDownAgent(\"countdown\")\n", - "\n", - " # Run the agent with a given task and stream the response.\n", - " async for message in countdown_agent.on_messages_stream([], CancellationToken()):\n", - " if isinstance(message, Response):\n", - " print(message.chat_message.content)\n", - " else:\n", - " print(message.content)\n", - "\n", - "\n", - "# Use asyncio.run(run_countdown_agent()) when running in a script.\n", - "await run_countdown_agent()" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### UserProxyAgent \n", - "\n", - "A common use case for building a custom agent is to create an agent that acts as a proxy for the user.\n", - "\n", - "In the example below we show how to implement a `UserProxyAgent` - an agent that asks the user to enter\n", - "some text through console and then returns that message as a response." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "I am glad to be here.\n" - ] - } - ], - "source": [ - "import asyncio\n", - "from typing import List, Sequence\n", - "\n", - "from autogen_core.base import CancellationToken\n", - "from autogen_agentchat.base import Response\n", - "from autogen_agentchat.agents import BaseChatAgent\n", - "from autogen_agentchat.messages import ChatMessage, TextMessage\n", - "\n", - "\n", - "class UserProxyAgent(BaseChatAgent):\n", - " def __init__(self, name: str) -> None:\n", - " super().__init__(name, \"A human user.\")\n", - "\n", - " @property\n", - " def produced_message_types(self) -> List[type[ChatMessage]]:\n", - " return [TextMessage]\n", - "\n", - " async def on_messages(self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken) -> Response:\n", - " user_input = await asyncio.get_event_loop().run_in_executor(None, input, \"Enter your response: \")\n", - " return Response(chat_message=TextMessage(content=user_input, source=self.name))\n", - "\n", - " async def on_reset(self, cancellation_token: CancellationToken) -> None:\n", - " pass\n", - "\n", - "\n", - "async def run_user_proxy_agent() -> None:\n", - " user_proxy_agent = UserProxyAgent(name=\"user_proxy_agent\")\n", - " response = await user_proxy_agent.on_messages([], CancellationToken())\n", - " print(response.chat_message.content)\n", - "\n", - "\n", - "# Use asyncio.run(run_user_proxy_agent()) when running in a script.\n", - "await run_user_proxy_agent()" - ] } ], "metadata": { @@ -444,7 +250,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.5" + "version": "3.11.5" } }, "nbformat": 4, diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/custom-agents.ipynb b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/custom-agents.ipynb new file mode 100644 index 000000000000..7c90a04440b6 --- /dev/null +++ b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/custom-agents.ipynb @@ -0,0 +1,166 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Custom Agents\n", + "\n", + "You may have agents with behaviors that do not fall into a preset. \n", + "In such cases, you can build custom agents.\n", + "\n", + "All agents in AgentChat inherit from {py:class}`~autogen_agentchat.agents.BaseChatAgent` \n", + "class and implement the following abstract methods and attributes:\n", + "\n", + "- {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages`: The abstract method that defines the behavior of the agent in response to messages. This method is called when the agent is asked to provide a response in {py:meth}`~autogen_agentchat.agents.BaseChatAgent.run`. It returns a {py:class}`~autogen_agentchat.base.Response` object.\n", + "- {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_reset`: The abstract method that resets the agent to its initial state. This method is called when the agent is asked to reset itself.\n", + "- {py:attr}`~autogen_agentchat.agents.BaseChatAgent.produced_message_types`: The list of possible {py:class}`~autogen_agentchat.messages.ChatMessage` message types the agent can produce in its response.\n", + "\n", + "Optionally, you can implement the the {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages_stream` method to stream messages as they are generated by the agent. If this method is not implemented, the agent\n", + "uses the default implementation of {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages_stream`\n", + "that calls the {py:meth}`~autogen_agentchat.agents.BaseChatAgent.on_messages` method and\n", + "yields all messages in the response." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## CounterDownAgent\n", + "\n", + "In this example, we create a simple agent that counts down from a given number to zero,\n", + "and produces a stream of messages with the current count." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from typing import AsyncGenerator, List, Sequence\n", + "\n", + "from autogen_agentchat.agents import BaseChatAgent\n", + "from autogen_agentchat.base import Response\n", + "from autogen_agentchat.messages import AgentMessage, ChatMessage, TextMessage\n", + "from autogen_core.base import CancellationToken\n", + "\n", + "\n", + "class CountDownAgent(BaseChatAgent):\n", + " def __init__(self, name: str, count: int = 3):\n", + " super().__init__(name, \"A simple agent that counts down.\")\n", + " self._count = count\n", + "\n", + " @property\n", + " def produced_message_types(self) -> List[type[ChatMessage]]:\n", + " return [TextMessage]\n", + "\n", + " async def on_messages(self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken) -> Response:\n", + " # Calls the on_messages_stream.\n", + " response: Response | None = None\n", + " async for message in self.on_messages_stream(messages, cancellation_token):\n", + " if isinstance(message, Response):\n", + " response = message\n", + " assert response is not None\n", + " return response\n", + "\n", + " async def on_messages_stream(\n", + " self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken\n", + " ) -> AsyncGenerator[AgentMessage | Response, None]:\n", + " inner_messages: List[AgentMessage] = []\n", + " for i in range(self._count, 0, -1):\n", + " msg = TextMessage(content=f\"{i}...\", source=self.name)\n", + " inner_messages.append(msg)\n", + " yield msg\n", + " # The response is returned at the end of the stream.\n", + " # It contains the final message and all the inner messages.\n", + " yield Response(chat_message=TextMessage(content=\"Done!\", source=self.name), inner_messages=inner_messages)\n", + "\n", + " async def on_reset(self, cancellation_token: CancellationToken) -> None:\n", + " pass\n", + "\n", + "\n", + "async def run_countdown_agent() -> None:\n", + " # Create a countdown agent.\n", + " countdown_agent = CountDownAgent(\"countdown\")\n", + "\n", + " # Run the agent with a given task and stream the response.\n", + " async for message in countdown_agent.on_messages_stream([], CancellationToken()):\n", + " if isinstance(message, Response):\n", + " print(message.chat_message.content)\n", + " else:\n", + " print(message.content)\n", + "\n", + "\n", + "# Use asyncio.run(run_countdown_agent()) when running in a script.\n", + "await run_countdown_agent()" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## UserProxyAgent \n", + "\n", + "A common use case for building a custom agent is to create an agent that acts as a proxy for the user.\n", + "\n", + "In the example below we show how to implement a `UserProxyAgent` - an agent that asks the user to enter\n", + "some text through console and then returns that message as a response." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "import asyncio\n", + "from typing import List, Sequence\n", + "\n", + "from autogen_agentchat.agents import BaseChatAgent\n", + "from autogen_agentchat.base import Response\n", + "from autogen_agentchat.messages import ChatMessage\n", + "from autogen_core.base import CancellationToken\n", + "\n", + "\n", + "class UserProxyAgent(BaseChatAgent):\n", + " def __init__(self, name: str) -> None:\n", + " super().__init__(name, \"A human user.\")\n", + "\n", + " @property\n", + " def produced_message_types(self) -> List[type[ChatMessage]]:\n", + " return [TextMessage]\n", + "\n", + " async def on_messages(self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken) -> Response:\n", + " user_input = await asyncio.get_event_loop().run_in_executor(None, input, \"Enter your response: \")\n", + " return Response(chat_message=TextMessage(content=user_input, source=self.name))\n", + "\n", + " async def on_reset(self, cancellation_token: CancellationToken) -> None:\n", + " pass\n", + "\n", + "\n", + "async def run_user_proxy_agent() -> None:\n", + " user_proxy_agent = UserProxyAgent(name=\"user_proxy_agent\")\n", + " response = await user_proxy_agent.on_messages([], CancellationToken())\n", + " print(response.chat_message.content)\n", + "\n", + "\n", + "# Use asyncio.run(run_user_proxy_agent()) when running in a script.\n", + "await run_user_proxy_agent()" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": ".venv", + "language": "python", + "name": "python3" + }, + "language_info": { + "name": "python", + "version": "3.11.5" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/index.md b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/index.md index d8a4d8559bb4..fa0ed5f6caa3 100644 --- a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/index.md +++ b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/index.md @@ -46,6 +46,12 @@ A smart team that uses a model-based strategy and custom selector. A dynamic team that uses handoffs to pass tasks between agents. ::: +:::{grid-item-card} {fas}`users;pst-color-primary` Custom Agents +:link: ./custom-agents.html + +How to build custom agents. +::: + :::: ```{toctree} @@ -58,4 +64,5 @@ teams selector-group-chat swarm termination +custom-agents ``` diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/models.ipynb b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/models.ipynb index 80c9c848273c..2adc862e541b 100644 --- a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/models.ipynb +++ b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/models.ipynb @@ -1,181 +1,191 @@ { - "cells": [ - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# Models\n", - "\n", - "In many cases, agents need access to model services such as OpenAI, Azure OpenAI, and local models.\n", - "AgentChat utilizes model clients provided by the\n", - "[`autogen-ext`](../../core-user-guide/framework/model-clients.ipynb) package." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## OpenAI\n", - "\n", - "To access OpenAI models, you need to install the `openai` extension to use the {py:class}`~autogen_ext.models.OpenAIChatCompletionClient`." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "vscode": { - "languageId": "shellscript" - } - }, - "outputs": [], - "source": [ - "pip install 'autogen-ext[openai]==0.4.0.dev6'" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "You will also need to obtain an [API key](https://platform.openai.com/account/api-keys) from OpenAI." - ] - }, - { - "cell_type": "code", - "execution_count": 10, - "metadata": {}, - "outputs": [], - "source": [ - "from autogen_ext.models import OpenAIChatCompletionClient\n", - "\n", - "opneai_model_client = OpenAIChatCompletionClient(\n", - " model=\"gpt-4o-2024-08-06\",\n", - " # api_key=\"sk-...\", # Optional if you have an OPENAI_API_KEY environment variable set.\n", - ")" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "To test the model client, you can use the following code:" - ] - }, - { - "cell_type": "code", - "execution_count": 11, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "CreateResult(finish_reason='stop', content='The capital of France is Paris.', usage=RequestUsage(prompt_tokens=15, completion_tokens=7), cached=False, logprobs=None)\n" - ] - } - ], - "source": [ - "from autogen_core.components.models import UserMessage\n", - "\n", - "result = await opneai_model_client.create([UserMessage(content=\"What is the capital of France?\", source=\"user\")])\n", - "print(result)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Azure OpenAI\n", - "\n", - "Install the `azure` and `openai` extensions to use the {py:class}`~autogen_ext.models.AzureOpenAIChatCompletionClient`." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "vscode": { - "languageId": "shellscript" - } - }, - "outputs": [], - "source": [ - "pip install 'autogen-ext[openai,azure]==0.4.0.dev6'" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "To use the client, you need to provide your deployment id, Azure Cognitive Services endpoint, api version, and model capabilities.\n", - "For authentication, you can either provide an API key or an Azure Active Directory (AAD) token credential.\n", - "\n", - "The following code snippet shows how to use AAD authentication.\n", - "The identity used must be assigned the [Cognitive Services OpenAI User](https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/role-based-access-control#cognitive-services-openai-user) role." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "from autogen_ext.models import AzureOpenAIChatCompletionClient\n", - "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n", - "\n", - "# Create the token provider\n", - "token_provider = get_bearer_token_provider(DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\")\n", - "\n", - "az_model_client = AzureOpenAIChatCompletionClient(\n", - " model=\"{your-azure-deployment}\",\n", - " api_version=\"2024-06-01\",\n", - " azure_endpoint=\"https://{your-custom-endpoint}.openai.azure.com/\",\n", - " azure_ad_token_provider=token_provider, # Optional if you choose key-based authentication.\n", - " # api_key=\"sk-...\", # For key-based authentication.\n", - " model_capabilities={\n", - " \"vision\": True,\n", - " \"function_calling\": True,\n", - " \"json_output\": True,\n", - " },\n", - ")" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "See [here](https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/managed-identity#chat-completions) for how to use the Azure client directly or for more info." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Local Models\n", - "\n", - "We are working on it. Stay tuned!" - ] - } - ], - "metadata": { - "kernelspec": { - "display_name": ".venv", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.11.5" - } - }, - "nbformat": 4, - "nbformat_minor": 2 + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Models\n", + "\n", + "In many cases, agents need access to model services such as OpenAI, Azure OpenAI, and local models.\n", + "AgentChat utilizes model clients provided by the\n", + "[`autogen-ext`](../../core-user-guide/framework/model-clients.ipynb) package." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## OpenAI\n", + "\n", + "To access OpenAI models, you need to install the `openai` extension to use the {py:class}`~autogen_ext.models.OpenAIChatCompletionClient`." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "vscode": { + "languageId": "shellscript" + } + }, + "outputs": [], + "source": [ + "pip install 'autogen-ext[openai]==0.4.0.dev6'" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "You will also need to obtain an [API key](https://platform.openai.com/account/api-keys) from OpenAI." + ] + }, + { + "cell_type": "code", + "execution_count": 10, + "metadata": {}, + "outputs": [], + "source": [ + "from autogen_ext.models import OpenAIChatCompletionClient\n", + "\n", + "opneai_model_client = OpenAIChatCompletionClient(\n", + " model=\"gpt-4o-2024-08-06\",\n", + " # api_key=\"sk-...\", # Optional if you have an OPENAI_API_KEY environment variable set.\n", + ")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "To test the model client, you can use the following code:" + ] + }, + { + "cell_type": "code", + "execution_count": 11, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "CreateResult(finish_reason='stop', content='The capital of France is Paris.', usage=RequestUsage(prompt_tokens=15, completion_tokens=7), cached=False, logprobs=None)\n" + ] + } + ], + "source": [ + "from autogen_core.components.models import UserMessage\n", + "\n", + "result = await opneai_model_client.create([UserMessage(content=\"What is the capital of France?\", source=\"user\")])\n", + "print(result)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "```{note}\n", + "You can use this client with models hosted on OpenAI-compatible endpoints, however, we have not tested this functionality.\n", + "See {py:class}`~autogen_ext.models.OpenAIChatCompletionClient` for more information.\n", + "```" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Azure OpenAI\n", + "\n", + "Install the `azure` and `openai` extensions to use the {py:class}`~autogen_ext.models.AzureOpenAIChatCompletionClient`." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "vscode": { + "languageId": "shellscript" + } + }, + "outputs": [], + "source": [ + "pip install 'autogen-ext[openai,azure]==0.4.0.dev6'" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "To use the client, you need to provide your deployment id, Azure Cognitive Services endpoint, api version, and model capabilities.\n", + "For authentication, you can either provide an API key or an Azure Active Directory (AAD) token credential.\n", + "\n", + "The following code snippet shows how to use AAD authentication.\n", + "The identity used must be assigned the [Cognitive Services OpenAI User](https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/role-based-access-control#cognitive-services-openai-user) role." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "from autogen_ext.models import AzureOpenAIChatCompletionClient\n", + "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n", + "\n", + "# Create the token provider\n", + "token_provider = get_bearer_token_provider(DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\")\n", + "\n", + "az_model_client = AzureOpenAIChatCompletionClient(\n", + " model=\"{your-azure-deployment}\",\n", + " api_version=\"2024-06-01\",\n", + " azure_endpoint=\"https://{your-custom-endpoint}.openai.azure.com/\",\n", + " azure_ad_token_provider=token_provider, # Optional if you choose key-based authentication.\n", + " # api_key=\"sk-...\", # For key-based authentication.\n", + " model_capabilities={\n", + " \"vision\": True,\n", + " \"function_calling\": True,\n", + " \"json_output\": True,\n", + " },\n", + ")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "See [here](https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/managed-identity#chat-completions) for how to use the Azure client directly or for more info." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Local Models\n", + "\n", + "We are working on it. Stay tuned!" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": ".venv", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.11.5" + } + }, + "nbformat": 4, + "nbformat_minor": 2 } diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/teams.ipynb b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/teams.ipynb index 8d001f897038..49340ef11b05 100644 --- a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/teams.ipynb +++ b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/teams.ipynb @@ -281,7 +281,7 @@ "outputs": [], "source": [ "from autogen_agentchat.agents import AssistantAgent\n", - "from autogen_agentchat.task import MaxMessageTermination, TextMentionTermination, Console\n", + "from autogen_agentchat.task import Console, MaxMessageTermination, TextMentionTermination\n", "from autogen_agentchat.teams import RoundRobinGroupChat\n", "from autogen_ext.models import OpenAIChatCompletionClient\n", "\n", @@ -764,16 +764,6 @@ "# Use `asyncio.run(Console(lazy_agent_team.run_stream(task=\"It is raining in New York.\")))` when running in a script.\n", "await Console(lazy_agent_team.run_stream(task=\"It is raining in New York.\"))" ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "```{note}\n", - "Currently the handoff termination approach does not work with {py:class}`~autogen_agentchat.teams.Swarm`.\n", - "Please stay tuned for the updates.\n", - "```" - ] } ], "metadata": { @@ -792,7 +782,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.6" + "version": "3.11.5" } }, "nbformat": 4, diff --git a/python/packages/autogen-core/samples/distributed-group-chat/README.md b/python/packages/autogen-core/samples/distributed-group-chat/README.md index 43d17ee0ebd9..b4cf16583996 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/README.md +++ b/python/packages/autogen-core/samples/distributed-group-chat/README.md @@ -31,7 +31,7 @@ The [run.sh](./run.sh) file provides commands to run the host and agents using [ Here is a screen recording of the execution: -[![Distributed Group Chat Demo with Simple UI Integration](https://img.youtube.com/vi/kLTzI-3VgPQ/0.jpg)](https://youtu.be/kLTzI-3VgPQ) +[![Distributed Group Chat Demo with Simple UI Integration](https://img.youtube.com/vi/503QJ1onV8I/0.jpg)](https://youtu.be/503QJ1onV8I?feature=shared) **Note**: Some `asyncio.sleep` commands have been added to the example code to make the `./run.sh` execution look sequential and visually easy to follow. In practice, these lines are not necessary. @@ -40,14 +40,16 @@ Here is a screen recording of the execution: If you prefer to run Python files individually, follow these steps. Note that each step must be run in a different terminal process, and the virtual environment should be activated using `source .venv/bin/activate`. 1. `python run_host.py`: Starts the host and listens for agent connections. -2. `python run_editor.py`: Starts the editor agent and connects it to the host. -3. `python run_writer.py`: Starts the writer agent and connects it to the host. -4. `chainlit run run_group_chat_manager.py --port 8001`: Run chainlit app which starts group chat manager agent and sends the initial message to start the conversation. We're using port 8001 as the default port 8000 is used to run host (assuming using same machine to run all of the agents) +2. `chainlit run run_ui.py --port 8001`: Starts the Chainlit app and UI agent and listens on UI topic to display messages. We're using port 8001 as the default port 8000 is used to run host (assuming using same machine to run all of the agents) +3. `python run_editor.py`: Starts the editor agent and connects it to the host. +4. `python run_writer.py`: Starts the writer agent and connects it to the host. +5. `python run_group_chat_manager.py`: Run chainlit app which starts group chat manager agent and sends the initial message to start the conversation. ## What's Going On? The general flow of this example is as follows: +0. The UI Agent runs starts the UI App, listens for stream of messages in the UI topic and displays them in the UI. 1. The Group Chat Manager, on behalf of `User`, sends a `RequestToSpeak` request to the `writer_agent`. 2. The `writer_agent` writes a short sentence into the group chat topic. 3. The `editor_agent` receives the message in the group chat topic and updates its memory. @@ -64,41 +66,49 @@ graph TD; A1[GRPC Server] wt[Writer Topic] et[Editor Topic] + ut[UI Topic] gct[Group Chat Topic] end + all_agents[All Agents - Simplified Arrows!] --> A1 subgraph Distributed Writer Runtime - writer_agent[ Writer Agent] --> A1 wt -.->|2 - Subscription| writer_agent gct -.->|4 - Subscription| writer_agent - writer_agent -.->|3 - Publish: Group Chat Message| gct + writer_agent -.->|3.1 - Publish: UI Message| ut + writer_agent -.->|3.2 - Publish: Group Chat Message| gct end subgraph Distributed Editor Runtime - editor_agent[ Editor Agent] --> A1 et -.->|6 - Subscription| editor_agent gct -.->|4 - Subscription| editor_agent - editor_agent -.->|7 - Publish: Group Chat Message| gct + editor_agent -.->|7.1 - Publish: UI Message| ut + editor_agent -.->|7.2 - Publish: Group Chat Message| gct end subgraph Distributed Group Chat Manager Runtime - group_chat_manager[ Group Chat Manager Agent] --> A1 gct -.->|4 - Subscription| group_chat_manager group_chat_manager -.->|1 - Request To Speak| wt group_chat_manager -.->|5 - Request To Speak| et + group_chat_manager -.->|\* - Publish Some of to UI Message| ut end + subgraph Distributed UI Runtime + ut -.->|\* - Subscription| ui_agent + end + + style wt fill:#beb2c3,color:#000 style et fill:#beb2c3,color:#000 style gct fill:#beb2c3,color:#000 + style ut fill:#beb2c3,color:#000 style writer_agent fill:#b7c4d7,color:#000 style editor_agent fill:#b7c4d7,color:#000 style group_chat_manager fill:#b7c4d7,color:#000 + style ui_agent fill:#b7c4d7,color:#000 ``` ## TODO: - [ ] Properly handle chat restarts. It complains about group chat manager being already registered -- [ ] Send Chainlit messages within each agent (Currently the manager can just sends messages in the group chat topic) -- [ ] Add streaming to the UI like [this example](https://docs.chainlit.io/advanced-features/streaming) but Autogen's Open AI Client [does not supporting streaming yet](https://github.com/microsoft/autogen/blob/0f4dd0cc6dd3eea303ad3d2063979b4b9a1aacfc/python/packages/autogen-ext/src/autogen_ext/models/_openai/_openai_client.py#L81) +- [ ] Add streaming to the UI like [this example](https://docs.chainlit.io/advanced-features/streaming) when [this bug](https://github.com/microsoft/autogen/issues/4213) is resolved diff --git a/python/packages/autogen-core/samples/distributed-group-chat/_agents.py b/python/packages/autogen-core/samples/distributed-group-chat/_agents.py index 89ac74555967..8ff935600bab 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/_agents.py +++ b/python/packages/autogen-core/samples/distributed-group-chat/_agents.py @@ -1,6 +1,10 @@ +import asyncio +import random from typing import Awaitable, Callable, List +from uuid import uuid4 -from _types import GroupChatMessage, RequestToSpeak +from _types import GroupChatMessage, MessageChunk, RequestToSpeak, UIAgentConfig +from autogen_core.application import WorkerAgentRuntime from autogen_core.base import MessageContext from autogen_core.components import DefaultTopicId, RoutedAgent, message_handler from autogen_core.components.models import ( @@ -23,12 +27,15 @@ def __init__( group_chat_topic_type: str, model_client: ChatCompletionClient, system_message: str, + ui_config: UIAgentConfig, ) -> None: super().__init__(description=description) self._group_chat_topic_type = group_chat_topic_type self._model_client = model_client self._system_message = SystemMessage(system_message) self._chat_history: List[LLMMessage] = [] + self._ui_config = ui_config + self.console = Console() @message_handler async def handle_message(self, message: GroupChatMessage, ctx: MessageContext) -> None: @@ -47,11 +54,16 @@ async def handle_request_to_speak(self, message: RequestToSpeak, ctx: MessageCon completion = await self._model_client.create([self._system_message] + self._chat_history) assert isinstance(completion.content, str) self._chat_history.append(AssistantMessage(content=completion.content, source=self.id.type)) - Console().print(Markdown(f"**{self.id.type}**: {completion.content}\n")) - await self.publish_message( - GroupChatMessage(body=UserMessage(content=completion.content, source=self.id.type)), - topic_id=DefaultTopicId(type=self._group_chat_topic_type), + console_message = f"\n{'-'*80}\n**{self.id.type}**: {completion.content}" + self.console.print(Markdown(console_message)) + + await publish_message_to_ui_and_backend( + runtime=self, + source=self.id.type, + user_message=completion.content, + ui_config=self._ui_config, + group_chat_topic_type=self._group_chat_topic_type, ) @@ -61,7 +73,7 @@ def __init__( model_client: ChatCompletionClient, participant_topic_types: List[str], participant_descriptions: List[str], - on_message_func: Callable[[str, str], Awaitable[None]], + ui_config: UIAgentConfig, max_rounds: int = 3, ) -> None: super().__init__("Group chat manager") @@ -71,14 +83,14 @@ def __init__( self._chat_history: List[GroupChatMessage] = [] self._max_rounds = max_rounds self.console = Console() - self._on_message_func = on_message_func self._participant_descriptions = participant_descriptions self._previous_participant_topic_type: str | None = None + self._ui_config = ui_config @message_handler async def handle_message(self, message: GroupChatMessage, ctx: MessageContext) -> None: assert isinstance(message.body, UserMessage) - await self._on_message_func(message.body.content, message.body.source) # type: ignore[arg-type] + self._chat_history.append(message.body) # type: ignore[reportargumenttype,arg-type] # Format message history. @@ -117,11 +129,17 @@ async def handle_message(self, message: GroupChatMessage, ctx: MessageContext) - """ system_message = SystemMessage(selector_prompt) completion = await self._model_client.create([system_message], cancellation_token=ctx.cancellation_token) - assert isinstance(completion.content, str) + + assert isinstance( + completion.content, str + ), f"Completion content must be a string, but is: {type(completion.content)}" if completion.content.upper() == "FINISH": - manager_message = f"\n{'-'*80}\n Manager ({id(self)}): I think it's enough iterations on the story! Thanks for collaborating!" - await self._on_message_func(manager_message, "group_chat_manager") + finish_msg = "I think it's enough iterations on the story! Thanks for collaborating!" + manager_message = f"\n{'-'*80}\n Manager ({id(self)}): {finish_msg}" + await publish_message_to_ui( + runtime=self, source=self.id.type, user_message=finish_msg, ui_config=self._ui_config + ) self.console.print(Markdown(manager_message)) return @@ -136,3 +154,62 @@ async def handle_message(self, message: GroupChatMessage, ctx: MessageContext) - await self.publish_message(RequestToSpeak(), DefaultTopicId(type=selected_topic_type)) return raise ValueError(f"Invalid role selected: {completion.content}") + + +class UIAgent(RoutedAgent): + """Handles UI-related tasks and message processing for the distributed group chat system.""" + + def __init__(self, on_message_chunk_func: Callable[[MessageChunk], Awaitable[None]]) -> None: + super().__init__("UI Agent") + self._on_message_chunk_func = on_message_chunk_func + + @message_handler + async def handle_message_chunk(self, message: MessageChunk, ctx: MessageContext) -> None: + await self._on_message_chunk_func(message) + + +async def publish_message_to_ui( + runtime: RoutedAgent | WorkerAgentRuntime, + source: str, + user_message: str, + ui_config: UIAgentConfig, +) -> None: + message_id = str(uuid4()) + # Stream the message to UI + message_chunks = ( + MessageChunk(message_id=message_id, text=token + " ", author=source, finished=False) + for token in user_message.split() + ) + for chunk in message_chunks: + await runtime.publish_message( + chunk, + DefaultTopicId(type=ui_config.topic_type), + ) + await asyncio.sleep(random.uniform(ui_config.min_delay, ui_config.max_delay)) + + await runtime.publish_message( + MessageChunk(message_id=message_id, text=" ", author=source, finished=True), + DefaultTopicId(type=ui_config.topic_type), + ) + + +async def publish_message_to_ui_and_backend( + runtime: RoutedAgent | WorkerAgentRuntime, + source: str, + user_message: str, + ui_config: UIAgentConfig, + group_chat_topic_type: str, +) -> None: + # Publish messages for ui + await publish_message_to_ui( + runtime=runtime, + source=source, + user_message=user_message, + ui_config=ui_config, + ) + + # Publish message to backend + await runtime.publish_message( + GroupChatMessage(body=UserMessage(content=user_message, source=source)), + topic_id=DefaultTopicId(type=group_chat_topic_type), + ) diff --git a/python/packages/autogen-core/samples/distributed-group-chat/_types.py b/python/packages/autogen-core/samples/distributed-group-chat/_types.py index 343c264f1823..178446ca8c62 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/_types.py +++ b/python/packages/autogen-core/samples/distributed-group-chat/_types.py @@ -1,3 +1,6 @@ +from dataclasses import dataclass +from typing import Dict + from autogen_core.components.models import ( LLMMessage, ) @@ -17,6 +20,17 @@ class RequestToSpeak(BaseModel): pass +@dataclass +class MessageChunk: + message_id: str + text: str + author: str + finished: bool + + def __str__(self) -> str: + return f"{self.author}({self.message_id}): {self.text}" + + # Define Host configuration model class HostConfig(BaseModel): hostname: str @@ -40,10 +54,25 @@ class ChatAgentConfig(BaseModel): system_message: str +# Define UI Agent configuration model +class UIAgentConfig(BaseModel): + topic_type: str + artificial_stream_delay_seconds: Dict[str, float] + + @property + def min_delay(self) -> float: + return self.artificial_stream_delay_seconds.get("min", 0.0) + + @property + def max_delay(self) -> float: + return self.artificial_stream_delay_seconds.get("max", 0.0) + + # Define the overall AppConfig model class AppConfig(BaseModel): host: HostConfig group_chat_manager: GroupChatManagerConfig writer_agent: ChatAgentConfig editor_agent: ChatAgentConfig - client_config: AzureOpenAIClientConfiguration = None # type: ignore[assignment] # This was required to do custom instantiation in `load_config`` + ui_agent: UIAgentConfig + client_config: AzureOpenAIClientConfiguration = None # type: ignore[assignment] # This was required to do custom instantiation in `load_config` diff --git a/python/packages/autogen-core/samples/distributed-group-chat/config.yaml b/python/packages/autogen-core/samples/distributed-group-chat/config.yaml index 26eaf5b3b38f..f18b4545500a 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/config.yaml +++ b/python/packages/autogen-core/samples/distributed-group-chat/config.yaml @@ -4,17 +4,23 @@ host: group_chat_manager: topic_type: "group_chat" - max_rounds: 7 + max_rounds: 3 writer_agent: topic_type: "Writer" description: "Writer for creating any text content." - system_message: "You are a one sentence Writer and provide one line content each time" + system_message: "You are a one sentence Writer and provide one sentence content each time" editor_agent: topic_type: "Editor" description: "Editor for planning and reviewing the content." - system_message: "You are an Editor. You provide just max 10 words as feedback on writers content." + system_message: "You are an Editor. You provide just max 15 words as feedback on writers content." + +ui_agent: + topic_type: "ui_events" + artificial_stream_delay_seconds: + min: 0.05 + max: 0.1 client_config: model: "gpt-4o" diff --git a/python/packages/autogen-core/samples/distributed-group-chat/run.sh b/python/packages/autogen-core/samples/distributed-group-chat/run.sh index 859096e9402b..d4b8c1b1b6f4 100755 --- a/python/packages/autogen-core/samples/distributed-group-chat/run.sh +++ b/python/packages/autogen-core/samples/distributed-group-chat/run.sh @@ -5,12 +5,14 @@ tmux new-session -d -s distributed_group_chat # # Split the terminal into 2 vertical panes tmux split-window -h -# # Split the left pane horizontally +# # Split the left pane into 3 windows tmux select-pane -t distributed_group_chat:0.0 -tmux split-window -v +tmux split-window -v +tmux select-pane -t distributed_group_chat:0.0 +tmux split-window -v # # Split the right pane horizontally -tmux select-pane -t distributed_group_chat:0.2 +tmux select-pane -t distributed_group_chat:0.3 tmux split-window -v # Select the first pane to start @@ -18,9 +20,10 @@ tmux select-pane -t distributed_group_chat:0.0 # Activate the virtual environment and run the scripts in each pane tmux send-keys -t distributed_group_chat:0.0 "python run_host.py" C-m -tmux send-keys -t distributed_group_chat:0.2 "python run_writer_agent.py" C-m -tmux send-keys -t distributed_group_chat:0.3 "python run_editor_agent.py" C-m -tmux send-keys -t distributed_group_chat:0.1 "chainlit run run_group_chat_manager.py --port 8001" C-m +tmux send-keys -t distributed_group_chat:0.1 "chainlit run run_ui.py --port 8001" C-m +tmux send-keys -t distributed_group_chat:0.3 "python run_writer_agent.py" C-m +tmux send-keys -t distributed_group_chat:0.4 "python run_editor_agent.py" C-m +tmux send-keys -t distributed_group_chat:0.2 "python run_group_chat_manager.py" C-m # # Attach to the session tmux attach-session -t distributed_group_chat diff --git a/python/packages/autogen-core/samples/distributed-group-chat/run_editor_agent.py b/python/packages/autogen-core/samples/distributed-group-chat/run_editor_agent.py index a452db6b9a3e..8a08bfe6b479 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/run_editor_agent.py +++ b/python/packages/autogen-core/samples/distributed-group-chat/run_editor_agent.py @@ -3,13 +3,13 @@ import warnings from _agents import BaseGroupChatAgent -from _types import AppConfig, GroupChatMessage, RequestToSpeak +from _types import AppConfig, GroupChatMessage, MessageChunk, RequestToSpeak from _utils import get_serializers, load_config, set_all_log_levels from autogen_core.application import WorkerAgentRuntime from autogen_core.components import ( TypeSubscription, ) -from autogen_core.components.models._openai_client import AzureOpenAIChatCompletionClient +from autogen_ext.models import AzureOpenAIChatCompletionClient from rich.console import Console from rich.markdown import Markdown @@ -17,7 +17,7 @@ async def main(config: AppConfig): set_all_log_levels(logging.ERROR) editor_agent_runtime = WorkerAgentRuntime(host_address=config.host.address) - editor_agent_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage])) # type: ignore[arg-type] + editor_agent_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage, MessageChunk])) # type: ignore[arg-type] await asyncio.sleep(4) Console().print(Markdown("Starting **`Editor Agent`**")) editor_agent_runtime.start() @@ -29,6 +29,7 @@ async def main(config: AppConfig): group_chat_topic_type=config.group_chat_manager.topic_type, system_message=config.editor_agent.system_message, model_client=AzureOpenAIChatCompletionClient(**config.client_config), + ui_config=config.ui_agent, ), ) await editor_agent_runtime.add_subscription( diff --git a/python/packages/autogen-core/samples/distributed-group-chat/run_group_chat_manager.py b/python/packages/autogen-core/samples/distributed-group-chat/run_group_chat_manager.py index 5af446ab1a94..e0b2880aa99f 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/run_group_chat_manager.py +++ b/python/packages/autogen-core/samples/distributed-group-chat/run_group_chat_manager.py @@ -2,18 +2,13 @@ import logging import warnings -import chainlit as cl # type: ignore [reportUnknownMemberType] # This dependency is installed through instructions -from _agents import GroupChatManager -from _types import AppConfig, GroupChatMessage, RequestToSpeak +from _agents import GroupChatManager, publish_message_to_ui, publish_message_to_ui_and_backend +from _types import AppConfig, GroupChatMessage, MessageChunk, RequestToSpeak from _utils import get_serializers, load_config, set_all_log_levels from autogen_core.application import WorkerAgentRuntime from autogen_core.components import ( - DefaultTopicId, TypeSubscription, ) -from autogen_core.components.models import ( - UserMessage, -) from autogen_ext.models import AzureOpenAIChatCompletionClient from rich.console import Console from rich.markdown import Markdown @@ -21,22 +16,16 @@ set_all_log_levels(logging.ERROR) -# TODO: This is the simple hack to send messages to the UI, needs to be improved once we get some help in https://github.com/Chainlit/chainlit/issues/1491 -async def send_cl(msg: str, author: str) -> None: - await cl.Message(content=msg, author=author).send() # type: ignore [reportAttributeAccessIssue,reportUnknownMemberType] - - async def main(config: AppConfig): set_all_log_levels(logging.ERROR) group_chat_manager_runtime = WorkerAgentRuntime(host_address=config.host.address) - # Add group chat manager runtime - - group_chat_manager_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage])) # type: ignore[arg-type] + group_chat_manager_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage, MessageChunk])) # type: ignore[arg-type] await asyncio.sleep(1) Console().print(Markdown("Starting **`Group Chat Manager`**")) group_chat_manager_runtime.start() set_all_log_levels(logging.ERROR) + group_chat_manager_type = await GroupChatManager.register( group_chat_manager_runtime, "group_chat_manager", @@ -45,7 +34,7 @@ async def main(config: AppConfig): participant_topic_types=[config.writer_agent.topic_type, config.editor_agent.topic_type], participant_descriptions=[config.writer_agent.description, config.editor_agent.description], max_rounds=config.group_chat_manager.max_rounds, - on_message_func=send_cl, + ui_config=config.ui_agent, ), ) @@ -53,36 +42,32 @@ async def main(config: AppConfig): TypeSubscription(topic_type=config.group_chat_manager.topic_type, agent_type=group_chat_manager_type.type) ) - # This is a simple way to make sure first message gets send after all of the agents have joined await asyncio.sleep(5) - user_message: str = "Please write a one line story about the gingerbread in halloween!" + + await publish_message_to_ui( + runtime=group_chat_manager_runtime, + source="System", + user_message="[ **Due to responsible AI considerations of this sample, group chat manager is sending an initiator message on behalf of user** ]", + ui_config=config.ui_agent, + ) + await asyncio.sleep(3) + + user_message: str = "Please write a short story about the gingerbread in halloween!" Console().print(f"Simulating User input in group chat topic:\n\t'{user_message}'") - await group_chat_manager_runtime.publish_message( - GroupChatMessage( - body=UserMessage( - content=user_message, - source="User", - ) - ), - DefaultTopicId(type=config.group_chat_manager.topic_type), + + await publish_message_to_ui_and_backend( + runtime=group_chat_manager_runtime, + source="User", + user_message=user_message, + ui_config=config.ui_agent, + group_chat_topic_type=config.group_chat_manager.topic_type, ) await group_chat_manager_runtime.stop_when_signal() Console().print("Manager left the chat!") -@cl.on_chat_start # type: ignore -async def start_chat(): +if __name__ == "__main__": set_all_log_levels(logging.ERROR) warnings.filterwarnings("ignore", category=UserWarning, message="Resolved model mismatch.*") asyncio.run(main(load_config())) - - -# This can be used for debugging, you can run this file using python -# if __name__ == "__main__": -# from chainlit.cli import run_chainlit - -# set_all_log_levels(logging.ERROR) -# run_chainlit( -# __file__, -# ) diff --git a/python/packages/autogen-core/samples/distributed-group-chat/run_ui.py b/python/packages/autogen-core/samples/distributed-group-chat/run_ui.py new file mode 100644 index 000000000000..aeb24e8d1755 --- /dev/null +++ b/python/packages/autogen-core/samples/distributed-group-chat/run_ui.py @@ -0,0 +1,67 @@ +import asyncio +import logging +import warnings + +import chainlit as cl # type: ignore [reportUnknownMemberType] # This dependency is installed through instructions +from _agents import MessageChunk, UIAgent +from _types import AppConfig, GroupChatMessage, RequestToSpeak +from _utils import get_serializers, load_config, set_all_log_levels +from autogen_core.application import WorkerAgentRuntime +from autogen_core.components import ( + TypeSubscription, +) +from chainlit import Message # type: ignore [reportAttributeAccessIssue] +from rich.console import Console +from rich.markdown import Markdown + +set_all_log_levels(logging.ERROR) + + +message_chunks: dict[str, Message] = {} # type: ignore [reportUnknownVariableType] + + +async def send_cl_stream(msg: MessageChunk) -> None: + if msg.message_id not in message_chunks: + message_chunks[msg.message_id] = Message(content="", author=msg.author) + + if not msg.finished: + await message_chunks[msg.message_id].stream_token(msg.text) # type: ignore [reportUnknownVariableType] + else: + await message_chunks[msg.message_id].stream_token(msg.text) # type: ignore [reportUnknownVariableType] + await message_chunks[msg.message_id].update() # type: ignore [reportUnknownMemberType] + await asyncio.sleep(3) + cl_msg = message_chunks[msg.message_id] # type: ignore [reportUnknownVariableType] + await cl_msg.send() # type: ignore [reportUnknownMemberType] + + +async def main(config: AppConfig): + set_all_log_levels(logging.ERROR) + ui_agent_runtime = WorkerAgentRuntime(host_address=config.host.address) + + ui_agent_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage, MessageChunk])) # type: ignore[arg-type] + + Console().print(Markdown("Starting **`UI Agent`**")) + ui_agent_runtime.start() + set_all_log_levels(logging.ERROR) + + ui_agent_type = await UIAgent.register( + ui_agent_runtime, + "ui_agent", + lambda: UIAgent( + on_message_chunk_func=send_cl_stream, + ), + ) + + await ui_agent_runtime.add_subscription( + TypeSubscription(topic_type=config.ui_agent.topic_type, agent_type=ui_agent_type.type) + ) # TODO: This could be a great example of using agent_id to route to sepecific element in the ui. Can replace MessageChunk.message_id + + await ui_agent_runtime.stop_when_signal() + Console().print("UI Agent left the chat!") + + +@cl.on_chat_start # type: ignore +async def start_chat(): + set_all_log_levels(logging.ERROR) + warnings.filterwarnings("ignore", category=UserWarning, message="Resolved model mismatch.*") + asyncio.run(main(load_config())) diff --git a/python/packages/autogen-core/samples/distributed-group-chat/run_writer_agent.py b/python/packages/autogen-core/samples/distributed-group-chat/run_writer_agent.py index 1c6935de383e..674ed59ce3a8 100644 --- a/python/packages/autogen-core/samples/distributed-group-chat/run_writer_agent.py +++ b/python/packages/autogen-core/samples/distributed-group-chat/run_writer_agent.py @@ -3,7 +3,7 @@ import warnings from _agents import BaseGroupChatAgent -from _types import AppConfig, GroupChatMessage, RequestToSpeak +from _types import AppConfig, GroupChatMessage, MessageChunk, RequestToSpeak from _utils import get_serializers, load_config, set_all_log_levels from autogen_core.application import WorkerAgentRuntime from autogen_core.components import ( @@ -17,7 +17,7 @@ async def main(config: AppConfig) -> None: set_all_log_levels(logging.ERROR) writer_agent_runtime = WorkerAgentRuntime(host_address=config.host.address) - writer_agent_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage])) # type: ignore[arg-type] + writer_agent_runtime.add_message_serializer(get_serializers([RequestToSpeak, GroupChatMessage, MessageChunk])) # type: ignore[arg-type] await asyncio.sleep(3) Console().print(Markdown("Starting **`Writer Agent`**")) @@ -30,6 +30,7 @@ async def main(config: AppConfig) -> None: group_chat_topic_type=config.group_chat_manager.topic_type, system_message=config.writer_agent.system_message, model_client=AzureOpenAIChatCompletionClient(**config.client_config), + ui_config=config.ui_agent, ), ) await writer_agent_runtime.add_subscription( diff --git a/python/packages/autogen-core/src/autogen_core/components/tools/_base.py b/python/packages/autogen-core/src/autogen_core/components/tools/_base.py index e9d8d2aa5b87..eb6a2067ebf5 100644 --- a/python/packages/autogen-core/src/autogen_core/components/tools/_base.py +++ b/python/packages/autogen-core/src/autogen_core/components/tools/_base.py @@ -1,7 +1,7 @@ import json from abc import ABC, abstractmethod from collections.abc import Sequence -from typing import Any, Dict, Generic, Mapping, Protocol, Type, TypedDict, TypeVar, runtime_checkable, cast +from typing import Any, Dict, Generic, Mapping, Protocol, Type, TypedDict, TypeVar, cast, runtime_checkable import jsonref from pydantic import BaseModel diff --git a/python/packages/autogen-core/tests/test_tools.py b/python/packages/autogen-core/tests/test_tools.py index 867fd012d577..70ec08469706 100644 --- a/python/packages/autogen-core/tests/test_tools.py +++ b/python/packages/autogen-core/tests/test_tools.py @@ -1,12 +1,12 @@ import inspect from typing import Annotated, List -from autogen_core.components.tools._base import ToolSchema import pytest from autogen_core.base import CancellationToken from autogen_core.components._function_utils import get_typed_signature from autogen_core.components.models._openai_client import convert_tools from autogen_core.components.tools import BaseTool, FunctionTool +from autogen_core.components.tools._base import ToolSchema from pydantic import BaseModel, Field, model_serializer from pydantic_core import PydanticUndefined diff --git a/python/packages/autogen-ext/src/autogen_ext/models/_openai/_openai_client.py b/python/packages/autogen-ext/src/autogen_ext/models/_openai/_openai_client.py index aa9f772d0b95..7faefa44c4a8 100644 --- a/python/packages/autogen-ext/src/autogen_ext/models/_openai/_openai_client.py +++ b/python/packages/autogen-ext/src/autogen_ext/models/_openai/_openai_client.py @@ -851,6 +851,65 @@ def capabilities(self) -> ModelCapabilities: class OpenAIChatCompletionClient(BaseOpenAIChatCompletionClient): + """Chat completion client for OpenAI hosted models. + + You can also use this client for OpenAI-compatible ChatCompletion endpoints. + **Using this client for non-OpenAI models is not tested or guaranteed.** + + For non-OpenAI models, please first take a look at our `community extensions `_ + for additional model clients. + + Args: + model (str): The model to use. **Required.** + api_key (str): The API key to use. **Required if 'OPENAI_API_KEY' is not found in the environment variables.** + timeout (optional, int): The timeout for the request in seconds. + max_retries (optional, int): The maximum number of retries to attempt. + organization_id (optional, str): The organization ID to use. + base_url (optional, str): The base URL to use. **Required if the model is not hosted on OpenAI.** + model_capabilities (optional, ModelCapabilities): The capabilities of the model. **Required if the model name is not a valid OpenAI model.** + + To use this client, you must install the `openai` extension: + + .. code-block:: bash + + pip install 'autogen-ext[openai]==0.4.0.dev6' + + The following code snippet shows how to use the client with an OpenAI model: + + .. code-block:: python + + from autogen_ext.models import OpenAIChatCompletionClient + from autogen_core.components.models import UserMessage + + opneai_model_client = OpenAIChatCompletionClient( + model="gpt-4o-2024-08-06", + # api_key="sk-...", # Optional if you have an OPENAI_API_KEY environment variable set. + ) + + result = await opneai_model_client.create([UserMessage(content="What is the capital of France?", source="user")]) + print(result) + + + To use the client with a non-OpenAI model, you need to provide the base URL of the model and the model capabilities: + + .. code-block:: python + + from autogen_ext.models import OpenAIChatCompletionClient + from autogen_core.components.models import UserMessage + + custom_model_client = OpenAIChatCompletionClient( + model="custom-model-name", + base_url="https://custom-model.com/reset/of/the/path", + api_key="placeholder", + model_capabilities={ + "vision": True, + "function_calling": True, + "json_output": True, + }, + ) + + """ + def __init__(self, **kwargs: Unpack[OpenAIClientConfiguration]): if "model" not in kwargs: raise ValueError("model is required for OpenAIChatCompletionClient") @@ -877,6 +936,57 @@ def __setstate__(self, state: Dict[str, Any]) -> None: class AzureOpenAIChatCompletionClient(BaseOpenAIChatCompletionClient): + """Chat completion client for Azure OpenAI hosted models. + + Args: + azure_endpoint (str): The endpoint for the Azure model. **Required for Azure models.** + model (str): The deployment ID for the Azure model. **Required for Azure models.** + api_version (str): The API version to use. **Required for Azure models.** + azure_ad_token (str): The Azure AD token to use. Provide this or `azure_ad_token_provider` for token-based authentication. + azure_ad_token_provider (Callable[[], Awaitable[str]]): The Azure AD token provider to use. Provide this or `azure_ad_token` for token-based authentication. + model_capabilities (ModelCapabilities): The capabilities of the model. **Required for Azure models.** + api_key (optional, str): The API key to use, use this if you are using key based authentication. It is optional if you are using Azure AD token based authentication or `AZURE_OPENAI_API_KEY` environment variable. + timeout (optional, int): The timeout for the request in seconds. + max_retries (optional, int): The maximum number of retries to attempt. + + To use this client, you must install the `azure` and `openai` extensions: + + .. code-block:: bash + + pip install 'autogen-ext[openai,azure]==0.4.0.dev6' + + To use the client, you need to provide your deployment id, Azure Cognitive Services endpoint, + api version, and model capabilities. + For authentication, you can either provide an API key or an Azure Active Directory (AAD) token credential. + + The following code snippet shows how to use AAD authentication. + The identity used must be assigned the `Cognitive Services OpenAI User `_ role. + + .. code-block:: python + + from autogen_ext.models import AzureOpenAIChatCompletionClient + from azure.identity import DefaultAzureCredential, get_bearer_token_provider + + # Create the token provider + token_provider = get_bearer_token_provider(DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default") + + az_model_client = AzureOpenAIChatCompletionClient( + model="{your-azure-deployment}", + api_version="2024-06-01", + azure_endpoint="https://{your-custom-endpoint}.openai.azure.com/", + azure_ad_token_provider=token_provider, # Optional if you choose key-based authentication. + # api_key="sk-...", # For key-based authentication. `AZURE_OPENAI_API_KEY` environment variable can also be used instead. + model_capabilities={ + "vision": True, + "function_calling": True, + "json_output": True, + }, + ) + + See `here `_ for how to use the Azure client directly or for more info. + + """ + def __init__(self, **kwargs: Unpack[AzureOpenAIClientConfiguration]): if "model" not in kwargs: raise ValueError("model is required for OpenAIChatCompletionClient") diff --git a/python/packages/autogen-studio/README.md b/python/packages/autogen-studio/README.md index 6aa86ce51156..007210350829 100644 --- a/python/packages/autogen-studio/README.md +++ b/python/packages/autogen-studio/README.md @@ -3,11 +3,11 @@ [![PyPI version](https://badge.fury.io/py/autogenstudio.svg)](https://badge.fury.io/py/autogenstudio) [![Downloads](https://static.pepy.tech/badge/autogenstudio/week)](https://pepy.tech/project/autogenstudio) -![ARA](./docs/ara_stockprices.png) +![ARA](./docs/ags_screen.png) AutoGen Studio is an AutoGen-powered AI app (user interface) to help you rapidly prototype AI agents, enhance them with skills, compose them into workflows and interact with them to accomplish tasks. It is built on top of the [AutoGen](https://microsoft.github.io/autogen) framework, which is a toolkit for building AI agents. -Code for AutoGen Studio is on GitHub at [microsoft/autogen](https://github.com/microsoft/autogen/tree/main/samples/apps/autogen-studio) +Code for AutoGen Studio is on GitHub at [microsoft/autogen](https://github.com/microsoft/autogen/tree/main/python/packages/autogen-studio) > **Note**: AutoGen Studio is meant to help you rapidly prototype multi-agent workflows and demonstrate an example of end user interfaces built with AutoGen. It is not meant to be a production-ready app. @@ -16,6 +16,7 @@ Code for AutoGen Studio is on GitHub at [microsoft/autogen](https://github.com/m **Updates** +> Nov 14: AutoGen Studio is being rewritten to use the updated AutoGen 0.4.0 api AgentChat api. > April 17: AutoGen Studio database layer is now rewritten to use [SQLModel](https://sqlmodel.tiangolo.com/) (Pydantic + SQLAlchemy). This provides entity linking (skills, models, agents and workflows are linked via association tables) and supports multiple [database backend dialects](https://docs.sqlalchemy.org/en/20/dialects/) supported in SQLAlchemy (SQLite, PostgreSQL, MySQL, Oracle, Microsoft SQL Server). The backend database can be specified a `--database-uri` argument when running the application. For example, `autogenstudio ui --database-uri sqlite:///database.sqlite` for SQLite and `autogenstudio ui --database-uri postgresql+psycopg://user:password@localhost/dbname` for PostgreSQL. > March 12: Default directory for AutoGen Studio is now /home//.autogenstudio. You can also specify this directory using the `--appdir` argument when running the application. For example, `autogenstudio ui --appdir /path/to/folder`. This will store the database and other files in the specified directory e.g. `/path/to/folder/database.sqlite`. `.env` files in that directory will be used to set environment variables for the app. @@ -49,7 +50,7 @@ There are two ways to install AutoGen Studio - from PyPi or from source. We **re pip install -e . ``` - - Navigate to the `samples/apps/autogen-studio/frontend` directory, install dependencies, and build the UI: + - Navigate to the `python/packages/autogen-studio/frontend` directory, install dependencies, and build the UI: ```bash npm install -g gatsby-cli @@ -84,20 +85,28 @@ AutoGen Studio also takes several parameters to customize the application: - `--port ` argument to specify the port number. By default, it is set to `8080`. - `--reload` argument to enable auto-reloading of the server when changes are made to the code. By default, it is set to `False`. - `--database-uri` argument to specify the database URI. Example values include `sqlite:///database.sqlite` for SQLite and `postgresql+psycopg://user:password@localhost/dbname` for PostgreSQL. If this is not specified, the database URIL defaults to a `database.sqlite` file in the `--appdir` directory. +- `--upgrade-database` argument to upgrade the database schema to the latest version. By default, it is set to `False`. Now that you have AutoGen Studio installed and running, you are ready to explore its capabilities, including defining and modifying agent workflows, interacting with agents and sessions, and expanding agent skills. #### If running from source + When running from source, you need to separately bring up the frontend server. + 1. Open a separate terminal and change directory to the frontend + ```bash cd frontend ``` + 3. Create a `.env.development` file. + ```bash cp .env.default .env.development ``` + 3. Launch frontend server + ```bash npm run start ``` @@ -107,12 +116,11 @@ npm run start We welcome contributions to AutoGen Studio. We recommend the following general steps to contribute to the project: - Review the overall AutoGen project [contribution guide](https://github.com/microsoft/autogen?tab=readme-ov-file#contributing) -- Please review the AutoGen Studio [roadmap](https://github.com/microsoft/autogen/issues/737) to get a sense of the current priorities for the project. Help is appreciated especially with Studio issues tagged with `help-wanted` +- Please review the AutoGen Studio [roadmap](https://github.com/microsoft/autogen/issues/4006) to get a sense of the current priorities for the project. Help is appreciated especially with Studio issues tagged with `help-wanted` - Please initiate a discussion on the roadmap issue or a new issue to discuss your proposed contribution. -- Please review the autogenstudio dev branch here [dev branch](https://github.com/microsoft/autogen/tree/autogenstudio) and use as a base for your contribution. This way, your contribution will be aligned with the latest changes in the AutoGen Studio project. - Submit a pull request with your contribution! - If you are modifying AutoGen Studio, it has its own devcontainer. See instructions in `.devcontainer/README.md` to use it -- Please use the tag `studio` for any issues, questions, and PRs related to Studio +- Please use the tag `proj-studio` for any issues, questions, and PRs related to Studio ## FAQ diff --git a/python/packages/autogen-studio/autogenstudio/components/__init__.py b/python/packages/autogen-studio/autogenstudio/components/__init__.py new file mode 100644 index 000000000000..ac3f3116bc2f --- /dev/null +++ b/python/packages/autogen-studio/autogenstudio/components/__init__.py @@ -0,0 +1 @@ +from .agents.userproxy import UserProxyAgent diff --git a/python/packages/autogen-studio/autogenstudio/components/agents/__init__.py b/python/packages/autogen-studio/autogenstudio/components/agents/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/python/packages/autogen-studio/autogenstudio/components/agents/userproxy.py b/python/packages/autogen-studio/autogenstudio/components/agents/userproxy.py new file mode 100644 index 000000000000..cb0fba52e07f --- /dev/null +++ b/python/packages/autogen-studio/autogenstudio/components/agents/userproxy.py @@ -0,0 +1,47 @@ +from typing import Callable, List, Optional, Sequence, Union, Awaitable +from inspect import iscoroutinefunction + +from autogen_agentchat.agents import BaseChatAgent +from autogen_agentchat.base import Response +from autogen_agentchat.messages import ChatMessage, TextMessage +from autogen_core.base import CancellationToken +import asyncio + + +class UserProxyAgent(BaseChatAgent): + """An agent that can represent a human user in a chat.""" + + def __init__( + self, + name: str, + description: Optional[str] = "a", + input_func: Optional[Union[Callable[..., str], + Callable[..., Awaitable[str]]]] = None + ) -> None: + super().__init__(name, description=description) + self.input_func = input_func or input + self._is_async = iscoroutinefunction( + input_func) if input_func else False + + @property + def produced_message_types(self) -> List[type[ChatMessage]]: + return [TextMessage] + + async def _get_input(self, prompt: str) -> str: + """Handle both sync and async input functions""" + if self._is_async: + return await self.input_func(prompt) + else: + return await asyncio.get_event_loop().run_in_executor(None, self.input_func, prompt) + + async def on_messages(self, messages: Sequence[ChatMessage], cancellation_token: CancellationToken) -> Response: + + try: + user_input = await self._get_input("Enter your response: ") + return Response(chat_message=TextMessage(content=user_input, source=self.name)) + except Exception as e: + # Consider logging the error here + raise RuntimeError(f"Failed to get user input: {str(e)}") from e + + async def on_reset(self, cancellation_token: CancellationToken) -> None: + pass diff --git a/python/packages/autogen-studio/autogenstudio/database/__init__.py b/python/packages/autogen-studio/autogenstudio/database/__init__.py index ac87c41f0bd7..18e67140acce 100644 --- a/python/packages/autogen-studio/autogenstudio/database/__init__.py +++ b/python/packages/autogen-studio/autogenstudio/database/__init__.py @@ -1,3 +1,3 @@ from .db_manager import DatabaseManager -from .component_factory import ComponentFactory +from .component_factory import ComponentFactory, Component from .config_manager import ConfigurationManager diff --git a/python/packages/autogen-studio/autogenstudio/database/component_factory.py b/python/packages/autogen-studio/autogenstudio/database/component_factory.py index 7c0275275135..bd8fec61a36a 100644 --- a/python/packages/autogen-studio/autogenstudio/database/component_factory.py +++ b/python/packages/autogen-studio/autogenstudio/database/component_factory.py @@ -1,6 +1,6 @@ import os from pathlib import Path -from typing import List, Literal, Union, Optional, Dict, Any, Type +from typing import Callable, List, Literal, Union, Optional, Dict, Any, Type from datetime import datetime import json from autogen_agentchat.task import MaxMessageTermination, TextMentionTermination, StopMessageTermination @@ -13,6 +13,7 @@ TeamTypes, AgentTypes, ModelTypes, ToolTypes, ComponentType, ComponentConfig, ComponentConfigInput, TerminationConfig, TerminationTypes, Response ) +from ..components import UserProxyAgent from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.teams import RoundRobinGroupChat, SelectorGroupChat from autogen_ext.models import OpenAIChatCompletionClient @@ -38,6 +39,17 @@ Component = Union[RoundRobinGroupChat, SelectorGroupChat, AssistantAgent, OpenAIChatCompletionClient, FunctionTool] +DEFAULT_SELECTOR_PROMPT = """You are in a role play game. The following roles are available: +{roles}. +Read the following conversation. Then select the next role from {participants} to play. Only return the role. + +{history} + +Read the above conversation. Then select the next role from {participants} to play. Only return the role. +""" + +CONFIG_RETURN_TYPES = Literal['object', 'dict', 'config'] + class ComponentFactory: """Creates and manages agent components with versioned configuration loading""" @@ -55,19 +67,22 @@ def __init__(self): self._tool_cache: Dict[str, FunctionTool] = {} self._last_cache_clear = datetime.now() - async def load(self, component: ComponentConfigInput, return_type: ReturnType = 'object') -> Union[Component, dict, ComponentConfig]: + async def load( + self, + component: ComponentConfigInput, + input_func: Optional[Callable] = None, + return_type: ReturnType = 'object' + ) -> Union[Component, dict, ComponentConfig]: """ Universal loader for any component type Args: component: Component configuration (file path, dict, or ComponentConfig) + input_func: Optional callable for user input handling return_type: Type of return value ('object', 'dict', or 'config') Returns: Component instance, config dict, or ComponentConfig based on return_type - - Raises: - ValueError: If component type is unknown or version unsupported """ try: # Load and validate config @@ -95,8 +110,8 @@ async def load(self, component: ComponentConfigInput, return_type: ReturnType = # Otherwise create and return component instance handlers = { - ComponentType.TEAM: self.load_team, - ComponentType.AGENT: self.load_agent, + ComponentType.TEAM: lambda c: self.load_team(c, input_func), + ComponentType.AGENT: lambda c: self.load_agent(c, input_func), ComponentType.MODEL: self.load_model, ComponentType.TOOL: self.load_tool, ComponentType.TERMINATION: self.load_termination @@ -113,7 +128,7 @@ async def load(self, component: ComponentConfigInput, return_type: ReturnType = logger.error(f"Failed to load component: {str(e)}") raise - async def load_directory(self, directory: Union[str, Path], check_exists: bool = False, return_type: ReturnType = 'object') -> List[Union[Component, dict, ComponentConfig]]: + async def load_directory(self, directory: Union[str, Path], return_type: ReturnType = 'object') -> List[Union[Component, dict, ComponentConfig]]: """ Import all component configurations from a directory. """ @@ -124,7 +139,7 @@ async def load_directory(self, directory: Union[str, Path], check_exists: bool = for path in list(directory.glob("*")): if path.suffix.lower().endswith(('.json', '.yaml', '.yml')): try: - component = await self.load(path, return_type) + component = await self.load(path, return_type=return_type) components.append(component) except Exception as e: logger.info( @@ -176,22 +191,17 @@ async def load_termination(self, config: TerminationConfig) -> TerminationCompon raise ValueError( f"Termination condition creation failed: {str(e)}") - async def load_team(self, config: TeamConfig) -> TeamComponent: + async def load_team( + self, + config: TeamConfig, + input_func: Optional[Callable] = None + ) -> TeamComponent: """Create team instance from configuration.""" - - default_selector_prompt = """You are in a role play game. The following roles are available: -{roles}. -Read the following conversation. Then select the next role from {participants} to play. Only return the role. - -{history} - -Read the above conversation. Then select the next role from {participants} to play. Only return the role. -""" try: - # Load participants (agents) + # Load participants (agents) with input_func participants = [] for participant in config.participants: - agent = await self.load(participant) + agent = await self.load(participant, input_func=input_func) participants.append(agent) # Load model client if specified @@ -202,7 +212,6 @@ async def load_team(self, config: TeamConfig) -> TeamComponent: # Load termination condition if specified termination = None if config.termination_condition: - # Now we can use the universal load() method since termination is a proper component termination = await self.load(config.termination_condition) # Create team based on type @@ -215,7 +224,7 @@ async def load_team(self, config: TeamConfig) -> TeamComponent: if not model_client: raise ValueError( "SelectorGroupChat requires a model_client") - selector_prompt = config.selector_prompt if config.selector_prompt else default_selector_prompt + selector_prompt = config.selector_prompt if config.selector_prompt else DEFAULT_SELECTOR_PROMPT return SelectorGroupChat( participants=participants, model_client=model_client, @@ -229,14 +238,20 @@ async def load_team(self, config: TeamConfig) -> TeamComponent: logger.error(f"Failed to create team {config.name}: {str(e)}") raise ValueError(f"Team creation failed: {str(e)}") - async def load_agent(self, config: AgentConfig) -> AgentComponent: + async def load_agent( + self, + config: AgentConfig, + input_func: Optional[Callable] = None + ) -> AgentComponent: """Create agent instance from configuration.""" try: # Load model client if specified model_client = None if config.model_client: model_client = await self.load(config.model_client) + system_message = config.system_message if config.system_message else "You are a helpful assistant" + # Load tools if specified tools = [] if config.tools: @@ -244,9 +259,16 @@ async def load_agent(self, config: AgentConfig) -> AgentComponent: tool = await self.load(tool_config) tools.append(tool) - if config.agent_type == AgentTypes.ASSISTANT: + if config.agent_type == AgentTypes.USERPROXY: + return UserProxyAgent( + name=config.name, + description=config.description or "A human user", + input_func=input_func # Pass through to UserProxyAgent + ) + elif config.agent_type == AgentTypes.ASSISTANT: return AssistantAgent( name=config.name, + description=config.description or "A helpful assistant", model_client=model_client, tools=tools, system_message=system_message diff --git a/python/packages/autogen-studio/autogenstudio/database/db_manager.py b/python/packages/autogen-studio/autogenstudio/database/db_manager.py index b1808f245e2f..d5f17492ed3c 100644 --- a/python/packages/autogen-studio/autogenstudio/database/db_manager.py +++ b/python/packages/autogen-studio/autogenstudio/database/db_manager.py @@ -1,3 +1,4 @@ +from pathlib import Path import threading from datetime import datetime from typing import Optional @@ -19,15 +20,34 @@ class DatabaseManager: _init_lock = threading.Lock() - def __init__(self, engine_uri: str, auto_upgrade: bool = True): + def __init__( + self, + engine_uri: str, + base_dir: Optional[Path | str] = None, + auto_upgrade: bool = True + ): + """ + Initialize DatabaseManager with optional custom base directory. + + Args: + engine_uri: Database connection URI + base_dir: Custom base directory for Alembic files. If None, uses current working directory + auto_upgrade: Whether to automatically upgrade schema when differences found + """ + # Convert string path to Path object if necessary + if isinstance(base_dir, str): + base_dir = Path(base_dir) + connection_args = { - "check_same_thread": True} if "sqlite" in engine_uri else {} + "check_same_thread": True + } if "sqlite" in engine_uri else {} + self.engine = create_engine(engine_uri, connect_args=connection_args) self.schema_manager = SchemaManager( engine=self.engine, + base_dir=base_dir, auto_upgrade=auto_upgrade, ) - # Check and upgrade on startup upgraded, status = self.schema_manager.check_and_upgrade() if upgraded: diff --git a/python/packages/autogen-studio/autogenstudio/database/schema_manager.py b/python/packages/autogen-studio/autogenstudio/database/schema_manager.py index 450e0a5d76a3..d4d7de42c8e7 100644 --- a/python/packages/autogen-studio/autogenstudio/database/schema_manager.py +++ b/python/packages/autogen-studio/autogenstudio/database/schema_manager.py @@ -10,6 +10,7 @@ from alembic.autogenerate import compare_metadata from sqlalchemy import Engine from sqlmodel import SQLModel +from alembic.util.exc import CommandError class SchemaManager: @@ -29,6 +30,7 @@ class SchemaManager: def __init__( self, engine: Engine, + base_dir: Optional[Path] = None, auto_upgrade: bool = True, init_mode: str = "auto" ): @@ -38,16 +40,45 @@ def __init__( self.engine = engine self.auto_upgrade = auto_upgrade - # Set up paths relative to this file - self.base_dir = Path(__file__).parent + # Use provided base_dir or default to class file location + self.base_dir = base_dir or Path(__file__).parent self.alembic_dir = self.base_dir / 'alembic' self.alembic_ini_path = self.base_dir / 'alembic.ini' - # Handle initialization based on mode - if init_mode == "none": - self._validate_alembic_setup() + # Create base directory if it doesn't exist + self.base_dir.mkdir(parents=True, exist_ok=True) + + # Initialize based on mode + if init_mode == "force": + self._cleanup_existing_alembic() + self._initialize_alembic() + else: + try: + self._validate_alembic_setup() + logger.info("Using existing Alembic configuration") + # Update existing configuration + self._update_configuration() + except FileNotFoundError: + if init_mode == "none": + raise + logger.info("Initializing new Alembic configuration") + self._initialize_alembic() + + def _update_configuration(self) -> None: + """Updates existing Alembic configuration with current settings.""" + logger.info("Updating existing Alembic configuration...") + + # Update alembic.ini + config_content = self._generate_alembic_ini_content() + with open(self.alembic_ini_path, 'w') as f: + f.write(config_content) + + # Update env.py + env_path = self.alembic_dir / 'env.py' + if env_path.exists(): + self._update_env_py(env_path) else: - self._ensure_alembic_setup(force=init_mode == "force") + self._create_minimal_env_py(env_path) def _cleanup_existing_alembic(self) -> None: """ @@ -106,43 +137,34 @@ def _ensure_alembic_setup(self, *, force: bool = False) -> None: self._initialize_alembic() logger.info("Alembic initialization complete") - def _initialize_alembic(self) -> str: - """Initializes Alembic configuration in the local directory.""" + def _initialize_alembic(self) -> None: logger.info("Initializing Alembic configuration...") - # Check if versions exists - has_versions = (self.alembic_dir / 'versions').exists() - logger.info(f"Existing versions directory found: {has_versions}") - - # Create base directories + # Create directories first self.alembic_dir.mkdir(exist_ok=True) - if not has_versions: - (self.alembic_dir / 'versions').mkdir(exist_ok=True) + versions_dir = self.alembic_dir / 'versions' + versions_dir.mkdir(exist_ok=True) + + # Create env.py BEFORE running command.init + env_path = self.alembic_dir / 'env.py' + if not env_path.exists(): + self._create_minimal_env_py(env_path) + logger.info("Created new env.py") # Write alembic.ini - ini_content = self._generate_alembic_ini_content() + config_content = self._generate_alembic_ini_content() with open(self.alembic_ini_path, 'w') as f: - f.write(ini_content) + f.write(config_content) logger.info("Created alembic.ini") - if not has_versions: - # Only run init if no versions directory + # Now run alembic init + try: config = self.get_alembic_config() command.init(config, str(self.alembic_dir)) - logger.info("Initialized new Alembic directory structure") - else: - # Create minimal env.py if it doesn't exist - env_path = self.alembic_dir / 'env.py' - if not env_path.exists(): - self._create_minimal_env_py(env_path) - logger.info("Created minimal env.py") - else: - # Update existing env.py - self._update_env_py(env_path) - logger.info("Updated existing env.py") - - logger.info(f"Alembic setup completed at {self.base_dir}") - return str(self.alembic_ini_path) + logger.info("Initialized Alembic directory structure") + except CommandError as e: + if "already exists" not in str(e): + raise def _create_minimal_env_py(self, env_path: Path) -> None: """Creates a minimal env.py file for Alembic.""" @@ -242,6 +264,9 @@ def _update_env_py(self, env_path: Path) -> None: """ Updates the env.py file to use SQLModel metadata. """ + if not env_path.exists(): + self._create_minimal_env_py(env_path) + return try: with open(env_path, 'r') as f: content = f.read() @@ -297,8 +322,17 @@ def _ensure_alembic_setup(self, *, force: bool = False) -> None: def _validate_alembic_setup(self) -> None: """Validates that Alembic is properly configured.""" - if not self.alembic_ini_path.exists(): - raise FileNotFoundError("Alembic configuration not found") + required_files = [ + self.alembic_ini_path, + self.alembic_dir / 'env.py', + self.alembic_dir / 'versions' + ] + + missing = [f for f in required_files if not f.exists()] + if missing: + raise FileNotFoundError( + f"Alembic configuration incomplete. Missing: {', '.join(str(f) for f in missing)}" + ) def get_alembic_config(self) -> Config: """ diff --git a/python/packages/autogen-studio/autogenstudio/datamodel/types.py b/python/packages/autogen-studio/autogenstudio/datamodel/types.py index ad8f2088ea3f..5fec5d984bec 100644 --- a/python/packages/autogen-studio/autogenstudio/datamodel/types.py +++ b/python/packages/autogen-studio/autogenstudio/datamodel/types.py @@ -17,7 +17,7 @@ class ToolTypes(str, Enum): class AgentTypes(str, Enum): ASSISTANT = "AssistantAgent" - CODING = "CodingAssistantAgent" + USERPROXY = "UserProxyAgent" class TeamTypes(str, Enum): diff --git a/python/packages/autogen-studio/autogenstudio/teammanager.py b/python/packages/autogen-studio/autogenstudio/teammanager.py index e50f740472d6..ebe4302c5f58 100644 --- a/python/packages/autogen-studio/autogenstudio/teammanager.py +++ b/python/packages/autogen-studio/autogenstudio/teammanager.py @@ -1,8 +1,8 @@ -from typing import AsyncGenerator, Union, Optional +from typing import AsyncGenerator, Callable, Union, Optional import time -from .database import ComponentFactory +from .database import ComponentFactory, Component from .datamodel import TeamResult, TaskResult, ComponentConfigInput -from autogen_agentchat.messages import InnerMessage, ChatMessage +from autogen_agentchat.messages import ChatMessage, AgentMessage from autogen_core.base import CancellationToken @@ -10,19 +10,37 @@ class TeamManager: def __init__(self) -> None: self.component_factory = ComponentFactory() + async def _create_team( + self, + team_config: ComponentConfigInput, + input_func: Optional[Callable] = None + ) -> Component: + """Create team instance with common setup logic""" + return await self.component_factory.load( + team_config, + input_func=input_func + ) + + def _create_result(self, task_result: TaskResult, start_time: float) -> TeamResult: + """Create TeamResult with timing info""" + return TeamResult( + task_result=task_result, + usage="", + duration=time.time() - start_time + ) + async def run_stream( self, task: str, team_config: ComponentConfigInput, + input_func: Optional[Callable] = None, cancellation_token: Optional[CancellationToken] = None - ) -> AsyncGenerator[Union[InnerMessage, ChatMessage, TaskResult], None]: + ) -> AsyncGenerator[Union[AgentMessage, ChatMessage, TaskResult], None]: """Stream the team's execution results""" start_time = time.time() try: - # Let factory handle all config processing - team = await self.component_factory.load(team_config) - + team = await self._create_team(team_config, input_func) stream = team.run_stream( task=task, cancellation_token=cancellation_token @@ -33,11 +51,7 @@ async def run_stream( break if isinstance(message, TaskResult): - yield TeamResult( - task_result=message, - usage="", - duration=time.time() - start_time - ) + yield self._create_result(message, start_time) else: yield message @@ -48,20 +62,16 @@ async def run( self, task: str, team_config: ComponentConfigInput, + input_func: Optional[Callable] = None, cancellation_token: Optional[CancellationToken] = None ) -> TeamResult: """Original non-streaming run method with optional cancellation""" start_time = time.time() - # Let factory handle all config processing - team = await self.component_factory.load(team_config) + team = await self._create_team(team_config, input_func) result = await team.run( task=task, cancellation_token=cancellation_token ) - return TeamResult( - task_result=result, - usage="", - duration=time.time() - start_time - ) + return self._create_result(result, start_time) diff --git a/python/packages/autogen-studio/autogenstudio/version.py b/python/packages/autogen-studio/autogenstudio/version.py index bf51c1b62b6e..a6f047da1cb8 100644 --- a/python/packages/autogen-studio/autogenstudio/version.py +++ b/python/packages/autogen-studio/autogenstudio/version.py @@ -1,3 +1,3 @@ -VERSION = "0.1.6" +VERSION = "0.4.0.dev37" __version__ = VERSION APP_NAME = "autogenstudio" diff --git a/python/packages/autogen-studio/autogenstudio/web/app.py b/python/packages/autogen-studio/autogenstudio/web/app.py index 8a0c2ce19ab4..8d62cf1adffb 100644 --- a/python/packages/autogen-studio/autogenstudio/web/app.py +++ b/python/packages/autogen-studio/autogenstudio/web/app.py @@ -34,7 +34,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]: logger.info("Initializing application...") try: # Initialize managers (DB, Connection, Team) - await init_managers(initializer.database_uri, initializer.config_dir) + await init_managers(initializer.database_uri, initializer.config_dir, initializer.app_root) logger.info("Managers initialized successfully") # Any other initialization code diff --git a/python/packages/autogen-studio/autogenstudio/web/deps.py b/python/packages/autogen-studio/autogenstudio/web/deps.py index b4c08e952aeb..1767c004eee0 100644 --- a/python/packages/autogen-studio/autogenstudio/web/deps.py +++ b/python/packages/autogen-studio/autogenstudio/web/deps.py @@ -86,7 +86,7 @@ async def get_current_user( # Manager initialization and cleanup -async def init_managers(database_uri: str, config_dir: str) -> None: +async def init_managers(database_uri: str, config_dir: str, app_root: str) -> None: """Initialize all manager instances""" global _db_manager, _websocket_manager, _team_manager @@ -95,7 +95,7 @@ async def init_managers(database_uri: str, config_dir: str) -> None: try: # Initialize database manager _db_manager = DatabaseManager( - engine_uri=database_uri, auto_upgrade=settings.UPGRADE_DATABASE) + engine_uri=database_uri, auto_upgrade=settings.UPGRADE_DATABASE, base_dir=app_root) _db_manager.create_db_and_tables() # init default team config diff --git a/python/packages/autogen-studio/autogenstudio/web/managers/__init__.py b/python/packages/autogen-studio/autogenstudio/web/managers/__init__.py index e69de29bb2d1..6a77bed8fec1 100644 --- a/python/packages/autogen-studio/autogenstudio/web/managers/__init__.py +++ b/python/packages/autogen-studio/autogenstudio/web/managers/__init__.py @@ -0,0 +1 @@ +from .connection import WebSocketManager diff --git a/python/packages/autogen-studio/autogenstudio/web/managers/connection.py b/python/packages/autogen-studio/autogenstudio/web/managers/connection.py index 0a0d5fb7cb4b..5ed613cbb837 100644 --- a/python/packages/autogen-studio/autogenstudio/web/managers/connection.py +++ b/python/packages/autogen-studio/autogenstudio/web/managers/connection.py @@ -1,13 +1,15 @@ +import asyncio from autogen_agentchat.base._task import TaskResult from fastapi import WebSocket, WebSocketDisconnect -from typing import Dict, Optional, Any +from typing import Callable, Dict, Optional, Any from uuid import UUID import logging from datetime import datetime, timezone from ...datamodel import Run, RunStatus, TeamResult from ...database import DatabaseManager -from autogen_agentchat.messages import InnerMessage, ChatMessage, TextMessage +from ...teammanager import TeamManager +from autogen_agentchat.messages import AgentMessage, ChatMessage, TextMessage from autogen_core.base import CancellationToken logger = logging.getLogger(__name__) @@ -22,25 +24,22 @@ def __init__(self, db_manager: DatabaseManager): self._cancellation_tokens: Dict[UUID, CancellationToken] = {} # Track explicitly closed connections self._closed_connections: set[UUID] = set() + self._input_responses: Dict[UUID, asyncio.Queue] = {} self._cancel_message = TeamResult(task_result=TaskResult(messages=[TextMessage( source="user", content="Run cancelled by user")], stop_reason="cancelled by user"), usage="", duration=0).model_dump() - async def connect(self, websocket: WebSocket, run_id: UUID) -> bool: - """Initialize WebSocket connection for a run - - Args: - websocket: The WebSocket connection to initialize - run_id: UUID of the run to associate with this connection + def _get_stop_message(self, reason: str) -> dict: + return TeamResult(task_result=TaskResult(messages=[TextMessage( + source="user", content=reason)], stop_reason=reason), usage="", duration=0).model_dump() - Returns: - bool: True if connection was successful, False otherwise - """ + async def connect(self, websocket: WebSocket, run_id: UUID) -> bool: try: await websocket.accept() self._connections[run_id] = websocket - # Remove from closed set if reconnecting self._closed_connections.discard(run_id) + # Initialize input queue for this connection + self._input_responses[run_id] = asyncio.Queue() run = await self._get_run(run_id) if run: @@ -54,7 +53,6 @@ async def connect(self, websocket: WebSocket, run_id: UUID) -> bool: }) return True - except Exception as e: logger.error(f"Connection error for run {run_id}: {e}") return False @@ -62,18 +60,10 @@ async def connect(self, websocket: WebSocket, run_id: UUID) -> bool: async def start_stream( self, run_id: UUID, - team_manager: Any, + team_manager: TeamManager, task: str, team_config: dict ) -> None: - """Start streaming task execution with improved error handling - - Args: - run_id: UUID of the run - team_manager: Instance of the team manager - task: Task string to execute - team_config: Team configuration dictionary - """ if run_id not in self._connections or run_id in self._closed_connections: raise ValueError(f"No active connection for run {run_id}") @@ -81,9 +71,13 @@ async def start_stream( self._cancellation_tokens[run_id] = cancellation_token try: + # Create input function for this run + input_func = self.create_input_func(run_id) + async for message in team_manager.run_stream( task=task, team_config=team_config, + input_func=input_func, # Pass the input function cancellation_token=cancellation_token ): if cancellation_token.is_cancelled() or run_id in self._closed_connections: @@ -113,7 +107,44 @@ async def start_stream( finally: self._cancellation_tokens.pop(run_id, None) - async def stop_run(self, run_id: UUID) -> None: + def create_input_func(self, run_id: UUID) -> Callable: + """Creates an input function for a specific run""" + async def input_handler(prompt: str = "") -> str: + try: + + # Send input request to client + await self._send_message(run_id, { + "type": "input_request", + "prompt": prompt, + "data": { + "source": "system", + "content": prompt + }, + "timestamp": datetime.now(timezone.utc).isoformat() + }) + + # Wait for response + if run_id in self._input_responses: + response = await self._input_responses[run_id].get() + return response + else: + raise ValueError(f"No input queue for run {run_id}") + + except Exception as e: + logger.error(f"Error handling input for run {run_id}: {e}") + raise + + return input_handler + + async def handle_input_response(self, run_id: UUID, response: str) -> None: + """Handle input response from client""" + if run_id in self._input_responses: + await self._input_responses[run_id].put(response) + else: + logger.warning( + f"Received input response for inactive run {run_id}") + + async def stop_run(self, run_id: UUID, reason: str) -> None: """Stop a running task""" if run_id in self._cancellation_tokens: logger.info(f"Stopping run {run_id}") @@ -125,7 +156,7 @@ async def stop_run(self, run_id: UUID) -> None: await self._send_message(run_id, { "type": "completion", "status": "cancelled", - "data": self._cancel_message, + "data": self._get_stop_message(reason), "timestamp": datetime.now(timezone.utc).isoformat() }) except Exception: @@ -139,11 +170,12 @@ async def disconnect(self, run_id: UUID) -> None: self._closed_connections.add(run_id) # Cancel any running tasks - await self.stop_run(run_id) + await self.stop_run(run_id, "Connection closed") # Clean up resources self._connections.pop(run_id, None) self._cancellation_tokens.pop(run_id, None) + self._input_responses.pop(run_id, None) async def _send_message(self, run_id: UUID, message: dict) -> None: """Send a message through the WebSocket with connection state checking @@ -203,7 +235,7 @@ def _format_message(self, message: Any) -> Optional[dict]: Optional[dict]: Formatted message or None if formatting fails """ try: - if isinstance(message, (InnerMessage, ChatMessage)): + if isinstance(message, (AgentMessage, ChatMessage)): return { "type": "message", "data": message.model_dump() @@ -251,6 +283,41 @@ async def _update_run_status( run.error_message = error self.db_manager.upsert(run) + async def cleanup(self) -> None: + """Clean up all active connections and resources when server is shutting down""" + logger.info( + f"Cleaning up {len(self.active_connections)} active connections") + + try: + # First cancel all running tasks + for run_id in self.active_runs.copy(): + if run_id in self._cancellation_tokens: + self._cancellation_tokens[run_id].cancel() + + # Then disconnect all websockets with timeout + # 10 second timeout for entire cleanup + async with asyncio.timeout(10): + for run_id in self.active_connections.copy(): + try: + # Give each disconnect operation 2 seconds + async with asyncio.timeout(2): + await self.disconnect(run_id) + except asyncio.TimeoutError: + logger.warning(f"Timeout disconnecting run {run_id}") + except Exception as e: + logger.error(f"Error disconnecting run {run_id}: {e}") + + except asyncio.TimeoutError: + logger.warning("WebSocketManager cleanup timed out") + except Exception as e: + logger.error(f"Error during WebSocketManager cleanup: {e}") + finally: + # Always clear internal state, even if cleanup had errors + self._connections.clear() + self._cancellation_tokens.clear() + self._closed_connections.clear() + self._input_responses.clear() + @property def active_connections(self) -> set[UUID]: """Get set of active run IDs""" diff --git a/python/packages/autogen-studio/autogenstudio/web/routes/ws.py b/python/packages/autogen-studio/autogenstudio/web/routes/ws.py index 8fd6844ff3ad..75152036fc29 100644 --- a/python/packages/autogen-studio/autogenstudio/web/routes/ws.py +++ b/python/packages/autogen-studio/autogenstudio/web/routes/ws.py @@ -8,6 +8,7 @@ from ..deps import get_websocket_manager, get_db, get_team_manager from ...datamodel import Run, RunStatus +from ..managers import WebSocketManager router = APIRouter() logger = logging.getLogger(__name__) @@ -17,7 +18,7 @@ async def run_websocket( websocket: WebSocket, run_id: UUID, - ws_manager=Depends(get_websocket_manager), + ws_manager: WebSocketManager = Depends(get_websocket_manager), db=Depends(get_db), team_manager=Depends(get_team_manager) ): @@ -48,8 +49,10 @@ async def run_websocket( message = json.loads(raw_message) if message.get("type") == "stop": - logger.info(f"Received stop request for run {run_id}") - await ws_manager.stop_run(run_id) + print(f"Received stop request for run {run_id}") + reason = message.get( + "reason") or "User requested stop/cancellation" + await ws_manager.stop_run(run_id, reason=reason) break elif message.get("type") == "ping": @@ -58,6 +61,15 @@ async def run_websocket( "timestamp": datetime.utcnow().isoformat() }) + elif message.get("type") == "input_response": + # Handle input response from client + response = message.get("response") + if response is not None: + await ws_manager.handle_input_response(run_id, response) + else: + logger.warning( + f"Invalid input response format for run {run_id}") + except json.JSONDecodeError: logger.warning(f"Invalid JSON received: {raw_message}") await websocket.send_json({ diff --git a/python/packages/autogen-studio/docs/ags_screen.png b/python/packages/autogen-studio/docs/ags_screen.png new file mode 100644 index 000000000000..30982cf6a828 --- /dev/null +++ b/python/packages/autogen-studio/docs/ags_screen.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa05d0e55262549880e3e06ca3839cffdbcd0836bd2b98690185255f03dc98ac +size 194702 diff --git a/python/packages/autogen-studio/docs/ara_stockprices.png b/python/packages/autogen-studio/docs/ara_stockprices.png deleted file mode 100644 index f5adf6256e55..000000000000 --- a/python/packages/autogen-studio/docs/ara_stockprices.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e3340a765da6dff6585c8b2e8a4014df0c94b537d62d341d2d0d45627bbc345 -size 198222 diff --git a/python/packages/autogen-studio/frontend/package.json b/python/packages/autogen-studio/frontend/package.json index 0123df464575..f205a7a1e44d 100644 --- a/python/packages/autogen-studio/frontend/package.json +++ b/python/packages/autogen-studio/frontend/package.json @@ -17,29 +17,29 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@ant-design/charts": "^2.2.1", + "@ant-design/charts": "^2.2.3", "@ant-design/plots": "^2.2.2", "@dagrejs/dagre": "^1.1.4", - "@headlessui/react": "^1.7.16", + "@headlessui/react": "^2.2.0", "@heroicons/react": "^2.0.18", "@mdx-js/react": "^3.1.0", "@monaco-editor/react": "^4.6.0", "@tailwindcss/typography": "^0.5.9", "@xyflow/react": "^12.3.5", - "antd": "^5.1.0", + "antd": "^5.22.1", "autoprefixer": "^10.4.20", - "gatsby": "^5.13.7", - "gatsby-plugin-image": "^3.13.1", - "gatsby-plugin-manifest": "^5.13.1", - "gatsby-plugin-mdx": "^5.13.1", - "gatsby-plugin-postcss": "^6.13.1", - "gatsby-plugin-sharp": "^5.13.1", - "gatsby-plugin-sitemap": "^6.13.1", - "gatsby-source-filesystem": "^5.13.1", - "gatsby-transformer-sharp": "^5.13.1", + "gatsby": "^5.14.0", + "gatsby-plugin-image": "^3.14.0", + "gatsby-plugin-manifest": "^5.14.0", + "gatsby-plugin-mdx": "^5.14.0", + "gatsby-plugin-postcss": "^6.14.0", + "gatsby-plugin-sharp": "^5.14.0", + "gatsby-plugin-sitemap": "^6.14.0", + "gatsby-source-filesystem": "^5.14.0", + "gatsby-transformer-sharp": "^5.14.0", "install": "^0.13.0", - "lucide-react": "^0.454.0", - "postcss": "^8.4.47", + "lucide-react": "^0.456.0", + "postcss": "^8.4.49", "react": "^18.2.0", "react-dom": "^18.2.0", "react-markdown": "^9.0.1", @@ -49,7 +49,7 @@ }, "devDependencies": { "@types/lodash.debounce": "^4.0.9", - "@types/node": "^20.11.19", + "@types/node": "^22.9.0", "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", "@types/react-syntax-highlighter": "^15.5.10", diff --git a/python/packages/autogen-studio/frontend/src/components/contentheader.tsx b/python/packages/autogen-studio/frontend/src/components/contentheader.tsx index b66bc0d7da27..0309b51dbc89 100644 --- a/python/packages/autogen-studio/frontend/src/components/contentheader.tsx +++ b/python/packages/autogen-studio/frontend/src/components/contentheader.tsx @@ -15,9 +15,9 @@ import { import { Tooltip } from "antd"; import { appContext } from "../hooks/provider"; import { useConfigStore } from "../hooks/store"; +import { Link } from "gatsby"; type ContentHeaderProps = { - title?: string; onMobileMenuToggle: () => void; isMobileMenuOpen: boolean; }; @@ -27,13 +27,13 @@ const classNames = (...classes: (string | undefined | boolean)[]) => { }; const ContentHeader = ({ - title, onMobileMenuToggle, isMobileMenuOpen, }: ContentHeaderProps) => { const { darkMode, setDarkMode, user, logout } = React.useContext(appContext); - const { sidebar, setSidebarState } = useConfigStore(); + const { sidebar, setSidebarState, header } = useConfigStore(); const { isExpanded } = sidebar; + const { title, breadcrumbs } = header; return (
@@ -68,24 +68,63 @@ const ContentHeader = ({
- {/* Search */} -
-
+ {/* Breadcrumbs */} +
+ {breadcrumbs && breadcrumbs.length > 0 ? ( + + ) : ( +

{title}

+ )} +
+ + {/* Right side header items */} +
+ {/* Search */} + - + -
- {/* Right side header items */} -
{/* Dark Mode Toggle */}
+
+ ); +}; diff --git a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chat.tsx b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chat.tsx index cdb0ac66776e..473c90b4f98c 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chat.tsx +++ b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chat.tsx @@ -3,15 +3,18 @@ import { message } from "antd"; import { getServerUrl } from "../../../utils"; import { SessionManager } from "../../shared/session/manager"; import { IStatus } from "../../../types/app"; -import { Message } from "../../../types/datamodel"; +import { + Message, + ThreadStatus, + WebSocketMessage, +} from "../../../types/datamodel"; import { useConfigStore } from "../../../../hooks/store"; import { appContext } from "../../../../hooks/provider"; import ChatInput from "./chatinput"; -import { ModelUsage, SocketMessage, ThreadState, ThreadStatus } from "./types"; +import { ModelUsage, ThreadState, TIMEOUT_CONFIG } from "./types"; import { MessageList } from "./messagelist"; import TeamManager from "../../shared/team/manager"; import { teamAPI } from "../../shared/team/api"; -import AgentFlow from "./agentflow/agentflow"; const logo = require("../../../../images/landing/welcome.svg").default; @@ -31,12 +34,14 @@ export default function ChatView({ Record >({}); const chatContainerRef = React.useRef(null); + const timeoutRefs = React.useRef>({}); const { user } = React.useContext(appContext); const { session, sessions } = useConfigStore(); const [activeSockets, setActiveSockets] = React.useState< Record >({}); + const activeSocketsRef = React.useRef>({}); const [teamConfig, setTeamConfig] = React.useState(null); @@ -58,12 +63,114 @@ export default function ChatView({ } }, [session]); + const updateSocket = (runId: string, socket: WebSocket | null) => { + if (socket) { + activeSocketsRef.current[runId] = socket; + setActiveSockets((prev) => ({ ...prev, [runId]: socket })); + } else { + delete activeSocketsRef.current[runId]; + setActiveSockets((prev) => { + const next = { ...prev }; + delete next[runId]; + return next; + }); + } + }; + React.useEffect(() => { return () => { Object.values(activeSockets).forEach((socket) => socket.close()); }; }, [activeSockets]); + const handleTimeoutForRun = (runId: string) => { + const socket = activeSocketsRef.current[runId]; + if (socket && socket.readyState === WebSocket.OPEN) { + // Send stop message to backend, just like when user clicks stop + socket.send( + JSON.stringify({ + type: "stop", + reason: TIMEOUT_CONFIG.DEFAULT_MESSAGE, + }) + ); + } + + // Update thread state with timeout reason + setThreadMessages((prev) => { + const currentThread = prev[runId]; + if (!currentThread) return prev; + + return { + ...prev, + [runId]: { + ...currentThread, + status: "cancelled", // Use existing cancelled status + reason: "Input request timed out after 3 minutes", + isExpanded: true, + inputRequest: currentThread.inputRequest + ? { + prompt: currentThread.inputRequest.prompt, + isPending: true, + } + : undefined, + }, + }; + }); + + if (timeoutRefs.current[runId]) { + clearTimeout(timeoutRefs.current[runId]); + delete timeoutRefs.current[runId]; + } + }; + + const handleInputResponse = async (runId: string, response: string) => { + // Clear timeout when response is received + if (timeoutRefs.current[runId]) { + clearTimeout(timeoutRefs.current[runId]); + delete timeoutRefs.current[runId]; + } + + if (response === "TIMEOUT") { + handleTimeoutForRun(runId); + return; + } + + const socket = activeSockets[runId]; + if (socket && socket.readyState === WebSocket.OPEN) { + try { + socket.send( + JSON.stringify({ + type: "input_response", + response: response, + }) + ); + + setThreadMessages((prev) => ({ + ...prev, + [runId]: { + ...prev[runId], + status: "streaming", + inputRequest: undefined, + }, + })); + } catch (error) { + console.error("Error sending input response:", error); + message.error("Failed to send response"); + + setThreadMessages((prev) => ({ + ...prev, + [runId]: { + ...prev[runId], + status: "error", + reason: "Failed to send input response", + }, + })); + } + } else { + message.error("Connection lost. Please try again."); + } + }; + const getBaseUrl = (url: string): string => { try { // Remove protocol (http:// or https://) @@ -91,7 +198,7 @@ export default function ChatView({ const createRun = async (sessionId: number): Promise => { const payload = { session_id: sessionId, user_id: user?.email || "" }; - const response = await fetch(`${serverUrl}/runs`, { + const response = await fetch(`${serverUrl}/runs/`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(payload), @@ -128,40 +235,32 @@ export default function ChatView({ return await response.json(); }; - interface RequestUsage { - prompt_tokens: number; - completion_tokens: number; - } - const connectWebSocket = (runId: string, query: string) => { const baseUrl = getBaseUrl(serverUrl); - // Determine if we should use ws:// or wss:// based on current protocol const wsProtocol = window.location.protocol === "https:" ? "wss:" : "ws:"; const wsUrl = `${wsProtocol}//${baseUrl}/api/ws/runs/${runId}`; - console.log("Connecting to WebSocket URL:", wsUrl); // For debugging - const socket = new WebSocket(wsUrl); let isClosing = false; + const clearTimeoutForRun = () => { + if (timeoutRefs.current[runId]) { + clearTimeout(timeoutRefs.current[runId]); + delete timeoutRefs.current[runId]; + } + }; + const closeSocket = () => { if (!isClosing && socket.readyState !== WebSocket.CLOSED) { isClosing = true; socket.close(); - setActiveSockets((prev) => { - const newSockets = { ...prev }; - delete newSockets[runId]; - return newSockets; - }); + updateSocket(runId, null); } }; socket.onopen = async () => { try { - setActiveSockets((prev) => ({ - ...prev, - [runId]: socket, - })); + updateSocket(runId, socket); setThreadMessages((prev) => ({ ...prev, @@ -187,13 +286,9 @@ export default function ChatView({ }) ); - // Start the run only after socket is connected await startRun(runId, query); } catch (error) { - console.error("Error starting run:", error); - message.error("Failed to start run"); closeSocket(); - setThreadMessages((prev) => ({ ...prev, [runId]: { @@ -206,11 +301,32 @@ export default function ChatView({ }; socket.onmessage = (event) => { - const message: SocketMessage = JSON.parse(event.data); - // console.log("WebSocket message received:", message); + const message: WebSocketMessage = JSON.parse(event.data); switch (message.type) { + case "input_request": + clearTimeoutForRun(); + + timeoutRefs.current[runId] = setTimeout(() => { + handleTimeoutForRun(runId); + }, TIMEOUT_CONFIG.DURATION_MS); + + setThreadMessages((prev) => ({ + ...prev, + [runId]: { + ...prev[runId], + status: "awaiting_input", + inputRequest: { + prompt: message.data?.content || "", + isPending: false, + }, + }, + })); + break; + case "message": + clearTimeoutForRun(); + setThreadMessages((prev) => { const currentThread = prev[runId] || { messages: [], @@ -227,17 +343,18 @@ export default function ChatView({ } : undefined; - const newMessage = { - source: message.data?.source || "", - content: message.data?.content || "", - models_usage, - }; - return { ...prev, [runId]: { ...currentThread, - messages: [...currentThread.messages, newMessage], + messages: [ + ...currentThread.messages, + { + source: message.data?.source || "", + content: message.data?.content || "", + models_usage, + }, + ], status: "streaming", }, }; @@ -246,30 +363,27 @@ export default function ChatView({ case "result": case "completion": + clearTimeoutForRun(); + setThreadMessages((prev) => { const currentThread = prev[runId]; if (!currentThread) return prev; - const finalMessage = message.data?.task_result?.messages - ?.filter((msg: any) => msg.content !== "TERMINATE") - .pop(); - const status: ThreadStatus = message.status || "complete"; - // Capture completion reason from task_result const reason = message.data?.task_result?.stop_reason || (message.error ? `Error: ${message.error}` : undefined); - console.log("All Messages", currentThread.messages); return { ...prev, [runId]: { ...currentThread, - status: status, - reason: reason, + status, + reason, isExpanded: true, - finalResult: finalMessage, - messages: currentThread.messages, + finalResult: message.data?.task_result?.messages + ?.filter((msg: any) => msg.content !== "TERMINATE") + .pop(), }, }; }); @@ -279,16 +393,10 @@ export default function ChatView({ }; socket.onclose = (event) => { - console.log( - `WebSocket closed for run ${runId}. Code: ${event.code}, Reason: ${event.reason}` - ); + clearTimeoutForRun(); if (!isClosing) { - setActiveSockets((prev) => { - const newSockets = { ...prev }; - delete newSockets[runId]; - return newSockets; - }); + updateSocket(runId, null); setThreadMessages((prev) => { const thread = prev[runId]; @@ -297,7 +405,10 @@ export default function ChatView({ ...prev, [runId]: { ...thread, - status: "complete", + status: + event.code === TIMEOUT_CONFIG.WEBSOCKET_CODE + ? "timeout" + : "complete", reason: event.reason || "Connection closed", }, }; @@ -308,8 +419,7 @@ export default function ChatView({ }; socket.onerror = (error) => { - console.error("WebSocket error:", error); - message.error("WebSocket connection error"); + clearTimeoutForRun(); setThreadMessages((prev) => { const thread = prev[runId]; @@ -335,7 +445,9 @@ export default function ChatView({ const cancelRun = async (runId: string) => { const socket = activeSockets[runId]; if (socket && socket.readyState === WebSocket.OPEN) { - socket.send(JSON.stringify({ type: "stop" })); + socket.send( + JSON.stringify({ type: "stop", reason: "Cancelled by user" }) + ); setThreadMessages((prev) => ({ ...prev, @@ -349,6 +461,16 @@ export default function ChatView({ } }; + // Clean up timeouts when component unmounts + React.useEffect(() => { + return () => { + Object.entries(timeoutRefs.current).forEach(([_, timeout]) => + clearTimeout(timeout) + ); + timeoutRefs.current = {}; + }; + }, []); + const runTask = async (query: string) => { setError(null); setLoading(true); @@ -429,7 +551,7 @@ export default function ChatView({
- {sessions && sessions?.length === 0 ? ( + {sessions !== null && sessions?.length === 0 ? (
Welcome @@ -454,7 +577,14 @@ export default function ChatView({ <> {session && (
- + thread.status === "awaiting_input" + )} // Disable input while waiting for user input + />
)} diff --git a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chatinput.tsx b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chatinput.tsx index b170f4bcc4c8..712c6936b585 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chatinput.tsx +++ b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/chatinput.tsx @@ -12,17 +12,21 @@ interface ChatInputProps { onSubmit: (text: string) => void; loading: boolean; error: IStatus | null; + disabled?: boolean; } + export default function ChatInput({ onSubmit, loading, error, + disabled = false, }: ChatInputProps) { const textAreaRef = React.useRef(null); const [previousLoading, setPreviousLoading] = React.useState(loading); const [text, setText] = React.useState(""); const textAreaDefaultHeight = "64px"; + const isInputDisabled = disabled || loading; // Handle textarea auto-resize React.useEffect(() => { @@ -54,10 +58,9 @@ export default function ChatInput({ }; const handleSubmit = () => { - if (textAreaRef.current?.value && !loading) { + if (textAreaRef.current?.value && !isInputDisabled) { const query = textAreaRef.current.value; onSubmit(query); - // Don't reset immediately - wait for response to complete } }; @@ -69,10 +72,10 @@ export default function ChatInput({ }; return ( -
+
-
- {!loading ? ( -
- -
+ {loading ? ( + ) : ( -
- -
+ )} -
+
diff --git a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/messagelist.tsx b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/messagelist.tsx index 613f96fd2289..d25a508e7bef 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/messagelist.tsx +++ b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/messagelist.tsx @@ -14,9 +14,12 @@ import { Loader2, CheckCircle, AlertTriangle, + TriangleAlertIcon, + GroupIcon, } from "lucide-react"; import AgentFlow from "./agentflow/agentflow"; import ThreadView from "./threadview"; +import LoadingDots from "../../shared/atoms"; interface MessageListProps { messages: Message[]; @@ -26,6 +29,7 @@ interface MessageListProps { >; onRetry: (content: string) => void; onCancel: (runId: string) => void; + onInputResponse: (runId: string, response: string) => void; loading?: boolean; teamConfig?: TeamConfig; } @@ -41,6 +45,7 @@ export const MessageList: React.FC = ({ setThreadMessages, onRetry, onCancel, + onInputResponse, // New prop loading = false, teamConfig, }) => { @@ -75,7 +80,7 @@ export const MessageList: React.FC = ({ } } }); - }, [threadMessages]); // This will trigger when any thread messages update + }, [threadMessages]); const toggleThread = (runId: string) => { setThreadMessages((prev) => ({ @@ -107,21 +112,43 @@ export const MessageList: React.FC = ({ size={20} className="inline-block mr-1 text-accent animate-spin" />{" "} - Processing ... + Processing{" "} + +
+ ); + case "awaiting_input": // New status + return ( +
+ {" "} + Waiting for your input
); - case "complete": return ( - +
+ {" "} + Task completed +
); case "error": return ( - +
+ {" "} + An error occurred. +
); case "cancelled": return ( - +
+ {" "} + Task was cancelled. +
); default: return null; @@ -135,26 +162,51 @@ export const MessageList: React.FC = ({ const thread = threadMessages[botMessage.run_id]; const hasThread = thread && thread.messages.length > 0; const isStreaming = thread?.status === "streaming"; + const isAwaitingInput = thread?.status === "awaiting_input"; // New check + + const isFirstMessage = pairIndex === 0; return (
- {/* User message - first */} + {/* User message */} + { +
+ {/*
Task Run 1.
*/} +
+ Run {pairIndex + 1} + {!isFirstMessage && ( + <> + {" "} + |{" "} + {" "} + Note: Each run does not share data with previous runs in + the same session yet.{" "} + + )} +
+
+ }
- User + You
-
+
- {/* Team response - second */} + + {/* Team response */}
- +
Agent Team @@ -162,18 +214,18 @@ export const MessageList: React.FC = ({
{/* Main response container */} -
-
+
+
{getStatusIcon(thread?.status)}{" "} - {thread?.finalResult?.content} + {!isAwaitingInput && thread?.finalResult?.content}
- {/* Thread section with left border for hierarchy */} + {/* Thread section */} {hasThread && (
-
+
+
+
+ ); +}; + const ThreadView: React.FC = ({ thread, isStreaming, runId, onCancel, + onInputResponse, threadContainerRef, }) => { + const isAwaitingInput = thread.status === "awaiting_input"; + const isTimedOut = thread.status === "timeout"; + + const getStatusIcon = () => { + switch (thread.status) { + case "streaming": + return ; + case "awaiting_input": + return ; + case "complete": + return ; + case "error": + return ; + case "timeout": + return ; + default: + return null; + } + }; + + const getStatusText = () => { + if (isStreaming) { + return ( + <> + Agents working + + + ); + } + if (isAwaitingInput) return "Waiting for your input"; + if (isTimedOut) return TIMEOUT_CONFIG.DEFAULT_MESSAGE; + if (thread.reason) + return ( + <> + Stop Reason: + {thread.reason} + + ); + return null; + }; + + const handleTimeout = () => { + if (thread.inputRequest) { + onInputResponse(runId, "TIMEOUT"); + } + }; + return (
- {/* Status bar - fixed at top */}
-
- {isStreaming ? ( - "Agents discussing..." - ) : ( - <> - Stop Reason - {thread.reason} - - )} +
+ {getStatusIcon()} + {getStatusText()}
- {isStreaming && ( + {(isStreaming || isAwaitingInput) && (
- {/* Thread messages and flow visualization in tabs */}
= ({ />
))} + + {thread.inputRequest && ( + onInputResponse(runId, response)} + disabled={!isAwaitingInput || isTimedOut} + onTimeout={handleTimeout} + /> + )}
diff --git a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/types.ts b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/types.ts index 565b1fc822d3..fa169da734d1 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/playground/chat/types.ts +++ b/python/packages/autogen-studio/frontend/src/components/views/playground/chat/types.ts @@ -1,22 +1,21 @@ -import { Message, TaskResult } from "../../../types/datamodel"; - -export type ThreadStatus = "streaming" | "complete" | "error" | "cancelled"; +import { + AgentMessageConfig, + Message, + TaskResult, + ThreadStatus, +} from "../../../types/datamodel"; export interface ThreadState { - messages: any[]; + messages: AgentMessageConfig[]; finalResult?: any; status: ThreadStatus; isExpanded: boolean; -} - -export interface ThreadState { - messages: any[]; - finalResult?: any; - status: "streaming" | "complete" | "error" | "cancelled"; - isExpanded: boolean; reason?: string; + inputRequest?: { + prompt: string; + isPending: boolean; + }; } - export interface MessageListProps { messages: Message[]; threadMessages: Record; @@ -33,15 +32,15 @@ export interface ModelUsage { completion_tokens: number; } -export interface SocketMessage { - type: "message" | "result" | "completion"; - data?: { - source?: string; - models_usage?: ModelUsage | null; - content?: string; - task_result?: TaskResult; - }; - status?: ThreadStatus; - timestamp?: string; - error?: string; +export const TIMEOUT_CONFIG = { + DURATION_MS: 3 * 60 * 1000, // 3 minutes in milliseconds + DURATION_SEC: 3 * 60, // 3 minutes in seconds + WEBSOCKET_CODE: 4000, // WebSocket close code for timeout + DEFAULT_MESSAGE: "Input timeout after 3 minutes", + WARNING_THRESHOLD_SEC: 30, // Show warning when 30 seconds remaining +} as const; + +export interface TimeoutError { + code: typeof TIMEOUT_CONFIG.WEBSOCKET_CODE; + message: string; } diff --git a/python/packages/autogen-studio/frontend/src/components/views/shared/atoms.tsx b/python/packages/autogen-studio/frontend/src/components/views/shared/atoms.tsx index c03099173e38..15dbc8c6f5a7 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/shared/atoms.tsx +++ b/python/packages/autogen-studio/frontend/src/components/views/shared/atoms.tsx @@ -6,3 +6,38 @@ export const LoadingIndicator = ({ size = 16 }: { size: number }) => (
); + +export const LoadingDots = ({ size = 8 }) => { + return ( + + + + + + ); +}; + +export default LoadingDots; diff --git a/python/packages/autogen-studio/frontend/src/components/views/shared/session/api.ts b/python/packages/autogen-studio/frontend/src/components/views/shared/session/api.ts index 65ce38c2e0b5..cccd6ad61a76 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/shared/session/api.ts +++ b/python/packages/autogen-studio/frontend/src/components/views/shared/session/api.ts @@ -14,7 +14,7 @@ export class SessionAPI { async listSessions(userId: string): Promise { const response = await fetch( - `${this.getBaseUrl()}/sessions?user_id=${userId}`, + `${this.getBaseUrl()}/sessions/?user_id=${userId}`, { headers: this.getHeaders(), } @@ -47,7 +47,7 @@ export class SessionAPI { user_id: userId, // Ensure user_id is included }; - const response = await fetch(`${this.getBaseUrl()}/sessions`, { + const response = await fetch(`${this.getBaseUrl()}/sessions/`, { method: "POST", headers: this.getHeaders(), body: JSON.stringify(session), diff --git a/python/packages/autogen-studio/frontend/src/components/views/shared/session/manager.tsx b/python/packages/autogen-studio/frontend/src/components/views/shared/session/manager.tsx index 4f36680c4a3f..e2f0a9ce7d0e 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/shared/session/manager.tsx +++ b/python/packages/autogen-studio/frontend/src/components/views/shared/session/manager.tsx @@ -149,12 +149,12 @@ export const SessionManager: React.FC = () => { icon={} > New Session{" "} - {sessions.length === 0 && ( - + {/* {sessions.length === 0 && ( + - )} + )} */}
diff --git a/python/packages/autogen-studio/frontend/src/components/views/shared/team/api.ts b/python/packages/autogen-studio/frontend/src/components/views/shared/team/api.ts index f2a4a6b0f262..8d13aa6a488f 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/shared/team/api.ts +++ b/python/packages/autogen-studio/frontend/src/components/views/shared/team/api.ts @@ -14,7 +14,7 @@ export class TeamAPI { async listTeams(userId: string): Promise { const response = await fetch( - `${this.getBaseUrl()}/teams?user_id=${userId}`, + `${this.getBaseUrl()}/teams/?user_id=${userId}`, { headers: this.getHeaders(), } @@ -42,7 +42,7 @@ export class TeamAPI { user_id: userId, }; - const response = await fetch(`${this.getBaseUrl()}/teams`, { + const response = await fetch(`${this.getBaseUrl()}/teams/`, { method: "POST", headers: this.getHeaders(), body: JSON.stringify(team), diff --git a/python/packages/autogen-studio/frontend/src/components/views/shared/team/editor.tsx b/python/packages/autogen-studio/frontend/src/components/views/shared/team/editor.tsx index 36c1e41f5d1b..a1fc87836eab 100644 --- a/python/packages/autogen-studio/frontend/src/components/views/shared/team/editor.tsx +++ b/python/packages/autogen-studio/frontend/src/components/views/shared/team/editor.tsx @@ -7,9 +7,39 @@ import type { Team, TeamConfig } from "../../../types/datamodel"; import { MonacoEditor } from "../monaco"; const defaultTeamConfig: TeamConfig = { - name: "", - participants: [], + version: "1.0.0", + component_type: "team", + name: "weather_team", + participants: [ + { + component_type: "agent", + name: "writing_agent", + agent_type: "AssistantAgent", + system_message: + "You are a helpful assistant. Solve tasks carefully. When done respond with TERMINATE", + model_client: { + component_type: "model", + model: "gpt-4o-2024-08-06", + model_type: "OpenAIChatCompletionClient", + }, + tools: [ + { + component_type: "tool", + name: "get_weather", + description: "Get the weather for a city", + content: + 'async def get_weather(city: str) -> str:\n return f"The weather in {city} is 73 degrees and Sunny."', + tool_type: "PythonFunction", + }, + ], + }, + ], team_type: "RoundRobinGroupChat", + termination_condition: { + component_type: "termination", + termination_type: "MaxMessageTermination", + max_messages: 10, + }, }; type FieldType = { @@ -122,48 +152,57 @@ export const TeamEditor: React.FC = ({ width={800} forceRender > -
-
- Required fields: name (string), team_type ("RoundRobinGroupChat" | - "SelectorGroupChat"), participants (array) -
- -
- +
+ + Work is still being done to create an improved team editor.
- - {jsonError && ( -
- - {jsonError} + +
+ Required fields: name (string), team_type ("RoundRobinGroupChat" | + "SelectorGroupChat"), participants (array)
- )} - - -
- - + +
+
- - + + {jsonError && ( +
+ + {jsonError} +
+ )} + + +
+ + +
+ + +
); }; diff --git a/python/packages/autogen-studio/frontend/src/hooks/store.tsx b/python/packages/autogen-studio/frontend/src/hooks/store.tsx index e730295b39fd..1272a3fcc7c1 100644 --- a/python/packages/autogen-studio/frontend/src/hooks/store.tsx +++ b/python/packages/autogen-studio/frontend/src/hooks/store.tsx @@ -1,7 +1,29 @@ import { create } from "zustand"; +import { persist, createJSONStorage } from "zustand/middleware"; import { v4 as uuidv4 } from "uuid"; import { Message, Session } from "../components/types/datamodel"; +interface IBreadcrumb { + name: string; + href: string; + current?: boolean; +} + +// New interfaces +export interface IAgentFlowSettings { + direction: "TB" | "LR"; + showLabels: boolean; + showGrid: boolean; + showTokens: boolean; + showMessages: boolean; + // Add any other settings we want to persist +} + +interface IHeaderState { + title: string; + breadcrumbs?: IBreadcrumb[]; +} + interface ISidebarState { isExpanded: boolean; isPinned: boolean; @@ -17,49 +39,95 @@ export interface IConfigState { version: string | null; setVersion: (version: string | null) => void; + // Header state + header: IHeaderState; + setHeader: (header: Partial) => void; + setBreadcrumbs: (breadcrumbs: IBreadcrumb[]) => void; + // Sidebar state sidebar: ISidebarState; setSidebarState: (state: Partial) => void; collapseSidebar: () => void; expandSidebar: () => void; toggleSidebar: () => void; -} -export const useConfigStore = create((set) => ({ - // Existing state - messages: [], - setMessages: (messages) => set({ messages }), - session: null, - setSession: (session) => set({ session }), - sessions: [], - setSessions: (sessions) => set({ sessions }), - version: null, - setVersion: (version) => set({ version }), - connectionId: uuidv4(), - - // Sidebar state and actions - sidebar: { - isExpanded: true, - isPinned: false, - }, + // Agent flow settings agentFlow: IAgentFlowSettings; + agentFlow: IAgentFlowSettings; + setAgentFlowSettings: (settings: Partial) => void; +} - setSidebarState: (newState) => - set((state) => ({ - sidebar: { ...state.sidebar, ...newState }, - })), +// Default settings +const DEFAULT_AGENT_FLOW_SETTINGS: IAgentFlowSettings = { + direction: "TB", + showLabels: true, + showGrid: true, + showTokens: true, + showMessages: true, +}; - collapseSidebar: () => - set((state) => ({ - sidebar: { ...state.sidebar, isExpanded: false }, - })), +export const useConfigStore = create()( + persist( + (set) => ({ + // Existing state + messages: [], + setMessages: (messages) => set({ messages }), + session: null, + setSession: (session) => set({ session }), + sessions: [], + setSessions: (sessions) => set({ sessions }), + version: null, + setVersion: (version) => set({ version }), + connectionId: uuidv4(), - expandSidebar: () => - set((state) => ({ - sidebar: { ...state.sidebar, isExpanded: true }, - })), + // Header state + header: { + title: "", + breadcrumbs: [], + }, + setHeader: (newHeader) => + set((state) => ({ + header: { ...state.header, ...newHeader }, + })), + setBreadcrumbs: (breadcrumbs) => + set((state) => ({ + header: { ...state.header, breadcrumbs }, + })), + // Add AgentFlow settings + agentFlow: DEFAULT_AGENT_FLOW_SETTINGS, + setAgentFlowSettings: (newSettings) => + set((state) => ({ + agentFlow: { ...state.agentFlow, ...newSettings }, + })), - toggleSidebar: () => - set((state) => ({ - sidebar: { ...state.sidebar, isExpanded: !state.sidebar.isExpanded }, - })), -})); + // Sidebar state and actions + sidebar: { + isExpanded: true, + isPinned: false, + }, + setSidebarState: (newState) => + set((state) => ({ + sidebar: { ...state.sidebar, ...newState }, + })), + collapseSidebar: () => + set((state) => ({ + sidebar: { ...state.sidebar, isExpanded: false }, + })), + expandSidebar: () => + set((state) => ({ + sidebar: { ...state.sidebar, isExpanded: true }, + })), + toggleSidebar: () => + set((state) => ({ + sidebar: { ...state.sidebar, isExpanded: !state.sidebar.isExpanded }, + })), + }), + { + name: "app-sidebar-state", + storage: createJSONStorage(() => localStorage), + partialize: (state) => ({ + sidebar: state.sidebar, + agentFlow: state.agentFlow, + }), + } + ) +); diff --git a/python/packages/autogen-studio/frontend/tailwind.config.js b/python/packages/autogen-studio/frontend/tailwind.config.js index 4bc76de888a9..6faec9a83ef4 100644 --- a/python/packages/autogen-studio/frontend/tailwind.config.js +++ b/python/packages/autogen-studio/frontend/tailwind.config.js @@ -9,7 +9,7 @@ module.exports = { typography: { DEFAULT: { css: { - maxWidth: "100ch", // add required value here + maxWidth: "100ch", }, }, }, @@ -17,7 +17,7 @@ module.exports = { height: "height", spacing: "margin, padding", }, - backgroundColor: { + colors: { primary: "var(--color-bg-primary)", secondary: "var(--color-bg-secondary)", accent: "var(--color-bg-accent)", @@ -36,5 +36,16 @@ module.exports = { }, }, }, - plugins: [require("@tailwindcss/typography")], + plugins: [ + require("@tailwindcss/typography"), + function ({ addBase, theme }) { + addBase({ + ":root": { + "--tw-bg-opacity": "1", + "--tw-text-opacity": "1", + "--tw-border-opacity": "1", + }, + }); + }, + ], }; diff --git a/python/packages/autogen-studio/frontend/yarn.lock b/python/packages/autogen-studio/frontend/yarn.lock index 8aaa3126b75a..03ca9a83ff87 100644 --- a/python/packages/autogen-studio/frontend/yarn.lock +++ b/python/packages/autogen-studio/frontend/yarn.lock @@ -20,11 +20,19 @@ resolved "https://registry.yarnpkg.com/@ant-design/charts-util/-/charts-util-0.0.1-alpha.6.tgz#09903d28a15d86cc73fafef5383a5a3f932811bb" integrity sha512-roZobGkUJ0WqULPiQkX/2j01r6Cn0W6WTVpszq9u8dZKwyrSDr+UgfA/hDmrwOm9TWD9HAxe7aRHnvC06dux8w== -"@ant-design/charts@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ant-design/charts/-/charts-2.2.1.tgz#5ee5d6f8c477c50308d89e41f57db5b61a628c15" - integrity sha512-OjAZeJo2xWlatj1/dw8eB9CDMsGCZ/BA6Z6k2sLPkSqDV9GUIjGNgXQ9igYrIqfpB+xVq5lLPvHndyXCHcOzMQ== +"@ant-design/charts-util@0.0.1-alpha.7": + version "0.0.1-alpha.7" + resolved "https://registry.yarnpkg.com/@ant-design/charts-util/-/charts-util-0.0.1-alpha.7.tgz#39152b7106970faa226ba857fae64a0eb32f30b9" + integrity sha512-Yh0o6EdO6SvdSnStFZMbnUzjyymkVzV+TQ9ymVW9hlVgO/fUkUII3JYSdV+UVcFnYwUF0YiDKuSTLCZNAzg2bQ== + dependencies: + lodash "^4.17.21" + +"@ant-design/charts@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@ant-design/charts/-/charts-2.2.3.tgz#ca484a70877ee9c7013951f477fcba661e842525" + integrity sha512-gjyOJwAvRH3NztbR4R7bQ+wVfA/jRT+EgtSEQxQtjka4w0srMIftXgaoxoycgCEHgO1eUg20RWXx0mMFKyWIfg== dependencies: + "@ant-design/graphs" "^2.0.0" "@ant-design/plots" "^2.1.3" lodash "^4.17.21" @@ -64,6 +72,18 @@ dependencies: "@babel/runtime" "^7.24.7" +"@ant-design/graphs@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@ant-design/graphs/-/graphs-2.0.0.tgz#dd0b39c05ffcb42c9368df0515fdc0a1917f26d8" + integrity sha512-giwe60AHwcQp5mXKQrsDU2/34cKOJQoc4rYPB9N1CqaGFcEWqOi6Kiz7O9s0QRwPBpzyP/boyP01a9qb03ycKw== + dependencies: + "@ant-design/charts-util" "0.0.1-alpha.7" + "@antv/g6" "^5.0.24" + "@antv/g6-extension-react" "^0.1.7" + "@antv/graphin" "^3.0.2" + lodash "^4.17.21" + styled-components "^6.1.13" + "@ant-design/icons-svg@^4.4.0": version "4.4.2" resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6" @@ -103,7 +123,15 @@ resize-observer-polyfill "^1.5.1" throttle-debounce "^5.0.0" -"@antv/component@^2.0.0": +"@antv/algorithm@^0.1.26": + version "0.1.26" + resolved "https://registry.yarnpkg.com/@antv/algorithm/-/algorithm-0.1.26.tgz#e3f5e7f1d8db5b415c3f31e32b119cbcafc8f5de" + integrity sha512-DVhcFSQ8YQnMNW34Mk8BSsfc61iC1sAnmcfYoXTAshYHuU50p/6b7x3QYaGctDNKWGvi1ub7mPcSY0bK+aN0qg== + dependencies: + "@antv/util" "^2.0.13" + tslib "^2.0.0" + +"@antv/component@^2.0.0", "@antv/component@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@antv/component/-/component-2.1.1.tgz#c91daad673913b6efb3c6503dca7ba123346197b" integrity sha512-V0UCq3Bekqtjw5WedexT1tHM/9x5BY0UAaU7G/5A2NhRfp9GuaQ8xGWLMSWlCQiJSRZWhPIA7RoOSw4Y/W+7UA== @@ -138,6 +166,17 @@ gl-matrix "^3.4.3" tslib "^2.5.3" +"@antv/g-camera-api@2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@antv/g-camera-api/-/g-camera-api-2.0.21.tgz#fb312a5db79addb978dee32fc2bb91c59ba384b5" + integrity sha512-cU903cmIBEyVX6hk7bmoltnnORnRd+KnRQsFzWv+Gg8l99bVOEqVa6/YE+Geh9Gt0JVUr+k06KVs8V40IVkz5Q== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + tslib "^2.5.3" + "@antv/g-canvas@^2.0.0": version "2.0.20" resolved "https://registry.yarnpkg.com/@antv/g-canvas/-/g-canvas-2.0.20.tgz#a79a6960f408a8e3b1982468b6659303b79f5f2d" @@ -154,6 +193,22 @@ "@babel/runtime" "^7.25.6" tslib "^2.5.3" +"@antv/g-canvas@^2.0.24": + version "2.0.25" + resolved "https://registry.yarnpkg.com/@antv/g-canvas/-/g-canvas-2.0.25.tgz#4558fe57b5b6ca823ab6461eb3ce302927443670" + integrity sha512-dHpEghB4f+Ts9b3vNzRf43xZ/V6xhLNYOT/0ZbK30fV495bo3Jn+sL1SSjeMnaTJkU6heBso/9yBn1ns2U7/Vw== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/g-plugin-canvas-path-generator" "2.1.2" + "@antv/g-plugin-canvas-picker" "2.1.4" + "@antv/g-plugin-canvas-renderer" "2.2.4" + "@antv/g-plugin-dom-interaction" "2.1.7" + "@antv/g-plugin-html-renderer" "2.1.7" + "@antv/g-plugin-image-loader" "2.1.4" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + "@antv/g-dom-mutation-observer-api@2.0.15": version "2.0.15" resolved "https://registry.yarnpkg.com/@antv/g-dom-mutation-observer-api/-/g-dom-mutation-observer-api-2.0.15.tgz#035199a7dca34514308edb723bfc59f0560b10ac" @@ -162,6 +217,14 @@ "@antv/g-lite" "2.1.4" "@babel/runtime" "^7.25.6" +"@antv/g-dom-mutation-observer-api@2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@antv/g-dom-mutation-observer-api/-/g-dom-mutation-observer-api-2.0.18.tgz#4ace5f4932dc3ce594912800487d6581ab193c18" + integrity sha512-LOriTfw9iSJVQv24VpBKnwWTy2Axv1JxnOpfC6siV8M1D+5cfv+fBmWs6cIQKxM9p7RZSkpaYFQWM27+sH0AvA== + dependencies: + "@antv/g-lite" "2.2.2" + "@babel/runtime" "^7.25.6" + "@antv/g-lite@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@antv/g-lite/-/g-lite-2.1.4.tgz#28ec3e971ff86c031b51750bb2765525dce79cda" @@ -176,6 +239,20 @@ rbush "^3.0.1" tslib "^2.5.3" +"@antv/g-lite@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@antv/g-lite/-/g-lite-2.2.2.tgz#154d60f68f842c1f3e45f91d8741ae2edd152c5a" + integrity sha512-Ffk7Jar+n6lUA+TEvoEaN30rAWe5l6Ybic7lucA90PKiyCsN0w+qVGJzbvskamuwp3RmcSZDNwQGP8vg374dCA== + dependencies: + "@antv/g-math" "3.0.0" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + d3-color "^3.1.0" + eventemitter3 "^5.0.1" + gl-matrix "^3.4.3" + rbush "^3.0.1" + tslib "^2.5.3" + "@antv/g-math@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@antv/g-math/-/g-math-3.0.0.tgz#834d993391546e39ae5a30452572fdc49a7c57ec" @@ -196,6 +273,17 @@ "@babel/runtime" "^7.25.6" tslib "^2.5.3" +"@antv/g-plugin-canvas-path-generator@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-canvas-path-generator/-/g-plugin-canvas-path-generator-2.1.2.tgz#b96f5a572eebb66f2607414fe180f84c9fb67667" + integrity sha512-ILaKEQvbAZNkRhbE3kWxd0EszDAb3TE0HQKNfur7YuVkQMgACDj6jbVUULFPcGpcw/pQbWM8nD1RRf24hfFAlw== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/g-math" "3.0.0" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + "@antv/g-plugin-canvas-picker@2.0.17": version "2.0.17" resolved "https://registry.yarnpkg.com/@antv/g-plugin-canvas-picker/-/g-plugin-canvas-picker-2.0.17.tgz#a213d9d7a0a6613c7456f65514fa1d7efb3fc312" @@ -210,6 +298,20 @@ gl-matrix "^3.4.3" tslib "^2.5.3" +"@antv/g-plugin-canvas-picker@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-canvas-picker/-/g-plugin-canvas-picker-2.1.4.tgz#963dfe2a8a6771ab969910e52a7d1e1a6ef7f0ed" + integrity sha512-L/L7wiZVCnLumIsE1DU14t4kwnwOLyQlsB3ZE/Q6ZVEf6UiZp1ARrGR8zzz+yUPxeWiJqduVnBRLOkyZkdjOoQ== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/g-math" "3.0.0" + "@antv/g-plugin-canvas-path-generator" "2.1.2" + "@antv/g-plugin-canvas-renderer" "2.2.4" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + tslib "^2.5.3" + "@antv/g-plugin-canvas-renderer@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@antv/g-plugin-canvas-renderer/-/g-plugin-canvas-renderer-2.1.4.tgz#677449301512e30ae4ec6975689b19f3e8241f41" @@ -224,6 +326,20 @@ gl-matrix "^3.4.3" tslib "^2.5.3" +"@antv/g-plugin-canvas-renderer@2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-canvas-renderer/-/g-plugin-canvas-renderer-2.2.4.tgz#3ac4227c16dfc52f074bc8343a9eea4afc99d403" + integrity sha512-cmqVUB+aAglj/gYvc8Zcqjwe9PXOapyTE6Q9ChYVnlStP8rMdyXgdfACNa7pi7T1TWoq2etuEp29t4k+oGKLqQ== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/g-math" "3.0.0" + "@antv/g-plugin-canvas-path-generator" "2.1.2" + "@antv/g-plugin-image-loader" "2.1.4" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + tslib "^2.5.3" + "@antv/g-plugin-dom-interaction@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@antv/g-plugin-dom-interaction/-/g-plugin-dom-interaction-2.1.4.tgz#56c4657ffddfa0a3ab86a4c7cb91df2b87c85b2f" @@ -233,6 +349,15 @@ "@babel/runtime" "^7.25.6" tslib "^2.5.3" +"@antv/g-plugin-dom-interaction@2.1.7": + version "2.1.7" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-dom-interaction/-/g-plugin-dom-interaction-2.1.7.tgz#93ffb590701999b742628936390a5890b81fab80" + integrity sha512-wrlcFlWsXq9Pa6ju5de8V0TzIR2GivBOkRyHQuNba6kpUC1RAT0EHpTpPCJML+Jys8nt8A0ppssSF4E0jZ1MpQ== + dependencies: + "@antv/g-lite" "2.2.2" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + "@antv/g-plugin-dragndrop@^2.0.0": version "2.0.15" resolved "https://registry.yarnpkg.com/@antv/g-plugin-dragndrop/-/g-plugin-dragndrop-2.0.15.tgz#8e710a8f66ed971c8d500cae82664de913405e05" @@ -243,6 +368,16 @@ "@babel/runtime" "^7.25.6" tslib "^2.5.3" +"@antv/g-plugin-dragndrop@^2.0.18": + version "2.0.18" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-dragndrop/-/g-plugin-dragndrop-2.0.18.tgz#1e7df5d6e40a29befc4e563ceb19f2f6d6b972e0" + integrity sha512-kjRj/yoWXh5J0Db/gtB3TFNlR4x3dMWvlRz6+7M3ka/mlrdMS0SGFLZfbWq6xvN+TzyiDXZdzSwA0A0OkA5Jww== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + "@antv/g-plugin-html-renderer@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@antv/g-plugin-html-renderer/-/g-plugin-html-renderer-2.1.4.tgz#e5604a9890495fa33e9f02f7648ec0d83cd8a5f5" @@ -254,6 +389,17 @@ gl-matrix "^3.4.3" tslib "^2.5.3" +"@antv/g-plugin-html-renderer@2.1.7": + version "2.1.7" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-html-renderer/-/g-plugin-html-renderer-2.1.7.tgz#ec4874d86a887809e9ef2b096132d6a50c1b53d4" + integrity sha512-MPquXo9MT9QHUdbvgwcBr9msNv9Qh2slOKpc1fzwWG7/aLpmOAxTAhd3+Sjj8JuVXHYw25Q3seI8lMJSGwTWvw== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + tslib "^2.5.3" + "@antv/g-plugin-image-loader@2.0.15": version "2.0.15" resolved "https://registry.yarnpkg.com/@antv/g-plugin-image-loader/-/g-plugin-image-loader-2.0.15.tgz#7928c4abf7ff283deddde78bc35a34bc46a53932" @@ -265,6 +411,51 @@ gl-matrix "^3.4.3" tslib "^2.5.3" +"@antv/g-plugin-image-loader@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-image-loader/-/g-plugin-image-loader-2.1.4.tgz#0b4f5e00a0941178db4efd54afc182b47c6ce543" + integrity sha512-dRikFBY/GNvMW7ecbDerChgnKnjZQoSNONR8uL/bZ1vurTZTd9HK1FYz2QDjLIRePWNTlfcWmux1RooSKfo1OA== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + tslib "^2.5.3" + +"@antv/g-plugin-svg-picker@2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-svg-picker/-/g-plugin-svg-picker-2.0.20.tgz#5401d37816a1bb6c8457fabfe38bc0eddeb2b383" + integrity sha512-gML0upmK24Bqr8REsuW8ZZqlKNHSEDtYlycFof36HDcKVNDWIf22ff5N3op1rCHkbny6XXjkIXoKulfQM6GHOA== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/g-plugin-svg-renderer" "2.2.2" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + +"@antv/g-plugin-svg-renderer@2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@antv/g-plugin-svg-renderer/-/g-plugin-svg-renderer-2.2.2.tgz#c48bd91df47e73ebce22a9e8eab63cedecc221ff" + integrity sha512-fWQ5gVSxcZr+Ip95wVeHY2WtoWnsyGDqj+lkxK1aAq0uzqI2qIVyawUc86R87Bv4UVY9b0B5KCtig5F5SGGwAg== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + tslib "^2.5.3" + +"@antv/g-svg@^2.0.11": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@antv/g-svg/-/g-svg-2.0.20.tgz#6f8377bd310381102b80930756a99e97f565b5aa" + integrity sha512-KMb5VzQ3nZpBBwH+sRIJGh/umfEpv4SmDWwV/Yy4nAn0X91yq++qEiIDCnq9QSXHOESV6Si7XJbo4WtX5G7TPw== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/g-plugin-dom-interaction" "2.1.7" + "@antv/g-plugin-svg-picker" "2.0.20" + "@antv/g-plugin-svg-renderer" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + "@antv/g-web-animations-api@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@antv/g-web-animations-api/-/g-web-animations-api-2.1.4.tgz#aaa2be6014fc58b9d8f6724b053b7893eae4cc18" @@ -275,6 +466,16 @@ "@babel/runtime" "^7.25.6" tslib "^2.5.3" +"@antv/g-web-animations-api@2.1.7": + version "2.1.7" + resolved "https://registry.yarnpkg.com/@antv/g-web-animations-api/-/g-web-animations-api-2.1.7.tgz#c56868ebaa8ddc7aca79c9314f6a211f91847039" + integrity sha512-yx7ZwLUgiglCe7sSisloWesO8gwgNwTGeDE0fTHhk1kZmO0BxZ8q6/VxlmLgXTyqdRso+6wfsTo2HukMURJSNw== + dependencies: + "@antv/g-lite" "2.2.2" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + tslib "^2.5.3" + "@antv/g2-extension-plot@^0.2.0": version "0.2.1" resolved "https://registry.yarnpkg.com/@antv/g2-extension-plot/-/g2-extension-plot-0.2.1.tgz#664a3cdf2d4d708ed1231ee90d984812b6226d29" @@ -311,6 +512,44 @@ fmin "^0.0.2" pdfast "^0.2.0" +"@antv/g6-extension-react@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@antv/g6-extension-react/-/g6-extension-react-0.1.7.tgz#d0cf5cb2584383c47bd4d6fd3a5caeeca3943e11" + integrity sha512-fKk1weq2odHSTi5i8iSg9/keDPbufryA2TZ2X2j+qkSAwxJ7WtURagV/7/CUN9r1tMMk1eoiuzQZXdvc72a1GA== + dependencies: + "@antv/g" "^6.0.13" + "@antv/g-svg" "^2.0.11" + "@antv/react-g" "^2.0.14" + +"@antv/g6@^5.0.24", "@antv/g6@^5.0.28": + version "5.0.30" + resolved "https://registry.yarnpkg.com/@antv/g6/-/g6-5.0.30.tgz#0e241100bc0519ba0bf2c0ab11cb80a576f1796d" + integrity sha512-QEpNNAz/DcSnyHMJJ1UNSVjKgbfJ0zhwHcq8I/+f/mZl87oK1GlcRi8FCVcPGBb+W3OH8xfH5GIjPxEPma1kxg== + dependencies: + "@antv/algorithm" "^0.1.26" + "@antv/component" "^2.1.1" + "@antv/event-emitter" "^0.1.3" + "@antv/g" "^6.1.7" + "@antv/g-canvas" "^2.0.24" + "@antv/g-plugin-dragndrop" "^2.0.18" + "@antv/graphlib" "^2.0.3" + "@antv/hierarchy" "^0.6.14" + "@antv/layout" "1.2.14-beta.9" + "@antv/util" "^3.3.10" + bubblesets-js "^2.3.4" + hull.js "^1.0.6" + +"@antv/g@6.1.7", "@antv/g@^6.0.13", "@antv/g@^6.1.7": + version "6.1.7" + resolved "https://registry.yarnpkg.com/@antv/g/-/g-6.1.7.tgz#3003b2532c4287f2208537bcca87bffd0e44c30a" + integrity sha512-qv8YnBKqX3Yjs85U9OnBa6E92tNAI3cKrBhDrI5EikzjVPqfcVQLx0P5Zo8uzCYt7m9jFpJCi/iaGvWX/fA14Q== + dependencies: + "@antv/g-camera-api" "2.0.21" + "@antv/g-dom-mutation-observer-api" "2.0.18" + "@antv/g-lite" "2.2.2" + "@antv/g-web-animations-api" "2.1.7" + "@babel/runtime" "^7.25.6" + "@antv/g@^6.0.0", "@antv/g@^6.1.2": version "6.1.4" resolved "https://registry.yarnpkg.com/@antv/g/-/g-6.1.4.tgz#4279fc065ab2fe4581874fddb06c46ce5c58c841" @@ -322,6 +561,56 @@ "@antv/g-web-animations-api" "2.1.4" "@babel/runtime" "^7.25.6" +"@antv/graphin@^3.0.2": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@antv/graphin/-/graphin-3.0.4.tgz#33f4ead798d8f1fa1bf885247c68ca94d18e17c4" + integrity sha512-7ce6RDI5Z6ud93yiyS7b+mmFrHJhlkwwNo53kb7P7KoCsnV7ioMONDE6Gw0ROeMSR6TwHtxGZUhHw9wxnPp82Q== + dependencies: + "@antv/g6" "^5.0.28" + +"@antv/graphlib@^2.0.0", "@antv/graphlib@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@antv/graphlib/-/graphlib-2.0.3.tgz#493e05872851c897e2133b0968cf5c6f4f6c022e" + integrity sha512-EtQR+DIfsYy28tumTnH560v7yIzXZq0nSgFBZh76mMiV1oHEN1L4p6JKu7IMtILH14mDqzmYYYFetYoAODoQUw== + dependencies: + "@antv/event-emitter" "^0.1.3" + +"@antv/hierarchy@^0.6.14": + version "0.6.14" + resolved "https://registry.yarnpkg.com/@antv/hierarchy/-/hierarchy-0.6.14.tgz#4e8b4966c9c2a44aaa6f9da7008c4bd44d490385" + integrity sha512-V3uknf7bhynOqQDw2sg+9r9DwZ9pc6k/EcqyTFdfXB1+ydr7urisP0MipIuimucvQKN+Qkd+d6w601r1UIroqQ== + +"@antv/layout@1.2.14-beta.9": + version "1.2.14-beta.9" + resolved "https://registry.yarnpkg.com/@antv/layout/-/layout-1.2.14-beta.9.tgz#5c66a0f22158c545aabd1654a50bfc8c3bf93f98" + integrity sha512-wPlwBFMtq2lWZFc89/7Lzb8fjHnyKVZZ9zBb2h+zZIP0YWmVmHRE8+dqCiPKOyOGUXEdDtn813f1g107dCHZlg== + dependencies: + "@antv/event-emitter" "^0.1.3" + "@antv/graphlib" "^2.0.0" + "@antv/util" "^3.3.2" + "@naoak/workerize-transferable" "^0.1.0" + comlink "^4.4.1" + d3-force "^3.0.0" + d3-force-3d "^3.0.5" + d3-octree "^1.0.2" + d3-quadtree "^3.0.1" + dagre "^0.8.5" + ml-matrix "^6.10.4" + tslib "^2.5.0" + +"@antv/react-g@^2.0.14": + version "2.0.23" + resolved "https://registry.yarnpkg.com/@antv/react-g/-/react-g-2.0.23.tgz#74df2fb27eba3144fd914baf51b9607233b4b670" + integrity sha512-Cur5/B6kRRK7kxj5USsEobKcGAGoWG9fDltVJ/3m95kMN95Ayx2rbVFxc5NavTrnmhxO4OUkRIyb0PDBFApfQA== + dependencies: + "@antv/g" "6.1.7" + "@antv/util" "^3.3.5" + "@babel/runtime" "^7.25.6" + gl-matrix "^3.4.3" + react-reconciler "^0.26.2" + scheduler "^0.20.2" + tslib "^2.5.3" + "@antv/scale@^0.4.12", "@antv/scale@^0.4.3": version "0.4.16" resolved "https://registry.yarnpkg.com/@antv/scale/-/scale-0.4.16.tgz#60557470668ccfe5217e482a01f05c0cbb706b62" @@ -339,7 +628,7 @@ csstype "^3.0.8" tslib "^2.0.3" -"@antv/util@^3.3.5", "@antv/util@^3.3.7": +"@antv/util@^3.3.10", "@antv/util@^3.3.2", "@antv/util@^3.3.5", "@antv/util@^3.3.7": version "3.3.10" resolved "https://registry.yarnpkg.com/@antv/util/-/util-3.3.10.tgz#6fb2560c0f42df61f824e1f995a1ed1bdb00eb9a" integrity sha512-basGML3DFA3O87INnzvDStjzS+n0JLEhRnRsDzP9keiXz8gT1z/fTdmJAZFOzMMWxy+HKbi7NbSt0+8vz/OsBQ== @@ -1345,7 +1634,7 @@ "@babel/plugin-transform-modules-commonjs" "^7.25.9" "@babel/plugin-transform-typescript" "^7.25.9" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.25.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.25.6", "@babel/runtime@^7.25.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.26.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1" integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw== @@ -1409,6 +1698,23 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== +"@emotion/is-prop-valid@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz#d4175076679c6a26faa92b03bb786f9e52612337" + integrity sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw== + dependencies: + "@emotion/memoize" "^0.8.1" + +"@emotion/memoize@^0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17" + integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA== + +"@emotion/unitless@0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3" + integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ== + "@emotion/unitless@^0.7.5": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" @@ -1441,15 +1747,51 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@gatsbyjs/parcel-namer-relative-to-cwd@^2.13.1": - version "2.13.1" - resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-2.13.1.tgz#79d2692330a942394200c9bf3e820a4e55075ffb" - integrity sha512-ze0u/CAt6fKV2yQlExkBARi8oqA559lX6/GFWwdtD9S1J4h8Bje70Odl/bcIECvT/w9mWCCQEVtKLvqkraDopw== +"@floating-ui/core@^1.6.0": + version "1.6.8" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12" + integrity sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA== + dependencies: + "@floating-ui/utils" "^0.2.8" + +"@floating-ui/dom@^1.0.0": + version "1.6.12" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.12.tgz#6333dcb5a8ead3b2bf82f33d6bc410e95f54e556" + integrity sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w== + dependencies: + "@floating-ui/core" "^1.6.0" + "@floating-ui/utils" "^0.2.8" + +"@floating-ui/react-dom@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31" + integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A== + dependencies: + "@floating-ui/dom" "^1.0.0" + +"@floating-ui/react@^0.26.16": + version "0.26.27" + resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.26.27.tgz#402f7b4b2702650662705fe9cbe0f1d5607846a1" + integrity sha512-jLP72x0Kr2CgY6eTYi/ra3VA9LOkTo4C+DUTrbFgFOExKy3omYVmwMjNKqxAHdsnyLS96BIDLcO2SlnsNf8KUQ== + dependencies: + "@floating-ui/react-dom" "^2.1.2" + "@floating-ui/utils" "^0.2.8" + tabbable "^6.0.0" + +"@floating-ui/utils@^0.2.8": + version "0.2.8" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.8.tgz#21a907684723bbbaa5f0974cf7730bd797eb8e62" + integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig== + +"@gatsbyjs/parcel-namer-relative-to-cwd@2.14.0": + version "2.14.0" + resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-2.14.0.tgz#46556c54c7c958528c1fdf9bda2a3d96886bdd2c" + integrity sha512-BWIIsz4oPLIUVAWr4Lgw4BGtJjjhb39+oTrXUa6rN0A+vS5qXrpkx1nGzVb5PJ2RJY9Paf4hNLZVW9LaLnGLBA== dependencies: "@babel/runtime" "^7.20.13" "@parcel/namer-default" "2.8.3" "@parcel/plugin" "2.8.3" - gatsby-core-utils "^4.13.1" + gatsby-core-utils "^4.14.0" "@gatsbyjs/reach-router@^2.0.1": version "2.0.1" @@ -1656,13 +1998,15 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@headlessui/react@^1.7.16": - version "1.7.19" - resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.19.tgz#91c78cf5fcb254f4a0ebe96936d48421caf75f40" - integrity sha512-Ll+8q3OlMJfJbAKM/+/Y2q6PPYbryqNTXDbryx7SXLIDamkF6iQFbriYHga0dY44PvDhvvBWCx1Xj4U5+G4hOw== +"@headlessui/react@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-2.2.0.tgz#a8e32f0899862849a1ce1615fa280e7891431ab7" + integrity sha512-RzCEg+LXsuI7mHiSomsu/gBJSjpupm6A1qIZ5sWjd7JhARNlMiSA4kKfJpCKwU9tE+zMRterhhrP74PvfJrpXQ== dependencies: - "@tanstack/react-virtual" "^3.0.0-beta.60" - client-only "^0.0.1" + "@floating-ui/react" "^0.26.16" + "@react-aria/focus" "^3.17.1" + "@react-aria/interactions" "^3.21.3" + "@tanstack/react-virtual" "^3.8.1" "@heroicons/react@^2.0.18": version "2.1.5" @@ -1904,6 +2248,11 @@ resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz#0aa5502d547b57abfc4ac492de68e2006e417242" integrity sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ== +"@naoak/workerize-transferable@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@naoak/workerize-transferable/-/workerize-transferable-0.1.0.tgz#864cc8241b977bffd8661c0be1441da9b4bfb633" + integrity sha512-fDLfuP71IPNP5+zSfxFb52OHgtjZvauRJWbVnpzQ7G7BjcbLjTny0OW1d3ZO806XKpLWNKmeeW3MhE0sy8iwYQ== + "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" @@ -2417,7 +2766,7 @@ classnames "^2.3.2" rc-util "^5.24.4" -"@rc-component/trigger@^2.0.0", "@rc-component/trigger@^2.1.1", "@rc-component/trigger@^2.2.3": +"@rc-component/trigger@^2.0.0", "@rc-component/trigger@^2.1.1": version "2.2.3" resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-2.2.3.tgz#b47e945115e2d0a7f7e067dbb9ed76c91c1b4385" integrity sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A== @@ -2429,6 +2778,69 @@ rc-resize-observer "^1.3.1" rc-util "^5.38.0" +"@rc-component/trigger@^2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-2.2.5.tgz#5ebe383e563e667b3fa24b6b32afedbab378a92e" + integrity sha512-F1EJ4KjFpGAHAjuKvOyZB/6IZDkVx0bHl0M4fQM5wXcmm7lgTgVSSnR3bXwdmS6jOJGHOqfDxIJW3WUvwMIXhQ== + dependencies: + "@babel/runtime" "^7.23.2" + "@rc-component/portal" "^1.1.0" + classnames "^2.3.2" + rc-motion "^2.0.0" + rc-resize-observer "^1.3.1" + rc-util "^5.38.0" + +"@react-aria/focus@^3.17.1": + version "3.18.4" + resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.18.4.tgz#a6e95896bc8680d1b5bcd855e983fc2c195a1a55" + integrity sha512-91J35077w9UNaMK1cpMUEFRkNNz0uZjnSwiyBCFuRdaVuivO53wNC9XtWSDNDdcO5cGy87vfJRVAiyoCn/mjqA== + dependencies: + "@react-aria/interactions" "^3.22.4" + "@react-aria/utils" "^3.25.3" + "@react-types/shared" "^3.25.0" + "@swc/helpers" "^0.5.0" + clsx "^2.0.0" + +"@react-aria/interactions@^3.21.3", "@react-aria/interactions@^3.22.4": + version "3.22.4" + resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.22.4.tgz#88ed61ab6a485f869bc1f65ae6688d48ca96064b" + integrity sha512-E0vsgtpItmknq/MJELqYJwib+YN18Qag8nroqwjk1qOnBa9ROIkUhWJerLi1qs5diXq9LHKehZDXRlwPvdEFww== + dependencies: + "@react-aria/ssr" "^3.9.6" + "@react-aria/utils" "^3.25.3" + "@react-types/shared" "^3.25.0" + "@swc/helpers" "^0.5.0" + +"@react-aria/ssr@^3.9.6": + version "3.9.6" + resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.9.6.tgz#a9e8b351acdc8238f2b5215b0ce904636c6ea690" + integrity sha512-iLo82l82ilMiVGy342SELjshuWottlb5+VefO3jOQqQRNYnJBFpUSadswDPbRimSgJUZuFwIEYs6AabkP038fA== + dependencies: + "@swc/helpers" "^0.5.0" + +"@react-aria/utils@^3.25.3": + version "3.25.3" + resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.25.3.tgz#cad9bffc07b045cdc283df2cb65c18747acbf76d" + integrity sha512-PR5H/2vaD8fSq0H/UB9inNbc8KDcVmW6fYAfSWkkn+OAdhTTMVKqXXrZuZBWyFfSD5Ze7VN6acr4hrOQm2bmrA== + dependencies: + "@react-aria/ssr" "^3.9.6" + "@react-stately/utils" "^3.10.4" + "@react-types/shared" "^3.25.0" + "@swc/helpers" "^0.5.0" + clsx "^2.0.0" + +"@react-stately/utils@^3.10.4": + version "3.10.4" + resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.4.tgz#310663a834b67048d305e1680ed258130092fe51" + integrity sha512-gBEQEIMRh5f60KCm7QKQ2WfvhB2gLUr9b72sqUdIZ2EG+xuPgaIlCBeSicvjmjBvYZwOjoOEnmIkcx2GHp/HWw== + dependencies: + "@swc/helpers" "^0.5.0" + +"@react-types/shared@^3.25.0": + version "3.25.0" + resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.25.0.tgz#7223baf72256e918a3c29081bb1ecc6fad4fbf58" + integrity sha512-OZSyhzU6vTdW3eV/mz5i6hQwQUhkRs7xwY2d1aqPvTdMe0+2cY7Fwp45PAiwYLEj73i9ro2FxF9qC4DvHGSCgQ== + "@rtsao/scc@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" @@ -2501,6 +2913,13 @@ "@swc/legacy-helpers" "npm:@swc/helpers@=0.4.14" tslib "^2.4.0" +"@swc/helpers@^0.5.0": + version "0.5.15" + resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7" + integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g== + dependencies: + tslib "^2.8.0" + "@swc/legacy-helpers@npm:@swc/helpers@=0.4.14": version "0.4.14" resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.14.tgz#1352ac6d95e3617ccb7c1498ff019654f1e12a74" @@ -2532,17 +2951,17 @@ lodash.merge "^4.6.2" postcss-selector-parser "6.0.10" -"@tanstack/react-virtual@^3.0.0-beta.60": - version "3.10.8" - resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.10.8.tgz#bf4b06f157ed298644a96ab7efc1a2b01ab36e3c" - integrity sha512-VbzbVGSsZlQktyLrP5nxE+vE1ZR+U0NFAWPbJLoG2+DKPwd2D7dVICTVIIaYlJqX1ZCEnYDbaOpmMwbsyhBoIA== +"@tanstack/react-virtual@^3.8.1": + version "3.10.9" + resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.10.9.tgz#40606b6dd8aba8e977f576d8f7df07f69ca63eea" + integrity sha512-OXO2uBjFqA4Ibr2O3y0YMnkrRWGVNqcvHQXmGvMu6IK8chZl3PrDxFXdGZ2iZkSrKh3/qUYoFqYe+Rx23RoU0g== dependencies: - "@tanstack/virtual-core" "3.10.8" + "@tanstack/virtual-core" "3.10.9" -"@tanstack/virtual-core@3.10.8": - version "3.10.8" - resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.10.8.tgz#975446a667755222f62884c19e5c3c66d959b8b4" - integrity sha512-PBu00mtt95jbKFi6Llk9aik8bnR3tR/oQP1o3TSi+iG//+Q2RTIzCEgKkHG8BB86kxMNW6O8wku+Lmi+QFR6jA== +"@tanstack/virtual-core@3.10.9": + version "3.10.9" + resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.10.9.tgz#55710c92b311fdaa8d8c66682a0dbdd684bc77c4" + integrity sha512-kBknKOKzmeR7lN+vSadaKWXaLS0SZZG+oqpQ/k80Q6g9REn6zRHS/ZYdrIzHnpHgy/eWs00SujveUN/GJT2qTw== "@tokenizer/token@^0.3.0": version "0.3.0" @@ -2554,18 +2973,6 @@ resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== -"@turist/fetch@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@turist/fetch/-/fetch-7.2.0.tgz#57df869df1cd9b299588554eec4b8543effcc714" - integrity sha512-2x7EGw+6OJ29phunsbGvtxlNmSfcuPcyYudkMbi8gARCP9eJ1CtuMvnVUHL//O9Ixi9SJiug8wNt6lj86pN8XQ== - dependencies: - "@types/node-fetch" "2" - -"@turist/time@^0.0.2": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@turist/time/-/time-0.0.2.tgz#32fe0ce708ea0f4512776bd313409f1459976dda" - integrity sha512-qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ== - "@types/acorn@^4.0.0": version "4.0.6" resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22" @@ -2809,14 +3216,6 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== -"@types/node-fetch@2": - version "2.6.11" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" - integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== - dependencies: - "@types/node" "*" - form-data "^4.0.0" - "@types/node@*", "@types/node@>=10.0.0": version "22.8.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.8.6.tgz#e8a0c0871623283d8b3ef7d7b9b1bfdfd3028e22" @@ -2829,12 +3228,12 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== -"@types/node@^20.11.19": - version "20.17.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.5.tgz#b7a1d8619ced7ce1da901b07a47c61107272449a" - integrity sha512-n8FYY/pRxu496441gIcAQFZPKXbhsd6VZygcq+PTSZ75eMh/Ke0hCAROdUa21qiFqKNsPPYic46yXDO1JGiPBQ== +"@types/node@^22.9.0": + version "22.9.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365" + integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ== dependencies: - undici-types "~6.19.2" + undici-types "~6.19.8" "@types/node@^8.5.7": version "8.10.66" @@ -2907,6 +3306,11 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== +"@types/stylis@4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@types/stylis/-/stylis-4.2.5.tgz#1daa6456f40959d06157698a653a9ab0a70281df" + integrity sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw== + "@types/tmp@^0.0.33": version "0.0.33" resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.33.tgz#1073c4bc824754ae3d10cfab88ab0237ba964e4d" @@ -3364,56 +3768,56 @@ ansi-styles@^6.1.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== -antd@^5.1.0: - version "5.21.6" - resolved "https://registry.yarnpkg.com/antd/-/antd-5.21.6.tgz#60d8eb442f7f8019bab198e30ea5a8d6d224a6ce" - integrity sha512-EviOde/VEu+OsIKH5t6YXTMmmNeg9R85m0W5zXAo+Np8Latg9q10691JvAqOTMpnrRmbdeKUQL1Krp69Bzbe/g== +antd@^5.22.1: + version "5.22.1" + resolved "https://registry.yarnpkg.com/antd/-/antd-5.22.1.tgz#726c9d4465a1f59079ef60896418fcdbb07a796c" + integrity sha512-itq8AZwe3IfawZH6SMM5XdbTz1xXGTTqA7sNN0qpEdxcoTpD5nRsCBAMIy+PhwcWFobgFc6ZlF8d7f8eicn0SQ== dependencies: "@ant-design/colors" "^7.1.0" "@ant-design/cssinjs" "^1.21.1" "@ant-design/cssinjs-utils" "^1.1.1" "@ant-design/icons" "^5.5.1" "@ant-design/react-slick" "~1.1.2" - "@babel/runtime" "^7.25.6" + "@babel/runtime" "^7.25.7" "@ctrl/tinycolor" "^3.6.1" "@rc-component/color-picker" "~2.0.1" "@rc-component/mutate-observer" "^1.1.0" "@rc-component/qrcode" "~1.0.0" "@rc-component/tour" "~1.15.1" - "@rc-component/trigger" "^2.2.3" + "@rc-component/trigger" "^2.2.5" classnames "^2.5.1" copy-to-clipboard "^3.3.3" dayjs "^1.11.11" - rc-cascader "~3.28.2" + rc-cascader "~3.30.0" rc-checkbox "~3.3.0" - rc-collapse "~3.8.0" + rc-collapse "~3.9.0" rc-dialog "~9.6.0" rc-drawer "~7.2.0" rc-dropdown "~4.2.0" - rc-field-form "~2.4.0" + rc-field-form "~2.5.0" rc-image "~7.11.0" rc-input "~1.6.3" - rc-input-number "~9.2.0" - rc-mentions "~2.16.1" - rc-menu "~9.15.1" + rc-input-number "~9.3.0" + rc-mentions "~2.17.0" + rc-menu "~9.16.0" rc-motion "^2.9.3" rc-notification "~5.6.2" rc-pagination "~4.3.0" - rc-picker "~4.6.15" + rc-picker "~4.8.0" rc-progress "~4.0.0" rc-rate "~2.13.0" rc-resize-observer "^1.4.0" rc-segmented "~2.5.0" - rc-select "~14.15.2" + rc-select "~14.16.3" rc-slider "~11.1.7" rc-steps "~6.0.1" rc-switch "~4.1.0" - rc-table "~7.47.5" - rc-tabs "~15.3.0" + rc-table "~7.48.1" + rc-tabs "~15.4.0" rc-textarea "~1.8.2" rc-tooltip "~6.2.1" - rc-tree "~5.9.0" - rc-tree-select "~5.23.0" + rc-tree "~5.10.1" + rc-tree-select "~5.24.4" rc-upload "~4.8.1" rc-util "^5.43.0" scroll-into-view-if-needed "^3.1.0" @@ -3489,11 +3893,6 @@ array-includes@^3.1.6, array-includes@^3.1.8: get-intrinsic "^1.2.4" is-string "^1.0.7" -array-tree-filter@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190" - integrity sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw== - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -3598,7 +3997,7 @@ async@1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== -async@^3.2.4: +async@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== @@ -3642,12 +4041,14 @@ axe-core@^4.10.0: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df" integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w== -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== +axios@^1.6.4: + version "1.7.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" + integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== dependencies: - follow-redirects "^1.14.0" + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" axobject-query@^4.1.0: version "4.1.0" @@ -3719,14 +4120,14 @@ babel-plugin-polyfill-regenerator@^0.6.1: dependencies: "@babel/helper-define-polyfill-provider" "^0.6.2" -babel-plugin-remove-graphql-queries@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-5.13.1.tgz#bf1feb392d8a1f74046f9584c72c952663a10695" - integrity sha512-yncJ/W6Un48aBRpK/rmdpQOMcr4+EmJ3oi2Wq1zXKu8WLlw+j93KTbejf7fg2msm8GUskb/+9Nnpz7oMCqO9aA== +babel-plugin-remove-graphql-queries@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-5.14.0.tgz#922ac7c23591434b800fedf163fed042105f3aed" + integrity sha512-k5NlcywGAiMklF7LfBSIuPlNYDdHQYTSuDdNDB1shEzxxmvd9akk+bzPE4qf2w/yvMirCkGSJOQud7w33HH2HQ== dependencies: "@babel/runtime" "^7.20.13" "@babel/types" "^7.20.7" - gatsby-core-utils "^4.13.1" + gatsby-core-utils "^4.14.0" babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" @@ -3771,10 +4172,10 @@ babel-preset-fbjs@^3.4.0: "@babel/plugin-transform-template-literals" "^7.0.0" babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0" -babel-preset-gatsby@^3.13.2: - version "3.13.2" - resolved "https://registry.yarnpkg.com/babel-preset-gatsby/-/babel-preset-gatsby-3.13.2.tgz#61f9f3a11f96577ca889c6061096c67ef287ec47" - integrity sha512-1zZ3Fpt9jD63inJXWUF2hA6U2cBAMYFDSC5hKqnSSVbNUzKlHUcY0Vbx8azBSaHg27TVp9BitR10zvq5AHP/OQ== +babel-preset-gatsby@^3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/babel-preset-gatsby/-/babel-preset-gatsby-3.14.0.tgz#17bb148e91c93735c056c8030c34f1477dfd2926" + integrity sha512-yE/1gmohqy+Y/v8RYWMyJ1WLrACSkblS8LRcByeNqqBPrDAaG5T/bU1Lhc75BW8j9iLDOkLilun3fGZRu5nacA== dependencies: "@babel/plugin-proposal-class-properties" "^7.18.6" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" @@ -3789,8 +4190,8 @@ babel-preset-gatsby@^3.13.2: babel-plugin-dynamic-import-node "^2.3.3" babel-plugin-macros "^3.1.0" babel-plugin-transform-react-remove-prop-types "^0.4.24" - gatsby-core-utils "^4.13.1" - gatsby-legacy-polyfills "^3.13.1" + gatsby-core-utils "^4.14.0" + gatsby-legacy-polyfills "^3.14.0" bail@^2.0.0: version "2.0.2" @@ -3888,24 +4289,6 @@ bluebird@^3.7.2: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.1" - type-is "~1.6.18" - unpipe "1.0.0" - body-parser@1.20.3: version "1.20.3" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" @@ -3982,6 +4365,11 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" +bubblesets-js@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/bubblesets-js/-/bubblesets-js-2.3.4.tgz#8e1230b29c309e3327a05630fe02df3d96596ab6" + integrity sha512-DyMjHmpkS2+xcFNtyN00apJYL3ESdp9fTrkDr5+9Qg/GPqFmcWgGsK1akZnttE1XFxJ/VMy4DNNGMGYtmFp1Sg== + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -4096,6 +4484,11 @@ camelcase@^6.2.0, camelcase@^6.3.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== +camelize@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" + integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -4293,11 +4686,6 @@ cli-width@^3.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== -client-only@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1" - integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== - clipboardy@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-4.0.0.tgz#e73ced93a76d19dd379ebf1f297565426dffdca1" @@ -4346,6 +4734,11 @@ clone@^2.1.1: resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== +clsx@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" + integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -4391,10 +4784,10 @@ colord@^2.9.1: resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== -colorette@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" - integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== +colorette@^2.0.10: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== combined-stream@^1.0.8: version "1.0.8" @@ -4403,6 +4796,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +comlink@^4.4.1: + version "4.4.2" + resolved "https://registry.yarnpkg.com/comlink/-/comlink-4.4.2.tgz#cbbcd82742fbebc06489c28a183eedc5c60a2bca" + integrity sha512-OxGdvBmJuNKSCMO4NTl1L47VRp6xn2wG4F/2hYzB6tiCb709otOxtEYCSvK80PtjODfXXZu8ds+Nw5kVCjqd2g== + comma-separated-tokens@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee" @@ -4635,10 +5033,10 @@ cosmiconfig@^8.3.5: parse-json "^5.2.0" path-type "^4.0.0" -create-gatsby@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/create-gatsby/-/create-gatsby-3.13.1.tgz#394f5ad7647409f5651057f46e93c1cee1efc47d" - integrity sha512-CCg8Vz/iQs1cgMEzyRlVGMvNs8ivE/2w+TL6yS56FVe1JjOou8nKYHzxnWxRmBUtC7rTfjxVaTESIotuYBsltQ== +create-gatsby@^3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/create-gatsby/-/create-gatsby-3.14.0.tgz#5934709d48b6d3a7ca32466b15349ba5de3359a2" + integrity sha512-HR90NlcTIAeo7OwcFfGubKa35+/Aj7lEfgcV4n4IIPCMy3A+gYwOEQcLIGtmPCVIl1C9AhT3/0XaWbnhAcbyGQ== dependencies: "@babel/runtime" "^7.20.13" @@ -4650,9 +5048,9 @@ cross-fetch@^3.1.5: node-fetch "^2.6.12" cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + version "7.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82" + integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" @@ -4663,6 +5061,11 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== + css-declaration-sorter@^6.3.1: version "6.4.1" resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71" @@ -4713,6 +5116,15 @@ css-selector-parser@^1.0.0: resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.4.1.tgz#03f9cb8a81c3e5ab2c51684557d5aaf6d2569759" integrity sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g== +css-to-react-native@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" + integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^4.0.2" + css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" @@ -4792,7 +5204,7 @@ csso@^4.2.0: dependencies: css-tree "^1.1.2" -csstype@^3.0.2, csstype@^3.0.8, csstype@^3.1.3: +csstype@3.1.3, csstype@^3.0.2, csstype@^3.0.8, csstype@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== @@ -4804,6 +5216,11 @@ csstype@^3.0.2, csstype@^3.0.8, csstype@^3.1.3: dependencies: internmap "1 - 2" +d3-binarytree@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/d3-binarytree/-/d3-binarytree-1.0.2.tgz#ed43ebc13c70fbabfdd62df17480bc5a425753cc" + integrity sha512-cElUNH+sHu95L04m92pG73t2MEJXKu+GeKUN1TJkFsu93E5W8E9Sc3kHEGJKgenGvj19m6upSn2EunvMgMD2Yw== + "d3-color@1 - 3", d3-color@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" @@ -4836,6 +5253,17 @@ d3-dsv@^3.0.1: resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4" integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w== +d3-force-3d@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/d3-force-3d/-/d3-force-3d-3.0.5.tgz#9c8931b49acc3554f9110e128bc580cd3ab830f2" + integrity sha512-tdwhAhoTYZY/a6eo9nR7HP3xSW/C6XvJTbeRpR92nlPzH6OiE+4MliN9feuSFd0tPtEUo+191qOhCTWx3NYifg== + dependencies: + d3-binarytree "1" + d3-dispatch "1 - 3" + d3-octree "1" + d3-quadtree "1 - 3" + d3-timer "1 - 3" + d3-force@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4" @@ -4869,12 +5297,17 @@ d3-hierarchy@^3.1.2: dependencies: d3-color "1 - 3" +d3-octree@1, d3-octree@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/d3-octree/-/d3-octree-1.0.2.tgz#b39026b82701e45c7163e34ee056dc492035a017" + integrity sha512-Qxg4oirJrNXauiuC94uKMbgxwnhdda9xRLl9ihq45srlJ4Ga3CSgqGcAL8iW7N5CIv4Oz8x3E734ulxyvHPvwA== + d3-path@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526" integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ== -"d3-quadtree@1 - 3": +"d3-quadtree@1 - 3", d3-quadtree@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f" integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw== @@ -4934,6 +5367,14 @@ d@1, d@^1.0.1, d@^1.0.2: es5-ext "^0.10.64" type "^2.7.2" +dagre@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" + integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw== + dependencies: + graphlib "^2.1.8" + lodash "^4.17.15" + damerau-levenshtein@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" @@ -5658,7 +6099,7 @@ eslint-plugin-import@^2.27.5: string.prototype.trimend "^1.0.8" tsconfig-paths "^3.15.0" -eslint-plugin-jsx-a11y@^6.7.1: +eslint-plugin-jsx-a11y@^6.8.0: version "6.10.2" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz#d2812bb23bf1ab4665f1718ea442e8372e638483" integrity sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q== @@ -6077,7 +6518,7 @@ fastest-levenshtein@^1.0.16: resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== -fastq@^1.15.0, fastq@^1.6.0: +fastq@^1.15.0, fastq@^1.16.0, fastq@^1.6.0: version "1.17.1" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== @@ -6256,7 +6697,7 @@ fmin@^0.0.2: tape "^4.5.1" uglify-js "^2.6.2" -follow-redirects@^1.14.0: +follow-redirects@^1.15.6: version "1.15.9" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== @@ -6334,7 +6775,7 @@ fs-exists-cached@1.0.0, fs-exists-cached@^1.0.0: resolved "https://registry.yarnpkg.com/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz#cf25554ca050dc49ae6656b41de42258989dcbce" integrity sha512-kSxoARUDn4F2RPXX48UXnaFKwVU7Ivd/6qpzZL29MCDmr9sTvybv4gFCp+qaI4fM9m0z9fgz/yJvi56GAz+BZg== -fs-extra@^11.1.1: +fs-extra@^11.2.0: version "11.2.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== @@ -6393,10 +6834,10 @@ functions-have-names@^1.2.3: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gatsby-cli@^5.13.3: - version "5.13.3" - resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-5.13.3.tgz#84c38ded7c73a35f0864b05cc27e8560e87a0ef8" - integrity sha512-JQTeivvZWuhxE1HRey2sRhwUmkCrs5478fiLR0XRFGin4X1ggCmrQx/DBkJP1TgktdPfNU8t987+slSnO2XzMA== +gatsby-cli@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-5.14.0.tgz#dee48b233b1686be7fa27b0f6f9d71c7748a88be" + integrity sha512-NvsWsuZdpNRStmDsNZaYveifFrFqFNy4rnFCLAWWghyxUks8qhGwy6wrz2kcUK+Y2sRJJn1eIjgwzi1AyFn5fQ== dependencies: "@babel/code-frame" "^7.18.6" "@babel/core" "^7.20.12" @@ -6414,13 +6855,12 @@ gatsby-cli@^5.13.3: clipboardy "^4.0.0" common-tags "^1.8.2" convert-hrtime "^3.0.0" - create-gatsby "^3.13.1" + create-gatsby "^3.14.0" envinfo "^7.10.0" execa "^5.1.1" fs-exists-cached "^1.0.0" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - gatsby-telemetry "^4.13.1" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" hosted-git-info "^3.0.8" is-valid-path "^0.1.1" joi "^17.9.2" @@ -6440,19 +6880,19 @@ gatsby-cli@^5.13.3: yoga-layout-prebuilt "^1.10.0" yurnalist "^2.1.0" -gatsby-core-utils@^4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-4.13.1.tgz#57955316486cc85ab150922f481484bc9287205e" - integrity sha512-w7G6SsQr8T2q+AJ1MxvRNGocCt+wjc22MiRLj2Zi3Ijpjszbr818JxwI4+aPt8WOSHlKT5SYCHICnEvcYPm9gg== +gatsby-core-utils@^4.14.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-4.14.0.tgz#d044327b9399f0449674f8abf1037d1a3ab4e84e" + integrity sha512-h0v20gB213PmhKjioCJ93SrUb7Hihnqxd6X6Iur4u1eiWTUDsGeV9g1bkquiuDl2qovUnjj7mOoHdWiu/Ax/9Q== dependencies: "@babel/runtime" "^7.20.13" ci-info "2.0.0" configstore "^5.0.1" fastq "^1.15.0" file-type "^16.5.4" - fs-extra "^11.1.1" + fs-extra "^11.2.0" got "^11.8.6" - hash-wasm "^4.9.0" + hash-wasm "^4.11.0" import-from "^4.0.0" lmdb "2.5.3" lock "^1.1.0" @@ -6462,48 +6902,48 @@ gatsby-core-utils@^4.13.1: tmp "^0.2.1" xdg-basedir "^4.0.0" -gatsby-graphiql-explorer@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-3.13.1.tgz#906f5b75f9c01ca5cd836de6cda60e376126e3e2" - integrity sha512-WR6jv18OhKLwK/hGZ6ZGUd82GFtM6gHz+sOpgsJJx/+uqRjZwqcrH2LSrWRSWUCk7FoZY1rJuBSD1QkOODV01A== +gatsby-graphiql-explorer@^3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-3.14.0.tgz#9a10f040ede72c104cf5af23561ba4fc01d43161" + integrity sha512-t+PpMu+6GkCdyGDw8S4pd1FBZVwFdpn6Jb2BLZtNJ2z1hOSxHKGoZO1sW2mwZ8/H1VuiSPb2XtXwHYo5CcYgAg== -gatsby-legacy-polyfills@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-3.13.1.tgz#6b18f6979a2dda4e9e0ffd0a453479a90a583385" - integrity sha512-NjR3B/rq6dsJuaMmeHlGExdVXJfDqVWERXi9ROfIBt7O3Fwzy5WYgoPeVikVZE06DmeZWlBzuNcGSfc8lilB5g== +gatsby-legacy-polyfills@^3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-3.14.0.tgz#45531260454c5e77f38cd1162a746ee1da4edd2d" + integrity sha512-CsNguwA88GgLgENx6WEuT8DDl+dus8FdedU1h43Xh9XtD8g/EjJGZk/N458+aZ32ulhuacJEexe3d9ASuEQxMQ== dependencies: "@babel/runtime" "^7.20.13" core-js-compat "3.31.0" -gatsby-link@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-5.13.1.tgz#f37d57f1eb45f8645f0dbc9ffc8c76aca47546ad" - integrity sha512-naQxvgX/rd4Pj5ICL2DcqT30TAENk6wHttcLioxIqW9/UhwAXGkM9QsOJOyUmwbrp37UIKU3K92Ks/cMbRxwXA== +gatsby-link@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-5.14.0.tgz#15b731c6e1050c51f1ff443959d82b523cb61b0a" + integrity sha512-BJYTdZ23pObzan1BG/XlqsnlQgiQS54Ztm1CuYj9OPtORT4i9kBrNSaRrQZdsLHM9s2Ox+oBullzZSi6CU/CbQ== dependencies: "@types/reach__router" "^1.3.10" - gatsby-page-utils "^3.13.1" + gatsby-page-utils "^3.14.0" prop-types "^15.8.1" -gatsby-page-utils@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/gatsby-page-utils/-/gatsby-page-utils-3.13.1.tgz#bd159e9f21ce48f170064682b9a8d087ce49abf4" - integrity sha512-+/V+ZKPn1Lv3KfeTBV/XUVljwTFQq5kg3T0esu9ygXEz3EVXjG5VjL/IX57awiDm9sLsEALqRuuYLoHpfNHg0A== +gatsby-page-utils@^3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/gatsby-page-utils/-/gatsby-page-utils-3.14.0.tgz#a1beaf5cc4805bd95480f5dd95aca7aeb480e8be" + integrity sha512-/Od94fkzkkSzngqglctGMTssQPvHt/Cnjl9hFPM2Clh5UIBSsHjOgOiqM0EPg7VRLXBZypq3DspG2lNaeqCNIA== dependencies: "@babel/runtime" "^7.20.13" bluebird "^3.7.2" chokidar "^3.5.3" fs-exists-cached "^1.0.0" - gatsby-core-utils "^4.13.1" + gatsby-core-utils "^4.14.0" glob "^7.2.3" lodash "^4.17.21" micromatch "^4.0.5" -gatsby-parcel-config@1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/gatsby-parcel-config/-/gatsby-parcel-config-1.13.1.tgz#1d504157a2ff02227ff239bd85b0f473e41f1981" - integrity sha512-zEiDKnq1UQvDDireYQN2TmDsxDf9n2SHYXASHyUTipwsMlNMEi0nLav1vHRQAfzbjw4tabk9Z5kcknkJ6nLqOA== +gatsby-parcel-config@1.14.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/gatsby-parcel-config/-/gatsby-parcel-config-1.14.0.tgz#450a8edc6965b01a02c4d6d69f8080489dd7d317" + integrity sha512-S7RQOo1O5wzHxHB1AHh4xKbg8Jj76VPbSMfVsVVapL2Ht7p1zxrZ7p2pOX3pr5WJnfacREOQwLhlk8rk8TDbGw== dependencies: - "@gatsbyjs/parcel-namer-relative-to-cwd" "^2.13.1" + "@gatsbyjs/parcel-namer-relative-to-cwd" "2.14.0" "@parcel/bundler-default" "2.8.3" "@parcel/compressor-raw" "2.8.3" "@parcel/namer-default" "2.8.3" @@ -6516,41 +6956,41 @@ gatsby-parcel-config@1.13.1: "@parcel/transformer-js" "2.8.3" "@parcel/transformer-json" "2.8.3" -gatsby-plugin-image@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-image/-/gatsby-plugin-image-3.13.1.tgz#5c6e03b1c21bb0dbc076f589aea9911086b25bde" - integrity sha512-v5jGXxjr//iLk7LzpW6RW/9H4KNVezxee2Sgy9mxvdvekTuFQLYoQmtk2jOZINMZMP3Vm+Rl3MqWWVMfhHuWFw== +gatsby-plugin-image@^3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-image/-/gatsby-plugin-image-3.14.0.tgz#a5a67be6cd460effa0ea70a4fdcdd8baa4a0c380" + integrity sha512-sEHZUSb67yRu8YJSV/Otb3QboYma8YuePu88c2wyWFq4kK4Hgf1YsbQEWqj5ywg+ikRULbkR6TAtTpJ3waQGRg== dependencies: "@babel/code-frame" "^7.18.6" "@babel/parser" "^7.20.13" "@babel/runtime" "^7.20.13" "@babel/traverse" "^7.20.13" babel-jsx-utils "^1.1.0" - babel-plugin-remove-graphql-queries "^5.13.1" + babel-plugin-remove-graphql-queries "^5.14.0" camelcase "^6.3.0" chokidar "^3.5.3" common-tags "^1.8.2" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - gatsby-plugin-utils "^4.13.1" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" + gatsby-plugin-utils "^4.14.0" objectFitPolyfill "^2.3.5" prop-types "^15.8.1" -gatsby-plugin-manifest@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-5.13.1.tgz#4e7a87c38c5d47622016eec70ce1383f6e331f60" - integrity sha512-F8zGMYz2tRDAzQO7hLrYv+xCFyIoeySeGsEk9j1KTdWB4liVQvLtFSXzj7yljyOTinDmA7mDStCiQFStC0rHZQ== +gatsby-plugin-manifest@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-5.14.0.tgz#c5e701af508c534102f27c2c52b4cb41a7599bc5" + integrity sha512-ZJS+sCg8KIlXTEilInBt+kkPbGPOXX3wuRlOJiHwcou+uCmU/VZ4gif1DVazCseAbWtAdQxb3GkMlKTsGqtYiQ== dependencies: "@babel/runtime" "^7.20.13" - gatsby-core-utils "^4.13.1" - gatsby-plugin-utils "^4.13.1" + gatsby-core-utils "^4.14.0" + gatsby-plugin-utils "^4.14.0" semver "^7.5.3" sharp "^0.32.6" -gatsby-plugin-mdx@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-5.13.1.tgz#9fd9d7612daefd372cb9c0f0b9ba8045f490bf3d" - integrity sha512-ZL/z1j8zBzQSqFTEoVdC+jPNpN/CXse2h87wUz78V+BMjp40ccR0DCo62KgF40HVz4iCEYVufqfjQNc0nLoSow== +gatsby-plugin-mdx@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-5.14.0.tgz#5f95124cae148bd5e91559198d983c562a88b0a4" + integrity sha512-tJJmR+sRrWFRuUKUq5bJLWcLXo6FTP06tfE+7yN2foKcW6+SphY3EVvqiTnCzNAkpvUCP3EASLMg2WGWIVzi4A== dependencies: "@mdx-js/mdx" "^2.3.0" acorn "^8.8.2" @@ -6558,9 +6998,9 @@ gatsby-plugin-mdx@^5.13.1: astring "^1.8.5" deepmerge "^4.3.1" estree-util-build-jsx "^2.2.2" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - gatsby-plugin-utils "^4.13.1" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" + gatsby-plugin-utils "^4.14.0" gray-matter "^4.0.3" mdast-util-mdx "^2.0.1" mdast-util-to-hast "^10.2.0" @@ -6572,64 +7012,63 @@ gatsby-plugin-mdx@^5.13.1: unist-util-visit "^4.1.2" vfile "^5.3.7" -gatsby-plugin-page-creator@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-5.13.1.tgz#41e844a16696e7a27d1909413a1102c314e86220" - integrity sha512-WBTQc0cFqaojS1Oh7MjBRSnLCOWWWl3L5t5LEsXwV+4L9OL6D5fLTz7K5xC34OVgfAIryuEKE/M2ZIEk3onVnw== +gatsby-plugin-page-creator@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-5.14.0.tgz#d825a6ca7f5ee5a15490c635d509bfdfbcd552f1" + integrity sha512-H7Yk6Z+kRgOKlco6gFyj9tay+V9eeufZce+NSH6tqHq7pQ56+/X46y4XdeBsrr6wnRs0dBy+Z9rmJTD5w78c2w== dependencies: "@babel/runtime" "^7.20.13" "@babel/traverse" "^7.20.13" "@sindresorhus/slugify" "^1.1.2" chokidar "^3.5.3" fs-exists-cached "^1.0.0" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - gatsby-page-utils "^3.13.1" - gatsby-plugin-utils "^4.13.1" - gatsby-telemetry "^4.13.1" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" + gatsby-page-utils "^3.14.0" + gatsby-plugin-utils "^4.14.0" globby "^11.1.0" lodash "^4.17.21" -gatsby-plugin-postcss@^6.13.1: - version "6.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-postcss/-/gatsby-plugin-postcss-6.13.1.tgz#5fd5c83c4cc96e6f3c4cda5fad0c718cae0520ff" - integrity sha512-5b/6D2Y91nAYpPVIwVO1PgrknQc+CDHQDrM7C7/SeUcT01ghQWtLo99v5PseNiGiO3XEkps4dbuLfNR7VzZYZA== +gatsby-plugin-postcss@^6.14.0: + version "6.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-postcss/-/gatsby-plugin-postcss-6.14.0.tgz#bdf374173f4717746ae5b131b371c2182b2e39c7" + integrity sha512-cX3tVwMh/ndQEqYakp3BgpBmTKXZB8FB3csu55eq2wu+aA0XzpnDSsdYT99HzGV93FtBHvxIaF2E5LUavz52EQ== dependencies: "@babel/runtime" "^7.20.13" - postcss-loader "^7.3.3" + postcss-loader "^7.3.4" -gatsby-plugin-sharp@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-5.13.1.tgz#051da57ddef3ad75a52152d3b78e3ed07589cff9" - integrity sha512-PA1LxLjZ7nKjgGykfbIxNQqrfqqfNsMN6+7wZNy5HK4Vhqjw1zDyImJEBEn6v08L2T3tlLMgR0or/OE7yo7F9A== +gatsby-plugin-sharp@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-5.14.0.tgz#c3c688f9e32b6b325fee2cac9f7b7359f18ff561" + integrity sha512-Kk0hePabeuFI9wJ3a4mhtubpn/7SrALM4YlZJIOvXVYfx2mGv3SIHpAtm0YcLxi+lBKKVUPcA5uh3gNptupDTQ== dependencies: "@babel/runtime" "^7.20.13" - async "^3.2.4" + async "^3.2.5" bluebird "^3.7.2" debug "^4.3.4" filenamify "^4.3.0" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - gatsby-plugin-utils "^4.13.1" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" + gatsby-plugin-utils "^4.14.0" lodash "^4.17.21" probe-image-size "^7.2.3" semver "^7.5.3" sharp "^0.32.6" -gatsby-plugin-sitemap@^6.13.1: - version "6.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-sitemap/-/gatsby-plugin-sitemap-6.13.1.tgz#c8752b3c57ff237ad01493b1b89ab26ac5635abb" - integrity sha512-PuBcCjpwVj7NVW/GXFgmP2NLhM5FsFV618pVGCWnLSr0cPrtJsmPtLze1PMaq148EGUGnnctl/+7VLozheQ/CA== +gatsby-plugin-sitemap@^6.14.0: + version "6.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-sitemap/-/gatsby-plugin-sitemap-6.14.0.tgz#e7815fc454499409350b2d8af9a0910208da4884" + integrity sha512-pF7sv+4IdihiyMaQcXzxXrsA8XzbCwJuiDmHN8PvxrMa2v9FFwjhGXEX/dwJAOSDz98tauT7PRj8Ys4F2DfOTQ== dependencies: "@babel/runtime" "^7.20.13" common-tags "^1.8.2" minimatch "^3.1.2" sitemap "^7.1.1" -gatsby-plugin-typescript@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-5.13.1.tgz#4544000239e7801eb0ab7636d7de27c18a90672d" - integrity sha512-FsTihoFKWTjzyIaUTndqktL39qMTAb0KyHj9kP+LxTY2FySqHIvFoYc1ycS5q52J76AoWUiGStJuuQLMNq66FQ== +gatsby-plugin-typescript@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-5.14.0.tgz#3c497954af635c2ee65018b85ea00b9184be9a3b" + integrity sha512-rvdNtBKGYV0HpvZ78up39rLu5057pVTil1Z7O65MVIQyB99FGfYy96dygWOQhf9wBh0tt9oFYvaU/VMY9Gwyrg== dependencies: "@babel/core" "^7.20.12" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" @@ -6637,104 +7076,86 @@ gatsby-plugin-typescript@^5.13.1: "@babel/plugin-proposal-optional-chaining" "^7.20.7" "@babel/preset-typescript" "^7.18.6" "@babel/runtime" "^7.20.13" - babel-plugin-remove-graphql-queries "^5.13.1" + babel-plugin-remove-graphql-queries "^5.14.0" -gatsby-plugin-utils@^4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/gatsby-plugin-utils/-/gatsby-plugin-utils-4.13.1.tgz#9def57eea4559e1355244ebf706ce528231a510e" - integrity sha512-dQ8cZyUENWHqZOOSBBYWCJ8yG3zSYnHYk0mKQbgZblUS30Sp7ZFM4r0/+lsvUkEYaBOnzFBQjSSQtTa0xu9QWA== +gatsby-plugin-utils@^4.14.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/gatsby-plugin-utils/-/gatsby-plugin-utils-4.14.0.tgz#5ba6f5a92ba3a79d5b66ab59c8243d4504418782" + integrity sha512-w7EZ0C7JA9sG3JiBS2ffGsrZplAbtNk0Junb3UeUFj66CY0MU8UV0rZIzBkz+EMbQvPkxvVJNQu4/tA9ohCvfA== dependencies: "@babel/runtime" "^7.20.13" - fastq "^1.15.0" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - gatsby-sharp "^1.13.0" + fastq "^1.16.0" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" + gatsby-sharp "^1.14.0" graphql-compose "^9.0.10" import-from "^4.0.0" - joi "^17.9.2" + joi "^17.11.0" mime "^3.0.0" -gatsby-react-router-scroll@^6.13.1: - version "6.13.1" - resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-6.13.1.tgz#b20d492a1fc0ac4f31a0435452b06e22e8cb6c41" - integrity sha512-srBpg/ZHW4miwH/4OWOcspHqr8ZmKLE4DBNvckt0KO4giJerWiGoLj6qePwLFRWZPfV7txJr2kuUzACxarpL5g== +gatsby-react-router-scroll@^6.14.0: + version "6.14.0" + resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-6.14.0.tgz#55c1a21e64ca195bf9ff97e8c12a31e0c1f2ccf2" + integrity sha512-Tx+TsS2JE4BGbImgadKEfESpZeCUkQKbL5OTybNHk9T/E9zDDtECD6IRVCiC1w5LucxvrNwRww9oyeAHCZbbeg== dependencies: "@babel/runtime" "^7.20.13" prop-types "^15.8.1" -gatsby-script@^2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/gatsby-script/-/gatsby-script-2.13.0.tgz#0fa7316739ebc31da217091e54db8ef86f41dbb3" - integrity sha512-TGNQGerf1NMJrgJkWxWrW6FFMAuC0L76WlyZgGXmhckPW/x7V1SxZrm0a2Q99kRHyoC59RYl2gTQWHaIwV+ZjA== +gatsby-script@^2.14.0: + version "2.14.0" + resolved "https://registry.yarnpkg.com/gatsby-script/-/gatsby-script-2.14.0.tgz#30a62ed010bfd29a8f8802a7fd0850cc4f7030a3" + integrity sha512-A3IV2cXUrXrzW39kTYJMjbvUlHRjoaZVwH0zsfPINldXw9PenIlr5uBOMWx3IWUlKIghN1rBG+sRIyNczPtxyw== -gatsby-sharp@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/gatsby-sharp/-/gatsby-sharp-1.13.0.tgz#4d55d877ed3a5c9cd7ac45f27e13d07acb99993b" - integrity sha512-DviUtgm7tatSd1Hm54o/orHimOcyXBO9OJkSfzEchPFClvOza+2Qe/lqZShio0gFDxmG0Jgn0XCLzG7uH5VyJQ== +gatsby-sharp@^1.14.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/gatsby-sharp/-/gatsby-sharp-1.14.0.tgz#85ee5b60999d68c508199b74f445a1d369e84254" + integrity sha512-2lZg8NEg5M8jzkMYZouf0I5e1TVpwjtEiKg48R4dGOhYqDKGfENVJWRnvYtw12zNfgBgQ/gUryG7Zj7qMLVANA== dependencies: sharp "^0.32.6" -gatsby-source-filesystem@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-5.13.1.tgz#1aad8f969fbfd4efe6f7cfcd8542253f54fdbd8a" - integrity sha512-nFWzOBpi84nDeVNeO7bpKL9mVYMl1tfjJmE5l868YATFShGzZnA6qMd200XCsf78PexZHAiV/P1MlsyKqjJduA== +gatsby-source-filesystem@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-5.14.0.tgz#f2c765f2eead173918b3d1bc92626bc770867972" + integrity sha512-uewEJaHvdxZlN6DOtZCIUuI7X5v9MRk5IVpCYy9SIZCDbnUA5siEd2A4SC+kcXxJM6AUbdvkfayqpVJrm5JaZA== dependencies: "@babel/runtime" "^7.20.13" chokidar "^3.5.3" file-type "^16.5.4" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" + fs-extra "^11.2.0" + gatsby-core-utils "^4.14.0" mime "^3.0.0" pretty-bytes "^5.6.0" valid-url "^1.0.9" xstate "^4.38.0" -gatsby-telemetry@^4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/gatsby-telemetry/-/gatsby-telemetry-4.13.1.tgz#f0f80b1fb71116085931b8c6b8f48efdbeb561bc" - integrity sha512-NstKs3N8LK9rwEli6SXO+ClNmewFbVzqS2yo6XZzQSXbymH6+Kkk+eqQivKhrD8PbQLLrdXkk1p47n91zc85XQ== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/runtime" "^7.20.13" - "@turist/fetch" "^7.2.0" - "@turist/time" "^0.0.2" - boxen "^5.1.2" - configstore "^5.0.1" - fs-extra "^11.1.1" - gatsby-core-utils "^4.13.1" - git-up "^7.0.0" - is-docker "^2.2.1" - lodash "^4.17.21" - node-fetch "^2.6.11" - -gatsby-transformer-sharp@^5.13.1: - version "5.13.1" - resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-5.13.1.tgz#9822caac4566b0d13e278bb1db9bdc9c839badd3" - integrity sha512-H5gBpnKOn86ns65fv0cP8yIpnT//+dkpnSOZSrtrtYEgmwEFqblUHSSyolu2SURgE+Af55W7IKTYk2w2d9+PCQ== +gatsby-transformer-sharp@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby-transformer-sharp/-/gatsby-transformer-sharp-5.14.0.tgz#f94d1cbee764127a99eab6a4bb204a948faf5a46" + integrity sha512-U4Z3t6JBKgM1QSpoicMsUzD5+BJGdO1bXW4b09M1Ze46B86gIBZFtSoH57PI3pARLjx0TmA9aoADbAo1B0jWPw== dependencies: "@babel/runtime" "^7.20.13" bluebird "^3.7.2" common-tags "^1.8.2" - fs-extra "^11.1.1" - gatsby-plugin-utils "^4.13.1" + fs-extra "^11.2.0" + gatsby-plugin-utils "^4.14.0" probe-image-size "^7.2.3" semver "^7.5.3" sharp "^0.32.6" -gatsby-worker@^2.13.1: - version "2.13.1" - resolved "https://registry.yarnpkg.com/gatsby-worker/-/gatsby-worker-2.13.1.tgz#75b1881642149058d68559fa32c0ed2bc1f88f5c" - integrity sha512-CEm+5M2+3PzPcqTaJ0xjNuorQ3d1PfnKG1yqRRPfw8LFdPiycGhZAug/jqx0iTyVWXFHakEmddlykGFEbq54/Q== +gatsby-worker@^2.14.0: + version "2.14.0" + resolved "https://registry.yarnpkg.com/gatsby-worker/-/gatsby-worker-2.14.0.tgz#57965ab2ecafed9c7024e72bd97de91d2773e098" + integrity sha512-a5DjKgC9mjhfLhyQO6ZX9tuKoDY8KkJrfBg3g0GHyh8hCzlxYvnOc+URGBG/PmF+7yNBiNjA1dENKKmD0fBWjw== dependencies: "@babel/core" "^7.20.12" "@babel/runtime" "^7.20.13" - fs-extra "^11.1.1" + fs-extra "^11.2.0" signal-exit "^3.0.7" -gatsby@^5.13.7: - version "5.13.7" - resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-5.13.7.tgz#51b90f907ec230c1555571e54087aca4434087e4" - integrity sha512-slQ0Ky+5ev5dMV6svAgQYWRw3lztTcj6FhmnGvFPWSwrE/L+2TlQG0Izjm8DRoqzQVBp0z+hkCEiRVF7IdzLCw== +gatsby@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-5.14.0.tgz#b3a9e0eef67adbcbbb594f5e5dc26e308fa7d404" + integrity sha512-VZZAN80FrcGLz0uOPK7Eww/tfGUQ26UuZOxiXFhcJgeO29lt8IPwSdNhAimyhbRDkvMNZu7Dz1+tO9PyvPZN4Q== dependencies: "@babel/code-frame" "^7.18.6" "@babel/core" "^7.20.12" @@ -6769,16 +7190,16 @@ gatsby@^5.13.7: address "1.2.2" anser "^2.1.1" autoprefixer "^10.4.14" - axios "^0.21.1" + axios "^1.6.4" babel-jsx-utils "^1.1.0" babel-loader "^8.3.0" babel-plugin-add-module-exports "^1.0.4" babel-plugin-dynamic-import-node "^2.3.3" - babel-plugin-remove-graphql-queries "^5.13.1" - babel-preset-gatsby "^3.13.2" + babel-plugin-remove-graphql-queries "^5.14.0" + babel-preset-gatsby "^3.14.0" better-opn "^2.1.1" bluebird "^3.7.2" - body-parser "1.20.1" + body-parser "1.20.3" browserslist "^4.21.9" cache-manager "^2.11.1" chalk "^4.1.2" @@ -6803,7 +7224,7 @@ gatsby@^5.13.7: eslint-config-react-app "^6.0.0" eslint-plugin-flowtype "^5.10.0" eslint-plugin-import "^2.27.5" - eslint-plugin-jsx-a11y "^6.7.1" + eslint-plugin-jsx-a11y "^6.8.0" eslint-plugin-react "^7.32.2" eslint-plugin-react-hooks "^4.6.0" eslint-webpack-plugin "^2.7.0" @@ -6816,21 +7237,20 @@ gatsby@^5.13.7: file-loader "^6.2.0" find-cache-dir "^3.3.2" fs-exists-cached "1.0.0" - fs-extra "^11.1.1" - gatsby-cli "^5.13.3" - gatsby-core-utils "^4.13.1" - gatsby-graphiql-explorer "^3.13.1" - gatsby-legacy-polyfills "^3.13.1" - gatsby-link "^5.13.1" - gatsby-page-utils "^3.13.1" - gatsby-parcel-config "1.13.1" - gatsby-plugin-page-creator "^5.13.1" - gatsby-plugin-typescript "^5.13.1" - gatsby-plugin-utils "^4.13.1" - gatsby-react-router-scroll "^6.13.1" - gatsby-script "^2.13.0" - gatsby-telemetry "^4.13.1" - gatsby-worker "^2.13.1" + fs-extra "^11.2.0" + gatsby-cli "^5.14.0" + gatsby-core-utils "^4.14.0" + gatsby-graphiql-explorer "^3.14.0" + gatsby-legacy-polyfills "^3.14.0" + gatsby-link "^5.14.0" + gatsby-page-utils "^3.14.0" + gatsby-parcel-config "1.14.0" + gatsby-plugin-page-creator "^5.14.0" + gatsby-plugin-typescript "^5.14.0" + gatsby-plugin-utils "^4.14.0" + gatsby-react-router-scroll "^6.14.0" + gatsby-script "^2.14.0" + gatsby-worker "^2.14.0" glob "^7.2.3" globby "^11.1.0" got "^11.8.6" @@ -6863,7 +7283,7 @@ gatsby@^5.13.7: opentracing "^0.14.7" p-defer "^3.0.0" parseurl "^1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" physical-cpu-count "^2.0.0" platform "^1.3.6" postcss "^8.4.24" @@ -6897,14 +7317,14 @@ gatsby@^5.13.7: url-loader "^4.1.1" uuid "^8.3.2" webpack "^5.88.1" - webpack-dev-middleware "^4.3.0" + webpack-dev-middleware "^5.3.4" webpack-merge "^5.9.0" webpack-stats-plugin "^1.1.3" webpack-virtual-modules "^0.5.0" xstate "^4.38.0" yaml-loader "^0.8.0" optionalDependencies: - gatsby-sharp "^1.13.0" + gatsby-sharp "^1.14.0" gensync@^1.0.0-beta.2: version "1.0.0-beta.2" @@ -6958,14 +7378,6 @@ get-symbol-description@^1.0.2: es-errors "^1.3.0" get-intrinsic "^1.2.4" -git-up@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467" - integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ== - dependencies: - is-ssh "^1.4.0" - parse-url "^8.1.0" - github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" @@ -7128,6 +7540,13 @@ graphemer@^1.4.0: resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== +graphlib@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" + integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== + dependencies: + lodash "^4.17.15" + graphql-compose@^9.0.10: version "9.0.11" resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-9.0.11.tgz#c3b5a3378b62be0deb9ea43d147b756010f6d611" @@ -7225,7 +7644,7 @@ has@~1.0.3: resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== -hash-wasm@^4.9.0: +hash-wasm@^4.11.0: version "4.11.0" resolved "https://registry.yarnpkg.com/hash-wasm/-/hash-wasm-4.11.0.tgz#7d1479b114c82e48498fdb1d2462a687d00386d5" integrity sha512-HVusNXlVqHe0fzIzdQOGolnFN6mX/fqcrSAOcTBXdvzrXVHwTz11vXeKRmkR5gTuwVpvHZEIyKoePDvuAR+XwQ== @@ -7438,6 +7857,11 @@ http2-wrapper@^2.1.10: quick-lru "^5.1.1" resolve-alpn "^1.2.0" +hull.js@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/hull.js/-/hull.js-1.0.6.tgz#75f013e8171eb9a871b4a94887e89eb555461d0e" + integrity sha512-TC7e9sHYOaCVms0sn2hN7buxnaGfcl9h5EPVoVX9DTPoMpqQiS9bf3tmGDgiNaMVHBD91RAvWjCxrJ5Jx8BI5A== + human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -7614,6 +8038,11 @@ is-alphanumerical@^2.0.0: is-alphabetical "^2.0.0" is-decimal "^2.0.0" +is-any-array@^2.0.0, is-any-array@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-any-array/-/is-any-array-2.0.1.tgz#9233242a9c098220290aa2ec28f82ca7fa79899e" + integrity sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ== + is-arguments@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" @@ -7717,7 +8146,7 @@ is-decimal@^2.0.0: resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7" integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A== -is-docker@^2.0.0, is-docker@^2.1.1, is-docker@^2.2.1: +is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== @@ -7891,13 +8320,6 @@ is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: dependencies: call-bind "^1.0.7" -is-ssh@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2" - integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ== - dependencies: - protocols "^2.0.1" - is-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" @@ -8076,7 +8498,7 @@ jiti@^1.20.0, jiti@^1.21.0: resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268" integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w== -joi@^17.9.2: +joi@^17.11.0, joi@^17.9.2: version "17.13.3" resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec" integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA== @@ -8505,10 +8927,10 @@ lru-queue@^0.1.0: dependencies: es5-ext "~0.10.2" -lucide-react@^0.454.0: - version "0.454.0" - resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.454.0.tgz#a81b9c482018720f07ead0503ae502d94d528444" - integrity sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ== +lucide-react@^0.456.0: + version "0.456.0" + resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.456.0.tgz#14906c3355cc65d3380b7b2294b331aeda1bb392" + integrity sha512-DIIGJqTT5X05sbAsQ+OhA8OtJYyD4NsEMCA/HQW/Y6ToPQ7gwbtujIoeAaup4HpHzV35SQOarKAWH8LYglB6eA== make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" @@ -8517,13 +8939,6 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" -map-age-cleaner@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - map-cache@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -8814,15 +9229,7 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -mem@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122" - integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA== - dependencies: - map-age-cleaner "^0.1.3" - mimic-fn "^3.1.0" - -memfs@^3.1.2, memfs@^3.2.2: +memfs@^3.1.2, memfs@^3.4.3: version "3.6.0" resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== @@ -9363,7 +9770,7 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447" integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -9385,11 +9792,6 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-fn@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" - integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== - mimic-fn@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" @@ -9460,6 +9862,37 @@ mkdirp@^0.5.1, mkdirp@^0.5.4: dependencies: minimist "^1.2.6" +ml-array-max@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/ml-array-max/-/ml-array-max-1.2.4.tgz#2373e2b7e51c8807e456cc0ef364c5863713623b" + integrity sha512-BlEeg80jI0tW6WaPyGxf5Sa4sqvcyY6lbSn5Vcv44lp1I2GR6AWojfUvLnGTNsIXrZ8uqWmo8VcG1WpkI2ONMQ== + dependencies: + is-any-array "^2.0.0" + +ml-array-min@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/ml-array-min/-/ml-array-min-1.2.3.tgz#662f027c400105816b849cc3cd786915d0801495" + integrity sha512-VcZ5f3VZ1iihtrGvgfh/q0XlMobG6GQ8FsNyQXD3T+IlstDv85g8kfV0xUG1QPRO/t21aukaJowDzMTc7j5V6Q== + dependencies: + is-any-array "^2.0.0" + +ml-array-rescale@^1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ml-array-rescale/-/ml-array-rescale-1.3.7.tgz#c4d129320d113a732e62dd963dc1695bba9a5340" + integrity sha512-48NGChTouvEo9KBctDfHC3udWnQKNKEWN0ziELvY3KG25GR5cA8K8wNVzracsqSW1QEkAXjTNx+ycgAv06/1mQ== + dependencies: + is-any-array "^2.0.0" + ml-array-max "^1.2.4" + ml-array-min "^1.2.3" + +ml-matrix@^6.10.4: + version "6.12.0" + resolved "https://registry.yarnpkg.com/ml-matrix/-/ml-matrix-6.12.0.tgz#def6a0574b5fdc54a753033830e784a17399e270" + integrity sha512-AGfR+pWaC0GmzjUnB6BfwhndPEUGz0i7QUYdqNuw1zhTov/vSRJ9pP2hs6BoGpaSbtXgrKjZz2zjD1M0xuur6A== + dependencies: + is-any-array "^2.0.1" + ml-array-rescale "^1.3.7" + mock-property@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/mock-property/-/mock-property-1.0.3.tgz#3e37c50a56609d548cabd56559fde3dd8767b10c" @@ -9899,11 +10332,6 @@ p-cancelable@^3.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050" integrity sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw== -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== - p-defer@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" @@ -10012,20 +10440,6 @@ parse-json@^5.0.0, parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-path@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b" - integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog== - dependencies: - protocols "^2.0.0" - -parse-url@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d" - integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w== - dependencies: - parse-path "^7.0.0" - parseurl@^1.3.3, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -10110,11 +10524,6 @@ path-to-regexp@0.1.10: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -10144,7 +10553,7 @@ physical-cpu-count@^2.0.0: resolved "https://registry.yarnpkg.com/physical-cpu-count/-/physical-cpu-count-2.0.0.tgz#18de2f97e4bf7a9551ad7511942b5496f7aba660" integrity sha512-rxJOljMuWtYlvREBmd6TZYanfcPhNUKtGDZBjBBS8WG1dpN2iwPsRJZgQqN/OtJuiQckdRFOfzogqJClTrsi7g== -picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0: +picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== @@ -10272,7 +10681,7 @@ postcss-loader@^5.3.0: klona "^2.0.4" semver "^7.3.4" -postcss-loader@^7.3.3: +postcss-loader@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.4.tgz#aed9b79ce4ed7e9e89e56199d25ad1ec8f606209" integrity sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A== @@ -10483,12 +10892,21 @@ postcss-unique-selectors@^5.1.1: dependencies: postcss-selector-parser "^6.0.5" -postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.2.15, postcss@^8.2.9, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.47: +postcss@8.4.38: + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" + +postcss@^8.2.15, postcss@^8.2.9, postcss@^8.4.23, postcss@^8.4.24: version "8.4.47" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365" integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== @@ -10497,6 +10915,15 @@ postcss@^8.2.15, postcss@^8.2.9, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4. picocolors "^1.1.0" source-map-js "^1.2.1" +postcss@^8.4.49: + version "8.4.49" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" + integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA== + dependencies: + nanoid "^3.3.7" + picocolors "^1.1.1" + source-map-js "^1.2.1" + prebuild-install@^7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056" @@ -10595,11 +11022,6 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -protocols@^2.0.0, protocols@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86" - integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q== - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -10608,6 +11030,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -10626,13 +11053,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - qs@6.13.0: version "6.13.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" @@ -10682,16 +11102,6 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-body@2.5.2, raw-body@^2.3.0: version "2.5.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" @@ -10717,17 +11127,16 @@ rbush@^3.0.1: dependencies: quickselect "^2.0.0" -rc-cascader@~3.28.2: - version "3.28.2" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.28.2.tgz#91720d3498261a7bff9fffc953501a8830f601fb" - integrity sha512-8f+JgM83iLTvjgdkgU7GfI4qY8icXOBP0cGZjOdx2iJAkEe8ucobxDQAVE69UD/c3ehCxZlcgEHeD5hFmypbUw== +rc-cascader@~3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.30.0.tgz#da3e35cadcc00c58c62a6757eca6c7147ff94ea8" + integrity sha512-rrzSbk1Bdqbu+pDwiLCLHu72+lwX9BZ28+JKzoi0DWZ4N29QYFeip8Gctl33QVd2Xg3Rf14D3yAOG76ElJw16w== dependencies: - "@babel/runtime" "^7.12.5" - array-tree-filter "^2.1.0" + "@babel/runtime" "^7.25.7" classnames "^2.3.1" - rc-select "~14.15.0" - rc-tree "~5.9.0" - rc-util "^5.37.0" + rc-select "~14.16.2" + rc-tree "~5.10.1" + rc-util "^5.43.0" rc-checkbox@~3.3.0: version "3.3.0" @@ -10738,10 +11147,10 @@ rc-checkbox@~3.3.0: classnames "^2.3.2" rc-util "^5.25.2" -rc-collapse@~3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.8.0.tgz#02bcf81e1601aa185cd3b9fab0ceefd8dc11aefb" - integrity sha512-YVBkssrKPBG09TGfcWWGj8zJBYD9G3XuTy89t5iUmSXrIXEAnO1M+qjUxRW6b4Qi0+wNWG6MHJF/+US+nmIlzA== +rc-collapse@~3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.9.0.tgz#972404ce7724e1c9d1d2476543e1175404a36806" + integrity sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -10780,10 +11189,10 @@ rc-dropdown@~4.2.0: classnames "^2.2.6" rc-util "^5.17.0" -rc-field-form@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-2.4.0.tgz#26997160d12ae43a94c356c1290bfc011c69b3ca" - integrity sha512-XZ/lF9iqf9HXApIHQHqzJK5v2w4mkUMsVqAzOyWVzoiwwXEavY6Tpuw7HavgzIoD+huVff4JghSGcgEfX6eycg== +rc-field-form@~2.5.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-2.5.1.tgz#30f3c529f86aec6af27589052df9c66cec94ceb4" + integrity sha512-33hunXwynQJyeae7LS3hMGTXNeRBjiPyPYgB0824EbmLHiXC1EBGyUwRh6xjLRy9c+en5WARYN0gJz5+JAqwig== dependencies: "@babel/runtime" "^7.18.0" "@rc-component/async-validator" "^5.0.3" @@ -10801,10 +11210,10 @@ rc-image@~7.11.0: rc-motion "^2.6.2" rc-util "^5.34.1" -rc-input-number@~9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-9.2.0.tgz#7e9344ff054421d2bfff0eebd7c1b8ef22d12220" - integrity sha512-5XZFhBCV5f9UQ62AZ2hFbEY8iZT/dm23Q1kAg0H8EvOgD3UDbYYJAayoVIkM3lQaCqYAW5gV0yV3vjw1XtzWHg== +rc-input-number@~9.3.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-9.3.0.tgz#3403c1071fcb9dbf91073faddd80ea83bd3974df" + integrity sha512-JQ363ywqRyxwgVxpg2z2kja3CehTpYdqR7emJ/6yJjRdbvo+RvfE83fcpBCIJRq3zLp8SakmEXq60qzWyZ7Usw== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/mini-decimal" "^1.0.1" @@ -10821,23 +11230,23 @@ rc-input@~1.6.0, rc-input@~1.6.3: classnames "^2.2.1" rc-util "^5.18.1" -rc-mentions@~2.16.1: - version "2.16.1" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-2.16.1.tgz#5e54ebe3ce6cd79838846ff1c8cfaf2e7aa15cec" - integrity sha512-GnhSTGP9Mtv6pqFFGQze44LlrtWOjHNrUUAcsdo9DnNAhN4pwVPEWy4z+2jpjkiGlJ3VoXdvMHcNDQdfI9fEaw== +rc-mentions@~2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-2.17.0.tgz#d16dd5c8e4db87862c1007f7195b0aea9247cdcd" + integrity sha512-sfHy+qLvc+p8jx8GUsujZWXDOIlIimp6YQz7N5ONQ6bHsa2kyG+BLa5k2wuxgebBbH97is33wxiyq5UkiXRpHA== dependencies: "@babel/runtime" "^7.22.5" "@rc-component/trigger" "^2.0.0" classnames "^2.2.6" rc-input "~1.6.0" - rc-menu "~9.15.1" + rc-menu "~9.16.0" rc-textarea "~1.8.0" rc-util "^5.34.1" -rc-menu@~9.15.1: - version "9.15.1" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.15.1.tgz#d8b38ea534a7f596a8da063881519e7eaafca698" - integrity sha512-UKporqU6LPfHnpPmtP6hdEK4iO5Q+b7BRv/uRpxdIyDGplZy9jwUjsnpev5bs3PQKB0H0n34WAPDfjAfn3kAPA== +rc-menu@~9.16.0: + version "9.16.0" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.16.0.tgz#53647f60f513bfa09bfc1accbd96a8df24900121" + integrity sha512-vAL0yqPkmXWk3+YKRkmIR8TYj3RVdEt3ptG2jCJXWNAvQbT0VJJdRyHZ7kG/l1JsZlB+VJq/VcYOo69VR4oD+w== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/trigger" "^2.0.0" @@ -10884,10 +11293,10 @@ rc-pagination@~4.3.0: classnames "^2.3.2" rc-util "^5.38.0" -rc-picker@~4.6.15: - version "4.6.15" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-4.6.15.tgz#1531c9c382a295e2d1f1f38440d6678b09cd0468" - integrity sha512-OWZ1yrMie+KN2uEUfYCfS4b2Vu6RC1FWwNI0s+qypsc3wRt7g+peuZKVIzXCTaJwyyZruo80+akPg2+GmyiJjw== +rc-picker@~4.8.0: + version "4.8.1" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-4.8.1.tgz#105cfae323bf1db5e9f9e6fdc773ff3250e837de" + integrity sha512-lj9hXXMSkbjFUIhfQh8XH698ybxnoBOfq7pdM1FvfSyDwdFhdQa7dvsIYwo6Uz7Zp1wVkfw5rOJO3MpdWzoHsg== dependencies: "@babel/runtime" "^7.24.7" "@rc-component/trigger" "^2.0.0" @@ -10934,10 +11343,10 @@ rc-segmented@~2.5.0: rc-motion "^2.4.4" rc-util "^5.17.0" -rc-select@~14.15.0, rc-select@~14.15.2: - version "14.15.2" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.15.2.tgz#d85fcf3a708bdf837b003feeed653347b8980ad0" - integrity sha512-oNoXlaFmpqXYcQDzcPVLrEqS2J9c+/+oJuGrlXeVVX/gVgrbHa5YcyiRUXRydFjyuA7GP3elRuLF7Y3Tfwltlw== +rc-select@~14.16.2, rc-select@~14.16.3: + version "14.16.3" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.16.3.tgz#cd5395ef724d693a8f782ddd7bcc6253c31c65a9" + integrity sha512-51+j6s3fJJJXB7E+B6W1hM4Tjzv1B/Decooz9ilgegDBt3ZAth1b/xMwYCTrT5BbG2e53XACQsyDib2+3Ro1fg== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/trigger" "^2.1.1" @@ -10974,10 +11383,10 @@ rc-switch@~4.1.0: classnames "^2.2.1" rc-util "^5.30.0" -rc-table@~7.47.5: - version "7.47.5" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.47.5.tgz#3c530200baa82346c7e72fe9b1dbd47d4aa15838" - integrity sha512-fzq+V9j/atbPIcvs3emuclaEoXulwQpIiJA6/7ey52j8+9cJ4P8DGmp4YzfUVDrb3qhgedcVeD6eRgUrokwVEQ== +rc-table@~7.48.1: + version "7.48.1" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.48.1.tgz#16ee3d82fa17284628d7883933b5d481238ea013" + integrity sha512-Z4mDKjWg+xz/Ezdw6ivWcbqRpaJ0QfCORRoRrlrw65KSGZLK8OcTdacH22/fyGb8L4It/0/9qcMm8VrVAk/WBw== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/context" "^1.4.0" @@ -10986,15 +11395,15 @@ rc-table@~7.47.5: rc-util "^5.41.0" rc-virtual-list "^3.14.2" -rc-tabs@~15.3.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.3.0.tgz#3fcc332fbb9307d5eb147e0404daca871fb92a89" - integrity sha512-lzE18r+zppT/jZWOAWS6ntdkDUKHOLJzqMi5UAij1LeKwOaQaupupAoI9Srn73GRzVpmGznkECMRrzkRusC40A== +rc-tabs@~15.4.0: + version "15.4.0" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.4.0.tgz#a829cabcb33f93525b548010f5bbf91dee7ac1d6" + integrity sha512-llKuyiAVqmXm2z7OrmhX5cNb2ueZaL8ZyA2P4R+6/72NYYcbEgOXibwHiQCFY2RiN3swXl53SIABi2CumUS02g== dependencies: "@babel/runtime" "^7.11.2" classnames "2.x" rc-dropdown "~4.2.0" - rc-menu "~9.15.1" + rc-menu "~9.16.0" rc-motion "^2.6.2" rc-resize-observer "^1.0.0" rc-util "^5.34.1" @@ -11019,21 +11428,21 @@ rc-tooltip@~6.2.1: "@rc-component/trigger" "^2.0.0" classnames "^2.3.1" -rc-tree-select@~5.23.0: - version "5.23.0" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.23.0.tgz#e56da0923c7c11dea98d4e14bb76969283c94468" - integrity sha512-aQGi2tFSRw1WbXv0UVXPzHm09E0cSvUVZMLxQtMv3rnZZpNmdRXWrnd9QkLNlVH31F+X5rgghmdSFF3yZW0N9A== +rc-tree-select@~5.24.4: + version "5.24.4" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.24.4.tgz#6789b8761daf53a8b91b75e9e6c4f720a7e8cc92" + integrity sha512-MzljkSkk7weKOcE853UtYlXB6uyUEzcEQhhpaCwE6jQPbmBUgGiRURuKWpYUnM/dXrwTTlCK969M6Pgjj35MLA== dependencies: - "@babel/runtime" "^7.10.1" + "@babel/runtime" "^7.25.7" classnames "2.x" - rc-select "~14.15.0" - rc-tree "~5.9.0" - rc-util "^5.16.1" + rc-select "~14.16.2" + rc-tree "~5.10.1" + rc-util "^5.43.0" -rc-tree@~5.9.0: - version "5.9.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.9.0.tgz#1835b2bef36cfeb4ec15d62e0319fc503aa485f1" - integrity sha512-CPrgOvm9d/9E+izTONKSngNzQdIEjMox2PBufWjS1wf7vxtvmCWzK1SlpHbRY6IaBfJIeZ+88RkcIevf729cRg== +rc-tree@~5.10.1: + version "5.10.1" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.10.1.tgz#8807614c54aaa39edc05392f0f5982b609d95255" + integrity sha512-FPXb3tT/u39mgjr6JNlHaUTYfHkVGW56XaGDahDpEFLGsnPxGcVLNTjcqoQb/GNbSCycl7tD7EvIymwOTP0+Yw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -11147,6 +11556,15 @@ react-markdown@^9.0.1: unist-util-visit "^5.0.0" vfile "^6.0.0" +react-reconciler@^0.26.2: + version "0.26.2" + resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.26.2.tgz#bbad0e2d1309423f76cf3c3309ac6c96e05e9d91" + integrity sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + react-refresh@^0.14.0: version "0.14.2" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9" @@ -11630,6 +12048,14 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler@^0.23.2: version "0.23.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" @@ -11664,7 +12090,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.2.0: +schema-utils@^4.0.0, schema-utils@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== @@ -11805,6 +12231,11 @@ shallow-compare@^1.2.2: resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb" integrity sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg== +shallowequal@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + sharp@^0.32.6: version "0.32.6" resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a" @@ -11968,7 +12399,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^1.2.1: +source-map-js@^1.2.0, source-map-js@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== @@ -12320,6 +12751,21 @@ style-to-object@^1.0.0: dependencies: inline-style-parser "0.2.4" +styled-components@^6.1.13: + version "6.1.13" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-6.1.13.tgz#2d777750b773b31469bd79df754a32479e9f475e" + integrity sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw== + dependencies: + "@emotion/is-prop-valid" "1.2.2" + "@emotion/unitless" "0.8.1" + "@types/stylis" "4.2.5" + css-to-react-native "3.2.0" + csstype "3.1.3" + postcss "8.4.38" + shallowequal "1.1.0" + stylis "4.3.2" + tslib "2.6.2" + stylehacks@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" @@ -12328,6 +12774,11 @@ stylehacks@^5.1.1: browserslist "^4.21.4" postcss-selector-parser "^6.0.4" +stylis@4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444" + integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== + stylis@^4.3.3: version "4.3.4" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.4.tgz#ca5c6c4a35c4784e4e93a2a24dc4e9fa075250a4" @@ -12412,6 +12863,11 @@ system-architecture@^0.1.0: resolved "https://registry.yarnpkg.com/system-architecture/-/system-architecture-0.1.0.tgz#71012b3ac141427d97c67c56bc7921af6bff122d" integrity sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA== +tabbable@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97" + integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew== + table@^6.0.9: version "6.8.2" resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58" @@ -12673,12 +13129,17 @@ tsconfig-paths@^3.15.0: minimist "^1.2.6" strip-bom "^3.0.0" +tslib@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.3: +tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3, tslib@^2.8.0: version "2.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== @@ -12838,7 +13299,7 @@ unc-path-regex@^0.1.2: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== -undici-types@~6.19.2, undici-types@~6.19.8: +undici-types@~6.19.8: version "6.19.8" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== @@ -13207,17 +13668,16 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webpack-dev-middleware@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz#179cc40795882cae510b1aa7f3710cbe93c9333e" - integrity sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w== +webpack-dev-middleware@^5.3.4: + version "5.3.4" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" + integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== dependencies: - colorette "^1.2.2" - mem "^8.1.1" - memfs "^3.2.2" - mime-types "^2.1.30" + colorette "^2.0.10" + memfs "^3.4.3" + mime-types "^2.1.31" range-parser "^1.2.1" - schema-utils "^3.0.0" + schema-utils "^4.0.0" webpack-merge@^5.9.0: version "5.10.0" diff --git a/python/packages/autogen-studio/notebooks/tutorial.ipynb b/python/packages/autogen-studio/notebooks/tutorial.ipynb index 4825d6580f51..8e749f743839 100644 --- a/python/packages/autogen-studio/notebooks/tutorial.ipynb +++ b/python/packages/autogen-studio/notebooks/tutorial.ipynb @@ -23,7 +23,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "task_result=TaskResult(messages=[TextMessage(source='user', models_usage=None, content='What is the weather in New York?'), ToolCallMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=65, completion_tokens=15), content=[FunctionCall(id='call_1LrIS8t1wuK3KzDPP4DuwuiQ', arguments='{\"city\":\"New York\"}', name='get_weather')]), ToolCallResultMessage(source='writing_agent', models_usage=None, content=[FunctionExecutionResult(content='The weather in New York is 73 degrees and Sunny.', call_id='call_1LrIS8t1wuK3KzDPP4DuwuiQ')]), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=97, completion_tokens=14), content='The current weather in New York is 73 degrees and sunny.'), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=123, completion_tokens=9), content='What is the weather in Los Angeles?')], stop_reason='Maximum number of messages 5 reached, current message count: 5') usage='' duration=2.2458291053771973\n" + "task_result=TaskResult(messages=[TextMessage(source='user', models_usage=None, content='What is the weather in New York?'), ToolCallMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=65, completion_tokens=15), content=[FunctionCall(id='call_x8C5nib1PJkMZGQ6zrNUlfa0', arguments='{\"city\":\"New York\"}', name='get_weather')]), ToolCallResultMessage(source='writing_agent', models_usage=None, content=[FunctionExecutionResult(content='The weather in New York is 73 degrees and Sunny.', call_id='call_x8C5nib1PJkMZGQ6zrNUlfa0')]), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=97, completion_tokens=14), content='The weather in New York is currently 73 degrees and sunny.'), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=123, completion_tokens=13), content='Would you like to know the weather in any other city?')], stop_reason='Maximum number of messages 5 reached, current message count: 5') usage='' duration=1.9984567165374756\n" ] } ], @@ -45,11 +45,11 @@ "output_type": "stream", "text": [ "source='user' models_usage=None content='What is the weather in New York?'\n", - "source='writing_agent' models_usage=RequestUsage(prompt_tokens=65, completion_tokens=15) content=[FunctionCall(id='call_Otg8Exxp7uAcsZnRyTWRYGkb', arguments='{\"city\":\"New York\"}', name='get_weather')]\n", - "source='writing_agent' models_usage=None content=[FunctionExecutionResult(content='The weather in New York is 73 degrees and Sunny.', call_id='call_Otg8Exxp7uAcsZnRyTWRYGkb')]\n", + "source='writing_agent' models_usage=RequestUsage(prompt_tokens=65, completion_tokens=15) content=[FunctionCall(id='call_Gwnfsa8ndnOsXTvRECTr92hr', arguments='{\"city\":\"New York\"}', name='get_weather')]\n", + "source='writing_agent' models_usage=None content=[FunctionExecutionResult(content='The weather in New York is 73 degrees and Sunny.', call_id='call_Gwnfsa8ndnOsXTvRECTr92hr')]\n", "source='writing_agent' models_usage=RequestUsage(prompt_tokens=97, completion_tokens=14) content='The weather in New York is currently 73 degrees and sunny.'\n", - "source='writing_agent' models_usage=RequestUsage(prompt_tokens=123, completion_tokens=16) content='Would you like to know anything else about the weather or any other information?'\n", - "task_result=TaskResult(messages=[TextMessage(source='user', models_usage=None, content='What is the weather in New York?'), ToolCallMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=65, completion_tokens=15), content=[FunctionCall(id='call_Otg8Exxp7uAcsZnRyTWRYGkb', arguments='{\"city\":\"New York\"}', name='get_weather')]), ToolCallResultMessage(source='writing_agent', models_usage=None, content=[FunctionExecutionResult(content='The weather in New York is 73 degrees and Sunny.', call_id='call_Otg8Exxp7uAcsZnRyTWRYGkb')]), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=97, completion_tokens=14), content='The weather in New York is currently 73 degrees and sunny.'), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=123, completion_tokens=16), content='Would you like to know anything else about the weather or any other information?')], stop_reason='Maximum number of messages 5 reached, current message count: 5') usage='' duration=1.9408440589904785\n" + "source='writing_agent' models_usage=RequestUsage(prompt_tokens=123, completion_tokens=14) content='The weather in New York is currently 73 degrees and sunny.'\n", + "task_result=TaskResult(messages=[TextMessage(source='user', models_usage=None, content='What is the weather in New York?'), ToolCallMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=65, completion_tokens=15), content=[FunctionCall(id='call_Gwnfsa8ndnOsXTvRECTr92hr', arguments='{\"city\":\"New York\"}', name='get_weather')]), ToolCallResultMessage(source='writing_agent', models_usage=None, content=[FunctionExecutionResult(content='The weather in New York is 73 degrees and Sunny.', call_id='call_Gwnfsa8ndnOsXTvRECTr92hr')]), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=97, completion_tokens=14), content='The weather in New York is currently 73 degrees and sunny.'), TextMessage(source='writing_agent', models_usage=RequestUsage(prompt_tokens=123, completion_tokens=14), content='The weather in New York is currently 73 degrees and sunny.')], stop_reason='Maximum number of messages 5 reached, current message count: 5') usage='' duration=2.363379955291748\n" ] } ], @@ -79,9 +79,9 @@ "text": [ "INFO [alembic.runtime.migration] Context impl SQLiteImpl.\n", "INFO [alembic.runtime.migration] Will assume non-transactional DDL.\n", - "\u001b[32m2024-11-09 11:55:02.090\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mautogenstudio.database.schema_manager\u001b[0m:\u001b[36mupgrade_schema\u001b[0m:\u001b[36m390\u001b[0m - \u001b[1mSchema upgraded successfully to head\u001b[0m\n", - "\u001b[32m2024-11-09 11:55:02.090\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mautogenstudio.database.db_manager\u001b[0m:\u001b[36m__init__\u001b[0m:\u001b[36m34\u001b[0m - \u001b[1mDatabase schema was upgraded automatically\u001b[0m\n", - "\u001b[32m2024-11-09 11:55:02.092\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mautogenstudio.database.db_manager\u001b[0m:\u001b[36mcreate_db_and_tables\u001b[0m:\u001b[36m108\u001b[0m - \u001b[1mDatabase tables created successfully\u001b[0m\n" + "\u001b[32m2024-11-14 09:06:25.242\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mautogenstudio.database.schema_manager\u001b[0m:\u001b[36mupgrade_schema\u001b[0m:\u001b[36m390\u001b[0m - \u001b[1mSchema upgraded successfully to head\u001b[0m\n", + "\u001b[32m2024-11-14 09:06:25.243\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mautogenstudio.database.db_manager\u001b[0m:\u001b[36m__init__\u001b[0m:\u001b[36m34\u001b[0m - \u001b[1mDatabase schema was upgraded automatically\u001b[0m\n", + "\u001b[32m2024-11-14 09:06:25.244\u001b[0m | \u001b[1mINFO \u001b[0m | \u001b[36mautogenstudio.database.db_manager\u001b[0m:\u001b[36mcreate_db_and_tables\u001b[0m:\u001b[36m108\u001b[0m - \u001b[1mDatabase tables created successfully\u001b[0m\n" ] } ], @@ -152,7 +152,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "43 teams in database\n" + "53 teams in database\n" ] } ], @@ -176,24 +176,17 @@ "metadata": {}, "outputs": [], "source": [ - "from autogenstudio.database import ConfigurationManager \n", + "from autogenstudio.database import ConfigurationManager \n", + "\n", "config_manager = ConfigurationManager(dbmanager)\n", " " ] }, { "cell_type": "code", - "execution_count": 7, + "execution_count": null, "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "message=\"team with team_type='TeamTypes.ROUND_ROBIN' and name='weather_team' already exists\" status=True data={'id': 42}\n" - ] - } - ], + "outputs": [], "source": [ "result = await config_manager.import_component(\"team.json\", user_id=\"user_id\", check_exists=True)\n", "print(result)" @@ -208,7 +201,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "message='Directory import complete' status=True data=[{'component': 'team', 'status': True, 'message': 'Team Created Successfully', 'id': 44}]\n" + "message='Directory import complete' status=True data=[{'component': 'team', 'status': True, 'message': 'Team Created Successfully', 'id': 54}]\n" ] } ], @@ -226,7 +219,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "44 teams in database\n" + "54 teams in database\n" ] } ], @@ -235,9 +228,16 @@ "print(len(all_teams.data), \"teams in database\")" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Sample AgentChat Example (Python)" + ] + }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 10, "metadata": {}, "outputs": [], "source": [ @@ -250,28 +250,28 @@ " \"planner_agent\",\n", " model_client=OpenAIChatCompletionClient(model=\"gpt-4\"),\n", " description=\"A helpful assistant that can plan trips.\",\n", - " system_message=\"You are a helpful assistant that can suggest a travel plan for a user based on their request.\",\n", + " system_message=\"You are a helpful assistant that can suggest a travel plan for a user based on their request. Respond with a single sentence\",\n", ")\n", "\n", "local_agent = AssistantAgent(\n", " \"local_agent\",\n", " model_client=OpenAIChatCompletionClient(model=\"gpt-4\"),\n", " description=\"A local assistant that can suggest local activities or places to visit.\",\n", - " system_message=\"You are a helpful assistant that can suggest authentic and interesting local activities or places to visit for a user and can utilize any context information provided.\",\n", + " system_message=\"You are a helpful assistant that can suggest authentic and interesting local activities or places to visit for a user and can utilize any context information provided. Respond with a single sentence\",\n", ")\n", "\n", "language_agent = AssistantAgent(\n", " \"language_agent\",\n", " model_client=OpenAIChatCompletionClient(model=\"gpt-4\"),\n", " description=\"A helpful assistant that can provide language tips for a given destination.\",\n", - " system_message=\"You are a helpful assistant that can review travel plans, providing feedback on important/critical tips about how best to address language or communication challenges for the given destination. If the plan already includes language tips, you can mention that the plan is satisfactory, with rationale.\",\n", + " system_message=\"You are a helpful assistant that can review travel plans, providing feedback on important/critical tips about how best to address language or communication challenges for the given destination. If the plan already includes language tips, you can mention that the plan is satisfactory, with rationale.Respond with a single sentence\",\n", ")\n", "\n", "travel_summary_agent = AssistantAgent(\n", " \"travel_summary_agent\",\n", " model_client=OpenAIChatCompletionClient(model=\"gpt-4\"),\n", " description=\"A helpful assistant that can summarize the travel plan.\",\n", - " system_message=\"You are a helpful assistant that can take in all of the suggestions and advice from the other agents and provide a detailed tfinal travel plan. You must ensure th b at the final plan is integrated and complete. YOUR FINAL RESPONSE MUST BE THE COMPLETE PLAN. When the plan is complete and all perspectives are integrated, you can respond with TERMINATE.\",\n", + " system_message=\"You are a helpful assistant that can take in all of the suggestions and advice from the other agents and provide a detailed tfinal travel plan. You must ensure th b at the final plan is integrated and complete. YOUR FINAL RESPONSE MUST BE THE COMPLETE PLAN. When the plan is complete and all perspectives are integrated, you can respond with TERMINATE.Respond with a single sentence\",\n", ")\n", "\n", "termination = TextMentionTermination(\"TERMINATE\")\n", @@ -282,7 +282,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 11, "metadata": {}, "outputs": [ { @@ -290,11 +290,11 @@ "output_type": "stream", "text": [ "source='user' models_usage=None content='Plan a 3 day trip to Nepal.'\n", - "source='planner_agent' models_usage=RequestUsage(prompt_tokens=40, completion_tokens=394) content=\"Sure, here is a simple 3-day itinerary for a trip to Nepal:\\n\\n**Day 1: Explore Kathmandu:**\\n\\n- Morning: Arrival in Tribhuvan International Airport. Take an airport taxi to your hotel in Thamel area – the touristic heart of Kathmandu. Freshen up after your journey.\\n\\n- Afternoon: Visit the historical and cultural hub - Kathmandu Durbar Square. This square is a complex of palaces, courtyards and temples. You can enjoy vibrant local life and activities around the square.\\n\\n- Evening: You can explore lots of shops, cafes and restaurants in the Thamel. Experience local food and artisanal delicacies.\\n\\n**Day 2: Visit Bhaktapur and Nagarkot:**\\n\\n- Morning/Early Afternoon: Take a short ride to Bhaktapur city. Visit sites like Bhaktapur Durbar Square, Nyatapola Temple and Bhaktapur National Art Gallery.\\n\\n- Afternoon/Evening: Travel to Nagarkot. If the weather is clear, this place offers great panoramic views of the Himalayan range including Mount Everest during sunset. It's also quite known for hiking so make sure to check out the trails if you're into that.\\n\\n**Day 3: Experience Patan and Return to Kathmandu:**\\n\\n- Morning: Travel back towards Patan, another royal city of Nepal. Visit the Patan Museum, Golden Temple and the Patan Durbar Square.\\n\\n- Afternoon: Return to Kathmandu and wrap up your trip by visiting a few more sites like Swayambhunath Stupa and Pashupatinath Temple.\\n\\n- Evening: Check out any last minute souvenirs from local markets and try some local Nepalese cuisine. \\n\\nPlease ensure to check travel advisories and any necessary travel documentations before your trip. It's also important to make arrangement for proper accommodation and transportation in advance of your trip.\\n\"\n", - "source='local_agent' models_usage=RequestUsage(prompt_tokens=451, completion_tokens=394) content=\"Sure, here is a simple 3-day itinerary for a trip to Nepal:\\n\\n**Day 1: Explore Kathmandu:**\\n\\n- Morning: Arrival in Tribhuvan International Airport. Take an airport taxi to your hotel in Thamel area – the touristic heart of Kathmandu. Freshen up after your journey.\\n\\n- Afternoon: Visit the historical and cultural hub - Kathmandu Durbar Square. This square is a complex of palaces, courtyards and temples. You can enjoy vibrant local life and activities around the square.\\n\\n- Evening: You can explore lots of shops, cafes and restaurants in the Thamel. Experience local food and artisanal delicacies.\\n\\n**Day 2: Visit Bhaktapur and Nagarkot:**\\n\\n- Morning/Early Afternoon: Take a short ride to Bhaktapur city. Visit sites like Bhaktapur Durbar Square, Nyatapola Temple and Bhaktapur National Art Gallery.\\n\\n- Afternoon/Evening: Travel to Nagarkot. If the weather is clear, this place offers great panoramic views of the Himalayan range including Mount Everest during sunset. It's also quite known for hiking so make sure to check out the trails if you're into that.\\n\\n**Day 3: Experience Patan and Return to Kathmandu:**\\n\\n- Morning: Travel back towards Patan, another royal city of Nepal. Visit the Patan Museum, Golden Temple and the Patan Durbar Square.\\n\\n- Afternoon: Return to Kathmandu and wrap up your trip by visiting a few more sites like Swayambhunath Stupa and Pashupatinath Temple.\\n\\n- Evening: Check out any last minute souvenirs from local markets and try some local Nepalese cuisine. \\n\\nPlease ensure to check travel advisories and any necessary travel documentations before your trip. It's also important to make arrangement for proper accommodation and transportation in advance of your trip.\"\n", - "source='language_agent' models_usage=RequestUsage(prompt_tokens=876, completion_tokens=246) content=\"Your travel itinerary seems to be well designed and comprehensive. However, communication and language fluency can significantly impact your travel experience. Here are some essential tips on this topic:\\n\\n1. The official language of Nepal is Nepali, but English is understood by a significant portion of the population in urban areas and tourist spots. Nevertheless, it can be helpful if you learn some basic Nepali phrases such as greetings, thanking, apologizing, and expressing urgency.\\n\\n2. Download a translator app on your phone like Google Translate in case you encounter someone who only speaks Nepali or for translating signs and menus.\\n\\n3. Be mindful of cultural sensitivities when communicating. Nepalese people are generally very friendly and hospitable, but it's important to respect their traditions and culture. Avoid criticism and negative comments about their culture and religion.\\n\\n4. Guide books, travel blogs, and forums can offer insights and useful phrases in Nepali that can enhance your interaction with locals.\\n\\n5. If you prefer, you may hire a local tour guide who can communicate in English to assist you, especially in rural areas.\\n\\nFeel free to modify your plan as per your preferences and ensure that you are well-prepared to handle communication challenges to have a seamless experience.\"\n", - "source='travel_summary_agent' models_usage=RequestUsage(prompt_tokens=1146, completion_tokens=484) content=\"Here is the final integrated 3-day travel plan for your trip to Nepal:\\n\\n**Day 1: Explore Kathmandu:**\\n\\n- Morning: Arrival in Tribhuvan International Airport. Take an airport taxi to your hotel in the Thamel area – the touristic heart of Kathmandu. Freshen up after your journey.\\n\\n- Afternoon: Visit the historic Kathmandu Durbar Square, a complex of palaces, courtyards and temples where you can enjoy vibrant local life and activities.\\n\\n- Evening: Wander around the Thamel district, checking out the array of shops, cafes and restaurants. Try local food and artisanal delicacies.\\n\\n**Day 2: Immerse in Bhaktapur and Relax in Nagarkot:**\\n\\n- Morning/Early Afternoon: Take a short trip to Bhaktapur, a culturally rich city known for its preserved palace courtyards and old city center. Visit sites like Bhaktapur Durbar Square, Nyatapola Temple, and Bhaktapur National Art Gallery.\\n\\n- Late Afternoon/Evening: Travel to Nagarkot, known for its stunning Himalayan views, including Mount Everest during clear weather. Consider going hiking if you're into outdoor activities.\\n\\n**Day 3: Experience Patan and Return to Kathmandu:**\\n\\n- Morning: Travel back towards Patan, another royal city of Nepal. Visit the Patan Museum, Golden Temple, and the Patan Durbar Square.\\n\\n- Afternoon: Return to Kathmandu and wrap up your trip by visiting the Swayambhunath Stupa and Pashupatinath Temple.\\n\\n- Evening: Explore local markets for last minute souvenirs and sample more of the delicious local Nepalese cuisine. \\n\\n_Note on communication:_ Although English is understood in urban areas and major tourist spots, learning a few basic Nepali phrases can help you during your travels. Be mindful of cultural sensitivities, and consider downloading a translation app.\\n\\nIt's also important to secure accommodations in advance, comply with travel document requirements and check travel advisories before your trip. If you want more seamless communication, especially in rural areas, consider hiring a local English-speaking tour guide. \\n\\nYou are now all set for a memorable journey to Nepal. Use this plan as a guideline and feel free to modify it to better suit your preferences and schedule. Safe travels!\\n\\nTERMINATE\"\n", - "TaskResult(messages=[TextMessage(source='user', models_usage=None, content='Plan a 3 day trip to Nepal.'), TextMessage(source='planner_agent', models_usage=RequestUsage(prompt_tokens=40, completion_tokens=394), content=\"Sure, here is a simple 3-day itinerary for a trip to Nepal:\\n\\n**Day 1: Explore Kathmandu:**\\n\\n- Morning: Arrival in Tribhuvan International Airport. Take an airport taxi to your hotel in Thamel area – the touristic heart of Kathmandu. Freshen up after your journey.\\n\\n- Afternoon: Visit the historical and cultural hub - Kathmandu Durbar Square. This square is a complex of palaces, courtyards and temples. You can enjoy vibrant local life and activities around the square.\\n\\n- Evening: You can explore lots of shops, cafes and restaurants in the Thamel. Experience local food and artisanal delicacies.\\n\\n**Day 2: Visit Bhaktapur and Nagarkot:**\\n\\n- Morning/Early Afternoon: Take a short ride to Bhaktapur city. Visit sites like Bhaktapur Durbar Square, Nyatapola Temple and Bhaktapur National Art Gallery.\\n\\n- Afternoon/Evening: Travel to Nagarkot. If the weather is clear, this place offers great panoramic views of the Himalayan range including Mount Everest during sunset. It's also quite known for hiking so make sure to check out the trails if you're into that.\\n\\n**Day 3: Experience Patan and Return to Kathmandu:**\\n\\n- Morning: Travel back towards Patan, another royal city of Nepal. Visit the Patan Museum, Golden Temple and the Patan Durbar Square.\\n\\n- Afternoon: Return to Kathmandu and wrap up your trip by visiting a few more sites like Swayambhunath Stupa and Pashupatinath Temple.\\n\\n- Evening: Check out any last minute souvenirs from local markets and try some local Nepalese cuisine. \\n\\nPlease ensure to check travel advisories and any necessary travel documentations before your trip. It's also important to make arrangement for proper accommodation and transportation in advance of your trip.\\n\"), TextMessage(source='local_agent', models_usage=RequestUsage(prompt_tokens=451, completion_tokens=394), content=\"Sure, here is a simple 3-day itinerary for a trip to Nepal:\\n\\n**Day 1: Explore Kathmandu:**\\n\\n- Morning: Arrival in Tribhuvan International Airport. Take an airport taxi to your hotel in Thamel area – the touristic heart of Kathmandu. Freshen up after your journey.\\n\\n- Afternoon: Visit the historical and cultural hub - Kathmandu Durbar Square. This square is a complex of palaces, courtyards and temples. You can enjoy vibrant local life and activities around the square.\\n\\n- Evening: You can explore lots of shops, cafes and restaurants in the Thamel. Experience local food and artisanal delicacies.\\n\\n**Day 2: Visit Bhaktapur and Nagarkot:**\\n\\n- Morning/Early Afternoon: Take a short ride to Bhaktapur city. Visit sites like Bhaktapur Durbar Square, Nyatapola Temple and Bhaktapur National Art Gallery.\\n\\n- Afternoon/Evening: Travel to Nagarkot. If the weather is clear, this place offers great panoramic views of the Himalayan range including Mount Everest during sunset. It's also quite known for hiking so make sure to check out the trails if you're into that.\\n\\n**Day 3: Experience Patan and Return to Kathmandu:**\\n\\n- Morning: Travel back towards Patan, another royal city of Nepal. Visit the Patan Museum, Golden Temple and the Patan Durbar Square.\\n\\n- Afternoon: Return to Kathmandu and wrap up your trip by visiting a few more sites like Swayambhunath Stupa and Pashupatinath Temple.\\n\\n- Evening: Check out any last minute souvenirs from local markets and try some local Nepalese cuisine. \\n\\nPlease ensure to check travel advisories and any necessary travel documentations before your trip. It's also important to make arrangement for proper accommodation and transportation in advance of your trip.\"), TextMessage(source='language_agent', models_usage=RequestUsage(prompt_tokens=876, completion_tokens=246), content=\"Your travel itinerary seems to be well designed and comprehensive. However, communication and language fluency can significantly impact your travel experience. Here are some essential tips on this topic:\\n\\n1. The official language of Nepal is Nepali, but English is understood by a significant portion of the population in urban areas and tourist spots. Nevertheless, it can be helpful if you learn some basic Nepali phrases such as greetings, thanking, apologizing, and expressing urgency.\\n\\n2. Download a translator app on your phone like Google Translate in case you encounter someone who only speaks Nepali or for translating signs and menus.\\n\\n3. Be mindful of cultural sensitivities when communicating. Nepalese people are generally very friendly and hospitable, but it's important to respect their traditions and culture. Avoid criticism and negative comments about their culture and religion.\\n\\n4. Guide books, travel blogs, and forums can offer insights and useful phrases in Nepali that can enhance your interaction with locals.\\n\\n5. If you prefer, you may hire a local tour guide who can communicate in English to assist you, especially in rural areas.\\n\\nFeel free to modify your plan as per your preferences and ensure that you are well-prepared to handle communication challenges to have a seamless experience.\"), TextMessage(source='travel_summary_agent', models_usage=RequestUsage(prompt_tokens=1146, completion_tokens=484), content=\"Here is the final integrated 3-day travel plan for your trip to Nepal:\\n\\n**Day 1: Explore Kathmandu:**\\n\\n- Morning: Arrival in Tribhuvan International Airport. Take an airport taxi to your hotel in the Thamel area – the touristic heart of Kathmandu. Freshen up after your journey.\\n\\n- Afternoon: Visit the historic Kathmandu Durbar Square, a complex of palaces, courtyards and temples where you can enjoy vibrant local life and activities.\\n\\n- Evening: Wander around the Thamel district, checking out the array of shops, cafes and restaurants. Try local food and artisanal delicacies.\\n\\n**Day 2: Immerse in Bhaktapur and Relax in Nagarkot:**\\n\\n- Morning/Early Afternoon: Take a short trip to Bhaktapur, a culturally rich city known for its preserved palace courtyards and old city center. Visit sites like Bhaktapur Durbar Square, Nyatapola Temple, and Bhaktapur National Art Gallery.\\n\\n- Late Afternoon/Evening: Travel to Nagarkot, known for its stunning Himalayan views, including Mount Everest during clear weather. Consider going hiking if you're into outdoor activities.\\n\\n**Day 3: Experience Patan and Return to Kathmandu:**\\n\\n- Morning: Travel back towards Patan, another royal city of Nepal. Visit the Patan Museum, Golden Temple, and the Patan Durbar Square.\\n\\n- Afternoon: Return to Kathmandu and wrap up your trip by visiting the Swayambhunath Stupa and Pashupatinath Temple.\\n\\n- Evening: Explore local markets for last minute souvenirs and sample more of the delicious local Nepalese cuisine. \\n\\n_Note on communication:_ Although English is understood in urban areas and major tourist spots, learning a few basic Nepali phrases can help you during your travels. Be mindful of cultural sensitivities, and consider downloading a translation app.\\n\\nIt's also important to secure accommodations in advance, comply with travel document requirements and check travel advisories before your trip. If you want more seamless communication, especially in rural areas, consider hiring a local English-speaking tour guide. \\n\\nYou are now all set for a memorable journey to Nepal. Use this plan as a guideline and feel free to modify it to better suit your preferences and schedule. Safe travels!\\n\\nTERMINATE\")], stop_reason=\"Text 'TERMINATE' mentioned\")\n" + "source='planner_agent' models_usage=RequestUsage(prompt_tokens=45, completion_tokens=54) content=\"Consider starting your 3-day trip to Nepal with a cultural tour in Kathmandu Valley, followed by an exploration of Pokhara's natural beauty on the second day, and finally, indulge in a thrilling safari at Chitwan National Park on the third day.\"\n", + "source='local_agent' models_usage=RequestUsage(prompt_tokens=116, completion_tokens=54) content=\"Consider starting your 3-day trip to Nepal with a cultural tour in Kathmandu Valley, followed by an exploration of Pokhara's natural beauty on the second day, and finally, indulge in a thrilling safari at Chitwan National Park on the third day.\"\n", + "source='language_agent' models_usage=RequestUsage(prompt_tokens=201, completion_tokens=45) content=\"Your travel plan lacks a mention of dealing with potential language barriers; it might be useful to learn some phrases in Nepali, as it's the official language of Nepal, or have a local translation app handy during your trip.\"\n", + "source='travel_summary_agent' models_usage=RequestUsage(prompt_tokens=270, completion_tokens=237) content='Day 1: Start your adventure in the capital city, Kathmandu. Take a guided tour of Kathmandu Valley to explore its UNESCO World Heritage Sites, such as the Durbar Squares, Swayambhunath Stupa, and Boudhanath Stupa. Engage with the locals and sample some traditional Nepalese cuisine.\\n\\nDay 2: Proceed to Pokhara, known for its stunning natural beauty. Visit the iconic Phewa Lake and enjoy a boat ride, then trek to the Peace Pagoda for a panoramic view of the city. Round off the day with a visit to the fascinating Pokhara Mountain Museum.\\n\\nDay 3: Travel to Chitwan National Park for a memorable safari. Explore the diverse wildlife and lush vegetation that make the park a UNESCO World Heritage site. Be on the lookout for rhinos, Bengal tigers, and a multitude of bird species.\\n\\nNote: Communication is key to enjoying your trip. The official language of Nepal is Nepali. It can be helpful to learn a few basic phrases or carry a translation app to help you interact with the local people and enrich your cultural experience.\\n\\nTERMINATE.'\n", + "TaskResult(messages=[TextMessage(source='user', models_usage=None, content='Plan a 3 day trip to Nepal.'), TextMessage(source='planner_agent', models_usage=RequestUsage(prompt_tokens=45, completion_tokens=54), content=\"Consider starting your 3-day trip to Nepal with a cultural tour in Kathmandu Valley, followed by an exploration of Pokhara's natural beauty on the second day, and finally, indulge in a thrilling safari at Chitwan National Park on the third day.\"), TextMessage(source='local_agent', models_usage=RequestUsage(prompt_tokens=116, completion_tokens=54), content=\"Consider starting your 3-day trip to Nepal with a cultural tour in Kathmandu Valley, followed by an exploration of Pokhara's natural beauty on the second day, and finally, indulge in a thrilling safari at Chitwan National Park on the third day.\"), TextMessage(source='language_agent', models_usage=RequestUsage(prompt_tokens=201, completion_tokens=45), content=\"Your travel plan lacks a mention of dealing with potential language barriers; it might be useful to learn some phrases in Nepali, as it's the official language of Nepal, or have a local translation app handy during your trip.\"), TextMessage(source='travel_summary_agent', models_usage=RequestUsage(prompt_tokens=270, completion_tokens=237), content='Day 1: Start your adventure in the capital city, Kathmandu. Take a guided tour of Kathmandu Valley to explore its UNESCO World Heritage Sites, such as the Durbar Squares, Swayambhunath Stupa, and Boudhanath Stupa. Engage with the locals and sample some traditional Nepalese cuisine.\\n\\nDay 2: Proceed to Pokhara, known for its stunning natural beauty. Visit the iconic Phewa Lake and enjoy a boat ride, then trek to the Peace Pagoda for a panoramic view of the city. Round off the day with a visit to the fascinating Pokhara Mountain Museum.\\n\\nDay 3: Travel to Chitwan National Park for a memorable safari. Explore the diverse wildlife and lush vegetation that make the park a UNESCO World Heritage site. Be on the lookout for rhinos, Bengal tigers, and a multitude of bird species.\\n\\nNote: Communication is key to enjoying your trip. The official language of Nepal is Nepali. It can be helpful to learn a few basic phrases or carry a translation app to help you interact with the local people and enrich your cultural experience.\\n\\nTERMINATE.')], stop_reason=\"Text 'TERMINATE' mentioned\")\n" ] } ], @@ -305,12 +305,52 @@ " print(response) " ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Human in the Loop with a UserProxy Agent\n", + "\n", + "AutoGen studio provides a custom agent allows a human interact as part of the agent team.\n", + "\n" + ] + }, { "cell_type": "code", - "execution_count": null, + "execution_count": 14, "metadata": {}, "outputs": [], - "source": [] + "source": [ + "from autogenstudio.components import UserProxyAgent \n", + "\n", + "def input_func(prompt: str) -> str: \n", + " return \"Hello World there\" + str(prompt)\n", + "user_agent = UserProxyAgent(name=\"user_agent\", description=\"a human user\", input_func=input_func)" + ] + }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "source='user' models_usage=None content='hello there'\n", + "source='user_agent' models_usage=None content='Hello World thereEnter your response: '\n", + "TaskResult(messages=[TextMessage(source='user', models_usage=None, content='hello there'), TextMessage(source='user_agent', models_usage=None, content='Hello World thereEnter your response: ')], stop_reason=None)\n" + ] + } + ], + "source": [ + "from autogen_core.base import CancellationToken \n", + "cancellation_token = CancellationToken()\n", + "stream = user_agent.run_stream(task=\"hello there\", cancellation_token=cancellation_token)\n", + "\n", + "async for response in stream:\n", + " print(response)" + ] } ], "metadata": { diff --git a/python/packages/autogen-studio/pyproject.toml b/python/packages/autogen-studio/pyproject.toml index b6d7e2a4fa53..41e4dea45821 100644 --- a/python/packages/autogen-studio/pyproject.toml +++ b/python/packages/autogen-studio/pyproject.toml @@ -20,6 +20,7 @@ classifiers = [ dependencies = [ "pydantic", + "pydantic-settings", "fastapi", "typer", "uvicorn", @@ -30,6 +31,10 @@ dependencies = [ "psycopg", "alembic", "loguru", + "pyyaml", + "autogen-core==0.4.0.dev6", + "autogen-agentchat==0.4.0.dev6", + "autogen-ext==0.4.0.dev6" ] optional-dependencies = {web = ["fastapi", "uvicorn"], database = ["psycopg"]} diff --git a/python/pyproject.toml b/python/pyproject.toml index 6bc826cd448f..83535c6f5402 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -25,6 +25,7 @@ dev-dependencies = [ [tool.uv.sources] autogen-core = { workspace = true } autogen-ext = { workspace = true } +autogen-agentchat = { workspace = true } [tool.ruff] line-length = 120 diff --git a/python/uv.lock b/python/uv.lock index 266b1122a5d7..db9fd753a92a 100644 --- a/python/uv.lock +++ b/python/uv.lock @@ -567,16 +567,21 @@ dev = [ [[package]] name = "autogenstudio" -version = "0.1.6" +version = "0.4.0.dev37" source = { editable = "packages/autogen-studio" } dependencies = [ { name = "alembic" }, + { name = "autogen-agentchat" }, + { name = "autogen-core" }, + { name = "autogen-ext" }, { name = "fastapi" }, { name = "loguru" }, { name = "numpy" }, { name = "psycopg" }, { name = "pydantic" }, + { name = "pydantic-settings" }, { name = "python-dotenv" }, + { name = "pyyaml" }, { name = "sqlmodel" }, { name = "typer" }, { name = "uvicorn" }, @@ -595,6 +600,9 @@ web = [ [package.metadata] requires-dist = [ { name = "alembic" }, + { name = "autogen-agentchat", editable = "packages/autogen-agentchat" }, + { name = "autogen-core", editable = "packages/autogen-core" }, + { name = "autogen-ext", editable = "packages/autogen-ext" }, { name = "fastapi" }, { name = "fastapi", marker = "extra == 'web'" }, { name = "loguru" }, @@ -602,7 +610,9 @@ requires-dist = [ { name = "psycopg" }, { name = "psycopg", marker = "extra == 'database'" }, { name = "pydantic" }, + { name = "pydantic-settings" }, { name = "python-dotenv" }, + { name = "pyyaml" }, { name = "sqlmodel" }, { name = "typer" }, { name = "uvicorn" },