A programming framework for agentic AI
Update MarkItDown. (#5920)
afourneyaefa66a3ce07
diff --git a/python/packages/autogen-ext/pyproject.toml b/python/packages/autogen-ext/pyproject.tomlindex 6cd2a7bd8..eab72a66b 100644--- a/python/packages/autogen-ext/pyproject.toml+++ b/python/packages/autogen-ext/pyproject.toml@@ -30,7 +30,8 @@ ollama = ["ollama>=0.4.7", "tiktoken>=0.8.0"]openai = ["openai>=1.52.2", "tiktoken>=0.8.0", "aiofiles"]file-surfer = ["autogen-agentchat==0.4.9",- "markitdown~=0.0.1",+ "magika>=0.6.1rc2",+ "markitdown[all]~=0.1.0a3",]llama-cpp = [@@ -43,11 +44,13 @@ web-surfer = ["autogen-agentchat==0.4.9","playwright>=1.48.0","pillow>=11.0.0",- "markitdown~=0.0.1",+ "magika>=0.6.1rc2",+ "markitdown[all]~=0.1.0a3",]magentic-one = ["autogen-agentchat==0.4.9",- "markitdown~=0.0.1",+ "magika>=0.6.1rc2",+ "markitdown[all]~=0.1.0a3","playwright>=1.48.0","pillow>=11.0.0",]diff --git a/python/packages/autogen-ext/src/autogen_ext/agents/file_surfer/_markdown_file_browser.py b/python/packages/autogen-ext/src/autogen_ext/agents/file_surfer/_markdown_file_browser.pyindex 03d3e72ea..3cf499a20 100644--- a/python/packages/autogen-ext/src/autogen_ext/agents/file_surfer/_markdown_file_browser.py+++ b/python/packages/autogen-ext/src/autogen_ext/agents/file_surfer/_markdown_file_browser.py@@ -207,7 +207,7 @@ class MarkdownFileBrowser:try:if os.path.isdir(path): # TODO: Fix markdown_converter typesres = self._markdown_converter.convert_stream( # type: ignore- io.StringIO(self._fetch_local_dir(path)), file_extension=".txt"+ io.BytesIO(self._fetch_local_dir(path).encode("utf-8")), file_extension=".txt")self.page_title = res.titleself._set_page_content(res.text_content, split_pages=False)diff --git a/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/playwright_controller.py b/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/playwright_controller.pyindex 37e1cdda4..305bc8076 100644--- a/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/playwright_controller.py+++ b/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/playwright_controller.py@@ -4,15 +4,9 @@ import ioimport osimport randomimport warnings+from types import ModuleTypefrom typing import Any, Callable, Dict, Optional, Tuple, Union, cast-# TODO: Fix unfollowed import-try:- # Suppress warnings from markitdown -- which is pretty chatty- warnings.filterwarnings(action="ignore", module="markitdown")- from markitdown import MarkItDown # type: ignore-except ImportError:- MarkItDown = Nonefrom playwright._impl._errors import Error as PlaywrightErrorfrom playwright._impl._errors import TimeoutErrorfrom playwright.async_api import Download, Page@@ -24,6 +18,14 @@ from ._types import (visualviewport_from_dict,)+markitdown: ModuleType | None = None+try:+ # Suppress warnings from markitdown -- which is pretty chatty+ warnings.filterwarnings(action="ignore", module="markitdown")+ import markitdown+except ImportError:+ pass+class PlaywrightController:"""@@ -561,8 +563,8 @@ class PlaywrightController:str: The markdown content of the page."""assert page is not None- if self._markdown_converter is None and MarkItDown is not None:- self._markdown_converter = MarkItDown()+ if self._markdown_converter is None and markitdown is not None:+ self._markdown_converter = markitdown.MarkItDown()html = await page.evaluate("document.documentElement.outerHTML;")res = self._markdown_converter.convert_stream(io.StringIO(html), file_extension=".html", url=page.url) # type: ignoreassert hasattr(res, "text_content") and isinstance(res.text_content, str)diff --git a/python/uv.lock b/python/uv.lockindex 5edd95768..12989dd5b 100644--- a/python/uv.lock+++ b/python/uv.lock@@ -606,7 +606,8 @@ docker = []file-surfer = [{ name = "autogen-agentchat" },- { name = "markitdown" },+ { name = "magika" },+ { name = "markitdown", extra = ["all"] },]gemini = [{ name = "google-genai" },@@ -633,7 +634,8 @@ llama-cpp = []magentic-one = [{ name = "autogen-agentchat" },- { name = "markitdown" },+ { name = "magika" },+ { name = "markitdown", extra = ["all"] },{ name = "pillow" },{ name = "playwright" },]@@ -700,7 +702,8 @@ video-surfer = []web-surfer = [{ name = "autogen-agentchat" },- { name = "markitdown" },+ { name = "magika" },+ { name = "markitdown", extra = ["all"] },{ name = "pillow" },{ name = "playwright" },]@@ -739,9 +742,12 @@ requires-dist = [{ name = "json-schema-to-pydantic", marker = "extra == 'mcp'", specifier = ">=0.2.2" },{ name = "langchain-core", marker = "extra == 'langchain'", specifier = "~=0.3.3" },{ name = "llama-cpp-python", marker = "extra == 'llama-cpp'", specifier = ">=0.1.9" },- { name = "markitdown", marker = "extra == 'file-surfer'", specifier = "~=0.0.1" },- { name = "markitdown", marker = "extra == 'magentic-one'", specifier = "~=0.0.1" },- { name = "markitdown", marker = "extra == 'web-surfer'", specifier = "~=0.0.1" },+ { name = "magika", marker = "extra == 'file-surfer'", specifier = ">=0.6.1rc2" },+ { name = "magika", marker = "extra == 'magentic-one'", specifier = ">=0.6.1rc2" },+ { name = "magika", marker = "extra == 'web-surfer'", specifier = ">=0.6.1rc2" },+ { name = "markitdown", extras = ["all"], marker = "extra == 'file-surfer'", specifier = "~=0.1.0a3" },+ { name = "markitdown", extras = ["all"], marker = "extra == 'magentic-one'", specifier = "~=0.1.0a3" },+ { name = "markitdown", extras = ["all"], marker = "extra == 'web-surfer'", specifier = "~=0.1.0a3" },{ name = "mcp", marker = "extra == 'mcp'", specifier = ">=1.1.3" },{ name = "nbclient", marker = "extra == 'jupyter-executor'", specifier = ">=0.10.2" },{ name = "ollama", marker = "extra == 'ollama'", specifier = ">=0.4.7" },@@ -3926,6 +3932,24 @@ requires-dist = [[package.metadata.requires-dev]dev = [{ name = "types-pyyaml" }]+[[package]]+name = "magika"+version = "0.6.1rc2"+source = { registry = "https://pypi.org/simple" }+dependencies = [+ { name = "click" },+ { name = "numpy" },+ { name = "onnxruntime" },+ { name = "python-dotenv" },+]+sdist = { url = "https://files.pythonhosted.org/packages/5e/bb/c0a7e675a89ac029d3e7889083fe77a723bde5a3372162b4b52f0c5a3b6d/magika-0.6.1rc2.tar.gz", hash = "sha256:27c8d96b015614657488a007b8c9b673e5d7ec9ffd2c3c27f7cdeb3a7b965bf9", size = 3026815 }+wheels = [+ { url = "https://files.pythonhosted.org/packages/b0/e5/c41420ef15ce2df012077fe48c7f7e8673c3f7bc9cf482b0782b6b267317/magika-0.6.1rc2-py3-none-any.whl", hash = "sha256:7b9d4ef3d3f41e4de88c80fb12a997234a67e9ec942d98db5eb23abd839bb12e", size = 2967086 },+ { url = "https://files.pythonhosted.org/packages/ce/c9/b478d2d063512e1c2c01ecab62daf3d5f4c62116bfeb77dd12a2ec7ebbb4/magika-0.6.1rc2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:0c4b165f0ba72722a4bf3b8d49d9603ec61014cf9f7677366dacb09b00f80091", size = 12406214 },+ { url = "https://files.pythonhosted.org/packages/b2/f0/a532bec3a3e429d46d60f5f0276f0cad24d67edebbcec43e6a3b14bb1a96/magika-0.6.1rc2-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:7b5adeb464bf77d6f73b86bbce152af04053aac237cbb1f424a03441cb24b392", size = 15087434 },+ { url = "https://files.pythonhosted.org/packages/66/ea/e266819e1b1ecd1d617bfa13453ad6b33347843ab3fcb6e191445d3f8cf8/magika-0.6.1rc2-py3-none-win_amd64.whl", hash = "sha256:5ac4bb90ffe7e81895975546b1f36d1d8939ef8cc50f88ca5791eb90d6bcf3bf", size = 12376271 },+]+[[package]]name = "mako"version = "1.3.8"@@ -3985,34 +4009,35 @@ wheels = [[[package]]name = "markitdown"-version = "0.0.1"+version = "0.1.0a3"source = { registry = "https://pypi.org/simple" }dependencies = [- { name = "azure-ai-documentintelligence" },- { name = "azure-identity" },{ name = "beautifulsoup4" },{ name = "charset-normalizer" },- { name = "mammoth" },+ { name = "magika" },{ name = "markdownify" },- { name = "numpy" },+ { name = "requests" },+]+sdist = { url = "https://files.pythonhosted.org/packages/b9/94/a9c1148229ec5bbf0dfec87289cefe3bd2a7d5efc2a1c2b02c0353e76b67/markitdown-0.1.0a3.tar.gz", hash = "sha256:10122a7aabff4380a1a7770a8ab75338241ba97ece35665fe082e2a0bcb71556", size = 28812 }+wheels = [+ { url = "https://files.pythonhosted.org/packages/db/7b/b0c4def78049503bd4102c9b2fa7c9a4917afb48e9f06317e5bb644e07ba/markitdown-0.1.0a3-py3-none-any.whl", hash = "sha256:02de241396a85d07bf20d901376acd77ff542e2712d8d03af046c912dd60ccf4", size = 44362 },+]++[package.optional-dependencies]+all = [+ { name = "azure-ai-documentintelligence" },+ { name = "azure-identity" },+ { name = "mammoth" },{ name = "olefile" },- { name = "openai" },{ name = "openpyxl" },{ name = "pandas" },- { name = "pathvalidate" },{ name = "pdfminer-six" },- { name = "puremagic" },{ name = "pydub" },{ name = "python-pptx" },- { name = "requests" },{ name = "speechrecognition" },{ name = "xlrd" },{ name = "youtube-transcript-api" },]-sdist = { url = "https://files.pythonhosted.org/packages/07/c6/21f17f3d8beffbf658fcab20331461733c88d254f49e714c384de1f21991/markitdown-0.0.1.tar.gz", hash = "sha256:54795c3ed3d28fa1d5b7103275b0fa784d992291b9f51963dd912b1eba75be40", size = 21597 }-wheels = [- { url = "https://files.pythonhosted.org/packages/49/44/bf36f276284a7c9e61877bcbdc545d57654f9d2a21254e91769806ad2e02/markitdown-0.0.1-py3-none-any.whl", hash = "sha256:22a62d8429146adcc2d809c2f02c6d96ef51b301143d663fada5de04444affd0", size = 21956 },-][[package]]name = "markupsafe"@@ -5294,15 +5319,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/7d/eb/b6260b31b1a96386c0a880edebe26f89669098acea8e0318bff6adb378fd/pathable-0.4.4-py3-none-any.whl", hash = "sha256:5ae9e94793b6ef5a4cbe0a7ce9dbbefc1eec38df253763fd0aeeacf2762dbbc2", size = 9592 },]-[[package]]-name = "pathvalidate"-version = "3.2.3"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/92/87/c7a2f51cc62df0495acb0ed2533a7c74cc895e569a1b020ee5f6e9fa4e21/pathvalidate-3.2.3.tar.gz", hash = "sha256:59b5b9278e30382d6d213497623043ebe63f10e29055be4419a9c04c721739cb", size = 61717 }-wheels = [- { url = "https://files.pythonhosted.org/packages/50/14/c5a0e1a947909810fc4c043b84cac472b70e438148d34f5393be1bac663f/pathvalidate-3.2.3-py3-none-any.whl", hash = "sha256:5eaf0562e345d4b6d0c0239d0f690c3bd84d2a9a3c4c73b99ea667401b27bee1", size = 24130 },-]-[[package]]name = "patsy"version = "1.0.1"@@ -5689,15 +5705,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842 },]-[[package]]-name = "puremagic"-version = "1.28"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/09/2d/40599f25667733e41bbc3d7e4c7c36d5e7860874aa5fe9c584e90b34954d/puremagic-1.28.tar.gz", hash = "sha256:195893fc129657f611b86b959aab337207d6df7f25372209269ed9e303c1a8c0", size = 314945 }-wheels = [- { url = "https://files.pythonhosted.org/packages/c5/53/200a97332d10ed3edd7afcbc5f5543920ac59badfe5762598327999f012e/puremagic-1.28-py3-none-any.whl", hash = "sha256:e16cb9708ee2007142c37931c58f07f7eca956b3472489106a7245e5c3aa1241", size = 43241 },-]-[[package]]name = "pyarrow"version = "15.0.2"@@ -8330,15 +8337,15 @@ wheels = [[[package]]name = "youtube-transcript-api"-version = "0.6.3"+version = "1.0.1"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "defusedxml" },{ name = "requests" },]-sdist = { url = "https://files.pythonhosted.org/packages/d7/f1/55ff16f7198bdf5204fd7be3c49122e07092a3da47bf4e1560989a4c0255/youtube_transcript_api-0.6.3.tar.gz", hash = "sha256:4d1f6451ae508390a5279f98519efb45e091bf60d3cca5ea0bb122800ab6a011", size = 612052 }+sdist = { url = "https://files.pythonhosted.org/packages/e6/2d/810b2b1d8cf401b257928f300415ec66933f82678ca27f273c2aedf42517/youtube_transcript_api-1.0.1.tar.gz", hash = "sha256:820977c8402e2e7f8ce86817e05044ddc8c5fe7085cb8058b9a21e14153a27ba", size = 1911393 }wheels = [- { url = "https://files.pythonhosted.org/packages/80/d4/be6fd091d29ae49d93813e598769e7ab453419a4de640e1755bf20911cce/youtube_transcript_api-0.6.3-py3-none-any.whl", hash = "sha256:297a74c1863d9df88f6885229f33a7eda61493d73ecb13ec80e876b65423e9b4", size = 622293 },+ { url = "https://files.pythonhosted.org/packages/dc/83/52d6730ca49723116ffcfe398854b6ef1ecc780e09203f6ba4b203fde15e/youtube_transcript_api-1.0.1-py3-none-any.whl", hash = "sha256:66b91279e239b21274ac6d91b55002eb9c418824aab70cd66a82954a09a298a2", size = 1929575 },][[package]]