Generate modelserving

Author: stackit-pipeline

services/modelserving/oas_commit

@@ -1 +1 @@
-0e64886dd0847341800d7191ed193b75413be998
+8f43ed707da765654e4427642c9d978f80d504e1

services/modelserving/src/stackit/modelserving/api_client.py

@@ -67,6 +67,7 @@ class ApiClient:
         "date": datetime.date,
         "datetime": datetime.datetime,
         "decimal": decimal.Decimal,
+        "UUID": uuid.UUID,
         "object": object,
     }
     _pool = None
@@ -266,7 +267,7 @@ def response_deserialize(
         response_text = None
         return_data = None
         try:
-            if response_type == "bytearray":
+            if response_type in ("bytearray", "bytes"):
                 return_data = response_data.data
             elif response_type == "file":
                 return_data = self.__deserialize_file(response_data)
@@ -327,25 +328,20 @@ def sanitize_for_serialization(self, obj):
             return obj.isoformat()
         elif isinstance(obj, decimal.Decimal):
             return str(obj)
-
         elif isinstance(obj, dict):
-            obj_dict = obj
+            return {key: self.sanitize_for_serialization(val) for key, val in obj.items()}
+
+        # Convert model obj to dict except
+        # attributes `openapi_types`, `attribute_map`
+        # and attributes which value is not None.
+        # Convert attribute name to json key in
+        # model definition for request.
+        if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")):  # noqa: B009
+            obj_dict = obj.to_dict()
         else:
-            # Convert model obj to dict except
-            # attributes `openapi_types`, `attribute_map`
-            # and attributes which value is not None.
-            # Convert attribute name to json key in
-            # model definition for request.
-            if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")):  # noqa: B009
-                obj_dict = obj.to_dict()
-            else:
-                obj_dict = obj.__dict__
-
-        if isinstance(obj_dict, list):
-            # here we handle instances that can either be a list or something else, and only became a real list by calling to_dict() # noqa: E501
-            return self.sanitize_for_serialization(obj_dict)
+            obj_dict = obj.__dict__
 
-        return {key: self.sanitize_for_serialization(val) for key, val in obj_dict.items()}
+        return self.sanitize_for_serialization(obj_dict)
 
     def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
         """Deserializes response into an object.
@@ -418,6 +414,8 @@ def __deserialize(self, data, klass):
             return self.__deserialize_datetime(data)
         elif klass is decimal.Decimal:
             return decimal.Decimal(data)
+        elif klass is uuid.UUID:
+            return uuid.UUID(data)
         elif issubclass(klass, Enum):
             return self.__deserialize_enum(data, klass)
         else:

services/modelserving/src/stackit/modelserving/models/chat_model_details.py

@@ -21,6 +21,7 @@
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.modelserving.models.sku import SKU
@@ -80,20 +81,29 @@ def category_validate_enum(cls, value):
     @field_validator("description")
     def description_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
 
     @field_validator("displayed_name")
     def displayed_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s_-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s_-]+$/")
         return value
 
     @field_validator("name")
     def name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
@@ -111,12 +121,16 @@ def quantization_method_validate_enum(cls, value):
     @field_validator("url")
     def url_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -127,8 +141,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/create_token_payload.py

@@ -20,6 +20,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 
@@ -43,19 +44,26 @@ def description_validate_regular_expression(cls, value):
         if value is None:
             return value
 
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
 
     @field_validator("name")
     def name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s_-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s_-]+$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -66,8 +74,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/create_token_response.py

@@ -19,6 +19,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.modelserving.models.token_created import TokenCreated
@@ -34,7 +35,8 @@ class CreateTokenResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["message", "token"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/embedding_model_details.py

@@ -21,6 +21,7 @@
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.modelserving.models.sku import SKU
@@ -64,33 +65,46 @@ def category_validate_enum(cls, value):
     @field_validator("description")
     def description_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
 
     @field_validator("displayed_name")
     def displayed_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s_-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s_-]+$/")
         return value
 
     @field_validator("name")
     def name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
 
     @field_validator("url")
     def url_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[0-9a-zA-Z\s.:\/\-]+$", value):
             raise ValueError(r"must validate the regular expression /^[0-9a-zA-Z\s.:\/\-]+$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -101,8 +115,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/error_message_response.py

@@ -19,6 +19,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -32,7 +33,8 @@ class ErrorMessageResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["error", "message"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/get_chat_model_response.py

@@ -19,6 +19,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.modelserving.models.chat_model_details import ChatModelDetails
@@ -34,7 +35,8 @@ class GetChatModelResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["message", "model"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/get_embeddings_model_resp.py

@@ -19,6 +19,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.modelserving.models.embedding_model_details import EmbeddingModelDetails
@@ -34,7 +35,8 @@ class GetEmbeddingsModelResp(BaseModel):
     __properties: ClassVar[List[str]] = ["message", "model"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:

services/modelserving/src/stackit/modelserving/models/get_token_response.py

@@ -19,6 +19,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.modelserving.models.token import Token
@@ -34,7 +35,8 @@ class GetTokenResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["message", "token"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ def to_str(self) -> str:
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
-        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
-        return json.dumps(self.to_dict())
+        return json.dumps(to_jsonable_python(self.to_dict()))
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]: