🌿 Fern Regeneration -- September 25, 2024 (#587)

* SDK regeneration * Fixes --------- Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Co-authored-by: Billy Trend <[email protected]>
cohere-ai · Sep 25, 2024 · 349c5ab · 349c5ab
1 parent 18c45e6
commit 349c5ab
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 34 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cohere"
-version = "5.9.4"
+version = "5.10.0"
 description = ""
 readme = "README.md"
 authors = []

diff --git a/reference.md b/reference.md
@@ -2453,7 +2453,7 @@ When `tools` is passed (without `tool_results`), the `text` content in the respo
 **safety_mode:** `typing.Optional[V2ChatStreamRequestSafetyMode]` 
 
 Used to select the [safety instruction](/docs/safety-modes) inserted into the prompt. Defaults to `CONTEXTUAL`.
-When `NONE` is specified, the safety instruction will be omitted.
+When `OFF` is specified, the safety instruction will be omitted.
 
 Safety modes are not yet configurable in combination with `tools`, `tool_results` and `documents` parameters.
 
@@ -2621,7 +2621,6 @@ client.v2.chat(
     messages=[
         ToolChatMessageV2(
             tool_call_id="messages",
-            tool_content="messages",
         )
     ],
 )
@@ -2697,7 +2696,7 @@ When `tools` is passed (without `tool_results`), the `text` content in the respo
 **safety_mode:** `typing.Optional[V2ChatRequestSafetyMode]` 
 
 Used to select the [safety instruction](/docs/safety-modes) inserted into the prompt. Defaults to `CONTEXTUAL`.
-When `NONE` is specified, the safety instruction will be omitted.
+When `OFF` is specified, the safety instruction will be omitted.
 
 Safety modes are not yet configurable in combination with `tools`, `tool_results` and `documents` parameters.
 

diff --git a/src/cohere/__init__.py b/src/cohere/__init__.py
@@ -209,7 +209,7 @@
     ToolContent,
     ToolMessage,
     ToolMessageV2,
-    ToolMessageV2ToolContent,
+    ToolMessageV2Content,
     ToolParameterDefinitionsValue,
     ToolPlanDeltaStreamedChatResponseV2,
     ToolResult,
@@ -498,7 +498,7 @@
     "ToolContent",
     "ToolMessage",
     "ToolMessageV2",
-    "ToolMessageV2ToolContent",
+    "ToolMessageV2Content",
     "ToolParameterDefinitionsValue",
     "ToolPlanDeltaStreamedChatResponseV2",
     "ToolResult",

diff --git a/src/cohere/core/client_wrapper.py b/src/cohere/core/client_wrapper.py
@@ -24,7 +24,7 @@ def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "cohere",
-            "X-Fern-SDK-Version": "5.9.4",
+            "X-Fern-SDK-Version": "5.10.0",
         }
         if self._client_name is not None:
             headers["X-Client-Name"] = self._client_name

diff --git a/src/cohere/types/__init__.py b/src/cohere/types/__init__.py
@@ -207,7 +207,7 @@
 from .tool_call_v2function import ToolCallV2Function
 from .tool_content import DocumentToolContent, TextToolContent, ToolContent
 from .tool_message_v2 import ToolMessageV2
-from .tool_message_v2tool_content import ToolMessageV2ToolContent
+from .tool_message_v2content import ToolMessageV2Content
 from .tool_parameter_definitions_value import ToolParameterDefinitionsValue
 from .tool_result import ToolResult
 from .tool_v2 import ToolV2
@@ -428,7 +428,7 @@
     "ToolContent",
     "ToolMessage",
     "ToolMessageV2",
-    "ToolMessageV2ToolContent",
+    "ToolMessageV2Content",
     "ToolParameterDefinitionsValue",
     "ToolPlanDeltaStreamedChatResponseV2",
     "ToolResult",

diff --git a/src/cohere/types/chat_message_v2.py b/src/cohere/types/chat_message_v2.py
@@ -10,7 +10,7 @@
 from .assistant_message_content import AssistantMessageContent
 from .citation import Citation
 from .system_message_content import SystemMessageContent
-from .tool_message_v2tool_content import ToolMessageV2ToolContent
+from .tool_message_v2content import ToolMessageV2Content
 import typing_extensions
 from ..core.unchecked_base_model import UnionMetadata
 
@@ -79,7 +79,7 @@ class ToolChatMessageV2(UncheckedBaseModel):
 
     role: typing.Literal["tool"] = "tool"
     tool_call_id: str
-    tool_content: ToolMessageV2ToolContent
+    content: typing.Optional[ToolMessageV2Content] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

diff --git a/src/cohere/types/document.py b/src/cohere/types/document.py
@@ -20,7 +20,7 @@ class Document(UncheckedBaseModel):
 
     id: typing.Optional[str] = pydantic.Field(default=None)
     """
-    Unique identifier for this document which will be referenced in citations. If not provided an ID will be automatically generated
+    Unique identifier for this document which will be referenced in citations. If not provided an ID will be automatically generated.
     """
 
     if IS_PYDANTIC_V2:

diff --git a/src/cohere/types/tool_message_v2.py b/src/cohere/types/tool_message_v2.py
@@ -2,9 +2,9 @@
 
 from ..core.unchecked_base_model import UncheckedBaseModel
 import pydantic
-from .tool_message_v2tool_content import ToolMessageV2ToolContent
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import typing
+from .tool_message_v2content import ToolMessageV2Content
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class ToolMessageV2(UncheckedBaseModel):
@@ -17,7 +17,7 @@ class ToolMessageV2(UncheckedBaseModel):
     The id of the associated tool call that has provided the given content
     """
 
-    tool_content: ToolMessageV2ToolContent = pydantic.Field()
+    content: typing.Optional[ToolMessageV2Content] = pydantic.Field(default=None)
     """
     A single or list of outputs from a tool. The content should formatted as a JSON object string, or a list of tool content blocks
     """

diff --git a/...here/types/tool_message_v2tool_content.py → src/cohere/types/tool_message_v2content.py b/...here/types/tool_message_v2tool_content.py → src/cohere/types/tool_message_v2content.py
@@ -3,4 +3,4 @@
 import typing
 from .tool_content import ToolContent
 
-ToolMessageV2ToolContent = typing.Union[str, typing.List[ToolContent]]
+ToolMessageV2Content = typing.Union[str, typing.List[ToolContent]]
diff --git a/src/cohere/v2/client.py b/src/cohere/v2/client.py
@@ -98,7 +98,7 @@ def chat_stream(
 
         safety_mode : typing.Optional[V2ChatStreamRequestSafetyMode]
             Used to select the [safety instruction](/docs/safety-modes) inserted into the prompt. Defaults to `CONTEXTUAL`.
-            When `NONE` is specified, the safety instruction will be omitted.
+            When `OFF` is specified, the safety instruction will be omitted.
 
             Safety modes are not yet configurable in combination with `tools`, `tool_results` and `documents` parameters.
 
@@ -424,7 +424,7 @@ def chat(
 
         safety_mode : typing.Optional[V2ChatRequestSafetyMode]
             Used to select the [safety instruction](/docs/safety-modes) inserted into the prompt. Defaults to `CONTEXTUAL`.
-            When `NONE` is specified, the safety instruction will be omitted.
+            When `OFF` is specified, the safety instruction will be omitted.
 
             Safety modes are not yet configurable in combination with `tools`, `tool_results` and `documents` parameters.
 
@@ -500,7 +500,6 @@ def chat(
             messages=[
                 ToolChatMessageV2(
                     tool_call_id="messages",
-                    tool_content="messages",
                 )
             ],
         )
@@ -1143,7 +1142,7 @@ async def chat_stream(
 
         safety_mode : typing.Optional[V2ChatStreamRequestSafetyMode]
             Used to select the [safety instruction](/docs/safety-modes) inserted into the prompt. Defaults to `CONTEXTUAL`.
-            When `NONE` is specified, the safety instruction will be omitted.
+            When `OFF` is specified, the safety instruction will be omitted.
 
             Safety modes are not yet configurable in combination with `tools`, `tool_results` and `documents` parameters.
 
@@ -1477,7 +1476,7 @@ async def chat(
 
         safety_mode : typing.Optional[V2ChatRequestSafetyMode]
             Used to select the [safety instruction](/docs/safety-modes) inserted into the prompt. Defaults to `CONTEXTUAL`.
-            When `NONE` is specified, the safety instruction will be omitted.
+            When `OFF` is specified, the safety instruction will be omitted.
 
             Safety modes are not yet configurable in combination with `tools`, `tool_results` and `documents` parameters.
 
@@ -1558,7 +1557,6 @@ async def main() -> None:
                 messages=[
                     ToolChatMessageV2(
                         tool_call_id="messages",
-                        tool_content="messages",
                     )
                 ],
             )

diff --git a/src/cohere/v2/types/v2chat_request_safety_mode.py b/src/cohere/v2/types/v2chat_request_safety_mode.py
@@ -2,4 +2,4 @@
 
 import typing
 
-V2ChatRequestSafetyMode = typing.Union[typing.Literal["CONTEXTUAL", "STRICT", "NONE"], typing.Any]
+V2ChatRequestSafetyMode = typing.Union[typing.Literal["CONTEXTUAL", "STRICT", "OFF"], typing.Any]
diff --git a/src/cohere/v2/types/v2chat_stream_request_safety_mode.py b/src/cohere/v2/types/v2chat_stream_request_safety_mode.py
@@ -2,4 +2,4 @@
 
 import typing
 
-V2ChatStreamRequestSafetyMode = typing.Union[typing.Literal["CONTEXTUAL", "STRICT", "NONE"], typing.Any]
+V2ChatStreamRequestSafetyMode = typing.Union[typing.Literal["CONTEXTUAL", "STRICT", "OFF"], typing.Any]