Merge branch 'erick/core-openai-rfc-structured-output-tracing' of github.com:langchain-ai/langchain into erick/core-openai-rfc-structured-output-tracing

Author: Erick Friis

libs/standard-tests/langchain_tests/integration_tests/chat_models.py

@@ -19,7 +19,10 @@
 from langchain_core.output_parsers import StrOutputParser
 from langchain_core.prompts import ChatPromptTemplate
 from langchain_core.tools import BaseTool, tool
-from langchain_core.utils.function_calling import tool_example_to_messages
+from langchain_core.utils.function_calling import (
+    convert_to_openai_tool,
+    tool_example_to_messages,
+)
 from pydantic import BaseModel, Field
 from pydantic.v1 import BaseModel as BaseModelV1
 from pydantic.v1 import Field as FieldV1
@@ -1244,27 +1247,9 @@ def has_tool_calling(self) -> bool:
         assert isinstance(
             invoke_callback.metadatas[0]["structured_output_format"]["schema"], dict
         )
-        assert invoke_callback.metadatas[0]["structured_output_format"]["schema"] == {
-            "type": "function",
-            "function": {
-                "name": "Joke",
-                "description": "Joke to tell user.",
-                "parameters": {
-                    "properties": {
-                        "setup": {
-                            "description": "question to set up a joke",
-                            "type": "string",
-                        },
-                        "punchline": {
-                            "description": "answer to resolve the joke",
-                            "type": "string",
-                        },
-                    },
-                    "required": ["setup", "punchline"],
-                    "type": "object",
-                },
-            },
-        }
+        assert invoke_callback.metadatas[0]["structured_output_format"][
+            "schema"
+        ] == convert_to_openai_tool(schema)
 
         stream_callback = _TestCallbackHandler()
 
@@ -1281,27 +1266,9 @@ def has_tool_calling(self) -> bool:
         assert isinstance(
             stream_callback.metadatas[0]["structured_output_format"]["schema"], dict
         )
-        assert stream_callback.metadatas[0]["structured_output_format"]["schema"] == {
-            "type": "function",
-            "function": {
-                "name": "Joke",
-                "description": "Joke to tell user.",
-                "parameters": {
-                    "properties": {
-                        "setup": {
-                            "description": "question to set up a joke",
-                            "type": "string",
-                        },
-                        "punchline": {
-                            "description": "answer to resolve the joke",
-                            "type": "string",
-                        },
-                    },
-                    "required": ["setup", "punchline"],
-                    "type": "object",
-                },
-            },
-        }
+        assert stream_callback.metadatas[0]["structured_output_format"][
+            "schema"
+        ] == convert_to_openai_tool(schema)
 
     @pytest.mark.parametrize("schema_type", ["pydantic", "typeddict", "json_schema"])
     async def test_structured_output_async(
@@ -1353,27 +1320,9 @@ def has_tool_calling(self) -> bool:
         assert isinstance(
             ainvoke_callback.metadatas[0]["structured_output_format"]["schema"], dict
         )
-        assert ainvoke_callback.metadatas[0]["structured_output_format"]["schema"] == {
-            "type": "function",
-            "function": {
-                "name": "Joke",
-                "description": "Joke to tell user.",
-                "parameters": {
-                    "properties": {
-                        "setup": {
-                            "description": "question to set up a joke",
-                            "type": "string",
-                        },
-                        "punchline": {
-                            "description": "answer to resolve the joke",
-                            "type": "string",
-                        },
-                    },
-                    "required": ["setup", "punchline"],
-                    "type": "object",
-                },
-            },
-        }
+        assert ainvoke_callback.metadatas[0]["structured_output_format"][
+            "schema"
+        ] == convert_to_openai_tool(schema)
 
         astream_callback = _TestCallbackHandler()
 
@@ -1391,27 +1340,9 @@ def has_tool_calling(self) -> bool:
         assert isinstance(
             astream_callback.metadatas[0]["structured_output_format"]["schema"], dict
         )
-        assert astream_callback.metadatas[0]["structured_output_format"]["schema"] == {
-            "type": "function",
-            "function": {
-                "name": "Joke",
-                "description": "Joke to tell user.",
-                "parameters": {
-                    "properties": {
-                        "setup": {
-                            "description": "question to set up a joke",
-                            "type": "string",
-                        },
-                        "punchline": {
-                            "description": "answer to resolve the joke",
-                            "type": "string",
-                        },
-                    },
-                    "required": ["setup", "punchline"],
-                    "type": "object",
-                },
-            },
-        }
+        assert astream_callback.metadatas[0]["structured_output_format"][
+            "schema"
+        ] == convert_to_openai_tool(schema)
 
     @pytest.mark.skipif(PYDANTIC_MAJOR_VERSION != 2, reason="Test requires pydantic 2.")
     def test_structured_output_pydantic_2_v1(self, model: BaseChatModel) -> None: