Revert "Fixed openapi dataplane.yaml"

mlserver/types/dataplane.py

@@ -1,12 +1,10 @@
 # generated by datamodel-codegen:
 #   filename:  dataplane.yaml
 
-from __future__ import annotations
-
 from enum import Enum
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
-from pydantic import ConfigDict, Field, RootModel
+from pydantic import Field, RootModel, ConfigDict
 
 from .base import BaseModel
 
@@ -21,6 +19,22 @@ class MetadataServerErrorResponse(BaseModel):
     error: str
 
 
+class Datatype(Enum):
+    BOOL = "BOOL"
+    UINT8 = "UINT8"
+    UINT16 = "UINT16"
+    UINT32 = "UINT32"
+    UINT64 = "UINT64"
+    INT8 = "INT8"
+    INT16 = "INT16"
+    INT32 = "INT32"
+    INT64 = "INT64"
+    FP16 = "FP16"
+    FP32 = "FP32"
+    FP64 = "FP64"
+    BYTES = "BYTES"
+
+
 class MetadataModelErrorResponse(BaseModel):
     error: str
 
@@ -29,12 +43,13 @@ class Parameters(BaseModel):
     model_config = ConfigDict(
         extra="allow",
     )
+
     content_type: Optional[str] = None
     headers: Optional[Dict[str, Any]] = None
 
 
-class TensorData(RootModel[Union[List, str]]):
-    root: Union[List, str] = Field(..., title="TensorData")
+class TensorData(RootModel[Any]):
+    root: Any = Field(..., title="TensorData")
 
     def __iter__(self):
         return iter(self.root)
@@ -48,71 +63,55 @@ def __len__(self):
 
 class RequestOutput(BaseModel):
     name: str
-    parameters: Optional[Parameters] = None
+    parameters: Optional["Parameters"] = None
 
 
-class InferenceErrorResponse(BaseModel):
-    error: Optional[str] = None
+class ResponseOutput(BaseModel):
+    name: str
+    shape: List[int]
+    datatype: "Datatype"
+    parameters: Optional["Parameters"] = None
+    data: "TensorData"
 
 
-class Datatype(Enum):
-    BOOL = "BOOL"
-    UINT8 = "UINT8"
-    UINT16 = "UINT16"
-    UINT32 = "UINT32"
-    UINT64 = "UINT64"
-    INT8 = "INT8"
-    INT16 = "INT16"
-    INT32 = "INT32"
-    INT64 = "INT64"
-    FP16 = "FP16"
-    FP32 = "FP32"
-    FP64 = "FP64"
-    BYTES = "BYTES"
+class InferenceResponse(BaseModel):
+    model_name: str
+    model_version: Optional[str] = None
+    id: Optional[str] = None
+    parameters: Optional["Parameters"] = None
+    outputs: List["ResponseOutput"]
 
 
-class MetadataTensor(BaseModel):
-    name: str
-    datatype: Datatype
-    shape: List[int]
-    parameters: Optional[Parameters] = None
+class InferenceErrorResponse(BaseModel):
+    error: Optional[str] = None
 
 
-class RequestInput(BaseModel):
+class MetadataTensor(BaseModel):
     name: str
+    datatype: "Datatype"
     shape: List[int]
-    datatype: Datatype
-    parameters: Optional[Parameters] = None
-    data: TensorData
+    parameters: Optional["Parameters"] = None
 
 
-class ResponseOutput(BaseModel):
+class RequestInput(BaseModel):
     name: str
     shape: List[int]
-    datatype: Datatype
-    parameters: Optional[Parameters] = None
-    data: TensorData
-
-
-class InferenceResponse(BaseModel):
-    model_name: str
-    model_version: Optional[str] = None
-    id: Optional[str] = None
-    parameters: Optional[Parameters] = None
-    outputs: List[ResponseOutput]
+    datatype: "Datatype"
+    parameters: Optional["Parameters"] = None
+    data: "TensorData"
 
 
 class MetadataModelResponse(BaseModel):
     name: str
     versions: Optional[List[str]] = None
     platform: str
-    inputs: Optional[List[MetadataTensor]] = None
-    outputs: Optional[List[MetadataTensor]] = None
-    parameters: Optional[Parameters] = None
+    inputs: Optional[List["MetadataTensor"]] = None
+    outputs: Optional[List["MetadataTensor"]] = None
+    parameters: Optional["Parameters"] = None
 
 
 class InferenceRequest(BaseModel):
     id: Optional[str] = None
-    parameters: Optional[Parameters] = None
-    inputs: List[RequestInput]
-    outputs: Optional[List[RequestOutput]] = None
+    parameters: Optional["Parameters"] = None
+    inputs: List["RequestInput"]
+    outputs: Optional[List["RequestOutput"]] = None

openapi/dataplane.yaml

@@ -247,7 +247,7 @@ paths:
         - model
 components:
   enums:
-    Datatype:
+    TensorDataTypes:
       type: string
       enum:
         - BOOL
@@ -321,8 +321,7 @@ components:
       properties:
         name:
           type: string
-        datatype:
-          $ref: '#/components/enums/Datatype'
+        datatype: $ref: '#/components/enums/TensorDataTypes'
         shape:
           type: array
           items:
@@ -416,8 +415,7 @@ components:
           type: array
           items:
             type: integer
-        datatype:
-          $ref: '#/components/enums/Datatype'
+        datatype: $ref: '#/components/enums/TensorDataTypes'
         parameters:
           $ref: '#/components/schemas/Parameters'
         data:
@@ -429,9 +427,7 @@ components:
         - data
     TensorData:
       title: TensorData
-      oneOf:
-        - type: array
-        - type: string
+      type: array
     RequestOutput:
       title: RequestOutput
       type: object
@@ -452,8 +448,7 @@ components:
           type: array
           items:
             type: integer
-        datatype:
-          $ref: '#/components/enums/Datatype'
+        datatype: $ref: '#/components/enums/TensorDataTypes'
         parameters:
           $ref: '#/components/schemas/Parameters'
         data: