Skip to content

A programming framework for agentic AI

Remove extract_markdown_code_blocks from core API (#4554)

Jack Gerritse615059345f4
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 7feccb14d..77a3581f7 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
@@ -1,13 +1,25 @@
+import re
from typing import List, Sequence
from autogen_core import CancellationToken
-from autogen_core.components.code_executor import CodeBlock, CodeExecutor, extract_markdown_code_blocks
+from autogen_core.components.code_executor import CodeBlock, CodeExecutor
from ..base import Response
from ..messages import ChatMessage, TextMessage
from ._base_chat_agent import BaseChatAgent
+def _extract_markdown_code_blocks(markdown_text: str) -> List[CodeBlock]:
+ pattern = re.compile(r"```(?:\s*([\w\+\-]+))?\n([\s\S]*?)```")
+ matches = pattern.findall(markdown_text)
+ code_blocks: List[CodeBlock] = []
+ for match in matches:
+ language = match[0].strip() if match[0] else ""
+ code_content = match[1]
+ code_blocks.append(CodeBlock(code=code_content, language=language))
+ return code_blocks
+
+
class CodeExecutorAgent(BaseChatAgent):
"""An agent that extracts and executes code snippets found in received messages and returns the output.
@@ -77,7 +89,7 @@ class CodeExecutorAgent(BaseChatAgent):
code_blocks: List[CodeBlock] = []
for msg in messages:
if isinstance(msg, TextMessage):
- code_blocks.extend(extract_markdown_code_blocks(msg.content))
+ code_blocks.extend(_extract_markdown_code_blocks(msg.content))
if code_blocks:
# Execute the code blocks.
result = await self._code_executor.execute_code_blocks(code_blocks, cancellation_token=cancellation_token)
diff --git a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/quickstart.ipynb b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/quickstart.ipynb
index 4f6c5511b..a0d781b80 100644
--- a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/quickstart.ipynb
+++ b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/quickstart.ipynb
@@ -27,15 +27,16 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": null,
"metadata": {},
"outputs": [],
"source": [
+ "import re\n",
"from dataclasses import dataclass\n",
"from typing import List\n",
"\n",
"from autogen_core import DefaultTopicId, MessageContext, RoutedAgent, default_subscription, message_handler\n",
- "from autogen_core.components.code_executor import CodeExecutor, extract_markdown_code_blocks\n",
+ "from autogen_core.components.code_executor import CodeBlock, CodeExecutor\n",
"from autogen_core.components.models import (\n",
" AssistantMessage,\n",
" ChatCompletionClient,\n",
@@ -71,6 +72,17 @@
" await self.publish_message(Message(content=result.content), DefaultTopicId()) # type: ignore\n",
"\n",
"\n",
+ "def extract_markdown_code_blocks(markdown_text: str) -> List[CodeBlock]:\n",
+ " pattern = re.compile(r\"```(?:\\s*([\\w\\+\\-]+))?\\n([\\s\\S]*?)```\")\n",
+ " matches = pattern.findall(markdown_text)\n",
+ " code_blocks: List[CodeBlock] = []\n",
+ " for match in matches:\n",
+ " language = match[0].strip() if match[0] else \"\"\n",
+ " code_content = match[1]\n",
+ " code_blocks.append(CodeBlock(code=code_content, language=language))\n",
+ " return code_blocks\n",
+ "\n",
+ "\n",
"@default_subscription\n",
"class Executor(RoutedAgent):\n",
" def __init__(self, code_executor: CodeExecutor) -> None:\n",
diff --git a/python/packages/autogen-core/src/autogen_core/components/code_executor/__init__.py b/python/packages/autogen-core/src/autogen_core/components/code_executor/__init__.py
index c09ee8b79..805b718ff 100644
--- a/python/packages/autogen-core/src/autogen_core/components/code_executor/__init__.py
+++ b/python/packages/autogen-core/src/autogen_core/components/code_executor/__init__.py
@@ -12,7 +12,6 @@ from ._func_with_reqs import (
from ._impl.command_line_code_result import CommandLineCodeResult
from ._impl.local_commandline_code_executor import LocalCommandLineCodeExecutor
from ._impl.utils import get_file_name_from_content, get_required_packages, lang_to_cmd, silence_pip
-from ._utils import extract_markdown_code_blocks
__all__ = [
"LocalCommandLineCodeExecutor",
@@ -27,7 +26,6 @@ __all__ = [
"FunctionWithRequirementsStr",
"with_requirements",
"to_stub",
- "extract_markdown_code_blocks",
"get_required_packages",
"build_python_functions_file",
"get_required_packages",
diff --git a/python/packages/autogen-core/src/autogen_core/components/code_executor/_utils.py b/python/packages/autogen-core/src/autogen_core/components/code_executor/_utils.py
deleted file mode 100644
index dd10e73c7..000000000
--- a/python/packages/autogen-core/src/autogen_core/components/code_executor/_utils.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import re
-from typing import List
-
-from . import CodeBlock
-
-
-def extract_markdown_code_blocks(markdown_text: str) -> List[CodeBlock]:
- pattern = re.compile(r"```(?:\s*([\w\+\-]+))?\n([\s\S]*?)```")
- matches = pattern.findall(markdown_text)
- code_blocks: List[CodeBlock] = []
- for match in matches:
- language = match[0].strip() if match[0] else ""
- code_content = match[1]
- code_blocks.append(CodeBlock(code=code_content, language=language))
- return code_blocks
diff --git a/python/packages/autogen-core/tests/execution/test_extract_code_blocks.py b/python/packages/autogen-core/tests/execution/test_extract_code_blocks.py
deleted file mode 100644
index c955a2dda..000000000
--- a/python/packages/autogen-core/tests/execution/test_extract_code_blocks.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from autogen_core.components.code_executor import extract_markdown_code_blocks
-
-
-def test_extract_markdown_code_blocks() -> None:
- text = """# This is a markdown text
-```python
-print("Hello World")
-```
-"""
-
- code_blocks = extract_markdown_code_blocks(text)
-
- assert len(code_blocks) == 1
- assert code_blocks[0].language == "python"
- assert code_blocks[0].code == 'print("Hello World")\n'
-
- text = """More markdown text
-```python
-print("Hello World")
-```
-
-Another code block.
-
-```python
-print("Hello World 2")
-```
-"""
-
- code_blocks = extract_markdown_code_blocks(text)
-
- assert len(code_blocks) == 2
- assert code_blocks[0].language == "python"
- assert code_blocks[0].code == 'print("Hello World")\n'
- assert code_blocks[1].language == "python"
- assert code_blocks[1].code == 'print("Hello World 2")\n'