beamlit 0.0.24rc20__py3-none-any.whl → 0.0.24rc21__py3-none-any.whl

beamlit/models/resource_deployment_metrics.py

@@ -8,13 +8,9 @@ from ..types import UNSET, Unset
 if TYPE_CHECKING:
     from ..models.metric import Metric
     from ..models.qps import QPS
-    from ..models.resource_deployment_metrics_inference_per_region import ResourceDeploymentMetricsInferencePerRegion
     from ..models.resource_deployment_metrics_inference_per_second_per_region import (
         ResourceDeploymentMetricsInferencePerSecondPerRegion,
     )
-    from ..models.resource_deployment_metrics_query_per_region_per_code import (
-        ResourceDeploymentMetricsQueryPerRegionPerCode,
-    )
     from ..models.resource_deployment_metrics_query_per_second_per_region_per_code import (
         ResourceDeploymentMetricsQueryPerSecondPerRegionPerCode,
     )
@@ -28,19 +24,9 @@ class ResourceDeploymentMetrics:
     """Metrics for a single resource deployment (eg. model deployment, function deployment)
 
     Attributes:
-        inference_global (Union[Unset, list['Metric']]): Array of metrics
-        inference_per_region (Union[Unset, ResourceDeploymentMetricsInferencePerRegion]): Historical requests (in last
-            24 hours) per location, for the model deployment
         inference_per_second_global (Union[Unset, list['Metric']]): Array of metrics
         inference_per_second_per_region (Union[Unset, ResourceDeploymentMetricsInferencePerSecondPerRegion]): Historical
             requests per second (RPS) per location, for the model deployment
-        query_global (Union[Unset, float]): Number of requests done on the resource for the model deployment
-        query_per_code_global (Union[Unset, QPS]): Query per second per element, can be per response status code (e.g.
-            200, 400) or per location
-        query_per_region (Union[Unset, QPS]): Query per second per element, can be per response status code (e.g. 200,
-            400) or per location
-        query_per_region_per_code (Union[Unset, ResourceDeploymentMetricsQueryPerRegionPerCode]): Number of requests
-            done on the resource for the model deployment
         query_per_second_global (Union[Unset, float]): RPS value (in last 24 hours) for the model deployment globally
         query_per_second_per_code_global (Union[Unset, QPS]): Query per second per element, can be per response status
             code (e.g. 200, 400) or per location
@@ -50,14 +36,8 @@ class ResourceDeploymentMetrics:
             RPS value (in last 24 hours) per response status code per location, for the model deployment
     """
 
-    inference_global: Union[Unset, list["Metric"]] = UNSET
-    inference_per_region: Union[Unset, "ResourceDeploymentMetricsInferencePerRegion"] = UNSET
     inference_per_second_global: Union[Unset, list["Metric"]] = UNSET
     inference_per_second_per_region: Union[Unset, "ResourceDeploymentMetricsInferencePerSecondPerRegion"] = UNSET
-    query_global: Union[Unset, float] = UNSET
-    query_per_code_global: Union[Unset, "QPS"] = UNSET
-    query_per_region: Union[Unset, "QPS"] = UNSET
-    query_per_region_per_code: Union[Unset, "ResourceDeploymentMetricsQueryPerRegionPerCode"] = UNSET
     query_per_second_global: Union[Unset, float] = UNSET
     query_per_second_per_code_global: Union[Unset, "QPS"] = UNSET
     query_per_second_per_region: Union[Unset, "QPS"] = UNSET
@@ -67,17 +47,6 @@ class ResourceDeploymentMetrics:
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
-        inference_global: Union[Unset, list[dict[str, Any]]] = UNSET
-        if not isinstance(self.inference_global, Unset):
-            inference_global = []
-            for componentsschemas_array_metric_item_data in self.inference_global:
-                componentsschemas_array_metric_item = componentsschemas_array_metric_item_data.to_dict()
-                inference_global.append(componentsschemas_array_metric_item)
-
-        inference_per_region: Union[Unset, dict[str, Any]] = UNSET
-        if not isinstance(self.inference_per_region, Unset):
-            inference_per_region = self.inference_per_region.to_dict()
-
         inference_per_second_global: Union[Unset, list[dict[str, Any]]] = UNSET
         if not isinstance(self.inference_per_second_global, Unset):
             inference_per_second_global = []
@@ -89,20 +58,6 @@ class ResourceDeploymentMetrics:
         if not isinstance(self.inference_per_second_per_region, Unset):
             inference_per_second_per_region = self.inference_per_second_per_region.to_dict()
 
-        query_global = self.query_global
-
-        query_per_code_global: Union[Unset, dict[str, Any]] = UNSET
-        if not isinstance(self.query_per_code_global, Unset):
-            query_per_code_global = self.query_per_code_global.to_dict()
-
-        query_per_region: Union[Unset, dict[str, Any]] = UNSET
-        if not isinstance(self.query_per_region, Unset):
-            query_per_region = self.query_per_region.to_dict()
-
-        query_per_region_per_code: Union[Unset, dict[str, Any]] = UNSET
-        if not isinstance(self.query_per_region_per_code, Unset):
-            query_per_region_per_code = self.query_per_region_per_code.to_dict()
-
         query_per_second_global = self.query_per_second_global
 
         query_per_second_per_code_global: Union[Unset, dict[str, Any]] = UNSET
@@ -120,22 +75,10 @@ class ResourceDeploymentMetrics:
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
-        if inference_global is not UNSET:
-            field_dict["inference_global"] = inference_global
-        if inference_per_region is not UNSET:
-            field_dict["inference_per_region"] = inference_per_region
         if inference_per_second_global is not UNSET:
             field_dict["inference_per_second_global"] = inference_per_second_global
         if inference_per_second_per_region is not UNSET:
             field_dict["inference_per_second_per_region"] = inference_per_second_per_region
-        if query_global is not UNSET:
-            field_dict["query_global"] = query_global
-        if query_per_code_global is not UNSET:
-            field_dict["query_per_code_global"] = query_per_code_global
-        if query_per_region is not UNSET:
-            field_dict["query_per_region"] = query_per_region
-        if query_per_region_per_code is not UNSET:
-            field_dict["query_per_region_per_code"] = query_per_region_per_code
         if query_per_second_global is not UNSET:
             field_dict["query_per_second_global"] = query_per_second_global
         if query_per_second_per_code_global is not UNSET:
@@ -151,15 +94,9 @@ class ResourceDeploymentMetrics:
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.metric import Metric
         from ..models.qps import QPS
-        from ..models.resource_deployment_metrics_inference_per_region import (
-            ResourceDeploymentMetricsInferencePerRegion,
-        )
         from ..models.resource_deployment_metrics_inference_per_second_per_region import (
             ResourceDeploymentMetricsInferencePerSecondPerRegion,
         )
-        from ..models.resource_deployment_metrics_query_per_region_per_code import (
-            ResourceDeploymentMetricsQueryPerRegionPerCode,
-        )
         from ..models.resource_deployment_metrics_query_per_second_per_region_per_code import (
             ResourceDeploymentMetricsQueryPerSecondPerRegionPerCode,
         )
@@ -167,20 +104,6 @@ class ResourceDeploymentMetrics:
         if not src_dict:
             return None
         d = src_dict.copy()
-        inference_global = []
-        _inference_global = d.pop("inference_global", UNSET)
-        for componentsschemas_array_metric_item_data in _inference_global or []:
-            componentsschemas_array_metric_item = Metric.from_dict(componentsschemas_array_metric_item_data)
-
-            inference_global.append(componentsschemas_array_metric_item)
-
-        _inference_per_region = d.pop("inference_per_region", UNSET)
-        inference_per_region: Union[Unset, ResourceDeploymentMetricsInferencePerRegion]
-        if isinstance(_inference_per_region, Unset):
-            inference_per_region = UNSET
-        else:
-            inference_per_region = ResourceDeploymentMetricsInferencePerRegion.from_dict(_inference_per_region)
-
         inference_per_second_global = []
         _inference_per_second_global = d.pop("inference_per_second_global", UNSET)
         for componentsschemas_array_metric_item_data in _inference_per_second_global or []:
@@ -197,31 +120,6 @@ class ResourceDeploymentMetrics:
                 _inference_per_second_per_region
             )
 
-        query_global = d.pop("query_global", UNSET)
-
-        _query_per_code_global = d.pop("query_per_code_global", UNSET)
-        query_per_code_global: Union[Unset, QPS]
-        if isinstance(_query_per_code_global, Unset):
-            query_per_code_global = UNSET
-        else:
-            query_per_code_global = QPS.from_dict(_query_per_code_global)
-
-        _query_per_region = d.pop("query_per_region", UNSET)
-        query_per_region: Union[Unset, QPS]
-        if isinstance(_query_per_region, Unset):
-            query_per_region = UNSET
-        else:
-            query_per_region = QPS.from_dict(_query_per_region)
-
-        _query_per_region_per_code = d.pop("query_per_region_per_code", UNSET)
-        query_per_region_per_code: Union[Unset, ResourceDeploymentMetricsQueryPerRegionPerCode]
-        if isinstance(_query_per_region_per_code, Unset):
-            query_per_region_per_code = UNSET
-        else:
-            query_per_region_per_code = ResourceDeploymentMetricsQueryPerRegionPerCode.from_dict(
-                _query_per_region_per_code
-            )
-
         query_per_second_global = d.pop("query_per_second_global", UNSET)
 
         _query_per_second_per_code_global = d.pop("query_per_second_per_code_global", UNSET)
@@ -248,14 +146,8 @@ class ResourceDeploymentMetrics:
             )
 
         resource_deployment_metrics = cls(
-            inference_global=inference_global,
-            inference_per_region=inference_per_region,
             inference_per_second_global=inference_per_second_global,
             inference_per_second_per_region=inference_per_second_per_region,
-            query_global=query_global,
-            query_per_code_global=query_per_code_global,
-            query_per_region=query_per_region,
-            query_per_region_per_code=query_per_region_per_code,
             query_per_second_global=query_per_second_global,
             query_per_second_per_code_global=query_per_second_per_code_global,
             query_per_second_per_region=query_per_second_per_region,

beamlit/models/resource_environment_metrics.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union
+from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
@@ -8,9 +8,13 @@ from ..types import UNSET, Unset
 if TYPE_CHECKING:
     from ..models.metric import Metric
     from ..models.qps import QPS
+    from ..models.resource_environment_metrics_inference_per_region import ResourceEnvironmentMetricsInferencePerRegion
     from ..models.resource_environment_metrics_inference_per_second_per_region import (
         ResourceEnvironmentMetricsInferencePerSecondPerRegion,
     )
+    from ..models.resource_environment_metrics_query_per_region_per_code import (
+        ResourceEnvironmentMetricsQueryPerRegionPerCode,
+    )
     from ..models.resource_environment_metrics_query_per_second_per_region_per_code import (
         ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode,
     )
@@ -24,9 +28,19 @@ class ResourceEnvironmentMetrics:
     """Metrics for a single resource deployment (eg. model deployment, function deployment)
 
     Attributes:
-        inference_per_second_global (Union[Unset, List['Metric']]): Array of metrics
+        inference_global (Union[Unset, list['Metric']]): Array of metrics
+        inference_per_region (Union[Unset, ResourceEnvironmentMetricsInferencePerRegion]): Historical requests (in last
+            24 hours) per location, for the model deployment
+        inference_per_second_global (Union[Unset, list['Metric']]): Array of metrics
         inference_per_second_per_region (Union[Unset, ResourceEnvironmentMetricsInferencePerSecondPerRegion]):
             Historical requests per second (RPS) per location, for the model deployment
+        query_global (Union[Unset, float]): Number of requests done on the resource for the model deployment
+        query_per_code_global (Union[Unset, QPS]): Query per second per element, can be per response status code (e.g.
+            200, 400) or per location
+        query_per_region (Union[Unset, QPS]): Query per second per element, can be per response status code (e.g. 200,
+            400) or per location
+        query_per_region_per_code (Union[Unset, ResourceEnvironmentMetricsQueryPerRegionPerCode]): Number of requests
+            done on the resource for the model deployment
         query_per_second_global (Union[Unset, float]): RPS value (in last 24 hours) for the model deployment globally
         query_per_second_per_code_global (Union[Unset, QPS]): Query per second per element, can be per response status
             code (e.g. 200, 400) or per location
@@ -36,128 +50,186 @@ class ResourceEnvironmentMetrics:
             RPS value (in last 24 hours) per response status code per location, for the model deployment
     """
 
-    inference_per_second_global: Union[Unset, List["Metric"]] = UNSET
-    inference_per_second_per_region: Union[
-        Unset, "ResourceEnvironmentMetricsInferencePerSecondPerRegion"
-    ] = UNSET
+    inference_global: Union[Unset, list["Metric"]] = UNSET
+    inference_per_region: Union[Unset, "ResourceEnvironmentMetricsInferencePerRegion"] = UNSET
+    inference_per_second_global: Union[Unset, list["Metric"]] = UNSET
+    inference_per_second_per_region: Union[Unset, "ResourceEnvironmentMetricsInferencePerSecondPerRegion"] = UNSET
+    query_global: Union[Unset, float] = UNSET
+    query_per_code_global: Union[Unset, "QPS"] = UNSET
+    query_per_region: Union[Unset, "QPS"] = UNSET
+    query_per_region_per_code: Union[Unset, "ResourceEnvironmentMetricsQueryPerRegionPerCode"] = UNSET
     query_per_second_global: Union[Unset, float] = UNSET
     query_per_second_per_code_global: Union[Unset, "QPS"] = UNSET
     query_per_second_per_region: Union[Unset, "QPS"] = UNSET
-    query_per_second_per_region_per_code: Union[
-        Unset, "ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode"
-    ] = UNSET
+    query_per_second_per_region_per_code: Union[Unset, "ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode"] = (
+        UNSET
+    )
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
-        inference_per_second_global: Union[Unset, List[Dict[str, Any]]] = UNSET
+        inference_global: Union[Unset, list[dict[str, Any]]] = UNSET
+        if not isinstance(self.inference_global, Unset):
+            inference_global = []
+            for componentsschemas_array_metric_item_data in self.inference_global:
+                componentsschemas_array_metric_item = componentsschemas_array_metric_item_data.to_dict()
+                inference_global.append(componentsschemas_array_metric_item)
+
+        inference_per_region: Union[Unset, dict[str, Any]] = UNSET
+        if not isinstance(self.inference_per_region, Unset):
+            inference_per_region = self.inference_per_region.to_dict()
+
+        inference_per_second_global: Union[Unset, list[dict[str, Any]]] = UNSET
         if not isinstance(self.inference_per_second_global, Unset):
             inference_per_second_global = []
-            for (
-                componentsschemas_array_metric_item_data
-            ) in self.inference_per_second_global:
-                componentsschemas_array_metric_item = (
-                    componentsschemas_array_metric_item_data.to_dict()
-                )
+            for componentsschemas_array_metric_item_data in self.inference_per_second_global:
+                componentsschemas_array_metric_item = componentsschemas_array_metric_item_data.to_dict()
                 inference_per_second_global.append(componentsschemas_array_metric_item)
 
-        inference_per_second_per_region: Union[Unset, Dict[str, Any]] = UNSET
+        inference_per_second_per_region: Union[Unset, dict[str, Any]] = UNSET
         if not isinstance(self.inference_per_second_per_region, Unset):
-            inference_per_second_per_region = (
-                self.inference_per_second_per_region.to_dict()
-            )
+            inference_per_second_per_region = self.inference_per_second_per_region.to_dict()
+
+        query_global = self.query_global
+
+        query_per_code_global: Union[Unset, dict[str, Any]] = UNSET
+        if not isinstance(self.query_per_code_global, Unset):
+            query_per_code_global = self.query_per_code_global.to_dict()
+
+        query_per_region: Union[Unset, dict[str, Any]] = UNSET
+        if not isinstance(self.query_per_region, Unset):
+            query_per_region = self.query_per_region.to_dict()
+
+        query_per_region_per_code: Union[Unset, dict[str, Any]] = UNSET
+        if not isinstance(self.query_per_region_per_code, Unset):
+            query_per_region_per_code = self.query_per_region_per_code.to_dict()
 
         query_per_second_global = self.query_per_second_global
 
-        query_per_second_per_code_global: Union[Unset, Dict[str, Any]] = UNSET
+        query_per_second_per_code_global: Union[Unset, dict[str, Any]] = UNSET
         if not isinstance(self.query_per_second_per_code_global, Unset):
-            query_per_second_per_code_global = (
-                self.query_per_second_per_code_global.to_dict()
-            )
+            query_per_second_per_code_global = self.query_per_second_per_code_global.to_dict()
 
-        query_per_second_per_region: Union[Unset, Dict[str, Any]] = UNSET
+        query_per_second_per_region: Union[Unset, dict[str, Any]] = UNSET
         if not isinstance(self.query_per_second_per_region, Unset):
             query_per_second_per_region = self.query_per_second_per_region.to_dict()
 
-        query_per_second_per_region_per_code: Union[Unset, Dict[str, Any]] = UNSET
+        query_per_second_per_region_per_code: Union[Unset, dict[str, Any]] = UNSET
         if not isinstance(self.query_per_second_per_region_per_code, Unset):
-            query_per_second_per_region_per_code = (
-                self.query_per_second_per_region_per_code.to_dict()
-            )
+            query_per_second_per_region_per_code = self.query_per_second_per_region_per_code.to_dict()
 
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
+        if inference_global is not UNSET:
+            field_dict["inference_global"] = inference_global
+        if inference_per_region is not UNSET:
+            field_dict["inference_per_region"] = inference_per_region
         if inference_per_second_global is not UNSET:
             field_dict["inference_per_second_global"] = inference_per_second_global
         if inference_per_second_per_region is not UNSET:
-            field_dict["inference_per_second_per_region"] = (
-                inference_per_second_per_region
-            )
+            field_dict["inference_per_second_per_region"] = inference_per_second_per_region
+        if query_global is not UNSET:
+            field_dict["query_global"] = query_global
+        if query_per_code_global is not UNSET:
+            field_dict["query_per_code_global"] = query_per_code_global
+        if query_per_region is not UNSET:
+            field_dict["query_per_region"] = query_per_region
+        if query_per_region_per_code is not UNSET:
+            field_dict["query_per_region_per_code"] = query_per_region_per_code
         if query_per_second_global is not UNSET:
             field_dict["query_per_second_global"] = query_per_second_global
         if query_per_second_per_code_global is not UNSET:
-            field_dict["query_per_second_per_code_global"] = (
-                query_per_second_per_code_global
-            )
+            field_dict["query_per_second_per_code_global"] = query_per_second_per_code_global
         if query_per_second_per_region is not UNSET:
             field_dict["query_per_second_per_region"] = query_per_second_per_region
         if query_per_second_per_region_per_code is not UNSET:
-            field_dict["query_per_second_per_region_per_code"] = (
-                query_per_second_per_region_per_code
-            )
+            field_dict["query_per_second_per_region_per_code"] = query_per_second_per_region_per_code
 
         return field_dict
 
     @classmethod
-    def from_dict(cls: Type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.metric import Metric
         from ..models.qps import QPS
+        from ..models.resource_environment_metrics_inference_per_region import (
+            ResourceEnvironmentMetricsInferencePerRegion,
+        )
         from ..models.resource_environment_metrics_inference_per_second_per_region import (
             ResourceEnvironmentMetricsInferencePerSecondPerRegion,
         )
+        from ..models.resource_environment_metrics_query_per_region_per_code import (
+            ResourceEnvironmentMetricsQueryPerRegionPerCode,
+        )
         from ..models.resource_environment_metrics_query_per_second_per_region_per_code import (
             ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode,
         )
 
+        if not src_dict:
+            return None
         d = src_dict.copy()
+        inference_global = []
+        _inference_global = d.pop("inference_global", UNSET)
+        for componentsschemas_array_metric_item_data in _inference_global or []:
+            componentsschemas_array_metric_item = Metric.from_dict(componentsschemas_array_metric_item_data)
+
+            inference_global.append(componentsschemas_array_metric_item)
+
+        _inference_per_region = d.pop("inference_per_region", UNSET)
+        inference_per_region: Union[Unset, ResourceEnvironmentMetricsInferencePerRegion]
+        if isinstance(_inference_per_region, Unset):
+            inference_per_region = UNSET
+        else:
+            inference_per_region = ResourceEnvironmentMetricsInferencePerRegion.from_dict(_inference_per_region)
+
         inference_per_second_global = []
         _inference_per_second_global = d.pop("inference_per_second_global", UNSET)
-        for componentsschemas_array_metric_item_data in (
-            _inference_per_second_global or []
-        ):
-            componentsschemas_array_metric_item = Metric.from_dict(
-                componentsschemas_array_metric_item_data
-            )
+        for componentsschemas_array_metric_item_data in _inference_per_second_global or []:
+            componentsschemas_array_metric_item = Metric.from_dict(componentsschemas_array_metric_item_data)
 
             inference_per_second_global.append(componentsschemas_array_metric_item)
 
-        _inference_per_second_per_region = d.pop(
-            "inference_per_second_per_region", UNSET
-        )
-        inference_per_second_per_region: Union[
-            Unset, ResourceEnvironmentMetricsInferencePerSecondPerRegion
-        ]
+        _inference_per_second_per_region = d.pop("inference_per_second_per_region", UNSET)
+        inference_per_second_per_region: Union[Unset, ResourceEnvironmentMetricsInferencePerSecondPerRegion]
         if isinstance(_inference_per_second_per_region, Unset):
             inference_per_second_per_region = UNSET
         else:
-            inference_per_second_per_region = (
-                ResourceEnvironmentMetricsInferencePerSecondPerRegion.from_dict(
-                    _inference_per_second_per_region
-                )
+            inference_per_second_per_region = ResourceEnvironmentMetricsInferencePerSecondPerRegion.from_dict(
+                _inference_per_second_per_region
+            )
+
+        query_global = d.pop("query_global", UNSET)
+
+        _query_per_code_global = d.pop("query_per_code_global", UNSET)
+        query_per_code_global: Union[Unset, QPS]
+        if isinstance(_query_per_code_global, Unset):
+            query_per_code_global = UNSET
+        else:
+            query_per_code_global = QPS.from_dict(_query_per_code_global)
+
+        _query_per_region = d.pop("query_per_region", UNSET)
+        query_per_region: Union[Unset, QPS]
+        if isinstance(_query_per_region, Unset):
+            query_per_region = UNSET
+        else:
+            query_per_region = QPS.from_dict(_query_per_region)
+
+        _query_per_region_per_code = d.pop("query_per_region_per_code", UNSET)
+        query_per_region_per_code: Union[Unset, ResourceEnvironmentMetricsQueryPerRegionPerCode]
+        if isinstance(_query_per_region_per_code, Unset):
+            query_per_region_per_code = UNSET
+        else:
+            query_per_region_per_code = ResourceEnvironmentMetricsQueryPerRegionPerCode.from_dict(
+                _query_per_region_per_code
             )
 
         query_per_second_global = d.pop("query_per_second_global", UNSET)
 
-        _query_per_second_per_code_global = d.pop(
-            "query_per_second_per_code_global", UNSET
-        )
+        _query_per_second_per_code_global = d.pop("query_per_second_per_code_global", UNSET)
         query_per_second_per_code_global: Union[Unset, QPS]
         if isinstance(_query_per_second_per_code_global, Unset):
             query_per_second_per_code_global = UNSET
         else:
-            query_per_second_per_code_global = QPS.from_dict(
-                _query_per_second_per_code_global
-            )
+            query_per_second_per_code_global = QPS.from_dict(_query_per_second_per_code_global)
 
         _query_per_second_per_region = d.pop("query_per_second_per_region", UNSET)
         query_per_second_per_region: Union[Unset, QPS]
@@ -166,24 +238,24 @@ class ResourceEnvironmentMetrics:
         else:
             query_per_second_per_region = QPS.from_dict(_query_per_second_per_region)
 
-        _query_per_second_per_region_per_code = d.pop(
-            "query_per_second_per_region_per_code", UNSET
-        )
-        query_per_second_per_region_per_code: Union[
-            Unset, ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode
-        ]
+        _query_per_second_per_region_per_code = d.pop("query_per_second_per_region_per_code", UNSET)
+        query_per_second_per_region_per_code: Union[Unset, ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode]
         if isinstance(_query_per_second_per_region_per_code, Unset):
             query_per_second_per_region_per_code = UNSET
         else:
-            query_per_second_per_region_per_code = (
-                ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode.from_dict(
-                    _query_per_second_per_region_per_code
-                )
+            query_per_second_per_region_per_code = ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode.from_dict(
+                _query_per_second_per_region_per_code
             )
 
         resource_environment_metrics = cls(
+            inference_global=inference_global,
+            inference_per_region=inference_per_region,
             inference_per_second_global=inference_per_second_global,
             inference_per_second_per_region=inference_per_second_per_region,
+            query_global=query_global,
+            query_per_code_global=query_per_code_global,
+            query_per_region=query_per_region,
+            query_per_region_per_code=query_per_region_per_code,
             query_per_second_global=query_per_second_global,
             query_per_second_per_code_global=query_per_second_per_code_global,
             query_per_second_per_region=query_per_second_per_region,

beamlit/models/{resource_deployment_metrics_inference_per_region.py → resource_environment_metrics_inference_per_region.py}

@@ -9,11 +9,11 @@ if TYPE_CHECKING:
     from ..models.metric import Metric
 
 
-T = TypeVar("T", bound="ResourceDeploymentMetricsInferencePerRegion")
+T = TypeVar("T", bound="ResourceEnvironmentMetricsInferencePerRegion")
 
 
 @_attrs_define
-class ResourceDeploymentMetricsInferencePerRegion:
+class ResourceEnvironmentMetricsInferencePerRegion:
     """Historical requests (in last 24 hours) per location, for the model deployment
 
     Attributes:
@@ -53,12 +53,12 @@ class ResourceDeploymentMetricsInferencePerRegion:
 
             region.append(componentsschemas_array_metric_item)
 
-        resource_deployment_metrics_inference_per_region = cls(
+        resource_environment_metrics_inference_per_region = cls(
             region=region,
         )
 
-        resource_deployment_metrics_inference_per_region.additional_properties = d
-        return resource_deployment_metrics_inference_per_region
+        resource_environment_metrics_inference_per_region.additional_properties = d
+        return resource_environment_metrics_inference_per_region
 
     @property
     def additional_keys(self) -> list[str]:

beamlit/models/resource_environment_metrics_inference_per_second_per_region.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union
+from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
@@ -17,20 +17,18 @@ class ResourceEnvironmentMetricsInferencePerSecondPerRegion:
     """Historical requests per second (RPS) per location, for the model deployment
 
     Attributes:
-        region (Union[Unset, List['Metric']]): Array of metrics
+        region (Union[Unset, list['Metric']]): Array of metrics
     """
 
-    region: Union[Unset, List["Metric"]] = UNSET
+    region: Union[Unset, list["Metric"]] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
-        region: Union[Unset, List[Dict[str, Any]]] = UNSET
+        region: Union[Unset, list[dict[str, Any]]] = UNSET
         if not isinstance(self.region, Unset):
             region = []
             for componentsschemas_array_metric_item_data in self.region:
-                componentsschemas_array_metric_item = (
-                    componentsschemas_array_metric_item_data.to_dict()
-                )
+                componentsschemas_array_metric_item = componentsschemas_array_metric_item_data.to_dict()
                 region.append(componentsschemas_array_metric_item)
 
         field_dict: dict[str, Any] = {}
@@ -42,16 +40,16 @@ class ResourceEnvironmentMetricsInferencePerSecondPerRegion:
         return field_dict
 
     @classmethod
-    def from_dict(cls: Type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.metric import Metric
 
+        if not src_dict:
+            return None
         d = src_dict.copy()
         region = []
         _region = d.pop("region", UNSET)
         for componentsschemas_array_metric_item_data in _region or []:
-            componentsschemas_array_metric_item = Metric.from_dict(
-                componentsschemas_array_metric_item_data
-            )
+            componentsschemas_array_metric_item = Metric.from_dict(componentsschemas_array_metric_item_data)
 
             region.append(componentsschemas_array_metric_item)
 

beamlit/models/{resource_deployment_metrics_query_per_region_per_code.py → resource_environment_metrics_query_per_region_per_code.py}

@@ -9,11 +9,11 @@ if TYPE_CHECKING:
     from ..models.qps import QPS
 
 
-T = TypeVar("T", bound="ResourceDeploymentMetricsQueryPerRegionPerCode")
+T = TypeVar("T", bound="ResourceEnvironmentMetricsQueryPerRegionPerCode")
 
 
 @_attrs_define
-class ResourceDeploymentMetricsQueryPerRegionPerCode:
+class ResourceEnvironmentMetricsQueryPerRegionPerCode:
     """Number of requests done on the resource for the model deployment
 
     Attributes:
@@ -51,12 +51,12 @@ class ResourceDeploymentMetricsQueryPerRegionPerCode:
         else:
             region = QPS.from_dict(_region)
 
-        resource_deployment_metrics_query_per_region_per_code = cls(
+        resource_environment_metrics_query_per_region_per_code = cls(
             region=region,
         )
 
-        resource_deployment_metrics_query_per_region_per_code.additional_properties = d
-        return resource_deployment_metrics_query_per_region_per_code
+        resource_environment_metrics_query_per_region_per_code.additional_properties = d
+        return resource_environment_metrics_query_per_region_per_code
 
     @property
     def additional_keys(self) -> list[str]:

beamlit/models/resource_environment_metrics_query_per_second_per_region_per_code.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, Type, TypeVar, Union
+from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
@@ -25,7 +25,7 @@ class ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode:
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
-        region: Union[Unset, Dict[str, Any]] = UNSET
+        region: Union[Unset, dict[str, Any]] = UNSET
         if not isinstance(self.region, Unset):
             region = self.region.to_dict()
 
@@ -38,9 +38,11 @@ class ResourceEnvironmentMetricsQueryPerSecondPerRegionPerCode:
         return field_dict
 
     @classmethod
-    def from_dict(cls: Type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.qps import QPS
 
+        if not src_dict:
+            return None
         d = src_dict.copy()
         _region = d.pop("region", UNSET)
         region: Union[Unset, QPS]