completed structured output parsing/conversion, updated tsp spec for correct items prop with arrays

Author: sethjuarez

runtime/prompty/prompty/azure/executor.py

@@ -178,6 +178,8 @@ async def _create_chat_async(
             trace("signature", "AzureOpenAIAsync.chat.completions.create")
             args = self._resolve_chat_args(data, ignore_thread_content)
             trace("inputs", args)
+
+            response = None
             if "stream" in args and args["stream"]:
                 response = await client.chat.completions.create(**args)
             else:
@@ -374,26 +376,29 @@ def invoke(self, data: typing.Any) -> typing.Union[str, PromptyStream]:
 
         client = self._get_ctor()
 
+        r = None
         if self.api == "chat":
-            response = self._create_chat(client, data)
-        elif self.api == "agent":
-            response = self._execute_agent(client, data)
+            r = self._create_chat(client, data)
+        #elif self.api == "agent":
+        #    r = self._execute_agent(client, data)
         elif self.api == "completion":
-            response = self._create_completion(client, data)
+            r = self._create_completion(client, data)
         elif self.api == "embedding":
-            response = self._create_embedding(client, data)
+            r = self._create_embedding(client, data)
         elif self.api == "image":
-            response = self._create_image(client, data)
+            r = self._create_image(client, data)
 
         # stream response
-        if isinstance(response, Iterator):
+        if isinstance(r, Iterator):
             if self.api == "chat":
                 # TODO: handle the case where there might be no usage in the stream
-                return PromptyStream("AzureOpenAIExecutor", response)
+                return PromptyStream("AzureOpenAIExecutor", r)
             else:
-                return PromptyStream("AzureOpenAIExecutor", response)
+                return PromptyStream("AzureOpenAIExecutor", r)
+        elif isinstance(r, str):
+            return r
         else:
-            return response
+            raise ValueError(f"Unexpected response type: {type(r)}")
 
     async def invoke_async(self, data: str) -> typing.Union[str, AsyncPromptyStream]:
         """Invoke the Prompty Chat Parser (Async)
@@ -410,23 +415,26 @@ async def invoke_async(self, data: str) -> typing.Union[str, AsyncPromptyStream]
         """
         client = self._get_async_ctor()
 
+        r = None
         if self.api == "chat":
-            response = await self._create_chat_async(client, data)
-        elif self.api == "agent":
-            response = await self._execute_agent_async(client, data)
+            r = await self._create_chat_async(client, data)
+        #elif self.api == "agent":
+        #    r = await self._execute_agent_async(client, data)
         elif self.api == "completion":
-            response = await self._create_completion_async(client, data)
+            r = await self._create_completion_async(client, data)
         elif self.api == "embedding":
-            response = await self._create_embedding_async(client, data)
+            r = await self._create_embedding_async(client, data)
         elif self.api == "image":
-            response = await self._create_image_async(client, data)
+            r = await self._create_image_async(client, data)
 
         # stream response
-        if isinstance(response, AsyncIterator):
+        if isinstance(r, AsyncIterator):
             if self.api == "chat":
                 # TODO: handle the case where there might be no usage in the stream
-                return AsyncPromptyStream("AzureOpenAIExecutorAsync", response)
+                return AsyncPromptyStream("AzureOpenAIExecutorAsync", r)
             else:
-                return AsyncPromptyStream("AzureOpenAIExecutorAsync", response)
+                return AsyncPromptyStream("AzureOpenAIExecutorAsync", r)
+        elif isinstance(r, str):
+            return r
         else:
-            return response
+            raise ValueError(f"Unexpected response type: {type(r)}")

runtime/prompty/prompty/azure/processor.py

@@ -42,13 +42,6 @@ def invoke(self, data: typing.Any) -> typing.Union[
         any
             The response from the OpenAI/Azure API
         """
-        # agent invocations return the thread
-        # and the last message is the response
-        if self.prompty.model.api == "agent" and isinstance(data, list):
-            if isinstance(data[-1], dict):
-                return data[-1]["content"]
-            else:
-                return data
 
         if isinstance(data, ChatCompletion):
             response = data.choices[0].message
@@ -113,7 +106,7 @@ def generator():
         else:
             return data
 
-    async def invoke_async(self, data: str) -> typing.Union[str, AsyncPromptyStream]:
+    async def invoke_async(self, data: str) -> typing.Any:
         """Invoke the Prompty Chat Parser (Async)
 
         Parameters
@@ -126,13 +119,6 @@ async def invoke_async(self, data: str) -> typing.Union[str, AsyncPromptyStream]
         str
             The parsed data
         """
-        # agent invocations return the thread
-        # and the last message is the response
-        if self.prompty.model.api == "agent" and isinstance(data, list):
-            if isinstance(data[-1], dict):
-                return data[-1]["content"]
-            else:
-                return data
 
         if isinstance(data, ChatCompletion):
             response = data.choices[0].message
@@ -179,7 +165,7 @@ async def invoke_async(self, data: str) -> typing.Union[str, AsyncPromptyStream]
             elif len(data.data) == 1:
                 return data.data[0].url if item.data[0].url else item.data[0].b64_json
             else:
-                return [item.url if item.url else item.b64_json for item in data.data]
+                return [str(item.url) if item.url else item.b64_json for item in data.data]
 
         elif isinstance(data, AsyncIterator):