Google Search API

.devcontainer/Dockerfile

@@ -1,32 +1,32 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE file in the project root for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
-
-#
-# Update the OS and maybe install packages
-#
-ENV DEBIAN_FRONTEND=noninteractive
-
-# add git lhs to apt
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-RUN apt-get update \
-   && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
-   && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
-   && dpkg -i quarto-1.5.23-linux-${arch}.deb \
-   && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
-ENV DEBIAN_FRONTEND=dialog
-
-# For docs
-RUN npm install --global yarn
-RUN pip install --upgrade pip
-RUN pip install pydoc-markdown
-RUN pip install pyyaml
-RUN pip install colored
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE file in the project root for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
+
+#
+# Update the OS and maybe install packages
+#
+ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
+RUN apt-get update \
+   && apt-get upgrade -y  \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
+   && apt-get autoremove -y \
+   && apt-get clean -y \
+   && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
+   && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
+   && dpkg -i quarto-1.5.23-linux-${arch}.deb \
+   && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
+ENV DEBIAN_FRONTEND=dialog
+
+# For docs
+RUN npm install --global yarn
+RUN pip install --upgrade pip
+RUN pip install pydoc-markdown
+RUN pip install pyyaml
+RUN pip install colored

.devcontainer/devcontainer.json

@@ -1,22 +1,22 @@
-{
-    "customizations":  {
-        "vscode": {
-            "extensions": [
-                "ms-python.python",
-                "ms-toolsai.jupyter",
-                "visualstudioexptteam.vscodeintellicode",
-                "GitHub.copilot"
-            ],
-            "settings": {
-                "terminal.integrated.profiles.linux": {
-                    "bash": {
-                        "path": "/bin/bash"
-                    }
-                },
-                "terminal.integrated.defaultProfile.linux": "bash"
-            }
-        }
-    },
-    "dockerFile": "Dockerfile",
-    "updateContentCommand": "pip install -e . pre-commit && pre-commit install"
-}
+{
+    "customizations":  {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "ms-toolsai.jupyter",
+                "visualstudioexptteam.vscodeintellicode",
+                "GitHub.copilot"
+            ],
+            "settings": {
+                "terminal.integrated.profiles.linux": {
+                    "bash": {
+                        "path": "/bin/bash"
+                    }
+                },
+                "terminal.integrated.defaultProfile.linux": "bash"
+            }
+        }
+    },
+    "dockerFile": "Dockerfile",
+    "updateContentCommand": "pip install -e . pre-commit && pre-commit install"
+}

.devcontainer/studio/Dockerfile

@@ -1,27 +1,27 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE file in the project root for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
-
-#
-# Update the OS and maybe install packages
-#
-ENV DEBIAN_FRONTEND=noninteractive
-
-# add git lhs to apt
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-RUN apt-get update \
-   && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
-ENV DEBIAN_FRONTEND=dialog
-
-# For docs
-RUN npm install --global yarn
-RUN pip install --upgrade pip
-RUN pip install pydoc-markdown
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE file in the project root for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
+
+#
+# Update the OS and maybe install packages
+#
+ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
+RUN apt-get update \
+   && apt-get upgrade -y  \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
+   && apt-get autoremove -y \
+   && apt-get clean -y \
+   && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog
+
+# For docs
+RUN npm install --global yarn
+RUN pip install --upgrade pip
+RUN pip install pydoc-markdown

.devcontainer/studio/devcontainer.json

@@ -1,21 +1,21 @@
-{
-    "customizations":  {
-        "vscode": {
-            "extensions": [
-                "ms-python.python",
-                "ms-toolsai.jupyter",
-                "visualstudioexptteam.vscodeintellicode"
-            ],
-            "settings": {
-                "terminal.integrated.profiles.linux": {
-                    "bash": {
-                        "path": "/bin/bash"
-                    }
-                },
-                "terminal.integrated.defaultProfile.linux": "bash"
-            }
-        }
-    },
-    "dockerFile": "Dockerfile",
-    "updateContentCommand": "cd samples/apps/autogen-studio && pip install -e . && sudo npm install -g gatsby-cli && cd frontend && yarn install && yarn build"
-}
+{
+    "customizations":  {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "ms-toolsai.jupyter",
+                "visualstudioexptteam.vscodeintellicode"
+            ],
+            "settings": {
+                "terminal.integrated.profiles.linux": {
+                    "bash": {
+                        "path": "/bin/bash"
+                    }
+                },
+                "terminal.integrated.defaultProfile.linux": "bash"
+            }
+        }
+    },
+    "dockerFile": "Dockerfile",
+    "updateContentCommand": "cd samples/apps/autogen-studio && pip install -e . && sudo npm install -g gatsby-cli && cd frontend && yarn install && yarn build"
+}

.gitignore

@@ -19,6 +19,7 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+.devcontainer/
 .Python
 build/
 develop-eggs/

autogen/agentchat/contrib/web_surfer.py

@@ -9,13 +9,16 @@
 from typing_extensions import Annotated
 
 from ... import Agent, AssistantAgent, ConversableAgent, GroupChat, GroupChatManager, OpenAIWrapper, UserProxyAgent
-from ...browser_utils import SimpleTextBrowser
+from ...browser_utils.bing_browser import BingTextBrowser
+from ...browser_utils.google_broswer import GoogleTextBrowser
 from ...code_utils import content_str
 from ...oai.openai_utils import filter_config
 from ...token_count_utils import count_token, get_max_token_limit
 
 logger = logging.getLogger(__name__)
 
+BROWSERS = {"google": GoogleTextBrowser, "bing": BingTextBrowser}
+
 
 class WebSurferAgent(ConversableAgent):
     """(In preview) An agent that acts as a basic web surfer that can search the web and visit web pages."""
@@ -40,6 +43,7 @@ def __init__(
         llm_config: Optional[Union[Dict, Literal[False]]] = None,
         summarizer_llm_config: Optional[Union[Dict, Literal[False]]] = None,
         default_auto_reply: Optional[Union[str, Dict, None]] = "",
+        browser_name: str = "bing",
         browser_config: Optional[Union[Dict, None]] = None,
     ):
         super().__init__(
@@ -58,7 +62,9 @@ def __init__(
         self._create_summarizer_client(summarizer_llm_config, llm_config)
 
         # Create the browser
-        self.browser = SimpleTextBrowser(**(browser_config if browser_config else {}))
+        self.browser_name = browser_name
+        chosen_browser = BROWSERS[self.browser_name]
+        self.browser = chosen_browser(**(browser_config if browser_config else {}))
 
         inner_llm_config = copy.deepcopy(llm_config)
 
@@ -134,7 +140,7 @@ def _browser_state() -> Tuple[str, str]:
             description="Perform an INFORMATIONAL web search query then return the search results.",
         )
         def _informational_search(query: Annotated[str, "The informational web search query to perform."]) -> str:
-            self.browser.visit_page(f"bing: {query}")
+            self.browser.visit_page(f"{self.browser_name}: {query}")
             header, content = _browser_state()
             return header.strip() + "\n=======================\n" + content
 
@@ -144,7 +150,7 @@ def _informational_search(query: Annotated[str, "The informational web search qu
             description="Perform a NAVIGATIONAL web search query then immediately navigate to the top result. Useful, for example, to navigate to a particular Wikipedia article or other known destination. Equivalent to Google's \"I'm Feeling Lucky\" button.",
         )
         def _navigational_search(query: Annotated[str, "The navigational web search query to perform."]) -> str:
-            self.browser.visit_page(f"bing: {query}")
+            self.browser.visit_page(f"{self.browser_name}: {query}")
 
             # Extract the first linl
             m = re.search(r"\[.*?\]\((http.*?)\)", self.browser.page_content)