Skip to content
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
be6f2f8
fix import issue related to agentchat update #4245
victordibia Nov 17, 2024
a127980
Merge branch 'main' into ags_save_sessions
victordibia Nov 17, 2024
6a78308
update uv lock file
victordibia Nov 17, 2024
64a51b3
fix db auto_upgrade logic issue.
victordibia Nov 21, 2024
6b054cf
im prove msg rendering issue
victordibia Nov 21, 2024
c5345c8
Support termination condition combination. Closes #4325
victordibia Nov 23, 2024
5800f8d
fix db instantiation bug
victordibia Nov 23, 2024
4646c4e
update yarn.lock, closes #4260 #4262
victordibia Nov 23, 2024
c27e782
remove deps for now with vulnerabilities found by dependabot #4262
victordibia Nov 23, 2024
55a9932
update db tests
victordibia Nov 23, 2024
25de819
add ability to load sessions from db ..
victordibia Nov 25, 2024
fb5bf1a
format updates, add format checks to ags
victordibia Nov 25, 2024
c81cd09
format check fixes
victordibia Nov 25, 2024
7bf3df2
linting and ruff check fixes
victordibia Nov 25, 2024
6a10acd
make tests for ags non-parrallel to avoid db race conditions.
victordibia Nov 26, 2024
332a835
Merge remote-tracking branch 'origin/main' into ags_save_sessions
victordibia Nov 26, 2024
6414f94
format updates
victordibia Nov 26, 2024
c3e0d44
fix concurrency issue
victordibia Nov 26, 2024
74490a8
minor ui tweaks, move run start to websocket
victordibia Nov 26, 2024
edebda4
lint fixes
victordibia Nov 26, 2024
7f33616
Merge branch 'main' into ags_save_sessions
victordibia Nov 26, 2024
33390ec
update uv.lock
victordibia Nov 26, 2024
bc237db
Merge branch 'ags_save_sessions' of github.com:microsoft/autogen into…
victordibia Nov 26, 2024
0b132c3
Update python/packages/autogen-studio/autogenstudio/datamodel/types.py
victordibia Nov 26, 2024
e996f26
Update python/packages/autogen-studio/autogenstudio/teammanager.py
victordibia Nov 26, 2024
4fb115f
reuse user proxy from agentchat
victordibia Nov 26, 2024
deb9dc4
ui tweaks
victordibia Nov 26, 2024
baa66fe
Merge branch 'main' into ags_save_sessions
victordibia Nov 26, 2024
e05dde0
Merge branch 'main' into ags_save_sessions
husseinmozannar Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions python/packages/autogen-studio/autogenstudio/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
from .datamodel import *
from .database.db_manager import DatabaseManager
from .datamodel import Agent, AgentConfig, Model, ModelConfig, Team, TeamConfig, Tool, ToolConfig
from .teammanager import TeamManager
from .version import __version__
from .teammanager import *

__all__ = [
"Tool",
"Model",
"DatabaseManager",
"Team",
"Agent",
"ToolConfig",
"ModelConfig",
"TeamConfig",
"AgentConfig",
"TeamManager",
"__version__",
]
8 changes: 2 additions & 6 deletions python/packages/autogen-studio/autogenstudio/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def ui(
host: str = "127.0.0.1",
port: int = 8081,
workers: int = 1,
reload: Annotated[bool, typer.Option("--reload")] = True,
reload: Annotated[bool, typer.Option("--reload")] = False,
docs: bool = True,
appdir: str = None,
database_uri: Optional[str] = None,
Expand Down Expand Up @@ -48,11 +48,7 @@ def ui(
port=port,
workers=workers,
reload=reload,
reload_excludes=[
"**/alembic/*",
"**/alembic.ini",
"**/versions/*"
] if reload else None
reload_excludes=["**/alembic/*", "**/alembic.ini", "**/versions/*"] if reload else None,
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from typing import Callable, List, Optional, Sequence, Union, Awaitable
import asyncio
from inspect import iscoroutinefunction
from typing import Awaitable, Callable, List, Optional, Sequence, Union

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):
Expand All @@ -15,13 +15,11 @@ def __init__(
self,
name: str,
description: Optional[str] = "a",
input_func: Optional[Union[Callable[..., str],
Callable[..., Awaitable[str]]]] = None
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
self._is_async = iscoroutinefunction(input_func) if input_func else False

@property
def produced_message_types(self) -> List[type[ChatMessage]]:
Expand All @@ -35,7 +33,6 @@ async def _get_input(self, prompt: str) -> str:
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))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .db_manager import DatabaseManager
from .component_factory import ComponentFactory, Component
from .component_factory import Component, ComponentFactory
from .config_manager import ConfigurationManager
from .db_manager import DatabaseManager
Loading
Loading