ag2 0.8.2rc0__tar.gz → 0.8.3__tar.gz

{ag2-0.8.2rc0/ag2.egg-info → ag2-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ag2
-Version: 0.8.2rc0
+Version: 0.8.3
 Summary: Alias package for pyautogen
 Home-page: https://github.com/ag2ai/ag2
 Author: Chi Wang & Qingyun Wu
@@ -161,13 +161,13 @@ You can use the sample file `OAI_CONFIG_LIST_sample` as a template.
 Create a script or a Jupyter Notebook and run your first agent.
 
 ```python
-from autogen import AssistantAgent, UserProxyAgent, config_list_from_json
+from autogen import AssistantAgent, UserProxyAgent, LLMConfig
+
+llm_config = LLMConfig.from_json(path="OAI_CONFIG_LIST")
 
-llm_config = {
-    "config_list": config_list_from_json(env_or_file="OAI_CONFIG_LIST")
-}
 
-assistant = AssistantAgent("assistant", llm_config=llm_config)
+with llm_config:
+    assistant = AssistantAgent("assistant")
 user_proxy = UserProxyAgent("user_proxy", code_execution_config={"work_dir": "coding", "use_docker": False})
 user_proxy.initiate_chat(assistant, message="Plot a chart of NVDA and TESLA stock price change YTD.")
 # This initiates an automated chat between the two agents to solve the task
@@ -198,19 +198,18 @@ It serves as a base class for all agents in AG2.
 ```python
 from autogen import ConversableAgent
 
-# Create an AI agent
-assistant = ConversableAgent(
-    name="assistant",
-    system_message="You are an assistant that responds concisely.",
-    llm_config=llm_config
-)
+with llm_config:
+  # Create an AI agent
+  assistant = ConversableAgent(
+      name="assistant",
+      system_message="You are an assistant that responds concisely.",
+  )
 
-# Create another AI agent
-fact_checker = ConversableAgent(
-    name="fact_checker",
-    system_message="You are a fact-checking assistant.",
-    llm_config=llm_config
-)
+  # Create another AI agent
+  fact_checker = ConversableAgent(
+      name="fact_checker",
+      system_message="You are a fact-checking assistant.",
+  )
 
 # Start the conversation
 assistant.initiate_chat(
@@ -234,11 +233,11 @@ We created a class which sets the `human_input_mode` to `ALWAYS` for you. Its ca
 from autogen import ConversableAgent
 
 # Create an AI agent
-assistant = ConversableAgent(
-    name="assistant",
-    system_message="You are a helpful assistant.",
-    llm_config=llm_config
-)
+with llm_config:
+  assistant = ConversableAgent(
+      name="assistant",
+      system_message="You are a helpful assistant.",
+  )
 
 # Create a human agent with manual input mode
 human = ConversableAgent(
@@ -304,11 +303,11 @@ def get_weekday(date_string: Annotated[str, "Format: YYYY-MM-DD"]) -> str:
     return date.strftime("%A")
 
 # 2. Agent for determining whether to run the tool
-date_agent = ConversableAgent(
-    name="date_agent",
-    system_message="You get the day of the week for a given date.",
-    llm_config=llm_config,
-)
+with llm_config:
+  date_agent = ConversableAgent(
+      name="date_agent",
+      system_message="You get the day of the week for a given date.",
+  )
 
 # 3. And an agent for executing the tool
 executor_agent = ConversableAgent(

{ag2-0.8.2rc0 → ag2-0.8.3}/README.md

@@ -93,13 +93,13 @@ You can use the sample file `OAI_CONFIG_LIST_sample` as a template.
 Create a script or a Jupyter Notebook and run your first agent.
 
 ```python
-from autogen import AssistantAgent, UserProxyAgent, config_list_from_json
+from autogen import AssistantAgent, UserProxyAgent, LLMConfig
+
+llm_config = LLMConfig.from_json(path="OAI_CONFIG_LIST")
 
-llm_config = {
-    "config_list": config_list_from_json(env_or_file="OAI_CONFIG_LIST")
-}
 
-assistant = AssistantAgent("assistant", llm_config=llm_config)
+with llm_config:
+    assistant = AssistantAgent("assistant")
 user_proxy = UserProxyAgent("user_proxy", code_execution_config={"work_dir": "coding", "use_docker": False})
 user_proxy.initiate_chat(assistant, message="Plot a chart of NVDA and TESLA stock price change YTD.")
 # This initiates an automated chat between the two agents to solve the task
@@ -130,19 +130,18 @@ It serves as a base class for all agents in AG2.
 ```python
 from autogen import ConversableAgent
 
-# Create an AI agent
-assistant = ConversableAgent(
-    name="assistant",
-    system_message="You are an assistant that responds concisely.",
-    llm_config=llm_config
-)
+with llm_config:
+  # Create an AI agent
+  assistant = ConversableAgent(
+      name="assistant",
+      system_message="You are an assistant that responds concisely.",
+  )
 
-# Create another AI agent
-fact_checker = ConversableAgent(
-    name="fact_checker",
-    system_message="You are a fact-checking assistant.",
-    llm_config=llm_config
-)
+  # Create another AI agent
+  fact_checker = ConversableAgent(
+      name="fact_checker",
+      system_message="You are a fact-checking assistant.",
+  )
 
 # Start the conversation
 assistant.initiate_chat(
@@ -166,11 +165,11 @@ We created a class which sets the `human_input_mode` to `ALWAYS` for you. Its ca
 from autogen import ConversableAgent
 
 # Create an AI agent
-assistant = ConversableAgent(
-    name="assistant",
-    system_message="You are a helpful assistant.",
-    llm_config=llm_config
-)
+with llm_config:
+  assistant = ConversableAgent(
+      name="assistant",
+      system_message="You are a helpful assistant.",
+  )
 
 # Create a human agent with manual input mode
 human = ConversableAgent(
@@ -236,11 +235,11 @@ def get_weekday(date_string: Annotated[str, "Format: YYYY-MM-DD"]) -> str:
     return date.strftime("%A")
 
 # 2. Agent for determining whether to run the tool
-date_agent = ConversableAgent(
-    name="date_agent",
-    system_message="You get the day of the week for a given date.",
-    llm_config=llm_config,
-)
+with llm_config:
+  date_agent = ConversableAgent(
+      name="date_agent",
+      system_message="You get the day of the week for a given date.",
+  )
 
 # 3. And an agent for executing the tool
 executor_agent = ConversableAgent(

{ag2-0.8.2rc0 → ag2-0.8.3/ag2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ag2
-Version: 0.8.2rc0
+Version: 0.8.3
 Summary: Alias package for pyautogen
 Home-page: https://github.com/ag2ai/ag2
 Author: Chi Wang & Qingyun Wu
@@ -161,13 +161,13 @@ You can use the sample file `OAI_CONFIG_LIST_sample` as a template.
 Create a script or a Jupyter Notebook and run your first agent.
 
 ```python
-from autogen import AssistantAgent, UserProxyAgent, config_list_from_json
+from autogen import AssistantAgent, UserProxyAgent, LLMConfig
+
+llm_config = LLMConfig.from_json(path="OAI_CONFIG_LIST")
 
-llm_config = {
-    "config_list": config_list_from_json(env_or_file="OAI_CONFIG_LIST")
-}
 
-assistant = AssistantAgent("assistant", llm_config=llm_config)
+with llm_config:
+    assistant = AssistantAgent("assistant")
 user_proxy = UserProxyAgent("user_proxy", code_execution_config={"work_dir": "coding", "use_docker": False})
 user_proxy.initiate_chat(assistant, message="Plot a chart of NVDA and TESLA stock price change YTD.")
 # This initiates an automated chat between the two agents to solve the task
@@ -198,19 +198,18 @@ It serves as a base class for all agents in AG2.
 ```python
 from autogen import ConversableAgent
 
-# Create an AI agent
-assistant = ConversableAgent(
-    name="assistant",
-    system_message="You are an assistant that responds concisely.",
-    llm_config=llm_config
-)
+with llm_config:
+  # Create an AI agent
+  assistant = ConversableAgent(
+      name="assistant",
+      system_message="You are an assistant that responds concisely.",
+  )
 
-# Create another AI agent
-fact_checker = ConversableAgent(
-    name="fact_checker",
-    system_message="You are a fact-checking assistant.",
-    llm_config=llm_config
-)
+  # Create another AI agent
+  fact_checker = ConversableAgent(
+      name="fact_checker",
+      system_message="You are a fact-checking assistant.",
+  )
 
 # Start the conversation
 assistant.initiate_chat(
@@ -234,11 +233,11 @@ We created a class which sets the `human_input_mode` to `ALWAYS` for you. Its ca
 from autogen import ConversableAgent
 
 # Create an AI agent
-assistant = ConversableAgent(
-    name="assistant",
-    system_message="You are a helpful assistant.",
-    llm_config=llm_config
-)
+with llm_config:
+  assistant = ConversableAgent(
+      name="assistant",
+      system_message="You are a helpful assistant.",
+  )
 
 # Create a human agent with manual input mode
 human = ConversableAgent(
@@ -304,11 +303,11 @@ def get_weekday(date_string: Annotated[str, "Format: YYYY-MM-DD"]) -> str:
     return date.strftime("%A")
 
 # 2. Agent for determining whether to run the tool
-date_agent = ConversableAgent(
-    name="date_agent",
-    system_message="You get the day of the week for a given date.",
-    llm_config=llm_config,
-)
+with llm_config:
+  date_agent = ConversableAgent(
+      name="date_agent",
+      system_message="You get the day of the week for a given date.",
+  )
 
 # 3. And an agent for executing the tool
 executor_agent = ConversableAgent(

{ag2-0.8.2rc0 → ag2-0.8.3}/ag2.egg-info/SOURCES.txt

@@ -14,6 +14,8 @@ test/test_conftest.py
 test/test_graph_utils.py
 test/test_import.py
 test/test_import_utils.py
+test/test_json_utils.py
+test/test_llm_config.py
 test/test_logging.py
 test/test_notebook.py
 test/test_retrieve_utils.py

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

@@ -0,0 +1,154 @@
+pyautogen==0.8.3
+
+[anthropic]
+pyautogen[anthropic]==0.8.3
+
+[autobuild]
+pyautogen[autobuild]==0.8.3
+
+[bedrock]
+pyautogen[bedrock]==0.8.3
+
+[blendsearch]
+pyautogen[blendsearch]==0.8.3
+
+[browser-use]
+pyautogen[browser-use]==0.8.3
+
+[captainagent]
+pyautogen[captainagent]==0.8.3
+
+[cerebras]
+pyautogen[cerebras]==0.8.3
+
+[cohere]
+pyautogen[cohere]==0.8.3
+
+[commsagent-discord]
+pyautogen[commsagent-discord]==0.8.3
+
+[commsagent-slack]
+pyautogen[commsagent-slack]==0.8.3
+
+[commsagent-telegram]
+pyautogen[commsagent-telegram]==0.8.3
+
+[cosmosdb]
+pyautogen[cosmosdb]==0.8.3
+
+[crawl4ai]
+pyautogen[crawl4ai]==0.8.3
+
+[deepseek]
+pyautogen[deepseek]==0.8.3
+
+[dev]
+pyautogen[dev]==0.8.3
+
+[docs]
+pyautogen[docs]==0.8.3
+
+[flaml]
+pyautogen[flaml]==0.8.3
+
+[gemini]
+pyautogen[gemini]==0.8.3
+
+[gemini-realtime]
+pyautogen[gemini-realtime]==0.8.3
+
+[google-search]
+pyautogen[google-search]==0.8.3
+
+[graph]
+pyautogen[graph]==0.8.3
+
+[graph-rag-falkor-db]
+pyautogen[graph-rag-falkor-db]==0.8.3
+
+[groq]
+pyautogen[groq]==0.8.3
+
+[interop]
+pyautogen[interop]==0.8.3
+
+[interop-crewai]
+pyautogen[interop-crewai]==0.8.3
+
+[interop-langchain]
+pyautogen[interop-langchain]==0.8.3
+
+[interop-pydantic-ai]
+pyautogen[interop-pydantic-ai]==0.8.3
+
+[jupyter-executor]
+pyautogen[jupyter-executor]==0.8.3
+
+[lint]
+pyautogen[lint]==0.8.3
+
+[lmm]
+pyautogen[lmm]==0.8.3
+
+[long-context]
+pyautogen[long-context]==0.8.3
+
+[mathchat]
+pyautogen[mathchat]==0.8.3
+
+[mistral]
+pyautogen[mistral]==0.8.3
+
+[neo4j]
+pyautogen[neo4j]==0.8.3
+
+[ollama]
+pyautogen[ollama]==0.8.3
+
+[openai]
+pyautogen[openai]==0.8.3
+
+[openai-realtime]
+pyautogen[openai-realtime]==0.8.3
+
+[rag]
+pyautogen[rag]==0.8.3
+
+[redis]
+pyautogen[redis]==0.8.3
+
+[retrievechat]
+pyautogen[retrievechat]==0.8.3
+
+[retrievechat-couchbase]
+pyautogen[retrievechat-couchbase]==0.8.3
+
+[retrievechat-mongodb]
+pyautogen[retrievechat-mongodb]==0.8.3
+
+[retrievechat-pgvector]
+pyautogen[retrievechat-pgvector]==0.8.3
+
+[retrievechat-qdrant]
+pyautogen[retrievechat-qdrant]==0.8.3
+
+[teachable]
+pyautogen[teachable]==0.8.3
+
+[test]
+pyautogen[test]==0.8.3
+
+[together]
+pyautogen[together]==0.8.3
+
+[twilio]
+pyautogen[twilio]==0.8.3
+
+[types]
+pyautogen[types]==0.8.3
+
+[websockets]
+pyautogen[websockets]==0.8.3
+
+[websurfer]
+pyautogen[websurfer]==0.8.3

{ag2-0.8.2rc0 → ag2-0.8.3}/pyproject.toml

@@ -163,9 +163,8 @@ google-search = [
 
 neo4j = [
     "docx2txt==0.8",
-    "llama-index==0.12.22",
+    "llama-index>=0.12,<1",
     "llama-index-graph-stores-neo4j==0.4.6",
-    "llama-index-core==0.12.22",
     "llama-index-readers-web==0.3.7",
 ]
 
@@ -201,7 +200,6 @@ gemini = [
     "google-auth",
     "pillow",
     "jsonschema",
-    "jsonref>=1,<2",
 ]
 
 gemini-realtime = [
@@ -220,7 +218,7 @@ cerebras = ["cerebras_cloud_sdk>=1.0.0"]
 mistral = ["mistralai>=1.0.1"]
 groq = ["groq>=0.9.0"]
 cohere = ["cohere>=5.13.5"]
-ollama = ["ollama>=0.4.5", "fix_busted_json>=0.0.18"]
+ollama = ["ollama>=0.4.7", "fix_busted_json>=0.0.18"]
 bedrock = ["boto3>=1.34.149"]
 deepseek = ["pyautogen[openai]"]
 
@@ -238,17 +236,18 @@ test = [
     "pytest-cov==6.0.0",
     "pytest-asyncio==0.25.3",
     "pytest==8.3.5",
-    "mock==5.1.0",
+    "mock==5.2.0",
     "pandas==2.2.3",
     "fastapi==0.115.11",
     "dirty-equals==0.9.0",
 ]
 
 docs = [
-    "mkdocs-material==9.6.7",
-    "mkdocstrings[python]==0.28.2",
+    "mkdocs-material==9.6.9",
+    "mkdocstrings[python]==0.29.0",
     "mkdocs-literate-nav==0.6.1",
     "mdx-include==1.4.2",
+    # currently problematic and cannot be upgraded
     "mkdocs-git-revision-date-localized-plugin==1.3.0",
     "mike==2.1.3",
     "typer==0.15.2",
@@ -259,7 +258,7 @@ docs = [
     "pillow",  # required for mkdocs-glightbo
     "cairosvg",  # required for mkdocs-glightbo
     "pdoc3==0.11.5",
-    "jinja2==3.1.5",
+    "jinja2==3.1.6",
     "pyyaml==6.0.2",
     "termcolor==2.5.0",
     "nbclient==0.10.2",
@@ -281,7 +280,7 @@ dev = [
     "pyautogen[lint,test,types,docs]",
     "pre-commit==4.1.0",
     "detect-secrets==1.5.0",
-    "uv==0.6.4",
+    "uv==0.6.6",
 ]
 
 
@@ -436,6 +435,7 @@ convention = "google"
 [tool.mypy]
 files = [
     "autogen/agentchat/agent.py",
+#    "autogen/agentchat/cenversable_agent.py",
     "autogen/agentchat/contrib/rag",
     "autogen/agentchat/contrib/graph_rag",
     "autogen/agentchat/contrib/swarm_agent.py",
@@ -448,6 +448,8 @@ files = [
     "autogen/import_utils.py",
     "autogen/interop",
     "autogen/io",
+    "autogen/json_utils.py",
+    "autogen/llm_config.py",
     "autogen/logger",
     "autogen/messages",
     "autogen/oai/oai_models",
@@ -464,6 +466,8 @@ files = [
 #    "test/fast_depends",
     "test/interop",
     "test/io",
+    "test/test_json_utils.py",
+    "test/test_llm_config.py",
     "test/messages",
     "test/test_import_utils.py",
     "test/test_import.py",

ag2-0.8.3/test/test_json_utils.py

@@ -0,0 +1,48 @@
+# Copyright (c) 2023 - 2025, AG2ai, Inc., AG2ai open-source projects maintainers and core contributors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import pytest
+from jsonschema.exceptions import _RefResolutionError
+
+from autogen.json_utils import resolve_json_references  # Replace 'your_module' with the actual module name
+
+
+def test_resolve_json_references_no_refs() -> None:
+    schema = {"type": "object", "properties": {"name": {"type": "string"}, "age": {"type": "integer"}}}
+    resolved_schema = resolve_json_references(schema)
+    assert resolved_schema == schema
+
+
+def test_resolve_json_references_with_refs() -> None:
+    schema = {
+        "type": "object",
+        "properties": {"name": {"type": "string"}, "address": {"$ref": "#/definitions/address"}},
+        "definitions": {
+            "address": {"type": "object", "properties": {"street": {"type": "string"}, "city": {"type": "string"}}}
+        },
+    }
+    expected_resolved_schema = {
+        "type": "object",
+        "properties": {
+            "name": {"type": "string"},
+            "address": {"type": "object", "properties": {"street": {"type": "string"}, "city": {"type": "string"}}},
+        },
+        "definitions": {
+            "address": {"type": "object", "properties": {"street": {"type": "string"}, "city": {"type": "string"}}}
+        },
+    }
+    resolved_schema = resolve_json_references(schema)
+    assert resolved_schema == expected_resolved_schema
+
+
+def test_resolve_json_references_invalid_ref() -> None:
+    schema = {
+        "type": "object",
+        "properties": {"name": {"type": "string"}, "address": {"$ref": "#/definitions/non_existent"}},
+        "definitions": {
+            "address": {"type": "object", "properties": {"street": {"type": "string"}, "city": {"type": "string"}}}
+        },
+    }
+    with pytest.raises(_RefResolutionError, match="Unresolvable JSON pointer: 'definitions/non_existent'"):
+        resolve_json_references(schema)