Merge branch 'main' into agentchat-tutorial

microsoft · Nov 10, 2024 · 160f335 · 160f335
2 parents 86e80eb + 0e985d4
commit 160f335
Show file tree

Hide file tree

Showing 117 changed files with 20,720 additions and 13,584 deletions.
diff --git a/python/packages/autogen-studio/.gitignore b/python/packages/autogen-studio/.gitignore
@@ -2,6 +2,8 @@ database.sqlite
 .cache/*
 autogenstudio/web/files/user/*
 autogenstudio/test
+autogenstudio/database/alembic.ini 
+autogenstudio/database/alembic/*
 autogenstudio/web/files/ui/*
 OAI_CONFIG_LIST
 scratch/
@@ -10,8 +12,10 @@ autogenstudio/web/ui/*
 autogenstudio/web/skills/user/*
 .release.sh
 .nightly.sh
+notebooks/test
 
 notebooks/work_dir/*
+notebooks/test.db
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/python/packages/autogen-studio/autogenstudio/__init__.py b/python/packages/autogen-studio/autogenstudio/__init__.py
@@ -1,4 +1,3 @@
-from .chatmanager import *
 from .datamodel import *
 from .version import __version__
-from .workflowmanager import *
+from .teammanager import *
diff --git a/python/packages/autogen-studio/autogenstudio/chatmanager.py b/python/packages/autogen-studio/autogenstudio/chatmanager.py
diff --git a/python/packages/autogen-studio/autogenstudio/cli.py b/python/packages/autogen-studio/autogenstudio/cli.py
@@ -15,10 +15,11 @@ def ui(
     host: str = "127.0.0.1",
     port: int = 8081,
     workers: int = 1,
-    reload: Annotated[bool, typer.Option("--reload")] = False,
+    reload: Annotated[bool, typer.Option("--reload")] = True,
     docs: bool = True,
     appdir: str = None,
     database_uri: Optional[str] = None,
+    upgrade_database: bool = False,
 ):
     """
     Run the AutoGen Studio UI.
@@ -30,21 +31,28 @@ def ui(
         reload (bool, optional): Whether to reload the UI on code changes. Defaults to False.
         docs (bool, optional): Whether to generate API docs. Defaults to False.
         appdir (str, optional): Path to the AutoGen Studio app directory. Defaults to None.
-        database-uri (str, optional): Database URI to connect to. Defaults to None. Examples include sqlite:///autogenstudio.db, postgresql://user:password@localhost/autogenstudio.
+        database-uri (str, optional): Database URI to connect to. Defaults to None.
     """
 
     os.environ["AUTOGENSTUDIO_API_DOCS"] = str(docs)
     if appdir:
         os.environ["AUTOGENSTUDIO_APPDIR"] = appdir
     if database_uri:
         os.environ["AUTOGENSTUDIO_DATABASE_URI"] = database_uri
+    if upgrade_database:
+        os.environ["AUTOGENSTUDIO_UPGRADE_DATABASE"] = "1"
 
     uvicorn.run(
         "autogenstudio.web.app:app",
         host=host,
         port=port,
         workers=workers,
         reload=reload,
+        reload_excludes=[
+            "**/alembic/*",
+            "**/alembic.ini",
+            "**/versions/*"
+        ] if reload else None
     )
 
 

diff --git a/python/packages/autogen-studio/autogenstudio/database/__init__.py b/python/packages/autogen-studio/autogenstudio/database/__init__.py
@@ -1,3 +1,3 @@
-# from .dbmanager import *
-from .dbmanager import *
-from .utils import *
+from .db_manager import DatabaseManager
+from .component_factory import ComponentFactory
+from .config_manager import ConfigurationManager
diff --git a/python/packages/autogen-studio/autogenstudio/database/alembic.ini b/python/packages/autogen-studio/autogenstudio/database/alembic.ini