Merge pull request #921 from microsoft/bugs/pydantic-update

Update to resolve Pydantic Startup Issue (@ryonsteelemsft)

app/backend/approaches/mathassistant.py

@@ -43,6 +43,8 @@
 #1. Tool to calculate pythagorean theorem
 
 from langchain.tools import BaseTool
+from pydantic import BaseModel
+from langchain.chains import LLMMathChain
 from typing import Optional
 from math import sqrt, cos, sin
 from typing import Union
@@ -53,6 +55,15 @@
     "['adjacent_side', 'opposite_side', 'angle']."
 )
 
+# Define the BaseCache to make the tool compatible with the Langchain
+class BaseCache(BaseModel):
+    pass
+class Callbacks(BaseModel):
+    pass
+
+# Call model_rebuild for LLMMathChain
+LLMMathChain.model_rebuild()
+
 class PythagorasTool(BaseTool):
     name: ClassVar[str] = "Hypotenuse calculator"
     description: ClassVar[str] = desc
@@ -76,7 +87,6 @@ def _run(
     def _arun(self, query: str):
         raise NotImplementedError("This tool does not support async")
 
-tools = [PythagorasTool()]
 
 #________________________________________
 
@@ -96,11 +106,12 @@ def _arun(self, radius: int):
         raise NotImplementedError("This tool does not support async")
 
 
-tools = [CircumferenceTool()]
-
-#add math module from Lanhgchain
-
-tools = load_tools(["llm-math","wikipedia"],  llm=model)
+# Examples of built-in tools
+llm_math_tool = load_tools(["llm-math"], llm=model)
+llm_wiki_tool = load_tools(["wikipedia"], llm=model)
+# Examples of custom tools
+llm_pythag_tool = [PythagorasTool()]
+llm_circumference_tool = [CircumferenceTool()]
 
 
 PREFIX = """Act as a math tutor that helps students solve a wide array of mathematical challenges, including arithmetic problems, algebraic equations, geometric proofs, calculus, and statistical analysis, as well as word problems.
@@ -110,11 +121,11 @@ def _arun(self, radius: int):
 In handling math queries, try using your tools initially. If no solution is found, then attempt to solve the problem on your own.
 """
 
-
-# # Initialize the agent
+# Initialize the agent with a single input tool
+# You can choose which of the tools to use or create separate agents for different tools
 zero_shot_agent_math = initialize_agent(
     agent=AgentType.ZERO_SHOT_REACT_DESCRIPTION,
-        tools=tools,
+        tools=llm_math_tool,
     llm=model,
     verbose=True,
     max_iterations=10,
@@ -128,7 +139,7 @@ def _arun(self, radius: int):
 async def stream_agent_responses(question):
     zero_shot_agent_math = initialize_agent(
         agent="zero-shot-react-description",
-        tools=tools,
+        tools=llm_math_tool,
         llm=model,
         verbose=True,
         max_iterations=10,

app/backend/requirements.txt

@@ -25,3 +25,4 @@ tabulate==0.9.0
 tiktoken==0.7.0
 uvicorn==0.30.6
 wikipedia==1.4.0
+pydantic==2.10.1