graphscope-flex 0.27.0__5-py2.py3-none-any.whl → 0.28.0__5-py2.py3-none-any.whl

graphscope/flex/rest/api/job_api.py

@@ -17,9 +17,11 @@ from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
-from pydantic import StrictStr
+from pydantic import StrictBool, StrictStr
+from typing import Optional
 from graphscope.flex.rest.models.create_dataloading_job_response import CreateDataloadingJobResponse
 from graphscope.flex.rest.models.dataloading_job_config import DataloadingJobConfig
+from graphscope.flex.rest.models.dataloading_mr_job_config import DataloadingMRJobConfig
 from graphscope.flex.rest.models.job_status import JobStatus
 
 from graphscope.flex.rest.api_client import ApiClient, RequestSerialized
@@ -44,6 +46,7 @@ class JobApi:
     def delete_job_by_id(
         self,
         job_id: StrictStr,
+        delete_scheduler: Optional[StrictBool] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -63,6 +66,8 @@ class JobApi:
 
         :param job_id: (required)
         :type job_id: str
+        :param delete_scheduler:
+        :type delete_scheduler: bool
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -87,6 +92,7 @@ class JobApi:
 
         _param = self._delete_job_by_id_serialize(
             job_id=job_id,
+            delete_scheduler=delete_scheduler,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -112,6 +118,7 @@ class JobApi:
     def delete_job_by_id_with_http_info(
         self,
         job_id: StrictStr,
+        delete_scheduler: Optional[StrictBool] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -131,6 +138,8 @@ class JobApi:
 
         :param job_id: (required)
         :type job_id: str
+        :param delete_scheduler:
+        :type delete_scheduler: bool
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -155,6 +164,7 @@ class JobApi:
 
         _param = self._delete_job_by_id_serialize(
             job_id=job_id,
+            delete_scheduler=delete_scheduler,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -180,6 +190,7 @@ class JobApi:
     def delete_job_by_id_without_preload_content(
         self,
         job_id: StrictStr,
+        delete_scheduler: Optional[StrictBool] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -199,6 +210,8 @@ class JobApi:
 
         :param job_id: (required)
         :type job_id: str
+        :param delete_scheduler:
+        :type delete_scheduler: bool
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -223,6 +236,7 @@ class JobApi:
 
         _param = self._delete_job_by_id_serialize(
             job_id=job_id,
+            delete_scheduler=delete_scheduler,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -243,6 +257,7 @@ class JobApi:
     def _delete_job_by_id_serialize(
         self,
         job_id,
+        delete_scheduler,
         _request_auth,
         _content_type,
         _headers,
@@ -265,6 +280,10 @@ class JobApi:
         if job_id is not None:
             _path_params['job_id'] = job_id
         # process the query parameters
+        if delete_scheduler is not None:
+            
+            _query_params.append(('delete_scheduler', delete_scheduler))
+            
         # process the header parameters
         # process the form parameters
         # process the body parameter
@@ -304,6 +323,7 @@ class JobApi:
     def get_dataloading_job_config(
         self,
         graph_id: StrictStr,
+        dataloading_job_config: DataloadingJobConfig,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -316,13 +336,15 @@ class JobApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> DataloadingJobConfig:
+    ) -> DataloadingMRJobConfig:
         """get_dataloading_job_config
 
-        Get the data loading configuration
+        Post to get the data loading configuration for MapReduce Task
 
         :param graph_id: (required)
         :type graph_id: str
+        :param dataloading_job_config: (required)
+        :type dataloading_job_config: DataloadingJobConfig
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -347,6 +369,7 @@ class JobApi:
 
         _param = self._get_dataloading_job_config_serialize(
             graph_id=graph_id,
+            dataloading_job_config=dataloading_job_config,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -354,7 +377,7 @@ class JobApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "DataloadingJobConfig",
+            '200': "DataloadingMRJobConfig",
             '500': "Error",
         }
         response_data = self.api_client.call_api(
@@ -372,6 +395,7 @@ class JobApi:
     def get_dataloading_job_config_with_http_info(
         self,
         graph_id: StrictStr,
+        dataloading_job_config: DataloadingJobConfig,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -384,13 +408,15 @@ class JobApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[DataloadingJobConfig]:
+    ) -> ApiResponse[DataloadingMRJobConfig]:
         """get_dataloading_job_config
 
-        Get the data loading configuration
+        Post to get the data loading configuration for MapReduce Task
 
         :param graph_id: (required)
         :type graph_id: str
+        :param dataloading_job_config: (required)
+        :type dataloading_job_config: DataloadingJobConfig
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -415,6 +441,7 @@ class JobApi:
 
         _param = self._get_dataloading_job_config_serialize(
             graph_id=graph_id,
+            dataloading_job_config=dataloading_job_config,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -422,7 +449,7 @@ class JobApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "DataloadingJobConfig",
+            '200': "DataloadingMRJobConfig",
             '500': "Error",
         }
         response_data = self.api_client.call_api(
@@ -440,6 +467,7 @@ class JobApi:
     def get_dataloading_job_config_without_preload_content(
         self,
         graph_id: StrictStr,
+        dataloading_job_config: DataloadingJobConfig,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -455,10 +483,12 @@ class JobApi:
     ) -> RESTResponseType:
         """get_dataloading_job_config
 
-        Get the data loading configuration
+        Post to get the data loading configuration for MapReduce Task
 
         :param graph_id: (required)
         :type graph_id: str
+        :param dataloading_job_config: (required)
+        :type dataloading_job_config: DataloadingJobConfig
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -483,6 +513,7 @@ class JobApi:
 
         _param = self._get_dataloading_job_config_serialize(
             graph_id=graph_id,
+            dataloading_job_config=dataloading_job_config,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -490,7 +521,7 @@ class JobApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "DataloadingJobConfig",
+            '200': "DataloadingMRJobConfig",
             '500': "Error",
         }
         response_data = self.api_client.call_api(
@@ -503,6 +534,7 @@ class JobApi:
     def _get_dataloading_job_config_serialize(
         self,
         graph_id,
+        dataloading_job_config,
         _request_auth,
         _content_type,
         _headers,
@@ -528,6 +560,8 @@ class JobApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
+        if dataloading_job_config is not None:
+            _body_params = dataloading_job_config
 
 
         # set the HTTP header `Accept`
@@ -537,13 +571,26 @@ class JobApi:
             ]
         )
 
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
 
         # authentication setting
         _auth_settings: List[str] = [
         ]
 
         return self.api_client.param_serialize(
-            method='GET',
+            method='POST',
             resource_path='/api/v1/graph/{graph_id}/dataloading/config',
             path_params=_path_params,
             query_params=_query_params,

graphscope/flex/rest/models/__init__.py

@@ -39,6 +39,7 @@ from graphscope.flex.rest.models.dataloading_job_config_edges_inner import Datal
 from graphscope.flex.rest.models.dataloading_job_config_loading_config import DataloadingJobConfigLoadingConfig
 from graphscope.flex.rest.models.dataloading_job_config_loading_config_format import DataloadingJobConfigLoadingConfigFormat
 from graphscope.flex.rest.models.dataloading_job_config_vertices_inner import DataloadingJobConfigVerticesInner
+from graphscope.flex.rest.models.dataloading_mr_job_config import DataloadingMRJobConfig
 from graphscope.flex.rest.models.edge_mapping import EdgeMapping
 from graphscope.flex.rest.models.edge_mapping_type_triplet import EdgeMappingTypeTriplet
 from graphscope.flex.rest.models.error import Error
@@ -49,17 +50,21 @@ from graphscope.flex.rest.models.get_alert_rule_response import GetAlertRuleResp
 from graphscope.flex.rest.models.get_edge_type import GetEdgeType
 from graphscope.flex.rest.models.get_graph_response import GetGraphResponse
 from graphscope.flex.rest.models.get_graph_schema_response import GetGraphSchemaResponse
+from graphscope.flex.rest.models.get_pod_log_response import GetPodLogResponse
 from graphscope.flex.rest.models.get_property_meta import GetPropertyMeta
+from graphscope.flex.rest.models.get_resource_usage_response import GetResourceUsageResponse
+from graphscope.flex.rest.models.get_storage_usage_response import GetStorageUsageResponse
 from graphscope.flex.rest.models.get_stored_proc_response import GetStoredProcResponse
 from graphscope.flex.rest.models.get_vertex_type import GetVertexType
 from graphscope.flex.rest.models.job_status import JobStatus
 from graphscope.flex.rest.models.long_text import LongText
 from graphscope.flex.rest.models.node_status import NodeStatus
 from graphscope.flex.rest.models.parameter import Parameter
+from graphscope.flex.rest.models.pod_status import PodStatus
 from graphscope.flex.rest.models.primitive_type import PrimitiveType
+from graphscope.flex.rest.models.resource_usage import ResourceUsage
 from graphscope.flex.rest.models.running_deployment_info import RunningDeploymentInfo
 from graphscope.flex.rest.models.running_deployment_status import RunningDeploymentStatus
-from graphscope.flex.rest.models.running_deployment_status_nodes_inner import RunningDeploymentStatusNodesInner
 from graphscope.flex.rest.models.schema_mapping import SchemaMapping
 from graphscope.flex.rest.models.service_status import ServiceStatus
 from graphscope.flex.rest.models.service_status_sdk_endpoints import ServiceStatusSdkEndpoints

graphscope/flex/rest/models/base_edge_type_vertex_type_pair_relations_inner.py

@@ -30,13 +30,16 @@ class BaseEdgeTypeVertexTypePairRelationsInner(BaseModel):
     """ # noqa: E501
     source_vertex: StrictStr
     destination_vertex: StrictStr
-    relation: StrictStr
+    relation: Optional[StrictStr] = None
     x_csr_params: Optional[BaseEdgeTypeVertexTypePairRelationsInnerXCsrParams] = None
     __properties: ClassVar[List[str]] = ["source_vertex", "destination_vertex", "relation", "x_csr_params"]
 
     @field_validator('relation')
     def relation_validate_enum(cls, value):
         """Validates the enum"""
+        if value is None:
+            return value
+
         if value not in set(['MANY_TO_MANY', 'ONE_TO_MANY', 'MANY_TO_ONE', 'ONE_TO_ONE']):
             raise ValueError("must be one of enum values ('MANY_TO_MANY', 'ONE_TO_MANY', 'MANY_TO_ONE', 'ONE_TO_ONE')")
         return value

graphscope/flex/rest/models/create_edge_type.py

@@ -33,7 +33,7 @@ class CreateEdgeType(BaseModel):
     vertex_type_pair_relations: List[BaseEdgeTypeVertexTypePairRelationsInner]
     directed: Optional[StrictBool] = None
     primary_keys: Optional[List[StrictStr]] = None
-    properties: List[CreatePropertyMeta]
+    properties: Optional[List[CreatePropertyMeta]] = None
     description: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = ["type_name", "vertex_type_pair_relations", "directed", "primary_keys", "properties", "description"]
 

graphscope/flex/rest/models/dataloading_mr_job_config.py

@@ -0,0 +1,88 @@
+# coding: utf-8
+
+"""
+    GraphScope FLEX HTTP SERVICE API
+
+    This is a specification for GraphScope FLEX HTTP service based on the OpenAPI 3.0 specification. You can find out more details about specification at [doc](https://swagger.io/specification/v3/).  Some useful links: - [GraphScope Repository](https://github.com/alibaba/GraphScope) - [The Source API definition for GraphScope Interactive](https://github.com/GraphScope/portal/tree/main/httpservice)
+
+    The version of the OpenAPI document: 1.0.0
+    Contact: graphscope@alibaba-inc.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, StrictStr
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class DataloadingMRJobConfig(BaseModel):
+    """
+    DataloadingMRJobConfig
+    """ # noqa: E501
+    config: StrictStr
+    __properties: ClassVar[List[str]] = ["config"]
+
+    model_config = {
+        "populate_by_name": True,
+        "validate_assignment": True,
+        "protected_namespaces": (),
+    }
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    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())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of DataloadingMRJobConfig from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of DataloadingMRJobConfig from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "config": obj.get("config")
+        })
+        return _obj
+
+

graphscope/flex/rest/models/edge_mapping.py

@@ -31,8 +31,8 @@ class EdgeMapping(BaseModel):
     """ # noqa: E501
     type_triplet: EdgeMappingTypeTriplet
     inputs: List[StrictStr]
-    source_vertex_mappings: List[ColumnMapping]
-    destination_vertex_mappings: List[ColumnMapping]
+    source_vertex_mappings: Optional[List[ColumnMapping]] = None
+    destination_vertex_mappings: Optional[List[ColumnMapping]] = None
     column_mappings: Optional[List[ColumnMapping]] = None
     __properties: ClassVar[List[str]] = ["type_triplet", "inputs", "source_vertex_mappings", "destination_vertex_mappings", "column_mappings"]
 

graphscope/flex/rest/models/get_edge_type.py

@@ -33,7 +33,7 @@ class GetEdgeType(BaseModel):
     vertex_type_pair_relations: List[BaseEdgeTypeVertexTypePairRelationsInner]
     directed: Optional[StrictBool] = None
     primary_keys: Optional[List[StrictStr]] = None
-    type_id: StrictInt
+    type_id: Optional[StrictInt] = None
     properties: Optional[List[GetPropertyMeta]] = None
     description: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = ["type_name", "vertex_type_pair_relations", "directed", "primary_keys", "type_id", "properties", "description"]

graphscope/flex/rest/models/get_pod_log_response.py

@@ -0,0 +1,88 @@
+# coding: utf-8
+
+"""
+    GraphScope FLEX HTTP SERVICE API
+
+    This is a specification for GraphScope FLEX HTTP service based on the OpenAPI 3.0 specification. You can find out more details about specification at [doc](https://swagger.io/specification/v3/).  Some useful links: - [GraphScope Repository](https://github.com/alibaba/GraphScope) - [The Source API definition for GraphScope Interactive](https://github.com/GraphScope/portal/tree/main/httpservice)
+
+    The version of the OpenAPI document: 1.0.0
+    Contact: graphscope@alibaba-inc.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class GetPodLogResponse(BaseModel):
+    """
+    GetPodLogResponse
+    """ # noqa: E501
+    log: Dict[str, Any]
+    __properties: ClassVar[List[str]] = ["log"]
+
+    model_config = {
+        "populate_by_name": True,
+        "validate_assignment": True,
+        "protected_namespaces": (),
+    }
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    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())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of GetPodLogResponse from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of GetPodLogResponse from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "log": obj.get("log")
+        })
+        return _obj
+
+

graphscope/flex/rest/models/get_resource_usage_response.py

@@ -0,0 +1,105 @@
+# coding: utf-8
+
+"""
+    GraphScope FLEX HTTP SERVICE API
+
+    This is a specification for GraphScope FLEX HTTP service based on the OpenAPI 3.0 specification. You can find out more details about specification at [doc](https://swagger.io/specification/v3/).  Some useful links: - [GraphScope Repository](https://github.com/alibaba/GraphScope) - [The Source API definition for GraphScope Interactive](https://github.com/GraphScope/portal/tree/main/httpservice)
+
+    The version of the OpenAPI document: 1.0.0
+    Contact: graphscope@alibaba-inc.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel
+from typing import Any, ClassVar, Dict, List
+from graphscope.flex.rest.models.resource_usage import ResourceUsage
+from typing import Optional, Set
+from typing_extensions import Self
+
+class GetResourceUsageResponse(BaseModel):
+    """
+    GetResourceUsageResponse
+    """ # noqa: E501
+    cpu_usage: List[ResourceUsage]
+    memory_usage: List[ResourceUsage]
+    __properties: ClassVar[List[str]] = ["cpu_usage", "memory_usage"]
+
+    model_config = {
+        "populate_by_name": True,
+        "validate_assignment": True,
+        "protected_namespaces": (),
+    }
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    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())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of GetResourceUsageResponse from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of each item in cpu_usage (list)
+        _items = []
+        if self.cpu_usage:
+            for _item in self.cpu_usage:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['cpu_usage'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in memory_usage (list)
+        _items = []
+        if self.memory_usage:
+            for _item in self.memory_usage:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['memory_usage'] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of GetResourceUsageResponse from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "cpu_usage": [ResourceUsage.from_dict(_item) for _item in obj["cpu_usage"]] if obj.get("cpu_usage") is not None else None,
+            "memory_usage": [ResourceUsage.from_dict(_item) for _item in obj["memory_usage"]] if obj.get("memory_usage") is not None else None
+        })
+        return _obj
+
+