grasp_agents 0.4.7__py3-none-any.whl → 0.5.0__py3-none-any.whl

grasp_agents/openai/__init__.py

@@ -3,8 +3,11 @@
 from openai._streaming import (
     AsyncStream as OpenAIAsyncStream,  # type: ignore[import] # noqa: PLC2701
 )
-from openai.types import CompletionUsage as OpenAICompletionUsage
+from openai.types import CompletionUsage as OpenAIUsage
 from openai.types.chat.chat_completion import ChatCompletion as OpenAICompletion
+from openai.types.chat.chat_completion import (
+    Choice as OpenAIChoice,
+)
 from openai.types.chat.chat_completion import (
     ChoiceLogprobs as OpenAIChoiceLogprobs,
 )
@@ -14,21 +17,18 @@ from openai.types.chat.chat_completion_assistant_message_param import (
 from openai.types.chat.chat_completion_chunk import (
     ChatCompletionChunk as OpenAICompletionChunk,
 )
-from openai.types.chat.chat_completion_chunk import (
-    Choice as CompletionChunkChoice,
-)
 from openai.types.chat.chat_completion_chunk import (
     Choice as OpenAIChunkChoice,
 )
-from openai.types.chat.chat_completion_chunk import (
-    ChoiceDelta as CompletionChunkChoiceDelta,
-)
 from openai.types.chat.chat_completion_chunk import (
     ChoiceDelta as OpenAIChunkChoiceDelta,
 )
 from openai.types.chat.chat_completion_chunk import (
     ChoiceDeltaToolCall as OpenAIChunkChoiceDeltaToolCall,
 )
+from openai.types.chat.chat_completion_chunk import (
+    ChoiceLogprobs as OpenAIChunkChoiceLogprobs,
+)
 from openai.types.chat.chat_completion_content_part_image_param import (
     ChatCompletionContentPartImageParam as OpenAIContentPartImageParam,
 )
@@ -48,7 +48,13 @@ from openai.types.chat.chat_completion_function_message_param import (
     ChatCompletionFunctionMessageParam as OpenAIFunctionMessageParam,
 )
 from openai.types.chat.chat_completion_message import (
-    ChatCompletionMessage as OpenAIMessage,
+    Annotation as OpenAIAnnotation,
+)
+from openai.types.chat.chat_completion_message import (
+    AnnotationURLCitation as OpenAIAnnotationURLCitation,
+)
+from openai.types.chat.chat_completion_message import (
+    ChatCompletionMessage as OpenAICompletionMessage,
 )
 from openai.types.chat.chat_completion_message_param import (
     ChatCompletionMessageParam as OpenAIMessageParam,
@@ -86,15 +92,24 @@ from openai.types.chat.chat_completion_tool_param import (
 from openai.types.chat.chat_completion_user_message_param import (
     ChatCompletionUserMessageParam as OpenAIUserMessageParam,
 )
+from openai.types.chat.completion_create_params import (
+    WebSearchOptions as OpenAIWebSearchOptions,
+)
 from openai.types.chat.parsed_chat_completion import (
     ParsedChatCompletion as OpenAIParsedCompletion,
 )
 from openai.types.chat.parsed_chat_completion import (
-    ParsedChatCompletionMessage as OpenAIParsedMessage,
+    ParsedChatCompletionMessage as OpenAIParsedCompletionMessage,
 )
 from openai.types.chat.parsed_chat_completion import (
     ParsedChoice as OpenAIParsedChoice,
 )
+from openai.types.shared_params import (
+    ResponseFormatJSONObject as OpenAIResponseFormatJSONObject,
+)
+from openai.types.shared_params import (
+    ResponseFormatText as OpenAIResponseFormatText,
+)
 from openai.types.shared_params.function_definition import (
     FunctionDefinition as OpenAIFunctionDefinition,
 )

grasp_agents/openai/completion_chunk_converters.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 from ..errors import CompletionError
 from ..typing.completion_chunk import (
     CompletionChunk,
@@ -5,7 +7,8 @@ from ..typing.completion_chunk import (
     CompletionChunkChoiceDelta,
     CompletionChunkDeltaToolCall,
 )
-from . import OpenAICompletionChunk  # type: ignore[import]
+from ..typing.message import Role
+from . import OpenAICompletionChunk
 from .completion_converters import from_api_completion_usage
 
 
@@ -21,7 +24,6 @@ def from_api_completion_chunk(
     choices: list[CompletionChunkChoice] = []
 
     for api_choice in api_completion_chunk.choices:
-        index = api_choice.index
         finish_reason = api_choice.finish_reason
 
         if api_choice.delta is None:  # type: ignore
@@ -38,7 +40,7 @@ def from_api_completion_chunk(
         delta = CompletionChunkChoiceDelta(
             content=api_choice.delta.content,
             refusal=api_choice.delta.refusal,
-            role=api_choice.delta.role,
+            role=cast("Role", api_choice.delta.role),
             tool_calls=[
                 CompletionChunkDeltaToolCall(
                     id=tool_call.id,
@@ -52,11 +54,9 @@ def from_api_completion_chunk(
         )
 
         choice = CompletionChunkChoice(
-            index=index,
+            index=api_choice.index,
             delta=delta,
             finish_reason=finish_reason,
-            # OpenAI logprobs have identical, but separately defined, types for
-            # completion chunks and completions
             logprobs=api_choice.logprobs,
         )
 

grasp_agents/openai/completion_converters.py

@@ -1,9 +1,10 @@
+from ..errors import CompletionError
 from ..typing.completion import Completion, CompletionChoice, Usage
-from . import OpenAICompletion, OpenAICompletionUsage
+from . import OpenAICompletion, OpenAIUsage
 from .message_converters import from_api_assistant_message
 
 
-def from_api_completion_usage(api_usage: OpenAICompletionUsage) -> Usage:
+def from_api_completion_usage(api_usage: OpenAIUsage) -> Usage:
     reasoning_tokens = None
     cached_tokens = None
 
@@ -27,42 +28,39 @@ def from_api_completion(
     api_completion: OpenAICompletion, name: str | None = None
 ) -> Completion:
     choices: list[CompletionChoice] = []
-    usage: Usage | None = None
 
     if api_completion.choices is None:  # type: ignore
         # Some providers return None for the choices when there is an error
         # TODO: add custom error types
-        raise RuntimeError(
+        raise CompletionError(
             f"Completion API error: {getattr(api_completion, 'error', None)}"
         )
     for api_choice in api_completion.choices:
-        index = api_choice.index
         finish_reason = api_choice.finish_reason
 
         # Some providers return None for the message when finish_reason is other than "stop"
         if api_choice.message is None:  # type: ignore
-            raise RuntimeError(
+            raise CompletionError(
                 f"API returned None for message with finish_reason: {finish_reason}"
             )
 
-        # usage = from_api_completion_usage(api_usage) if api_usage else None
-
-        usage = (
-            from_api_completion_usage(api_completion.usage)
-            if api_completion.usage
-            else None
-        )
         message = from_api_assistant_message(api_choice.message, name=name)
 
         choices.append(
             CompletionChoice(
-                index=index,
+                index=api_choice.index,
                 message=message,
                 finish_reason=finish_reason,
                 logprobs=api_choice.logprobs,
             )
         )
 
+    usage = (
+        from_api_completion_usage(api_completion.usage)
+        if api_completion.usage
+        else None
+    )
+
     return Completion(
         id=api_completion.id,
         created=api_completion.created,

grasp_agents/openai/content_converters.py

@@ -56,9 +56,7 @@ def from_api_content(
     return Content(parts=content_parts)
 
 
-def to_api_content(
-    content: Content,
-) -> Iterable[OpenAIContentPartParam]:
+def to_api_content(content: Content) -> Iterable[OpenAIContentPartParam]:
     api_content: list[OpenAIContentPartParam] = []
     for content_part in content.parts:
         api_content_part: OpenAIContentPartParam

grasp_agents/openai/converters.py

@@ -13,13 +13,13 @@ from . import (
     OpenAIAssistantMessageParam,
     OpenAICompletion,
     OpenAICompletionChunk,
-    OpenAICompletionUsage,
+    OpenAICompletionMessage,
     OpenAIContentPartParam,
-    OpenAIMessage,
     OpenAISystemMessageParam,
     OpenAIToolChoiceOptionParam,
     OpenAIToolMessageParam,
     OpenAIToolParam,
+    OpenAIUsage,
     OpenAIUserMessageParam,
 )
 from .completion_chunk_converters import from_api_completion_chunk
@@ -74,12 +74,12 @@ class OpenAIConverters(Converters):
         return to_api_assistant_message(assistant_message, **kwargs)
 
     @staticmethod
-    def from_completion_usage(raw_usage: OpenAICompletionUsage, **kwargs: Any) -> Usage:
+    def from_completion_usage(raw_usage: OpenAIUsage, **kwargs: Any) -> Usage:
         return from_api_completion_usage(raw_usage, **kwargs)
 
     @staticmethod
     def from_assistant_message(
-        raw_message: OpenAIMessage, name: str | None = None, **kwargs: Any
+        raw_message: OpenAICompletionMessage, name: str | None = None, **kwargs: Any
     ) -> AssistantMessage:
         return from_api_assistant_message(raw_message, name=name, **kwargs)
 
@@ -96,10 +96,8 @@ class OpenAIConverters(Converters):
         return from_api_tool_message(raw_message, name=name, **kwargs)
 
     @staticmethod
-    def to_tool(
-        tool: BaseTool[BaseModel, Any, Any], strict: bool | None = None, **kwargs: Any
-    ) -> OpenAIToolParam:
-        return to_api_tool(tool, strict=strict, **kwargs)
+    def to_tool(tool: BaseTool[BaseModel, Any, Any], **kwargs: Any) -> OpenAIToolParam:
+        return to_api_tool(tool, **kwargs)
 
     @staticmethod
     def to_tool_choice(

grasp_agents/openai/message_converters.py

@@ -1,5 +1,10 @@
 from typing import TypeAlias
 
+from litellm.types.llms.openai import (
+    ChatCompletionAnnotation,
+    ChatCompletionAnnotationURLCitation,
+)
+
 from ..typing.content import Content
 from ..typing.message import (
     AssistantMessage,
@@ -10,9 +15,9 @@ from ..typing.message import (
 from ..typing.tool import ToolCall
 from . import (
     OpenAIAssistantMessageParam,
+    OpenAICompletionMessage,
     OpenAIDeveloperMessageParam,
     OpenAIFunctionMessageParam,
-    OpenAIMessage,
     OpenAISystemMessageParam,
     OpenAIToolCallFunction,
     OpenAIToolCallParam,
@@ -55,7 +60,7 @@ def to_api_user_message(message: UserMessage) -> OpenAIUserMessageParam:
 
 
 def from_api_assistant_message(
-    api_message: OpenAIMessage, name: str | None = None
+    api_message: OpenAICompletionMessage, name: str | None = None
 ) -> AssistantMessage:
     tool_calls = None
     if api_message.tool_calls is not None:
@@ -68,10 +73,23 @@ def from_api_assistant_message(
             for tool_call in api_message.tool_calls
         ]
 
+    annotations = None
+    if api_message.annotations is not None:
+        annotations = [
+            ChatCompletionAnnotation(
+                type="url_citation",
+                url_citation=ChatCompletionAnnotationURLCitation(
+                    **api_annotation.url_citation.model_dump()
+                ),
+            )
+            for api_annotation in api_message.annotations
+        ]
+
     return AssistantMessage(
         content=api_message.content,
         tool_calls=tool_calls,
         refusal=api_message.refusal,
+        annotations=annotations,
         name=name,
     )
 
@@ -102,7 +120,7 @@ def to_api_assistant_message(
     if message.refusal is not None:
         api_message["refusal"] = message.refusal
 
-    # TODO: hack
+    # TODO: avoid this hack
     if message.content is None:
         # Some API providers return None in the generated content without errors,
         # even though None in the input content is not accepted.