beamlit 0.0.34rc70__py3-none-any.whl → 0.0.34rc72__py3-none-any.whl

beamlit/deploy/deploy.py

@@ -35,7 +35,7 @@ def set_default_values(resource: Resource, deployment: Agent | Function):
     deployment.metadata.workspace = settings.workspace
     deployment.metadata.environment = settings.environment
     if not deployment.metadata.name:
-        deployment.metadata.name = resource.name
+        deployment.metadata.name = slugify(resource.name)
     if not deployment.metadata.display_name:
         deployment.metadata.display_name = deployment.metadata.name
     if not deployment.spec.description:
@@ -117,7 +117,6 @@ def get_agent_yaml(
     agent.spec.functions = [slugify(function.metadata.name) for (_, function) in functions]
     agent.metadata.labels = agent.metadata.labels and MetadataLabels.from_dict(agent.metadata.labels) or MetadataLabels()
     agent.metadata.labels["x-beamlit-auto-generated"] = "true"
-    agent.metadata.name = slugify(agent.metadata.name)
     agent_yaml = yaml.dump(agent.to_dict())
     template = f"""
 apiVersion: beamlit.com/v1alpha1
@@ -140,7 +139,6 @@ def get_function_yaml(function: Function, settings: Settings, client: Authentica
     """
     function.metadata.labels = function.metadata.labels and MetadataLabels.from_dict(function.metadata.labels) or MetadataLabels()
     function.metadata.labels["x-beamlit-auto-generated"] = "true"
-    function.metadata.name = slugify(function.metadata.name)
     function_yaml = yaml.dump(function.to_dict())
     return f"""
 apiVersion: beamlit.com/v1alpha1

beamlit/models/__init__.py

@@ -14,7 +14,6 @@ from .continent import Continent
 from .core_event import CoreEvent
 from .core_spec import CoreSpec
 from .core_spec_configurations import CoreSpecConfigurations
-from .core_status import CoreStatus
 from .country import Country
 from .create_api_key_for_service_account_body import CreateApiKeyForServiceAccountBody
 from .create_workspace_service_account_body import CreateWorkspaceServiceAccountBody
@@ -36,6 +35,8 @@ from .get_trace_response_200 import GetTraceResponse200
 from .get_workspace_service_accounts_response_200_item import (
     GetWorkspaceServiceAccountsResponse200Item,
 )
+from .histogram_bucket import HistogramBucket
+from .histogram_stats import HistogramStats
 from .increase_and_rate_metric import IncreaseAndRateMetric
 from .integration_config import IntegrationConfig
 from .integration_connection import IntegrationConnection
@@ -52,6 +53,9 @@ from .metadata import Metadata
 from .metadata_labels import MetadataLabels
 from .metric import Metric
 from .metrics import Metrics
+from .metrics_models import MetricsModels
+from .metrics_request_total_per_code import MetricsRequestTotalPerCode
+from .metrics_rps_per_code import MetricsRpsPerCode
 from .model import Model
 from .model_metadata import ModelMetadata
 from .model_private_cluster import ModelPrivateCluster
@@ -74,7 +78,18 @@ from .private_location import PrivateLocation
 from .provider_config import ProviderConfig
 from .qps import QPS
 from .repository import Repository
+from .request_duration_over_time_metric import RequestDurationOverTimeMetric
+from .request_duration_over_time_metrics import RequestDurationOverTimeMetrics
+from .request_total_by_origin_metric import RequestTotalByOriginMetric
+from .request_total_by_origin_metric_request_total_by_origin import (
+    RequestTotalByOriginMetricRequestTotalByOrigin,
+)
+from .request_total_by_origin_metric_request_total_by_origin_and_code import (
+    RequestTotalByOriginMetricRequestTotalByOriginAndCode,
+)
 from .request_total_metric import RequestTotalMetric
+from .request_total_metric_request_total_per_code import RequestTotalMetricRequestTotalPerCode
+from .request_total_metric_rps_per_code import RequestTotalMetricRpsPerCode
 from .resource_deployment_metrics import ResourceDeploymentMetrics
 from .resource_deployment_metrics_inference_per_second_per_region import (
     ResourceDeploymentMetricsInferencePerSecondPerRegion,
@@ -83,6 +98,10 @@ from .resource_deployment_metrics_query_per_second_per_region_per_code import (
     ResourceDeploymentMetricsQueryPerSecondPerRegionPerCode,
 )
 from .resource_environment_metrics import ResourceEnvironmentMetrics
+from .resource_environment_metrics_request_total_per_code import (
+    ResourceEnvironmentMetricsRequestTotalPerCode,
+)
+from .resource_environment_metrics_rps_per_code import ResourceEnvironmentMetricsRpsPerCode
 from .resource_log import ResourceLog
 from .resource_metrics import ResourceMetrics
 from .runtime import Runtime
@@ -99,6 +118,9 @@ from .store_function_kit import StoreFunctionKit
 from .store_function_labels import StoreFunctionLabels
 from .store_function_parameter import StoreFunctionParameter
 from .time_fields import TimeFields
+from .token_rate_metric import TokenRateMetric
+from .token_rate_metrics import TokenRateMetrics
+from .token_total_metric import TokenTotalMetric
 from .trace_ids_response import TraceIdsResponse
 from .update_workspace_service_account_body import UpdateWorkspaceServiceAccountBody
 from .update_workspace_service_account_response_200 import UpdateWorkspaceServiceAccountResponse200
@@ -123,7 +145,6 @@ __all__ = (
     "CoreEvent",
     "CoreSpec",
     "CoreSpecConfigurations",
-    "CoreStatus",
     "Country",
     "CreateApiKeyForServiceAccountBody",
     "CreateWorkspaceServiceAccountBody",
@@ -143,6 +164,8 @@ __all__ = (
     "GetTraceLogsResponse200",
     "GetTraceResponse200",
     "GetWorkspaceServiceAccountsResponse200Item",
+    "HistogramBucket",
+    "HistogramStats",
     "IncreaseAndRateMetric",
     "IntegrationConfig",
     "IntegrationConnection",
@@ -159,6 +182,9 @@ __all__ = (
     "MetadataLabels",
     "Metric",
     "Metrics",
+    "MetricsModels",
+    "MetricsRequestTotalPerCode",
+    "MetricsRpsPerCode",
     "Model",
     "ModelMetadata",
     "ModelPrivateCluster",
@@ -181,11 +207,20 @@ __all__ = (
     "ProviderConfig",
     "QPS",
     "Repository",
+    "RequestDurationOverTimeMetric",
+    "RequestDurationOverTimeMetrics",
+    "RequestTotalByOriginMetric",
+    "RequestTotalByOriginMetricRequestTotalByOrigin",
+    "RequestTotalByOriginMetricRequestTotalByOriginAndCode",
     "RequestTotalMetric",
+    "RequestTotalMetricRequestTotalPerCode",
+    "RequestTotalMetricRpsPerCode",
     "ResourceDeploymentMetrics",
     "ResourceDeploymentMetricsInferencePerSecondPerRegion",
     "ResourceDeploymentMetricsQueryPerSecondPerRegionPerCode",
     "ResourceEnvironmentMetrics",
+    "ResourceEnvironmentMetricsRequestTotalPerCode",
+    "ResourceEnvironmentMetricsRpsPerCode",
     "ResourceLog",
     "ResourceMetrics",
     "Runtime",
@@ -202,6 +237,9 @@ __all__ = (
     "StoreFunctionLabels",
     "StoreFunctionParameter",
     "TimeFields",
+    "TokenRateMetric",
+    "TokenRateMetrics",
+    "TokenTotalMetric",
     "TraceIdsResponse",
     "UpdateWorkspaceServiceAccountBody",
     "UpdateWorkspaceServiceAccountResponse200",

beamlit/models/agent.py

@@ -8,7 +8,6 @@ from ..types import UNSET, Unset
 if TYPE_CHECKING:
     from ..models.agent_spec import AgentSpec
     from ..models.core_event import CoreEvent
-    from ..models.core_status import CoreStatus
     from ..models.environment_metadata import EnvironmentMetadata
 
 
@@ -23,13 +22,13 @@ class Agent:
         events (Union[Unset, list['CoreEvent']]): Core events
         metadata (Union[Unset, EnvironmentMetadata]): Environment metadata
         spec (Union[Unset, AgentSpec]): Agent specification
-        status (Union[Unset, CoreStatus]): Core status
+        status (Union[Unset, str]): Agent status
     """
 
     events: Union[Unset, list["CoreEvent"]] = UNSET
     metadata: Union[Unset, "EnvironmentMetadata"] = UNSET
     spec: Union[Unset, "AgentSpec"] = UNSET
-    status: Union[Unset, "CoreStatus"] = UNSET
+    status: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -48,9 +47,7 @@ class Agent:
         if self.spec and not isinstance(self.spec, Unset):
             spec = self.spec.to_dict()
 
-        status: Union[Unset, dict[str, Any]] = UNSET
-        if self.status and not isinstance(self.status, Unset):
-            status = self.status.to_dict()
+        status = self.status
 
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
@@ -70,7 +67,6 @@ class Agent:
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.agent_spec import AgentSpec
         from ..models.core_event import CoreEvent
-        from ..models.core_status import CoreStatus
         from ..models.environment_metadata import EnvironmentMetadata
 
         if not src_dict:
@@ -97,12 +93,7 @@ class Agent:
         else:
             spec = AgentSpec.from_dict(_spec)
 
-        _status = d.pop("status", UNSET)
-        status: Union[Unset, CoreStatus]
-        if isinstance(_status, Unset):
-            status = UNSET
-        else:
-            status = CoreStatus.from_dict(_status)
+        status = d.pop("status", UNSET)
 
         agent = cls(
             events=events,

beamlit/models/core_event.py

@@ -14,11 +14,13 @@ class CoreEvent:
 
     Attributes:
         message (Union[Unset, str]): Event message
+        status (Union[Unset, str]): Event status
         time (Union[Unset, str]): Event time
         type_ (Union[Unset, str]): Event type
     """
 
     message: Union[Unset, str] = UNSET
+    status: Union[Unset, str] = UNSET
     time: Union[Unset, str] = UNSET
     type_: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -26,6 +28,8 @@ class CoreEvent:
     def to_dict(self) -> dict[str, Any]:
         message = self.message
 
+        status = self.status
+
         time = self.time
 
         type_ = self.type_
@@ -35,6 +39,8 @@ class CoreEvent:
         field_dict.update({})
         if message is not UNSET:
             field_dict["message"] = message
+        if status is not UNSET:
+            field_dict["status"] = status
         if time is not UNSET:
             field_dict["time"] = time
         if type_ is not UNSET:
@@ -49,12 +55,15 @@ class CoreEvent:
         d = src_dict.copy()
         message = d.pop("message", UNSET)
 
+        status = d.pop("status", UNSET)
+
         time = d.pop("time", UNSET)
 
         type_ = d.pop("type", UNSET)
 
         core_event = cls(
             message=message,
+            status=status,
             time=time,
             type_=type_,
         )

beamlit/models/function.py

@@ -7,7 +7,6 @@ from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
     from ..models.core_event import CoreEvent
-    from ..models.core_status import CoreStatus
     from ..models.environment_metadata import EnvironmentMetadata
     from ..models.function_spec import FunctionSpec
 
@@ -23,13 +22,13 @@ class Function:
         events (Union[Unset, list['CoreEvent']]): Core events
         metadata (Union[Unset, EnvironmentMetadata]): Environment metadata
         spec (Union[Unset, FunctionSpec]): Function specification
-        status (Union[Unset, CoreStatus]): Core status
+        status (Union[Unset, str]): Function status
     """
 
     events: Union[Unset, list["CoreEvent"]] = UNSET
     metadata: Union[Unset, "EnvironmentMetadata"] = UNSET
     spec: Union[Unset, "FunctionSpec"] = UNSET
-    status: Union[Unset, "CoreStatus"] = UNSET
+    status: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -48,9 +47,7 @@ class Function:
         if self.spec and not isinstance(self.spec, Unset):
             spec = self.spec.to_dict()
 
-        status: Union[Unset, dict[str, Any]] = UNSET
-        if self.status and not isinstance(self.status, Unset):
-            status = self.status.to_dict()
+        status = self.status
 
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
@@ -69,7 +66,6 @@ class Function:
     @classmethod
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.core_event import CoreEvent
-        from ..models.core_status import CoreStatus
         from ..models.environment_metadata import EnvironmentMetadata
         from ..models.function_spec import FunctionSpec
 
@@ -97,12 +93,7 @@ class Function:
         else:
             spec = FunctionSpec.from_dict(_spec)
 
-        _status = d.pop("status", UNSET)
-        status: Union[Unset, CoreStatus]
-        if isinstance(_status, Unset):
-            status = UNSET
-        else:
-            status = CoreStatus.from_dict(_status)
+        status = d.pop("status", UNSET)
 
         function = cls(
             events=events,

beamlit/models/histogram_bucket.py

@@ -0,0 +1,79 @@
+from typing import Any, TypeVar, Union
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="HistogramBucket")
+
+
+@_attrs_define
+class HistogramBucket:
+    """Histogram bucket
+
+    Attributes:
+        count (Union[Unset, int]): Count
+        end (Union[Unset, float]): End
+        start (Union[Unset, float]): Start
+    """
+
+    count: Union[Unset, int] = UNSET
+    end: Union[Unset, float] = UNSET
+    start: Union[Unset, float] = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        count = self.count
+
+        end = self.end
+
+        start = self.start
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if count is not UNSET:
+            field_dict["count"] = count
+        if end is not UNSET:
+            field_dict["end"] = end
+        if start is not UNSET:
+            field_dict["start"] = start
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+        if not src_dict:
+            return None
+        d = src_dict.copy()
+        count = d.pop("count", UNSET)
+
+        end = d.pop("end", UNSET)
+
+        start = d.pop("start", UNSET)
+
+        histogram_bucket = cls(
+            count=count,
+            end=end,
+            start=start,
+        )
+
+        histogram_bucket.additional_properties = d
+        return histogram_bucket
+
+    @property
+    def additional_keys(self) -> list[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

beamlit/models/histogram_stats.py

@@ -0,0 +1,88 @@
+from typing import Any, TypeVar, Union
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="HistogramStats")
+
+
+@_attrs_define
+class HistogramStats:
+    """Histogram stats
+
+    Attributes:
+        average (Union[Unset, float]): Average request duration
+        p50 (Union[Unset, float]): P50 request duration
+        p90 (Union[Unset, float]): P90 request duration
+        p99 (Union[Unset, float]): P99 request duration
+    """
+
+    average: Union[Unset, float] = UNSET
+    p50: Union[Unset, float] = UNSET
+    p90: Union[Unset, float] = UNSET
+    p99: Union[Unset, float] = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        average = self.average
+
+        p50 = self.p50
+
+        p90 = self.p90
+
+        p99 = self.p99
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if average is not UNSET:
+            field_dict["average"] = average
+        if p50 is not UNSET:
+            field_dict["p50"] = p50
+        if p90 is not UNSET:
+            field_dict["p90"] = p90
+        if p99 is not UNSET:
+            field_dict["p99"] = p99
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+        if not src_dict:
+            return None
+        d = src_dict.copy()
+        average = d.pop("average", UNSET)
+
+        p50 = d.pop("p50", UNSET)
+
+        p90 = d.pop("p90", UNSET)
+
+        p99 = d.pop("p99", UNSET)
+
+        histogram_stats = cls(
+            average=average,
+            p50=p50,
+            p90=p90,
+            p99=p99,
+        )
+
+        histogram_stats.additional_properties = d
+        return histogram_stats
+
+    @property
+    def additional_keys(self) -> list[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

beamlit/models/latency_metric.py

@@ -1,29 +1,108 @@
-from typing import Any, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar, Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
+from ..types import UNSET, Unset
+
+if TYPE_CHECKING:
+    from ..models.histogram_bucket import HistogramBucket
+    from ..models.histogram_stats import HistogramStats
+
+
 T = TypeVar("T", bound="LatencyMetric")
 
 
 @_attrs_define
 class LatencyMetric:
-    """Latency metrics"""
+    """Latency metrics
+
+    Attributes:
+        global_histogram (Union[Unset, HistogramBucket]): Histogram bucket
+        global_stats (Union[Unset, HistogramStats]): Histogram stats
+        histogram_per_code (Union[Unset, HistogramBucket]): Histogram bucket
+        stats_per_code (Union[Unset, HistogramStats]): Histogram stats
+    """
 
+    global_histogram: Union[Unset, "HistogramBucket"] = UNSET
+    global_stats: Union[Unset, "HistogramStats"] = UNSET
+    histogram_per_code: Union[Unset, "HistogramBucket"] = UNSET
+    stats_per_code: Union[Unset, "HistogramStats"] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
+        global_histogram: Union[Unset, dict[str, Any]] = UNSET
+        if self.global_histogram and not isinstance(self.global_histogram, Unset):
+            global_histogram = self.global_histogram.to_dict()
+
+        global_stats: Union[Unset, dict[str, Any]] = UNSET
+        if self.global_stats and not isinstance(self.global_stats, Unset):
+            global_stats = self.global_stats.to_dict()
+
+        histogram_per_code: Union[Unset, dict[str, Any]] = UNSET
+        if self.histogram_per_code and not isinstance(self.histogram_per_code, Unset):
+            histogram_per_code = self.histogram_per_code.to_dict()
+
+        stats_per_code: Union[Unset, dict[str, Any]] = UNSET
+        if self.stats_per_code and not isinstance(self.stats_per_code, Unset):
+            stats_per_code = self.stats_per_code.to_dict()
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if global_histogram is not UNSET:
+            field_dict["globalHistogram"] = global_histogram
+        if global_stats is not UNSET:
+            field_dict["globalStats"] = global_stats
+        if histogram_per_code is not UNSET:
+            field_dict["histogramPerCode"] = histogram_per_code
+        if stats_per_code is not UNSET:
+            field_dict["statsPerCode"] = stats_per_code
 
         return field_dict
 
     @classmethod
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+        from ..models.histogram_bucket import HistogramBucket
+        from ..models.histogram_stats import HistogramStats
+
         if not src_dict:
             return None
         d = src_dict.copy()
-        latency_metric = cls()
+        _global_histogram = d.pop("globalHistogram", UNSET)
+        global_histogram: Union[Unset, HistogramBucket]
+        if isinstance(_global_histogram, Unset):
+            global_histogram = UNSET
+        else:
+            global_histogram = HistogramBucket.from_dict(_global_histogram)
+
+        _global_stats = d.pop("globalStats", UNSET)
+        global_stats: Union[Unset, HistogramStats]
+        if isinstance(_global_stats, Unset):
+            global_stats = UNSET
+        else:
+            global_stats = HistogramStats.from_dict(_global_stats)
+
+        _histogram_per_code = d.pop("histogramPerCode", UNSET)
+        histogram_per_code: Union[Unset, HistogramBucket]
+        if isinstance(_histogram_per_code, Unset):
+            histogram_per_code = UNSET
+        else:
+            histogram_per_code = HistogramBucket.from_dict(_histogram_per_code)
+
+        _stats_per_code = d.pop("statsPerCode", UNSET)
+        stats_per_code: Union[Unset, HistogramStats]
+        if isinstance(_stats_per_code, Unset):
+            stats_per_code = UNSET
+        else:
+            stats_per_code = HistogramStats.from_dict(_stats_per_code)
+
+        latency_metric = cls(
+            global_histogram=global_histogram,
+            global_stats=global_stats,
+            histogram_per_code=histogram_per_code,
+            stats_per_code=stats_per_code,
+        )
 
         latency_metric.additional_properties = d
         return latency_metric

beamlit/models/metric.py

@@ -13,13 +13,13 @@ class Metric:
     """Metric
 
     Attributes:
-        rate (Union[Unset, str]): Metric value
-        request_total (Union[Unset, str]): Metric value
+        rate (Union[Unset, int]): Metric value
+        request_total (Union[Unset, int]): Metric value
         timestamp (Union[Unset, str]): Metric timestamp
     """
 
-    rate: Union[Unset, str] = UNSET
-    request_total: Union[Unset, str] = UNSET
+    rate: Union[Unset, int] = UNSET
+    request_total: Union[Unset, int] = UNSET
     timestamp: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)