github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-08-17 16:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

nit

Browse Source
This commit is contained in:
Mason Daugherty 2025-08-04 14:01:21 -04:00
parent 332215ed41
commit 08cb07e1a6
No known key found for this signature in database
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/partners/ollama/langchain_ollama/chat_models.py
View File

@ -87,8 +87,8 @@ def _parse_json_string(
) -> Any: ) -> Any:
"""Attempt to parse a JSON string for tool calling. """Attempt to parse a JSON string for tool calling.
It first tries to use the standard json.loads. If that fails, it falls It first tries to use the standard ``json.loads``. If that fails, it falls
back to ast.literal_eval to safely parse Python literals, which is more back to ``ast.literal_eval`` to safely parse Python literals, which is more
robust against models using single quotes or containing apostrophes. robust against models using single quotes or containing apostrophes.
Args: Args:
@ -100,7 +100,8 @@ def _parse_json_string(
The parsed JSON string or Python literal. The parsed JSON string or Python literal.
Raises: Raises:
OutputParserException: If the string is invalid and skip=False. OutputParserException: If the string is invalid and ``skip=False``.
""" """
try: try:
return json.loads(json_string) return json.loads(json_string)
@ -138,7 +139,9 @@ def _parse_arguments_from_tool_call(
Band-aid fix for issue in Ollama with inconsistent tool call argument structure. Band-aid fix for issue in Ollama with inconsistent tool call argument structure.
Should be removed/changed if fixed upstream. Should be removed/changed if fixed upstream.
See https://github.com/ollama/ollama/issues/6155 See https://github.com/ollama/ollama/issues/6155
""" """
if "function" not in raw_tool_call: if "function" not in raw_tool_call:
return None return None
@ -1064,14 +1067,14 @@ class ChatOllama(BaseChatModel):
- ``'function_calling'``: - ``'function_calling'``:
Uses Ollama's tool-calling API Uses Ollama's tool-calling API
- ``'json_mode'``: - ``'json_mode'``:
Specifies ``format="json"``. Note that if using JSON mode then you Specifies ``format='json'``. Note that if using JSON mode then you
must include instructions for formatting the output into the must include instructions for formatting the output into the
desired schema into the model call. desired schema into the model call.
include_raw: include_raw:
If False then only the parsed structured output is returned. If If False then only the parsed structured output is returned. If
an error occurs during model output parsing it will be raised. If True an error occurs during model output parsing it will be raised. If True
then both the raw model response (a BaseMessage) and the parsed model then both the raw model response (a ``BaseMessage``) and the parsed model
response will be returned. If an error occurs during output parsing it response will be returned. If an error occurs during output parsing it
will be caught and returned as well. The final output is always a dict will be caught and returned as well. The final output is always a dict
with keys ``'raw'``, ``'parsed'``, and ``'parsing_error'``. with keys ``'raw'``, ``'parsed'``, and ``'parsing_error'``.
@ -1085,7 +1088,7 @@ class ChatOllama(BaseChatModel):
If ``include_raw`` is True, then Runnable outputs a dict with keys: If ``include_raw`` is True, then Runnable outputs a dict with keys:
- ``'raw'``: BaseMessage - ``'raw'``: ``BaseMessage``
- ``'parsed'``: None if there was a parsing error, otherwise the type depends on the ``schema`` as described above. - ``'parsed'``: None if there was a parsing error, otherwise the type depends on the ``schema`` as described above.
- ``'parsing_error'``: Optional[BaseException] - ``'parsing_error'``: Optional[BaseException]
@ -1130,7 +1133,7 @@ class ChatOllama(BaseChatModel):
# justification='Both a pound of bricks and a pound of feathers weigh one pound. The weight is the same, but the volume or density of the objects may differ.' # justification='Both a pound of bricks and a pound of feathers weigh one pound. The weight is the same, but the volume or density of the objects may differ.'
# ) # )
.. dropdown:: Example: schema=Pydantic class, method="json_schema", include_raw=True .. dropdown:: Example: ``schema=Pydantic`` class, ``method='json_schema'``, ``include_raw=True``
.. code-block:: python .. code-block:: python
@ -1159,7 +1162,7 @@ class ChatOllama(BaseChatModel):
# 'parsing_error': None # 'parsing_error': None
# } # }
.. dropdown:: Example: schema=Pydantic class, method="function_calling", include_raw=False .. dropdown:: Example: ``schema=Pydantic`` class, ``method='function_calling'``, ``include_raw=False``
.. code-block:: python .. code-block:: python
@ -1223,7 +1226,7 @@ class ChatOllama(BaseChatModel):
# 'justification': 'Both a pound of bricks and a pound of feathers weigh one pound. The weight is the same, but the volume and density of the two substances differ.' # 'justification': 'Both a pound of bricks and a pound of feathers weigh one pound. The weight is the same, but the volume and density of the two substances differ.'
# } # }
.. dropdown:: Example: schema=OpenAI function schema, method="function_calling", include_raw=False .. dropdown:: Example: ``schema=OpenAI`` function schema, ``method='function_calling'``, ``include_raw=False``
.. code-block:: python .. code-block:: python
@ -1253,7 +1256,7 @@ class ChatOllama(BaseChatModel):
# 'justification': 'Both a pound of bricks and a pound of feathers weigh one pound. The weight is the same, but the volume and density of the two substances differ.' # 'justification': 'Both a pound of bricks and a pound of feathers weigh one pound. The weight is the same, but the volume and density of the two substances differ.'
# } # }
.. dropdown:: Example: schema=Pydantic class, method="json_mode", include_raw=True .. dropdown:: Example: ``schema=Pydantic`` class, ``method='json_mode'``, ``include_raw=True``
.. code-block:: .. code-block::