ag2 0.7.1__tar.gz → 0.7.2b1__tar.gz

{ag2-0.7.1 → ag2-0.7.2b1}/NOTICE.md

@@ -1,6 +1,6 @@
 ## NOTICE
 
-Copyright (c) 2023-2024, Owners of https://github.com/ag2ai
+Copyright (c) 2023-2025, Owners of https://github.com/ag2ai
 
 This project is a fork of https://github.com/microsoft/autogen.
 
@@ -12,8 +12,8 @@ This project, i.e., https://github.com/ag2ai/ag2, is licensed under the Apache L
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-Ongoing MIT-licensed contributions:
-This project regularly incorporates code merged from the [original repository](https://github.com/microsoft/autogen) after the initial fork. This merged code remains under the original MIT license. For specific details on merged commits, please refer to the project's commit history.
-The MIT license applies to portions of code originating from the [original repository](https://github.com/microsoft/autogen) as described above.
+MIT-licensed contributions:
+The MIT license applies to portions of code originating from the [original repository](https://github.com/microsoft/autogen).
+For specific details on merged commits, please refer to the project's commit history.
 
-Last updated: 08/25/2024
+Last updated: 01/16/2025

{ag2-0.7.1/ag2.egg-info → ag2-0.7.2b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ag2
-Version: 0.7.1
+Version: 0.7.2b1
 Summary: Alias package for pyautogen
 Home-page: https://github.com/ag2ai/ag2
 Author: Chi Wang & Qingyun Wu
@@ -12,15 +12,22 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9,<3.14
 Description-Content-Type: text/markdown
-Provides-Extra: test
-Provides-Extra: blendsearch
-Provides-Extra: mathchat
+Provides-Extra: flaml
+Provides-Extra: jupyter-executor
 Provides-Extra: retrievechat
 Provides-Extra: retrievechat-pgvector
 Provides-Extra: retrievechat-mongodb
 Provides-Extra: retrievechat-qdrant
 Provides-Extra: graph-rag-falkor-db
+Provides-Extra: neo4j
+Provides-Extra: twilio
+Provides-Extra: interop-crewai
+Provides-Extra: interop-langchain
+Provides-Extra: interop-pydantic-ai
+Provides-Extra: interop
 Provides-Extra: autobuild
+Provides-Extra: blendsearch
+Provides-Extra: mathchat
 Provides-Extra: captainagent
 Provides-Extra: teachable
 Provides-Extra: lmm
@@ -31,8 +38,6 @@ Provides-Extra: websurfer
 Provides-Extra: redis
 Provides-Extra: cosmosdb
 Provides-Extra: websockets
-Provides-Extra: jupyter-executor
-Provides-Extra: types
 Provides-Extra: long-context
 Provides-Extra: anthropic
 Provides-Extra: cerebras
@@ -41,12 +46,11 @@ Provides-Extra: groq
 Provides-Extra: cohere
 Provides-Extra: ollama
 Provides-Extra: bedrock
-Provides-Extra: twilio
-Provides-Extra: interop-crewai
-Provides-Extra: interop-langchain
-Provides-Extra: interop-pydantic-ai
-Provides-Extra: interop
-Provides-Extra: neo4j
+Provides-Extra: test
+Provides-Extra: docs
+Provides-Extra: types
+Provides-Extra: lint
+Provides-Extra: dev
 License-File: LICENSE
 License-File: NOTICE.md
 
@@ -57,7 +61,7 @@ License-File: NOTICE.md
 [![Build](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml/badge.svg)](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml)
 ![Python Version](https://img.shields.io/badge/3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
 [![Discord](https://img.shields.io/discord/1153072414184452236?logo=discord&style=flat)](https://discord.gg/pAbnFJrkgZ)
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/ag2ai)
+[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/Chi_Wang_)
 
 <!-- [![NuGet version](https://badge.fury.io/nu/AutoGen.Core.svg)](https://badge.fury.io/nu/AutoGen.Core) -->
 
@@ -72,7 +76,7 @@ License-File: NOTICE.md
 > **:tada: IMPORTANT**
 >
 > :fire: :tada: **Nov 11, 2024:** We are evolving AutoGen into **AG2**!
-> A new organization [AG2ai](https://github.com/ag2ai) is created to host the development of AG2 and related projects with open governance. Check [AG2's new look](https://ag2.ai/).
+> A new organization [AG2AI](https://github.com/ag2ai) is created to host the development of AG2 and related projects with open governance. Check [AG2's new look](https://ag2.ai/).
 >
 > We invite collaborators from all organizations and individuals to join the development.
 
@@ -139,7 +143,7 @@ AG2 (formerly AutoGen) is an open-source programming framework for building AI a
 The project is currently maintained by a [dynamic group of volunteers](MAINTAINERS.md) from several organizations. Contact project administrators Chi Wang and Qingyun Wu via [support@ag2.ai](mailto:support@ag2.ai) if you are interested in becoming a maintainer.
 
 
-![AutoGen Overview](https://media.githubusercontent.com/media/ag2ai/ag2/refs/heads/main/website/static/img/autogen_agentchat.png)
+![AG2 Overview](https://media.githubusercontent.com/media/ag2ai/ag2/refs/heads/main/website/static/img/autogen_agentchat.png)
 
 
 <p align="right" style="font-size: 14px; color: #555; margin-top: 20px;">

{ag2-0.7.1 → ag2-0.7.2b1}/README.md

@@ -5,7 +5,7 @@
 [![Build](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml/badge.svg)](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml)
 ![Python Version](https://img.shields.io/badge/3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
 [![Discord](https://img.shields.io/discord/1153072414184452236?logo=discord&style=flat)](https://discord.gg/pAbnFJrkgZ)
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/ag2ai)
+[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/Chi_Wang_)
 
 <!-- [![NuGet version](https://badge.fury.io/nu/AutoGen.Core.svg)](https://badge.fury.io/nu/AutoGen.Core) -->
 
@@ -20,7 +20,7 @@
 > **:tada: IMPORTANT**
 >
 > :fire: :tada: **Nov 11, 2024:** We are evolving AutoGen into **AG2**!
-> A new organization [AG2ai](https://github.com/ag2ai) is created to host the development of AG2 and related projects with open governance. Check [AG2's new look](https://ag2.ai/).
+> A new organization [AG2AI](https://github.com/ag2ai) is created to host the development of AG2 and related projects with open governance. Check [AG2's new look](https://ag2.ai/).
 >
 > We invite collaborators from all organizations and individuals to join the development.
 
@@ -87,7 +87,7 @@ AG2 (formerly AutoGen) is an open-source programming framework for building AI a
 The project is currently maintained by a [dynamic group of volunteers](MAINTAINERS.md) from several organizations. Contact project administrators Chi Wang and Qingyun Wu via [support@ag2.ai](mailto:support@ag2.ai) if you are interested in becoming a maintainer.
 
 
-![AutoGen Overview](https://media.githubusercontent.com/media/ag2ai/ag2/refs/heads/main/website/static/img/autogen_agentchat.png)
+![AG2 Overview](https://media.githubusercontent.com/media/ag2ai/ag2/refs/heads/main/website/static/img/autogen_agentchat.png)
 
 
 <p align="right" style="font-size: 14px; color: #555; margin-top: 20px;">

{ag2-0.7.1 → ag2-0.7.2b1/ag2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ag2
-Version: 0.7.1
+Version: 0.7.2b1
 Summary: Alias package for pyautogen
 Home-page: https://github.com/ag2ai/ag2
 Author: Chi Wang & Qingyun Wu
@@ -12,15 +12,22 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9,<3.14
 Description-Content-Type: text/markdown
-Provides-Extra: test
-Provides-Extra: blendsearch
-Provides-Extra: mathchat
+Provides-Extra: flaml
+Provides-Extra: jupyter-executor
 Provides-Extra: retrievechat
 Provides-Extra: retrievechat-pgvector
 Provides-Extra: retrievechat-mongodb
 Provides-Extra: retrievechat-qdrant
 Provides-Extra: graph-rag-falkor-db
+Provides-Extra: neo4j
+Provides-Extra: twilio
+Provides-Extra: interop-crewai
+Provides-Extra: interop-langchain
+Provides-Extra: interop-pydantic-ai
+Provides-Extra: interop
 Provides-Extra: autobuild
+Provides-Extra: blendsearch
+Provides-Extra: mathchat
 Provides-Extra: captainagent
 Provides-Extra: teachable
 Provides-Extra: lmm
@@ -31,8 +38,6 @@ Provides-Extra: websurfer
 Provides-Extra: redis
 Provides-Extra: cosmosdb
 Provides-Extra: websockets
-Provides-Extra: jupyter-executor
-Provides-Extra: types
 Provides-Extra: long-context
 Provides-Extra: anthropic
 Provides-Extra: cerebras
@@ -41,12 +46,11 @@ Provides-Extra: groq
 Provides-Extra: cohere
 Provides-Extra: ollama
 Provides-Extra: bedrock
-Provides-Extra: twilio
-Provides-Extra: interop-crewai
-Provides-Extra: interop-langchain
-Provides-Extra: interop-pydantic-ai
-Provides-Extra: interop
-Provides-Extra: neo4j
+Provides-Extra: test
+Provides-Extra: docs
+Provides-Extra: types
+Provides-Extra: lint
+Provides-Extra: dev
 License-File: LICENSE
 License-File: NOTICE.md
 
@@ -57,7 +61,7 @@ License-File: NOTICE.md
 [![Build](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml/badge.svg)](https://github.com/ag2ai/ag2/actions/workflows/python-package.yml)
 ![Python Version](https://img.shields.io/badge/3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)
 [![Discord](https://img.shields.io/discord/1153072414184452236?logo=discord&style=flat)](https://discord.gg/pAbnFJrkgZ)
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/ag2ai)
+[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40ag2ai)](https://x.com/Chi_Wang_)
 
 <!-- [![NuGet version](https://badge.fury.io/nu/AutoGen.Core.svg)](https://badge.fury.io/nu/AutoGen.Core) -->
 
@@ -72,7 +76,7 @@ License-File: NOTICE.md
 > **:tada: IMPORTANT**
 >
 > :fire: :tada: **Nov 11, 2024:** We are evolving AutoGen into **AG2**!
-> A new organization [AG2ai](https://github.com/ag2ai) is created to host the development of AG2 and related projects with open governance. Check [AG2's new look](https://ag2.ai/).
+> A new organization [AG2AI](https://github.com/ag2ai) is created to host the development of AG2 and related projects with open governance. Check [AG2's new look](https://ag2.ai/).
 >
 > We invite collaborators from all organizations and individuals to join the development.
 
@@ -139,7 +143,7 @@ AG2 (formerly AutoGen) is an open-source programming framework for building AI a
 The project is currently maintained by a [dynamic group of volunteers](MAINTAINERS.md) from several organizations. Contact project administrators Chi Wang and Qingyun Wu via [support@ag2.ai](mailto:support@ag2.ai) if you are interested in becoming a maintainer.
 
 
-![AutoGen Overview](https://media.githubusercontent.com/media/ag2ai/ag2/refs/heads/main/website/static/img/autogen_agentchat.png)
+![AG2 Overview](https://media.githubusercontent.com/media/ag2ai/ag2/refs/heads/main/website/static/img/autogen_agentchat.png)
 
 
 <p align="right" style="font-size: 14px; color: #555; margin-top: 20px;">

{ag2-0.7.1 → ag2-0.7.2b1}/ag2.egg-info/SOURCES.txt

@@ -10,7 +10,10 @@ ag2.egg-info/requires.txt
 ag2.egg-info/top_level.txt
 test/test_browser_utils.py
 test/test_code_utils.py
+test/test_conftest.py
 test/test_graph_utils.py
+test/test_import.py
+test/test_import_utils.py
 test/test_logging.py
 test/test_notebook.py
 test/test_pydantic.py

ag2-0.7.2b1/ag2.egg-info/requires.txt

@@ -0,0 +1,118 @@
+pyautogen==0.7.2b1
+
+[anthropic]
+pyautogen[anthropic]==0.7.2b1
+
+[autobuild]
+pyautogen[autobuild]==0.7.2b1
+
+[bedrock]
+pyautogen[bedrock]==0.7.2b1
+
+[blendsearch]
+pyautogen[blendsearch]==0.7.2b1
+
+[captainagent]
+pyautogen[captainagent]==0.7.2b1
+
+[cerebras]
+pyautogen[cerebras]==0.7.2b1
+
+[cohere]
+pyautogen[cohere]==0.7.2b1
+
+[cosmosdb]
+pyautogen[cosmosdb]==0.7.2b1
+
+[dev]
+pyautogen[dev]==0.7.2b1
+
+[docs]
+pyautogen[docs]==0.7.2b1
+
+[flaml]
+pyautogen[flaml]==0.7.2b1
+
+[gemini]
+pyautogen[gemini]==0.7.2b1
+
+[graph]
+pyautogen[graph]==0.7.2b1
+
+[graph-rag-falkor-db]
+pyautogen[graph-rag-falkor-db]==0.7.2b1
+
+[groq]
+pyautogen[groq]==0.7.2b1
+
+[interop]
+pyautogen[interop]==0.7.2b1
+
+[interop-crewai]
+pyautogen[interop-crewai]==0.7.2b1
+
+[interop-langchain]
+pyautogen[interop-langchain]==0.7.2b1
+
+[interop-pydantic-ai]
+pyautogen[interop-pydantic-ai]==0.7.2b1
+
+[jupyter-executor]
+pyautogen[jupyter-executor]==0.7.2b1
+
+[lint]
+pyautogen[lint]==0.7.2b1
+
+[lmm]
+pyautogen[lmm]==0.7.2b1
+
+[long-context]
+pyautogen[long-context]==0.7.2b1
+
+[mathchat]
+pyautogen[mathchat]==0.7.2b1
+
+[mistral]
+pyautogen[mistral]==0.7.2b1
+
+[neo4j]
+pyautogen[neo4j]==0.7.2b1
+
+[ollama]
+pyautogen[ollama]==0.7.2b1
+
+[redis]
+pyautogen[redis]==0.7.2b1
+
+[retrievechat]
+pyautogen[retrievechat]==0.7.2b1
+
+[retrievechat-mongodb]
+pyautogen[retrievechat-mongodb]==0.7.2b1
+
+[retrievechat-pgvector]
+pyautogen[retrievechat-pgvector]==0.7.2b1
+
+[retrievechat-qdrant]
+pyautogen[retrievechat-qdrant]==0.7.2b1
+
+[teachable]
+pyautogen[teachable]==0.7.2b1
+
+[test]
+pyautogen[test]==0.7.2b1
+
+[together]
+pyautogen[together]==0.7.2b1
+
+[twilio]
+pyautogen[twilio]==0.7.2b1
+
+[types]
+pyautogen[types]==0.7.2b1
+
+[websockets]
+pyautogen[websockets]==0.7.2b1
+
+[websurfer]
+pyautogen[websurfer]==0.7.2b1

{ag2-0.7.1 → ag2-0.7.2b1}/pyproject.toml

@@ -55,12 +55,9 @@ dependencies = [
     "openai>=1.58",
     "diskcache",
     "termcolor",
-    "flaml",
-    # numpy is installed by flaml, but we want to pin the version to below 2.x (see https://github.com/microsoft/autogen/issues/1960)
-    "numpy>=2.1; python_version>='3.13'",  # numpy 2.1+ required for Python 3.13
-    "numpy>=1.24.0,<2.0.0; python_version<'3.13'",  # numpy 1.24+ for older Python versions
     "python-dotenv",
     "tiktoken",
+    "numpy",
     # Disallowing 2.6.0 can be removed when this is fixed https://github.com/pydantic/pydantic/issues/8705
     "pydantic>=2.6.1,<3",
     "docker",
@@ -72,6 +69,13 @@ dependencies = [
 
 [project.optional-dependencies]
 
+flaml = [
+    "flaml",
+    # numpy is installed by flaml, but we want to pin the version to below 2.x (see https://github.com/microsoft/autogen/issues/1960)
+    "numpy>=2.1; python_version>='3.13'",  # numpy 2.1+ required for Python 3.13
+    "numpy>=1.24.0,<2.0.0; python_version<'3.13'",  # numpy 1.24+ for older Python versions
+]
+
 # public distributions
 jupyter-executor = [
     "jupyter-kernel-gateway",
@@ -116,10 +120,10 @@ graph-rag-falkor-db = [
 
 neo4j = [
     "docx2txt==0.8",
-    "llama-index==0.12.5",
-    "llama-index-graph-stores-neo4j==0.4.2",
-    "llama-index-core==0.12.5",
-    "llama-index-readers-web==0.3.3",
+    "llama-index==0.12.11",
+    "llama-index-graph-stores-neo4j==0.4.5",
+    "llama-index-core==0.12.11",
+    "llama-index-readers-web==0.3.4",
 ]
 
 # used for agentchat_realtime_swarm notebook and realtime agent twilio demo
@@ -176,40 +180,42 @@ bedrock = ["boto3>=1.34.149"]
 
 # test dependencies
 test = [
-    "ipykernel",
-    "nbconvert",
-    "nbformat",
-    "pre-commit",
-    "pytest-cov>=5",
-    "pytest-asyncio",
-    "pytest>=8,<9",
-    "pandas",
-    "fastapi>=0.115.0,<1",
+    "ipykernel==6.29.5",
+    "nbconvert==7.16.5",
+    "nbformat==5.10.4",
+    "pytest-cov==6.0.0",
+    "pytest-asyncio==0.25.2",
+    "pytest==8.3.4",
+    "pandas==2.2.3",
+    "fastapi==0.115.6",
 ]
 
+# docs dependencies
 docs = [
-    "pydoc-markdown",
+    "pdoc3==0.11.5",
+    "jinja2==3.1.5",
     "pyyaml==6.0.2",
-    "termcolor",
-    "nbclient",
+    "termcolor==2.5.0",
+    "nbclient==0.10.2",
 ]
 
 types = [
-    "mypy==1.9.0",
+    "mypy==1.14.1",
     "pyautogen[test, jupyter-executor, interop]",
 ]
 
 lint = [
-    "ruff==0.9.1",
+    "ruff==0.9.2",
     "codespell==2.3.0",
     "pyupgrade-directories==0.3.0",
 ]
 
 dev = [
+    "toml==0.10.2",
     "pyautogen[lint,test,types,docs]",
-    "pre-commit==4.0.1",
+    "pre-commit==4.1.0",
     "detect-secrets==1.5.0",
-    "uv==0.5.16",
+    "uv==0.5.21",
 ]
 
 
@@ -249,6 +255,7 @@ markers = [
     "all",
     "openai",
     "gemini",
+    "anthropic",
     "redis",
     "docker",
 ]
@@ -263,8 +270,22 @@ exclude = "(.eggs|.git|.hg|.mypy_cache|.venv|_build|buck-out|build|dist)"
 fix = true
 line-length = 120
 target-version = 'py39'
-#include = ["autogen", "test", "docs"]
-#exclude = []
+# Exclude a variety of commonly ignored directories.
+exclude = [
+    ".eggs",
+    ".git",
+    ".mypy_cache",
+    ".ruff_cache",
+    "__pypackages__",
+    "_build",
+    "build",
+    "dist",
+    "docs",
+    # This file needs to be either upgraded or removed and therefore should be
+    # ignore from type checking for now
+    "math_utils\\.py$",
+    "setup_*.py",
+]
 
 [tool.ruff.lint]
 # Enable Pyflakes `E` and `F` codes by default.
@@ -298,22 +319,6 @@ ignore = ["E501", "F403", "C901",
     "D100", "D101", "D102", "D103", "D104",
     "C901",  # too complex
 ]
-# Exclude a variety of commonly ignored directories.
-exclude = [
-    ".eggs",
-    ".git",
-    ".mypy_cache",
-    ".ruff_cache",
-    "__pypackages__",
-    "_build",
-    "build",
-    "dist",
-    "docs",
-    # This file needs to be either upgraded or removed and therefore should be
-    # ignore from type checking for now
-    "math_utils\\.py$",
-    "**/cap/py/autogencap/proto/*",
-]
 
 [tool.ruff.lint.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
@@ -341,13 +346,20 @@ files = [
     "autogen/interop",
     "autogen/agentchat/realtime_agent",
     "autogen/messages",
+    "autogen/import_utils.py",
+    "website/*.py",
     "test/test_pydantic.py",
     "test/io",
     "test/tools",
     "test/interop",
     "test/agentchat/realtime_agent",
     "test/messages",
+    "test/conftest.py",
+    "test/test_import_utils.py",
+    "test/test_import.py",
+    "test/website",
 ]
+
 exclude = [
     "autogen/math_utils\\.py",
     "autogen/oai/completion\\.py",

{ag2-0.7.1 → ag2-0.7.2b1}/setup_ag2.py

@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# this file is autogenerated, please do not edit it directly
+# instead, edit the corresponding setup.jinja file and run the ./scripts/build-setup-files.py script
+
 import os
 
 import setuptools
@@ -25,15 +28,22 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     install_requires=["pyautogen==" + __version__],
     extras_require={
-        "test": ["pyautogen[test]==" + __version__],
-        "blendsearch": ["pyautogen[blendsearch]==" + __version__],
-        "mathchat": ["pyautogen[mathchat]==" + __version__],
+        "flaml": ["pyautogen[flaml]==" + __version__],
+        "jupyter-executor": ["pyautogen[jupyter-executor]==" + __version__],
         "retrievechat": ["pyautogen[retrievechat]==" + __version__],
         "retrievechat-pgvector": ["pyautogen[retrievechat-pgvector]==" + __version__],
         "retrievechat-mongodb": ["pyautogen[retrievechat-mongodb]==" + __version__],
         "retrievechat-qdrant": ["pyautogen[retrievechat-qdrant]==" + __version__],
         "graph-rag-falkor-db": ["pyautogen[graph-rag-falkor-db]==" + __version__],
+        "neo4j": ["pyautogen[neo4j]==" + __version__],
+        "twilio": ["pyautogen[twilio]==" + __version__],
+        "interop-crewai": ["pyautogen[interop-crewai]==" + __version__],
+        "interop-langchain": ["pyautogen[interop-langchain]==" + __version__],
+        "interop-pydantic-ai": ["pyautogen[interop-pydantic-ai]==" + __version__],
+        "interop": ["pyautogen[interop]==" + __version__],
         "autobuild": ["pyautogen[autobuild]==" + __version__],
+        "blendsearch": ["pyautogen[blendsearch]==" + __version__],
+        "mathchat": ["pyautogen[mathchat]==" + __version__],
         "captainagent": ["pyautogen[captainagent]==" + __version__],
         "teachable": ["pyautogen[teachable]==" + __version__],
         "lmm": ["pyautogen[lmm]==" + __version__],
@@ -44,8 +54,6 @@ setuptools.setup(
         "redis": ["pyautogen[redis]==" + __version__],
         "cosmosdb": ["pyautogen[cosmosdb]==" + __version__],
         "websockets": ["pyautogen[websockets]==" + __version__],
-        "jupyter-executor": ["pyautogen[jupyter-executor]==" + __version__],
-        "types": ["pyautogen[types]==" + __version__],
         "long-context": ["pyautogen[long-context]==" + __version__],
         "anthropic": ["pyautogen[anthropic]==" + __version__],
         "cerebras": ["pyautogen[cerebras]==" + __version__],
@@ -54,12 +62,12 @@ setuptools.setup(
         "cohere": ["pyautogen[cohere]==" + __version__],
         "ollama": ["pyautogen[ollama]==" + __version__],
         "bedrock": ["pyautogen[bedrock]==" + __version__],
-        "twilio": ["pyautogen[twilio]==" + __version__],
-        "interop-crewai": ["pyautogen[interop-crewai]==" + __version__],
-        "interop-langchain": ["pyautogen[interop-langchain]==" + __version__],
-        "interop-pydantic-ai": ["pyautogen[interop-pydantic-ai]==" + __version__],
-        "interop": ["pyautogen[interop]==" + __version__],
-        "neo4j": ["pyautogen[neo4j]==" + __version__],
+        "test": ["pyautogen[test]==" + __version__],
+        "docs": ["pyautogen[docs]==" + __version__],
+        "types": ["pyautogen[types]==" + __version__],
+        "lint": ["pyautogen[lint]==" + __version__],
+        "dev": ["pyautogen[dev]==" + __version__],
+
     },
     url="https://github.com/ag2ai/ag2",
     author="Chi Wang & Qingyun Wu",

{ag2-0.7.1 → ag2-0.7.2b1}/test/test_browser_utils.py

@@ -15,6 +15,9 @@ from tempfile import TemporaryDirectory
 import pytest
 import requests
 
+from autogen.browser_utils import SimpleTextBrowser
+from autogen.import_utils import optional_import_block
+
 BLOG_POST_URL = "https://docs.ag2.ai/blog/2023-04-21-LLM-tuning-math"
 BLOG_POST_TITLE = "Does Model and Inference Parameter Matter in LLM Applications? - A Case Study for MATH - AG2"
 BLOG_POST_STRING = "Large language models (LLMs) are powerful tools that can generate natural language texts for various applications, such as chatbots, summarization, translation, and more. GPT-4 is currently the state of the art LLM in the world. Is model selection irrelevant? What about inference parameters?"
@@ -33,12 +36,16 @@ BING_QUERY = "Microsoft"
 BING_TITLE = f"{BING_QUERY} - Search"
 BING_STRING = f"A Bing search for '{BING_QUERY}' found"
 
-try:
-    from autogen.browser_utils import SimpleTextBrowser
-except ImportError:
-    skip_all = True
-else:
-    skip_all = False
+
+with optional_import_block() as result:
+    import markdownify  # noqa: F401
+    import pathvalidate  # noqa: F401
+    import requests
+    from bs4 import BeautifulSoup  # noqa: F401
+
+
+skip_all = not result.is_successful
+
 
 try:
     BING_API_KEY = os.environ["BING_API_KEY"]

{ag2-0.7.1 → ag2-0.7.2b1}/test/test_code_utils.py

@@ -30,12 +30,13 @@ from autogen.code_utils import (
     infer_lang,
     is_docker_running,
 )
+from autogen.import_utils import optional_import_block
 
-from .conftest import Credentials, skip_docker
+from .conftest import Credentials
 
 here = os.path.abspath(os.path.dirname(__file__))
 
-if skip_docker or not is_docker_running() or not decide_use_docker(use_docker=None):
+if not is_docker_running() or not decide_use_docker(use_docker=None):
     skip_docker_test = True
 else:
     skip_docker_test = False
@@ -179,6 +180,7 @@ def scrape(url):
     assert len(codeblocks) == 1 and codeblocks[0] == ("", "source setup.sh")
 
 
+@pytest.mark.docker
 @pytest.mark.skipif(skip_docker_test, reason="docker is not running or requested to skip docker tests")
 def test_execute_code(use_docker=True):
     # Test execute code and save the code to a file.
@@ -243,6 +245,7 @@ def test_execute_code(use_docker=True):
             assert isinstance(image, str)
 
 
+@pytest.mark.docker
 @pytest.mark.skipif(skip_docker_test, reason="docker is not running or requested to skip docker tests")
 def test_execute_code_with_custom_filename_on_docker():
     with tempfile.TemporaryDirectory() as tempdir:
@@ -257,6 +260,7 @@ def test_execute_code_with_custom_filename_on_docker():
         assert image == "python:codetest.py"
 
 
+@pytest.mark.docker
 @pytest.mark.skipif(
     skip_docker_test,
     reason="docker is not running or requested to skip docker tests",
@@ -387,9 +391,9 @@ def test_create_virtual_env_with_extra_args():
 
 
 def _test_improve(credentials_all: Credentials):
-    try:
+    with optional_import_block() as result:
         import openai  # noqa: F401
-    except ImportError:
+    if not result.is_successful:
         return
     config_list = credentials_all.config_list
     improved, _ = improve_function(

ag2-0.7.2b1/test/test_conftest.py

@@ -0,0 +1,34 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/ag2ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
+
+
+import pytest
+
+from .conftest import Credentials, credentials_all_llms
+
+
+@pytest.mark.parametrize("credentials_from_test_param", credentials_all_llms, indirect=True)
+def test_credentials_from_test_param_fixture(
+    credentials_from_test_param: Credentials,
+    request: pytest.FixtureRequest,
+) -> None:
+    # Get the parameter name request node
+    current_llm = request.node.callspec.id
+
+    assert current_llm is not None
+    assert isinstance(credentials_from_test_param, Credentials)
+
+    first_config = credentials_from_test_param.config_list[0]
+    if "gpt_4" in current_llm:
+        if "api_type" in first_config:
+            assert first_config["api_type"] == "openai"
+    elif "gemini" in current_llm:
+        assert first_config["api_type"] == "google"
+    elif "anthropic" in current_llm:
+        assert first_config["api_type"] == "anthropic"
+    else:
+        assert False, f"Unknown LLM fixture: {current_llm}"

ag2-0.7.2b1/test/test_import.py

@@ -0,0 +1,84 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/ag2ai
+#
+# SPDX-License-Identifier: Apache-2.0
+
+
+import importlib
+import pkgutil
+import sys
+from collections.abc import Iterator
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Optional
+
+import pytest
+
+
+@contextmanager
+def add_to_sys_path(path: Optional[Path]) -> Iterator[None]:
+    if path is None:
+        yield
+        return
+
+    if not path.exists():
+        raise ValueError(f"Path {path} does not exist")
+
+    sys.path.append(str(path))
+    try:
+        yield
+    finally:
+        sys.path.remove(str(path))
+
+
+def list_submodules(module_name: str, *, include_path: Optional[Path] = None, include_root: bool = True) -> list[str]:
+    """List all submodules of a given module.
+
+    Args:
+        module_name (str): The name of the module to list submodules for.
+        include_path (Optional[Path], optional): The path to the module. Defaults to None.
+        include_root (bool, optional): Whether to include the root module in the list. Defaults to True.
+
+    Returns:
+        list: A list of submodule names.
+    """
+    with add_to_sys_path(include_path):
+        try:
+            module = importlib.import_module(module_name)  # nosemgrep
+        except Exception:
+            return []
+
+        # Get the path of the module. This is necessary to find its submodules.
+        module_path = module.__path__
+
+        # Initialize an empty list to store the names of submodules
+        submodules = [module_name] if include_root else []
+
+        # Iterate over the submodules in the module's path
+        for _, name, ispkg in pkgutil.iter_modules(module_path, prefix=f"{module_name}."):
+            # Add the name of each submodule to the list
+            submodules.append(name)
+
+            if ispkg:
+                submodules.extend(list_submodules(name, include_root=False))
+
+        # Return the list of submodule names
+        return submodules
+
+
+def test_list_submodules() -> None:
+    # Specify the name of the module you want to inspect
+    module_name = "autogen"
+
+    # Get the list of submodules for the specified module
+    submodules = list_submodules(module_name)
+
+    assert len(submodules) > 0
+    assert "autogen" in submodules
+    assert "autogen.io" in submodules
+    assert "autogen.coding.jupyter" in submodules
+
+
+# todo: we should always run this
+@pytest.mark.parametrize("module", list_submodules("autogen"))
+def test_submodules(module: str) -> None:
+    importlib.import_module(module)  # nosemgrep

ag2-0.7.2b1/test/test_import_utils.py

@@ -0,0 +1,171 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/ag2ai
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from typing import Any, Type
+
+import pytest
+
+from autogen.import_utils import optional_import_block, require_optional_import
+
+
+class TestOptionalImportBlock:
+    def test_optional_import_block(self) -> None:
+        with optional_import_block():
+            import ast
+
+            import some_module
+            import some_other_module
+
+        assert ast is not None
+        with pytest.raises(
+            UnboundLocalError,
+            match=r"(local variable 'some_module' referenced before assignment|cannot access local variable 'some_module' where it is not associated with a value)",
+        ):
+            some_module
+
+        with pytest.raises(
+            UnboundLocalError,
+            match=r"(local variable 'some_other_module' referenced before assignment|cannot access local variable 'some_other_module' where it is not associated with a value)",
+        ):
+            some_other_module
+
+
+class TestRequiresOptionalImportCallables:
+    def test_function_attributes(self) -> None:
+        def dummy_function() -> None:
+            """Dummy function to test requires_optional_import"""
+            pass
+
+        dummy_function.__module__ = "some_random_module.dummy_stuff"
+
+        actual = require_optional_import("some_optional_module", "optional_dep")(dummy_function)
+
+        assert actual is not None
+        assert actual.__module__ == "some_random_module.dummy_stuff"
+        assert actual.__name__ == "dummy_function"
+        assert actual.__doc__ == "Dummy function to test requires_optional_import"
+
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for some_random_module.dummy_stuff.dummy_function is missing, please install it using 'pip install ag2\[optional_dep\]'",
+        ):
+            actual()
+
+    def test_function_call(self) -> None:
+        @require_optional_import("some_optional_module", "optional_dep")
+        def dummy_function() -> None:
+            """Dummy function to test requires_optional_import"""
+            pass
+
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for test.test_import_utils.dummy_function is missing, please install it using 'pip install ag2\[optional_dep\]'",
+        ):
+            dummy_function()
+
+    def test_method_attributes(self) -> None:
+        class DummyClass:
+            def dummy_method(self) -> None:
+                """Dummy method to test requires_optional_import"""
+                pass
+
+        assert hasattr(DummyClass.dummy_method, "__module__")
+        assert DummyClass.dummy_method.__module__ == "test.test_import_utils"
+
+        DummyClass.__module__ = "some_random_module.dummy_stuff"
+        DummyClass.dummy_method.__module__ = "some_random_module.dummy_stuff"
+
+        DummyClass.dummy_method = require_optional_import("some_optional_module", "optional_dep")(  # type: ignore[method-assign]
+            DummyClass.dummy_method
+        )
+
+        assert DummyClass.dummy_method is not None
+        assert DummyClass.dummy_method.__module__ == "some_random_module.dummy_stuff"
+        assert DummyClass.dummy_method.__name__ == "dummy_method"
+        assert DummyClass.dummy_method.__doc__ == "Dummy method to test requires_optional_import"
+
+        dummy = DummyClass()
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for some_random_module.dummy_stuff.dummy_method is missing, please install it using 'pip install ag2\[optional_dep\]",
+        ):
+            dummy.dummy_method()
+
+    def test_method_call(self) -> None:
+        class DummyClass:
+            @require_optional_import("some_optional_module", "optional_dep")
+            def dummy_method(self) -> None:
+                """Dummy method to test requires_optional_import"""
+                pass
+
+        dummy = DummyClass()
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for test.test_import_utils.dummy_method is missing, please install it using 'pip install ag2\[optional_dep\]'",
+        ):
+            dummy.dummy_method()
+
+    def test_static_call(self) -> None:
+        class DummyClass:
+            @require_optional_import("some_optional_module", "optional_dep")
+            @staticmethod
+            def dummy_static_function() -> None:
+                """Dummy static function to test requires_optional_import"""
+                pass
+
+        dummy = DummyClass()
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for test.test_import_utils.dummy_static_function is missing, please install it using 'pip install ag2\[optional_dep\]'",
+        ):
+            dummy.dummy_static_function()
+
+    def test_property_call(self) -> None:
+        class DummyClass:
+            @property
+            @require_optional_import("some_optional_module", "optional_dep")
+            def dummy_property(self) -> int:
+                """Dummy property to test requires_optional_import"""
+                return 4
+
+        dummy = DummyClass()
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for test.test_import_utils.dummy_property is missing, please install it using 'pip install ag2\[optional_dep\]'",
+        ):
+            dummy.dummy_property
+
+
+class TestRequiresOptionalImportClasses:
+    @pytest.fixture
+    def dummy_cls(self) -> Type[Any]:
+        @require_optional_import("some_optional_module", "optional_dep")
+        class DummyClass:
+            def dummy_method(self) -> None:
+                """Dummy method to test requires_optional_import"""
+                pass
+
+            @staticmethod
+            def dummy_static_method() -> None:
+                """Dummy static method to test requires_optional_import"""
+                pass
+
+            @classmethod
+            def dummy_class_method(cls) -> None:
+                """Dummy class method to test requires_optional_import"""
+                pass
+
+            @property
+            def dummy_property(self) -> int:
+                """Dummy property to test requires_optional_import"""
+                return 4
+
+        return DummyClass
+
+    def test_class_init_call(self, dummy_cls: Type[Any]) -> None:
+        with pytest.raises(
+            ImportError,
+            match=r"Module 'some_optional_module' needed for __init__ is missing, please install it using 'pip install ag2\[optional_dep\]'",
+        ):
+            dummy_cls()

{ag2-0.7.1 → ag2-0.7.2b1}/test/test_notebook.py

@@ -11,12 +11,12 @@ import sys
 
 import pytest
 
-try:
+from autogen.import_utils import optional_import_block
+
+with optional_import_block() as result:
     import openai  # noqa: F401
-except ImportError:
-    skip = True
-else:
-    skip = False
+
+skip = not result.is_successful
 
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -24,7 +24,7 @@ here = os.path.abspath(os.path.dirname(__file__))
 
 def run_notebook(input_nb, output_nb="executed_openai_notebook.ipynb", save=False):
     import nbformat
-    from nbconvert.preprocessors import CellExecutionError, ExecutePreprocessor
+    from nbconvert.preprocessors import ExecutePreprocessor
 
     try:
         nb_loc = os.path.join(here, os.pardir, "notebook")
@@ -44,8 +44,6 @@ def run_notebook(input_nb, output_nb="executed_openai_notebook.ipynb", save=Fals
                             nb_output_file.write(output["text"].strip() + "\n")
                         elif "data" in output and "text/plain" in output["data"]:
                             nb_output_file.write(output["data"]["text/plain"].strip() + "\n")
-    except CellExecutionError:
-        raise
     finally:
         if save:
             with open(os.path.join(here, output_nb), "w", encoding="utf-8") as nb_executed_file:

{ag2-0.7.1 → ag2-0.7.2b1}/test/test_retrieve_utils.py

@@ -8,34 +8,36 @@
 
 """Unit test for retrieve_utils.py"""
 
+import os
+
 import pytest
 
-try:
+from autogen.import_utils import optional_import_block
+from autogen.retrieve_utils import (
+    create_vector_db_from_dir,
+    extract_text_from_pdf,
+    get_files_from_dir,
+    is_url,
+    parse_html_to_markdown,
+    query_vector_db,
+    split_files_to_chunks,
+    split_text_to_chunks,
+)
+from autogen.token_count_utils import count_token
+
+with optional_import_block() as result:
+    import bs4  # noqa: F401
     import chromadb
+    import markdownify  # noqa: F401
+    import pypdf  # noqa: F401
 
-    from autogen.retrieve_utils import (
-        create_vector_db_from_dir,
-        extract_text_from_pdf,
-        get_files_from_dir,
-        is_url,
-        parse_html_to_markdown,
-        query_vector_db,
-        split_files_to_chunks,
-        split_text_to_chunks,
-    )
-    from autogen.token_count_utils import count_token
-except ImportError:
-    skip = True
-else:
-    skip = False
-import os
 
-try:
+skip = not result.is_successful
+
+with optional_import_block() as result:
     from unstructured.partition.auto import partition  # noqa: F401
 
-    HAS_UNSTRUCTURED = True
-except ImportError:
-    HAS_UNSTRUCTURED = False
+HAS_UNSTRUCTURED = result.is_successful
 
 test_dir = os.path.join(os.path.dirname(__file__), "test_files")
 expected_text = """AutoGen is an advanced tool designed to assist developers in harnessing the capabilities
@@ -136,9 +138,9 @@ class TestRetrieveUtils:
         assert isinstance(results, dict) and any("autogen" in res[0].lower() for res in results.get("documents", []))
 
     def test_custom_vector_db(self):
-        try:
+        with optional_import_block() as result:
             import lancedb
-        except ImportError:
+        if not result.is_successful:
             return
         from autogen.agentchat.contrib.retrieve_user_proxy_agent import RetrieveUserProxyAgent
 

{ag2-0.7.1 → ag2-0.7.2b1}/test/test_token_count.py

@@ -8,12 +8,12 @@
 
 import pytest
 
-try:
-    from autogen.agentchat.contrib.img_utils import num_tokens_from_gpt_image  # noqa: F401
+from autogen.import_utils import optional_import_block
 
-    img_util_imported = True
-except ImportError:
-    img_util_imported = False
+with optional_import_block() as result:
+    from PIL import Image  # noqa: F401
+
+img_util_imported = result.is_successful
 
 
 from autogen.token_count_utils import (

ag2-0.7.1/ag2.egg-info/requires.txt

@@ -1,106 +0,0 @@
-pyautogen==0.7.1
-
-[anthropic]
-pyautogen[anthropic]==0.7.1
-
-[autobuild]
-pyautogen[autobuild]==0.7.1
-
-[bedrock]
-pyautogen[bedrock]==0.7.1
-
-[blendsearch]
-pyautogen[blendsearch]==0.7.1
-
-[captainagent]
-pyautogen[captainagent]==0.7.1
-
-[cerebras]
-pyautogen[cerebras]==0.7.1
-
-[cohere]
-pyautogen[cohere]==0.7.1
-
-[cosmosdb]
-pyautogen[cosmosdb]==0.7.1
-
-[gemini]
-pyautogen[gemini]==0.7.1
-
-[graph]
-pyautogen[graph]==0.7.1
-
-[graph-rag-falkor-db]
-pyautogen[graph-rag-falkor-db]==0.7.1
-
-[groq]
-pyautogen[groq]==0.7.1
-
-[interop]
-pyautogen[interop]==0.7.1
-
-[interop-crewai]
-pyautogen[interop-crewai]==0.7.1
-
-[interop-langchain]
-pyautogen[interop-langchain]==0.7.1
-
-[interop-pydantic-ai]
-pyautogen[interop-pydantic-ai]==0.7.1
-
-[jupyter-executor]
-pyautogen[jupyter-executor]==0.7.1
-
-[lmm]
-pyautogen[lmm]==0.7.1
-
-[long-context]
-pyautogen[long-context]==0.7.1
-
-[mathchat]
-pyautogen[mathchat]==0.7.1
-
-[mistral]
-pyautogen[mistral]==0.7.1
-
-[neo4j]
-pyautogen[neo4j]==0.7.1
-
-[ollama]
-pyautogen[ollama]==0.7.1
-
-[redis]
-pyautogen[redis]==0.7.1
-
-[retrievechat]
-pyautogen[retrievechat]==0.7.1
-
-[retrievechat-mongodb]
-pyautogen[retrievechat-mongodb]==0.7.1
-
-[retrievechat-pgvector]
-pyautogen[retrievechat-pgvector]==0.7.1
-
-[retrievechat-qdrant]
-pyautogen[retrievechat-qdrant]==0.7.1
-
-[teachable]
-pyautogen[teachable]==0.7.1
-
-[test]
-pyautogen[test]==0.7.1
-
-[together]
-pyautogen[together]==0.7.1
-
-[twilio]
-pyautogen[twilio]==0.7.1
-
-[types]
-pyautogen[types]==0.7.1
-
-[websockets]
-pyautogen[websockets]==0.7.1
-
-[websurfer]
-pyautogen[websurfer]==0.7.1