meshagent-openai 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

meshagent/openai/tools/completions_adapter.py

@@ -219,13 +219,11 @@ class OpenAICompletionsAdapter(LLMAdapter):
         model: str = os.getenv("OPENAI_MODEL"),
         parallel_tool_calls : Optional[bool] = None,
         client: Optional[AsyncOpenAI] = None,
-        reasoning_effort: Optional[str] = None,
     ):
         self._model = model
         self._parallel_tool_calls = parallel_tool_calls
         self._client = client
-        self._reasoning_effort = reasoning_effort
-
+    
 
     def create_chat_context(self):
         system_role = "system"
@@ -303,9 +301,6 @@ class OpenAICompletionsAdapter(LLMAdapter):
                         }
                     }
 
-                if self._reasoning_effort != None:
-                    extra["reasoning_effort"] = self._reasoning_effort
-
                 response : ChatCompletion = await openai.chat.completions.create(
                     n=1,
                     model = self._model,

meshagent/openai/tools/responses_adapter.py

@@ -70,7 +70,7 @@ class ResponsesToolBundle:
         
         for toolkit in toolkits:                
             for v in toolkit.tools:
-          
+
                 k = v.name
 
                 name = safe_tool_name(k)
@@ -235,14 +235,14 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
         model: str = os.getenv("OPENAI_MODEL"),
         parallel_tool_calls : Optional[bool] = None,
         client: Optional[AsyncOpenAI] = None,
-        reasoning_effort: Optional[str] = None,
-        retries : int = 10,
+        retries : int = 0,
+        response_options : Optional[dict] = None
     ):
         self._model = model
         self._parallel_tool_calls = parallel_tool_calls
         self._client = client
-        self._reasoning_effort = reasoning_effort
         self._retries = retries
+        self._response_options = response_options
 
     def create_chat_context(self):
         system_role = "system"
@@ -252,6 +252,7 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
             system_role = "developer"
         elif self._model.startswith("computer-use"):
             system_role = "developer"
+            
 
         context = AgentChatContext(
             system_role=system_role
@@ -311,22 +312,27 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
             
             openai = self._get_client(room=room)
 
-            tool_bundle = ResponsesToolBundle(toolkits=[
-                *toolkits,
-            ])
-            open_ai_tools = tool_bundle.to_json()
-
-            if open_ai_tools != None:
-                logger.info("OpenAI Tools: %s", json.dumps(open_ai_tools))
-            else:
-                logger.info("OpenAI Tools: Empty")
-                open_ai_tools = NOT_GIVEN
-            
+          
             response_schema = output_schema
             response_name = "response"
             
 
             while True:
+
+                # We need to do this inside the loop because tools can change mid loop
+                # for example computer use adds goto tools after the first interaction
+                tool_bundle = ResponsesToolBundle(toolkits=[
+                    *toolkits,
+                ])
+                open_ai_tools = tool_bundle.to_json()
+
+                if open_ai_tools != None:
+                    logger.info("OpenAI Tools: %s", json.dumps(open_ai_tools))
+                else:
+                    logger.info("OpenAI Tools: Empty")
+                    open_ai_tools = NOT_GIVEN
+                
+
   
                 logger.info("model: %s, context: %s, output_schema: %s", self._model, context.messages, output_schema)
                 ptc = self._parallel_tool_calls
@@ -334,10 +340,6 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
                 if ptc != None and self._model.startswith("o") == False:
                     extra["parallel_tool_calls"] = ptc 
                 
-                trunc = NOT_GIVEN
-                if self._model == "computer-use-preview":
-                    trunc = "auto"
-
                 text = NOT_GIVEN
                 if output_schema != None:
                     text = {
@@ -349,12 +351,7 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
                         }
                     }
 
-                reasoning = NOT_GIVEN
-                if self._reasoning_effort != None:
-                    reasoning = {
-                        "effort" : self._reasoning_effort
-                    }
-
+           
                 previous_response_id = NOT_GIVEN
                 if context.previous_response_id != None:
                     previous_response_id = context.previous_response_id
@@ -365,15 +362,19 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
                     if range == self._retries:
                         raise RoomException("exceeded maximum attempts calling openai")
                     try:
-                        response = await openai.responses.create(
+                        response_options = self._response_options
+                        if response_options == None:
+                            response_options = {}
+
+                        response : Response = await openai.responses.create(
                             stream=stream,
                             model = self._model,
                             input = context.messages,
                             tools = open_ai_tools,
                             text = text,
                             previous_response_id=previous_response_id,
-                            reasoning=reasoning,
-                            truncation=trunc
+                            
+                            **response_options
                         )
                         break
                     except Exception as e:
@@ -472,7 +473,9 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
 
                     final_outputs = []
                     
+                    
                     for message in response.output:
+                        context.previous_messages.append(message.to_dict())
                         outputs, done = await handle_message(message=message)
                         if done:
                             final_outputs.extend(outputs)
@@ -483,6 +486,17 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
                     if len(final_outputs) > 0:
 
                         return final_outputs[0]
+                    
+                    term = await self.check_for_termination(context=context, room=room)
+                    if term:
+                        text = ""
+                        for output in response.output:
+                            if output.type == "message":
+                                for content in output.content:
+                                    text += content.text
+
+                        return text
+
 
                 else:
                     
@@ -513,7 +527,9 @@ class OpenAIResponsesAdapter(LLMAdapter[ResponsesToolBundle]):
                             all_outputs = []
 
                         elif event.type == "response.output_item.done":
-                          
+
+                            room.developer.log_nowait(type="llm.output", data={ "context" : context.id, "participant_id" : room.local_participant.id, "participant_name" : room.local_participant.get_attribute("name"), "response" : event.to_dict() })
+                
                             context.previous_messages.append(event.item.to_dict())
                         
                             outputs, done = await handle_message(message=event.item)

{meshagent_openai-0.0.5.dist-info → meshagent_openai-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: meshagent-openai
-Version: 0.0.5
+Version: 0.0.7
 Summary: OpenAI Building Blocks for Meshagent
 Home-page: 
 License: Apache License 2.0
@@ -14,11 +14,12 @@ Requires-Dist: pyjwt>=2.0.0
 Requires-Dist: pytest>=8.3.4
 Requires-Dist: pytest-asyncio>=0.24.0
 Requires-Dist: openai>=1.66.2
-Requires-Dist: meshagent-api>=0.0.5
-Requires-Dist: meshagent-agents>=0.0.5
-Requires-Dist: meshagent-tools>=0.0.5
+Requires-Dist: meshagent-api>=0.0.7
+Requires-Dist: meshagent-agents>=0.0.7
+Requires-Dist: meshagent-tools>=0.0.7
 Dynamic: description-content-type
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

meshagent_openai-0.0.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+meshagent/openai/__init__.py,sha256=qAqthmkQBsTqmrnVbtGOeaWCz9o5N48uEUCX7irzEsg,141
+meshagent/openai/tools/__init__.py,sha256=RBU_J4qRDuBaaUdi6jpgpuMlIbvT30QmTBrZrYLwsUU,185
+meshagent/openai/tools/completions_adapter.py,sha256=Rqq8c9E4lkVKrXkbWFcTPHQFCLcoomdM1nIiU1a_T7w,15123
+meshagent/openai/tools/responses_adapter.py,sha256=mC0I6pmSy3d7tSq7Nm1LhuFmuibzXK0oCE0zPuRqqDI,22618
+meshagent_openai-0.0.7.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_openai-0.0.7.dist-info/METADATA,sha256=XUJbVfUC1mZ9yvwX_skoDCvVpG7OiMh1auDq5YcWLdk,774
+meshagent_openai-0.0.7.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+meshagent_openai-0.0.7.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_openai-0.0.7.dist-info/RECORD,,

{meshagent_openai-0.0.5.dist-info → meshagent_openai-0.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

meshagent_openai-0.0.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-meshagent/openai/__init__.py,sha256=qAqthmkQBsTqmrnVbtGOeaWCz9o5N48uEUCX7irzEsg,141
-meshagent/openai/tools/__init__.py,sha256=RBU_J4qRDuBaaUdi6jpgpuMlIbvT30QmTBrZrYLwsUU,185
-meshagent/openai/tools/completions_adapter.py,sha256=I74OC6JMbGb_C7qCYc0lWpJPs3uwuX9TfIDyn9Jou6U,15340
-meshagent/openai/tools/responses_adapter.py,sha256=WGUCHYXq_ZzvjjUOlD59G0lazRSntQqg6BgU7N18W5M,21766
-meshagent_openai-0.0.5.dist-info/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_openai-0.0.5.dist-info/METADATA,sha256=qPqdpUmXtQEgx01u2edIoWzjNUT85aCb_5VVTUlP9gk,752
-meshagent_openai-0.0.5.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-meshagent_openai-0.0.5.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_openai-0.0.5.dist-info/RECORD,,