update OpenAI function agents' llm validation

libs/langchain/langchain/agents/agent_toolkits/conversational_retrieval/openai_functions.py

@@ -10,7 +10,6 @@
     AgentTokenBufferMemory,
 )
 from langchain.agents.openai_functions_agent.base import OpenAIFunctionsAgent
-from langchain.chat_models.openai import ChatOpenAI
 from langchain.memory.token_buffer import ConversationTokenBufferMemory
 from langchain.tools.base import BaseTool
 
@@ -57,7 +56,7 @@ def create_conversational_retrieval_agent(
         An agent executor initialized appropriately
     """
 
-    if not isinstance(llm, ChatOpenAI):
+    if not (hasattr(llm, "supports_oai_functions") and llm.supports_oai_functions):
         raise ValueError("Only supported with ChatOpenAI models.")
     if remember_intermediate_steps:
         memory: BaseMemory = AgentTokenBufferMemory(

libs/langchain/langchain/agents/openai_functions_agent/base.py

@@ -25,7 +25,6 @@
 )
 from langchain.callbacks.base import BaseCallbackManager
 from langchain.callbacks.manager import Callbacks
-from langchain.chat_models.openai import ChatOpenAI
 from langchain.tools.base import BaseTool
 from langchain.tools.render import format_tool_to_openai_function
 
@@ -52,7 +51,10 @@ def get_allowed_tools(self) -> List[str]:
 
     @root_validator
     def validate_llm(cls, values: dict) -> dict:
-        if not isinstance(values["llm"], ChatOpenAI):
+        if not (
+            hasattr(values["llm"], "supports_oai_functions")
+            and values["llm"].supports_oai_functions
+        ):
             raise ValueError("Only supported with ChatOpenAI models.")
         return values
 
@@ -222,7 +224,7 @@ def from_llm_and_tools(
         **kwargs: Any,
     ) -> BaseSingleActionAgent:
         """Construct an agent from an LLM and tools."""
-        if not isinstance(llm, ChatOpenAI):
+        if not (hasattr(llm, "supports_oai_functions") and llm.supports_oai_functions):
             raise ValueError("Only supported with ChatOpenAI models.")
         prompt = cls.create_prompt(
             extra_prompt_messages=extra_prompt_messages,

libs/langchain/langchain/agents/openai_functions_multi_agent/base.py

@@ -26,7 +26,6 @@
 )
 from langchain.callbacks.base import BaseCallbackManager
 from langchain.callbacks.manager import Callbacks
-from langchain.chat_models.openai import ChatOpenAI
 from langchain.tools import BaseTool
 
 # For backwards compatibility
@@ -111,7 +110,10 @@ def get_allowed_tools(self) -> List[str]:
 
     @root_validator
     def validate_llm(cls, values: dict) -> dict:
-        if not isinstance(values["llm"], ChatOpenAI):
+        if not (
+            hasattr(values["llm"], "supports_oai_functions")
+            and values["llm"].supports_oai_functions
+        ):
             raise ValueError("Only supported with ChatOpenAI models.")
         return values
 

libs/langchain/langchain/chat_models/openai.py

@@ -549,6 +549,11 @@ def _llm_type(self) -> str:
         """Return type of chat model."""
         return "openai-chat"
 
+    @property
+    def supports_oai_functions(self) -> bool:
+        """Return whether class supports OpenAI functions."""
+        return True
+
     def _get_encoding_model(self) -> Tuple[str, tiktoken.Encoding]:
         tiktoken_ = _import_tiktoken()
         if self.tiktoken_model_name is not None: