airia 0.1.29__py3-none-any.whl → 0.1.31__py3-none-any.whl

airia/client/pipeline_execution/async_pipeline_execution.py

@@ -1,6 +1,9 @@
-from typing import Any, Dict, List, Literal, Optional, Union, overload
+from typing import Any, Dict, List, Literal, Optional, Type, Union, overload
+
+from pydantic import BaseModel
 
 from ...types._api_version import ApiVersion
+from ...types._structured_output import create_schema_system_message, parse_response_to_model
 from ...types.api.pipeline_execution import (
     PipelineExecutionAsyncStreamedResponse,
     PipelineExecutionResponse,
@@ -80,6 +83,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_schema: Optional[Type[BaseModel]] = None,
         correlation_id: Optional[str] = None,
     ) -> PipelineExecutionResponse: ...
 
@@ -103,6 +107,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_schema: Optional[Type[BaseModel]] = None,
         correlation_id: Optional[str] = None,
     ) -> PipelineExecutionAsyncStreamedResponse: ...
 
@@ -125,6 +130,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_schema: Optional[Type[BaseModel]] = None,
         correlation_id: Optional[str] = None,
     ) -> Union[
         PipelineExecutionResponse,
@@ -151,6 +157,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
             additional_info: Optional additional information.
             prompt_variables: Optional variables to be used in the prompt.
             voice_enabled: Whether the request came through the airia-voice-proxy. Default is False.
+            output_schema: Optional Pydantic model class for structured output.
             correlation_id: Optional correlation ID for request tracing. If not provided,
                         one will be generated automatically.
 
@@ -161,7 +168,8 @@ class AsyncPipelineExecution(BasePipelineExecution):
             AiriaAPIError: If the API request fails with details about the error.
             aiohttp.ClientError: For other request-related errors.
 
-        Example:
+        Examples:
+            Basic usage:
             ```python
             client = AiriaAsyncClient(api_key="your_api_key")
             response = await client.pipeline_execution.execute_pipeline(
@@ -170,6 +178,21 @@ class AsyncPipelineExecution(BasePipelineExecution):
             )
             print(response.result)
             ```
+
+            With structured output:
+            ```python
+            from pydantic import BaseModel
+
+            class PersonInfo(BaseModel):
+                name: str
+                age: int
+
+            response = await client.pipeline_execution.execute_pipeline(
+                pipeline_id="pipeline_123",
+                user_input="Extract person info",
+                output_schema=PersonInfo
+            )
+            ```
         """
         # Validate user_input parameter
         if not user_input:
@@ -182,6 +205,15 @@ class AsyncPipelineExecution(BasePipelineExecution):
         if images or files:
             file_urls, image_urls = await self._upload_files(files or [], images or [])
 
+        # Handle structured output by injecting schema as system message
+        modified_in_memory_messages = in_memory_messages
+        if output_schema is not None:
+            # Create a copy of in_memory_messages if it exists, otherwise create new list
+            modified_in_memory_messages = list(in_memory_messages) if in_memory_messages else []
+            # Insert schema instruction as first system message
+            schema_message = create_schema_system_message(output_schema)
+            modified_in_memory_messages.insert(0, schema_message)
+
         request_data = self._pre_execute_pipeline(
             pipeline_id=pipeline_id,
             user_input=user_input,
@@ -194,12 +226,13 @@ class AsyncPipelineExecution(BasePipelineExecution):
             files=file_urls,
             data_source_folders=data_source_folders,
             data_source_files=data_source_files,
-            in_memory_messages=in_memory_messages,
+            in_memory_messages=modified_in_memory_messages,
             current_date_time=current_date_time,
             save_history=save_history,
             additional_info=additional_info,
             prompt_variables=prompt_variables,
             voice_enabled=voice_enabled,
+            output_configuration=None,  # Not using output_configuration anymore
             correlation_id=correlation_id,
             api_version=ApiVersion.V2.value,
         )
@@ -210,7 +243,11 @@ class AsyncPipelineExecution(BasePipelineExecution):
         )
 
         if not async_output:
-            return PipelineExecutionResponse(**resp)
+            response = PipelineExecutionResponse(**resp)
+            # Parse response to Pydantic model if output_schema was provided
+            if output_schema is not None and response.result:
+                response.result = parse_response_to_model(response.result, output_schema)
+            return response
 
         return PipelineExecutionAsyncStreamedResponse(stream=resp)
 
@@ -237,6 +274,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
         images: Optional[List[str]] = None,
         in_memory_messages: Optional[List[Dict[str, Any]]] = None,
         output_configuration: Optional[Dict[str, Any]] = None,
+        output_schema: Optional[Type[BaseModel]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         user_id: Optional[str] = None,
         user_input_id: Optional[str] = None,
@@ -267,6 +305,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
         images: Optional[List[str]] = None,
         in_memory_messages: Optional[List[Dict[str, Any]]] = None,
         output_configuration: Optional[Dict[str, Any]] = None,
+        output_schema: Optional[Type[BaseModel]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         user_id: Optional[str] = None,
         user_input_id: Optional[str] = None,
@@ -296,6 +335,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
         images: Optional[List[str]] = None,
         in_memory_messages: Optional[List[Dict[str, Any]]] = None,
         output_configuration: Optional[Dict[str, Any]] = None,
+        output_schema: Optional[Type[BaseModel]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         user_id: Optional[str] = None,
         user_input_id: Optional[str] = None,
@@ -332,7 +372,9 @@ class AsyncPipelineExecution(BasePipelineExecution):
             files: Optional list of file identifiers
             images: Optional list of image identifiers
             in_memory_messages: Optional list of in-memory messages
-            output_configuration: Optional output configuration
+            output_configuration: Optional output configuration (raw dict format)
+            output_schema: Optional Pydantic model class for structured output.
+                         If provided, takes precedence over output_configuration.
             prompt_variables: Optional prompt variables dictionary
             user_id: Optional user identifier
             user_input_id: Optional unique identifier for user input
@@ -349,7 +391,8 @@ class AsyncPipelineExecution(BasePipelineExecution):
             aiohttp.ClientError: For other request-related errors.
             ValueError: If required parameters are missing or invalid.
 
-        Example:
+        Examples:
+            Basic usage:
             ```python
             client = AiriaAsyncClient(api_key="your_api_key")
             response = await client.pipeline_execution.execute_temporary_assistant(
@@ -363,6 +406,21 @@ class AsyncPipelineExecution(BasePipelineExecution):
             )
             print(response.result)
             ```
+
+            With structured output:
+            ```python
+            from pydantic import BaseModel
+
+            class WeatherInfo(BaseModel):
+                temperature: float
+                conditions: str
+
+            response = await client.pipeline_execution.execute_temporary_assistant(
+                model_parameters={...},
+                user_input="What's the weather?",
+                output_schema=WeatherInfo
+            )
+            ```
         """
         # Validate required parameters
         if not user_input:
@@ -378,6 +436,17 @@ class AsyncPipelineExecution(BasePipelineExecution):
         if images or files:
             file_urls, image_urls = await self._upload_files(files or [], images or [])
 
+        # Handle structured output by injecting schema as system message
+        modified_in_memory_messages = in_memory_messages
+        if output_schema is not None:
+            # Create a copy of in_memory_messages if it exists, otherwise create new list
+            modified_in_memory_messages = list(in_memory_messages) if in_memory_messages else []
+            # Insert schema instruction as first system message
+            schema_message = create_schema_system_message(output_schema)
+            modified_in_memory_messages.insert(0, schema_message)
+            # Don't use output_configuration when using output_schema
+            output_configuration = None
+
         request_data = self._pre_execute_temporary_assistant(
             model_parameters=model_parameters,
             user_input=user_input,
@@ -397,7 +466,7 @@ class AsyncPipelineExecution(BasePipelineExecution):
             external_user_id=external_user_id,
             files=file_urls,
             images=image_urls,
-            in_memory_messages=in_memory_messages,
+            in_memory_messages=modified_in_memory_messages,
             output_configuration=output_configuration,
             prompt_variables=prompt_variables,
             user_id=user_id,
@@ -415,4 +484,8 @@ class AsyncPipelineExecution(BasePipelineExecution):
         if async_output:
             return TemporaryAssistantAsyncStreamedResponse(stream=resp)
 
-        return TemporaryAssistantResponse(**resp)
+        response = TemporaryAssistantResponse(**resp)
+        # Parse response to Pydantic model if output_schema was provided
+        if output_schema is not None and response.result:
+            response.result = parse_response_to_model(str(response.result), output_schema)
+        return response

airia/client/pipeline_execution/base_pipeline_execution.py

@@ -42,6 +42,7 @@ class BasePipelineExecution:
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_configuration: Optional[Dict[str, Any]] = None,
         correlation_id: Optional[str] = None,
         api_version: str = ApiVersion.V2.value,
     ):
@@ -69,6 +70,7 @@ class BasePipelineExecution:
             additional_info: Optional additional information
             prompt_variables: Optional prompt variables
             voice_enabled: Whether the request came through the airia-voice-proxy
+            output_configuration: Optional output configuration for structured output
             correlation_id: Optional correlation ID for tracing
             api_version: API version to use for the request
 
@@ -105,6 +107,7 @@ class BasePipelineExecution:
             "additionalInfo": additional_info,
             "promptVariables": prompt_variables,
             "voiceEnabled": voice_enabled,
+            "outputConfiguration": output_configuration,
         }
 
         request_data = self._request_handler.prepare_request(

airia/client/pipeline_execution/sync_pipeline_execution.py

@@ -1,6 +1,9 @@
-from typing import Any, Dict, List, Literal, Optional, Union, overload
+from typing import Any, Dict, List, Literal, Optional, Type, Union, overload
+
+from pydantic import BaseModel
 
 from ...types._api_version import ApiVersion
+from ...types._structured_output import create_schema_system_message, parse_response_to_model
 from ...types.api.pipeline_execution import (
     PipelineExecutionResponse,
     PipelineExecutionStreamedResponse,
@@ -80,6 +83,7 @@ class PipelineExecution(BasePipelineExecution):
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_schema: Optional[Type[BaseModel]] = None,
         correlation_id: Optional[str] = None,
     ) -> PipelineExecutionResponse: ...
 
@@ -103,6 +107,7 @@ class PipelineExecution(BasePipelineExecution):
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_schema: Optional[Type[BaseModel]] = None,
         correlation_id: Optional[str] = None,
     ) -> PipelineExecutionStreamedResponse: ...
 
@@ -125,6 +130,7 @@ class PipelineExecution(BasePipelineExecution):
         additional_info: Optional[List[Any]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         voice_enabled: bool = False,
+        output_schema: Optional[Type[BaseModel]] = None,
         correlation_id: Optional[str] = None,
     ) -> Union[PipelineExecutionResponse, PipelineExecutionStreamedResponse]:
         """
@@ -148,6 +154,7 @@ class PipelineExecution(BasePipelineExecution):
             additional_info: Optional additional information.
             prompt_variables: Optional variables to be used in the prompt.
             voice_enabled: Whether the request came through the airia-voice-proxy. Default is False.
+            output_schema: Optional Pydantic model class for structured output.
             correlation_id: Optional correlation ID for request tracing. If not provided,
                         one will be generated automatically.
 
@@ -158,7 +165,8 @@ class PipelineExecution(BasePipelineExecution):
             AiriaAPIError: If the API request fails with details about the error.
             requests.RequestException: For other request-related errors.
 
-        Example:
+        Examples:
+            Basic usage:
             ```python
             client = AiriaClient(api_key="your_api_key")
             response = client.pipeline_execution.execute_pipeline(
@@ -167,6 +175,23 @@ class PipelineExecution(BasePipelineExecution):
             )
             print(response.result)
             ```
+
+            With structured output using a Pydantic model:
+            ```python
+            from pydantic import BaseModel
+
+            class PersonInfo(BaseModel):
+                name: str
+                age: int
+                occupation: str
+
+            response = client.pipeline_execution.execute_pipeline(
+                pipeline_id="pipeline_123",
+                user_input="Extract the person's information",
+                output_schema=PersonInfo
+            )
+            # Response will conform to PersonInfo schema
+            ```
         """
         # Validate user_input parameter
         if not user_input:
@@ -179,6 +204,15 @@ class PipelineExecution(BasePipelineExecution):
         if images or files:
             file_urls, image_urls = self._upload_files(files or [], images or [])
 
+        # Handle structured output by injecting schema as system message
+        modified_in_memory_messages = in_memory_messages
+        if output_schema is not None:
+            # Create a copy of in_memory_messages if it exists, otherwise create new list
+            modified_in_memory_messages = list(in_memory_messages) if in_memory_messages else []
+            # Insert schema instruction as first system message
+            schema_message = create_schema_system_message(output_schema)
+            modified_in_memory_messages.insert(0, schema_message)
+
         request_data = self._pre_execute_pipeline(
             pipeline_id=pipeline_id,
             user_input=user_input,
@@ -191,12 +225,13 @@ class PipelineExecution(BasePipelineExecution):
             files=file_urls,
             data_source_folders=data_source_folders,
             data_source_files=data_source_files,
-            in_memory_messages=in_memory_messages,
+            in_memory_messages=modified_in_memory_messages,
             current_date_time=current_date_time,
             save_history=save_history,
             additional_info=additional_info,
             prompt_variables=prompt_variables,
             voice_enabled=voice_enabled,
+            output_configuration=None,  # Not using output_configuration anymore
             correlation_id=correlation_id,
             api_version=ApiVersion.V2.value,
         )
@@ -207,7 +242,11 @@ class PipelineExecution(BasePipelineExecution):
         )
 
         if not async_output:
-            return PipelineExecutionResponse(**resp)
+            response = PipelineExecutionResponse(**resp)
+            # Parse response to Pydantic model if output_schema was provided
+            if output_schema is not None and response.result:
+                response.result = parse_response_to_model(response.result, output_schema)
+            return response
 
         return PipelineExecutionStreamedResponse(stream=resp)
 
@@ -234,6 +273,7 @@ class PipelineExecution(BasePipelineExecution):
         images: Optional[List[str]] = None,
         in_memory_messages: Optional[List[Dict[str, Any]]] = None,
         output_configuration: Optional[Dict[str, Any]] = None,
+        output_schema: Optional[Type[BaseModel]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         user_id: Optional[str] = None,
         user_input_id: Optional[str] = None,
@@ -264,6 +304,7 @@ class PipelineExecution(BasePipelineExecution):
         images: Optional[List[str]] = None,
         in_memory_messages: Optional[List[Dict[str, Any]]] = None,
         output_configuration: Optional[Dict[str, Any]] = None,
+        output_schema: Optional[Type[BaseModel]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         user_id: Optional[str] = None,
         user_input_id: Optional[str] = None,
@@ -293,6 +334,7 @@ class PipelineExecution(BasePipelineExecution):
         images: Optional[List[str]] = None,
         in_memory_messages: Optional[List[Dict[str, Any]]] = None,
         output_configuration: Optional[Dict[str, Any]] = None,
+        output_schema: Optional[Type[BaseModel]] = None,
         prompt_variables: Optional[Dict[str, Any]] = None,
         user_id: Optional[str] = None,
         user_input_id: Optional[str] = None,
@@ -329,7 +371,9 @@ class PipelineExecution(BasePipelineExecution):
             files: Optional list of file identifiers
             images: Optional list of image identifiers
             in_memory_messages: Optional list of in-memory messages
-            output_configuration: Optional output configuration
+            output_configuration: Optional output configuration (raw dict format)
+            output_schema: Optional Pydantic model class for structured output.
+                         If provided, takes precedence over output_configuration.
             prompt_variables: Optional prompt variables dictionary
             user_id: Optional user identifier (GUID string or UUID)
             user_input_id: Optional unique identifier for user input (GUID string or UUID)
@@ -345,7 +389,8 @@ class PipelineExecution(BasePipelineExecution):
             requests.RequestException: For other request-related errors.
             ValueError: If required parameters are missing or invalid.
 
-        Example:
+        Examples:
+            Basic usage:
             ```python
             client = AiriaClient(api_key="your_api_key")
             response = client.pipeline_execution.execute_temporary_assistant(
@@ -359,6 +404,23 @@ class PipelineExecution(BasePipelineExecution):
             )
             print(response.result)
             ```
+
+            With structured output using a Pydantic model:
+            ```python
+            from pydantic import BaseModel
+
+            class WeatherInfo(BaseModel):
+                temperature: float
+                conditions: str
+                humidity: int
+
+            response = client.pipeline_execution.execute_temporary_assistant(
+                model_parameters={...},
+                user_input="What's the weather like?",
+                output_schema=WeatherInfo
+            )
+            # Response will conform to WeatherInfo schema
+            ```
         """
         # Validate required parameters
         if not user_input:
@@ -374,6 +436,17 @@ class PipelineExecution(BasePipelineExecution):
         if images or files:
             file_urls, image_urls = self._upload_files(files or [], images or [])
 
+        # Handle structured output by injecting schema as system message
+        modified_in_memory_messages = in_memory_messages
+        if output_schema is not None:
+            # Create a copy of in_memory_messages if it exists, otherwise create new list
+            modified_in_memory_messages = list(in_memory_messages) if in_memory_messages else []
+            # Insert schema instruction as first system message
+            schema_message = create_schema_system_message(output_schema)
+            modified_in_memory_messages.insert(0, schema_message)
+            # Don't use output_configuration when using output_schema
+            output_configuration = None
+
         # Convert UUID objects to strings for API compatibility
         conversation_id_str = str(conversation_id) if conversation_id else conversation_id
         user_id_str = str(user_id) if user_id else user_id
@@ -398,7 +471,7 @@ class PipelineExecution(BasePipelineExecution):
             external_user_id=external_user_id,
             files=file_urls,
             images=image_urls,
-            in_memory_messages=in_memory_messages,
+            in_memory_messages=modified_in_memory_messages,
             output_configuration=output_configuration,
             prompt_variables=prompt_variables,
             user_id=user_id_str,
@@ -416,4 +489,8 @@ class PipelineExecution(BasePipelineExecution):
         if async_output:
             return TemporaryAssistantStreamedResponse(stream=resp)
 
-        return TemporaryAssistantResponse(**resp)
+        response = TemporaryAssistantResponse(**resp)
+        # Parse response to Pydantic model if output_schema was provided
+        if output_schema is not None and response.result:
+            response.result = parse_response_to_model(str(response.result), output_schema)
+        return response

airia/types/__init__.py

@@ -0,0 +1,11 @@
+"""Type definitions for the Airia SDK."""
+
+from airia.types._structured_output import (
+    create_schema_system_message,
+    parse_response_to_model,
+)
+
+__all__ = [
+    "create_schema_system_message",
+    "parse_response_to_model",
+]

airia/types/_structured_output.py

@@ -0,0 +1,182 @@
+"""Helper utilities for structured output with Pydantic models."""
+
+import json
+import re
+import uuid
+from typing import Any, Dict, Type
+from textwrap import dedent
+
+from pydantic import BaseModel, ValidationError
+
+
+def create_schema_system_message(model: Type[BaseModel]) -> Dict[str, Any]:
+    """
+    Create a system message that instructs the LLM to return structured output.
+
+    Args:
+        model: The Pydantic model class to generate schema from
+
+    Returns:
+        Dictionary representing a system message for in_memory_messages
+
+    Example:
+        ```python
+        from pydantic import BaseModel
+
+        class UserInfo(BaseModel):
+            name: str
+            age: int
+
+        message = create_schema_system_message(UserInfo)
+        # Use in in_memory_messages parameter
+        ```
+    """
+    schema = model.model_json_schema()
+
+    message_content = dedent(f"""As a genius expert, your task is to understand the content and provide the parsed objects in json that match the following json_schema:
+
+    {json.dumps(schema, indent=2, ensure_ascii=False)}
+
+    Make sure to return an instance of the JSON, not the schema itself""")
+
+    return {
+        "id": str(uuid.uuid4()),
+        "message": message_content,
+        "role": "system",
+        "toolRequests": [],
+        "toolResponses": [],
+    }
+
+
+def remove_start_md_json(response_msg: str) -> str:
+    """
+    Checks the message for the listed start patterns and removes them if present.
+
+    Args:
+        response_msg: The response message to check.
+
+    Returns:
+        The response message without the start marker (if one was present).
+    """
+    start_pattern = re.compile(
+        r"^(```json\n|`json\n|```\n|`\n|```json|`json|```|`|json|json\n)"
+    )
+    match = start_pattern.match(response_msg)
+    if match:
+        response_msg = response_msg[match.end() :]
+
+    return response_msg
+
+
+def remove_end_md_json(response_msg: str) -> str:
+    """
+    Checks the message for the listed end patterns and removes them if present.
+
+    Args:
+        response_msg: The response message to check.
+
+    Returns:
+        The response message without the end marker (if one was present).
+    """
+    end_pattern = re.compile(r"(\n```|\n`|```|`)$")
+    match = end_pattern.search(response_msg)
+    if match:
+        response_msg = response_msg[: match.start()]
+
+    return response_msg
+
+
+def extract_json_from_string(response_msg: str) -> str:
+    """
+    Attempts to extract JSON (object or array) from within a larger string, not specific to markdown.
+
+    Args:
+        response_msg: The response message to check.
+
+    Returns:
+        The extracted JSON string if found, otherwise the original string.
+    """
+    json_pattern = re.compile(r"\{.*\}|\[.*\]", re.DOTALL)
+    match = json_pattern.search(response_msg)
+    if match:
+        return match.group(0)
+
+    return response_msg
+
+
+def remove_markdown_json(response_msg: str) -> str:
+    """
+    Checks if the response message is in JSON format and removes Markdown formatting if present.
+
+    Args:
+        response_msg: The response message to check.
+
+    Returns:
+        The response message without Markdown formatting if present, or an error message.
+    """
+    response_msg = remove_start_md_json(response_msg)
+    response_msg = remove_end_md_json(response_msg)
+
+    # Validate if the remaining response message is valid JSON. If it's still not valid
+    # after removing the markdown notation, try to extract JSON from within the string.
+    try:
+        json.loads(response_msg)
+        return response_msg
+    except json.JSONDecodeError:
+        response_msg = extract_json_from_string(response_msg)
+        try:
+            json.loads(response_msg)
+            return response_msg
+        except json.JSONDecodeError:
+            return f"Invalid JSON response: {response_msg}"
+
+
+def parse_response_to_model(response_text: str, model: Type[BaseModel]) -> BaseModel:
+    """
+    Parse a response string to a Pydantic model instance.
+
+    This function cleans markdown formatting from JSON responses and validates
+    the parsed data against the provided Pydantic model.
+
+    Args:
+        response_text: The raw response text from the LLM
+        model: The Pydantic model class to parse into
+
+    Returns:
+        An instance of the Pydantic model
+
+    Raises:
+        ValidationError: If the response doesn't match the model schema
+        ValueError: If the response is not valid JSON
+
+    Example:
+        ```python
+        from pydantic import BaseModel
+
+        class UserInfo(BaseModel):
+            name: str
+            age: int
+
+        response = '```json\\n{"name": "John", "age": 30}\\n```'
+        user = parse_response_to_model(response, UserInfo)
+        print(user.name)  # "John"
+        ```
+    """
+    # Clean markdown formatting
+    cleaned_json = remove_markdown_json(response_text)
+
+    # Check for error message
+    if cleaned_json.startswith("Invalid JSON response:"):
+        raise ValueError(cleaned_json)
+
+    # Parse JSON
+    try:
+        data = json.loads(cleaned_json)
+    except json.JSONDecodeError as e:
+        raise ValueError(f"Failed to parse JSON: {e}") from e
+
+    # Validate against Pydantic model
+    try:
+        return model.model_validate(data)
+    except ValidationError as e:
+        raise ValidationError(f"Response does not match schema: {e}") from e

airia/types/api/models/list_models.py

@@ -111,7 +111,7 @@ class ModelItem(BaseModel):
     source_type: str = Field(alias="sourceType")
     type: str
     provider: str
-    tenant_id: str = Field(alias="tenantId")
+    tenant_id: Optional[str] = Field(None, alias="tenantId")
     project_id: Optional[str] = Field(None, alias="projectId")
     project_name: Optional[str] = Field(None, alias="projectName")
     project: Optional[ModelProject] = None
@@ -121,7 +121,7 @@ class ModelItem(BaseModel):
     has_tool_support: bool = Field(alias="hasToolSupport")
     has_stream_support: bool = Field(alias="hasStreamSupport")
     library_model_id: Optional[str] = Field(None, alias="libraryModelId")
-    user_provided_details: ModelUserProvidedDetails = Field(alias="userProvidedDetails")
+    user_provided_details: Optional[ModelUserProvidedDetails] = Field(None, alias="userProvidedDetails")
     allow_airia_credentials: bool = Field(alias="allowAiriaCredentials")
     allow_byok_credentials: bool = Field(alias="allowBYOKCredentials")
     price_type: str = Field(alias="priceType")

{airia-0.1.29.dist-info → airia-0.1.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airia
-Version: 0.1.29
+Version: 0.1.31
 Summary: Python SDK for Airia API
 Author-email: Airia LLC <support@airia.com>
 License: MIT

{airia-0.1.29.dist-info → airia-0.1.31.dist-info}/RECORD

@@ -35,9 +35,9 @@ airia/client/models/async_models.py,sha256=gwW3tWwzSZ9_3JmGlwryY48w9KrFXoLET6Jps
 airia/client/models/base_models.py,sha256=FchsA7P-Fc7fxzlN88jJ3BEVXPWDcIHSzci6wtSArqg,3439
 airia/client/models/sync_models.py,sha256=FQLM4xCoxcBk1NuLf6z7jVVejlDKx5KpMRBz2tQm71o,5748
 airia/client/pipeline_execution/__init__.py,sha256=7qEZsPRTLySC71zlwYioBuJs6B4BwRCgFL3TQyFWXmc,175
-airia/client/pipeline_execution/async_pipeline_execution.py,sha256=alglTaHtWEipJx56WOUdV8MNhpOmo4GuhCXI9wkv7Mw,18022
-airia/client/pipeline_execution/base_pipeline_execution.py,sha256=fVGG__zHPpKLZdcwOL3GYmEyjCC7V4GZVuZ4CagGRP4,9608
-airia/client/pipeline_execution/sync_pipeline_execution.py,sha256=tvzo05lKgcUT-_LgFbyU7HdyV-EFWQMPAgC6znRKLzI,18106
+airia/client/pipeline_execution/async_pipeline_execution.py,sha256=hk_bHFKcDfRTzpdWC-3noflO5WGqtfitxzPulfckElU,21539
+airia/client/pipeline_execution/base_pipeline_execution.py,sha256=9nmJSVAL6zfAlfBpGQcJOFwIRoZBJNouCH6o3JSLYX0,9814
+airia/client/pipeline_execution/sync_pipeline_execution.py,sha256=VRgdAvR9-Ims46YYMso90deimxcRtff77oEqU4GxBxY,21852
 airia/client/pipeline_import/__init__.py,sha256=ELSVZbekuhTnGDWFZsqE3-ILWsyHUwj9J_-Z75zGz_0,157
 airia/client/pipeline_import/async_pipeline_import.py,sha256=BC6HkkMNiU7_7H8vAhXwehV_Q5781xuNLTik6ehTgiU,7251
 airia/client/pipeline_import/base_pipeline_import.py,sha256=_6AHf_bL3RABDaIQN3-ivL3Z8NR1l0J7A4S0ilJCluY,3844
@@ -58,9 +58,10 @@ airia/client/tools/__init__.py,sha256=9bRyvbHD_AthBZA8YXMG79ZYoQjoGCl6mVnu5kVH1J
 airia/client/tools/async_tools.py,sha256=Qnh0aDT-QM0P_Au3G-ehBL4iSxbMMf58TsbBBqzF1ow,11231
 airia/client/tools/base_tools.py,sha256=YFTLESJBwvm5Z4YiRiadOQis9PH8Cwz6QC4scf1hazw,5913
 airia/client/tools/sync_tools.py,sha256=mFWkHwbcHPf95UB58TDtAgbBvDbpXylEC1S5fRXFhAE,10618
-airia/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+airia/types/__init__.py,sha256=fbNw1eto8l-qgz-W2QG32i-zQY7WiWZY3JR6fL2HsKM,235
 airia/types/_api_version.py,sha256=Uzom6O2ZG92HN_Z2h-lTydmO2XYX9RVs4Yi4DJmXytE,255
 airia/types/_request_data.py,sha256=q8t7KfO2WvgbPVYPvPWiwYb8LyP0kovlOgHFhZIU6ns,1278
+airia/types/_structured_output.py,sha256=j_uqBMl5SmDNv0v_FrAli0ugQoLzhZKT_YGLHvWc2A0,5357
 airia/types/api/__init__.py,sha256=hAkcgB07FFdYUqGAP9-7CUFTBTYUOn6DFRH4wMo2PoM,150
 airia/types/api/attachments/__init__.py,sha256=zFSCwsmPr05I7NJRG6MCWME3AKhBpL0MhgOBOaF7rok,78
 airia/types/api/attachments/upload_file.py,sha256=XBCm1lZJAloFxmyp_3fbtuJ9Y28O-mbAfwy6D0EvTgQ,457
@@ -74,7 +75,7 @@ airia/types/api/deployments/get_deployments.py,sha256=5Dm7pTkEFmIZ4p4Scle9x9p3Nq
 airia/types/api/library/__init__.py,sha256=b2TLWT90EhQ41f8LcGMtvzEftd3ol_eKc41ian6zXX8,201
 airia/types/api/library/_library_models.py,sha256=d0YbmKNuUDXrieSRZh1IkhW_2aKrnaU08yuxqij98Dg,10486
 airia/types/api/models/__init__.py,sha256=bm4Rn86Tuk7q3988bJ_gvS5zY7t-sqCFt1BYb0nS7Xo,224
-airia/types/api/models/list_models.py,sha256=6tZRi_MBiMaQZb6whU2Ky8VRnUw_JDMkDZPY0PS3vQA,5451
+airia/types/api/models/list_models.py,sha256=r4xpRhoawG8VLmNwVSZRsS__K6bCv-HTVVw2c_ClJow,5483
 airia/types/api/pipeline_execution/__init__.py,sha256=jlBLNN3yzd9TBQEfi7JJWlp3ur2NfXmON3YDnMkYdEY,674
 airia/types/api/pipeline_execution/_pipeline_execution.py,sha256=4E8rmr3Ok9EHkTzHjeZHQFlQVIXQIXIpbEeDtKAh3sQ,6425
 airia/types/api/pipeline_import/__init__.py,sha256=5m8e4faOYGCEFLQWJgj-v5H4NXPNtnlAKAxA4tGJUbw,267
@@ -93,8 +94,8 @@ airia/types/api/tools/_tools.py,sha256=PSJYFok7yQdE4it55iQmbryFzKN54nT6N161X1Rkp
 airia/types/sse/__init__.py,sha256=KWnNTfsQnthfrU128pUX6ounvSS7DvjC-Y21FE-OdMk,1863
 airia/types/sse/sse_messages.py,sha256=asq9KG5plT2XSgQMz-Nqo0WcKlXvE8UT3E-WLhCegPk,30244
 airia/utils/sse_parser.py,sha256=XCTkuaroYWaVQOgBq8VpbseQYSAVruF69AvKUwZQKTA,4251
-airia-0.1.29.dist-info/licenses/LICENSE,sha256=R3ClUMMKPRItIcZ0svzyj2taZZnFYw568YDNzN9KQ1Q,1066
-airia-0.1.29.dist-info/METADATA,sha256=SjH5WPody0kAfZ8TreZ_Vr3A1PLkxXNb-CzSLJ2BQtQ,4506
-airia-0.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-airia-0.1.29.dist-info/top_level.txt,sha256=qUQEKfs_hdOYTwjKj1JZbRhS5YeXDNaKQaVTrzabS6w,6
-airia-0.1.29.dist-info/RECORD,,
+airia-0.1.31.dist-info/licenses/LICENSE,sha256=R3ClUMMKPRItIcZ0svzyj2taZZnFYw568YDNzN9KQ1Q,1066
+airia-0.1.31.dist-info/METADATA,sha256=Kozozw2Ucrhze9XJ60rBuIB63VHVTUN7tEgWrFfdySQ,4506
+airia-0.1.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+airia-0.1.31.dist-info/top_level.txt,sha256=qUQEKfs_hdOYTwjKj1JZbRhS5YeXDNaKQaVTrzabS6w,6
+airia-0.1.31.dist-info/RECORD,,