beamlit 0.0.57rc108__py3-none-any.whl → 0.0.57rc110__py3-none-any.whl

beamlit/deploy/deploy.py

@@ -23,10 +23,10 @@ from beamlit.common.settings import Settings, get_settings, init
 from beamlit.models import (
     Agent,
     AgentSpec,
-    EnvironmentMetadata,
     Flavor,
     Function,
     FunctionSpec,
+    Metadata,
     MetadataLabels,
 )
 
@@ -49,7 +49,6 @@ def set_default_values(resource: Resource, deployment: Agent | Function):
     """
     settings = get_settings()
     deployment.metadata.workspace = settings.workspace
-    deployment.metadata.environment = settings.environment
     if not deployment.metadata.name:
         deployment.metadata.name = slugify(resource.name)
     if not deployment.metadata.display_name:
@@ -75,8 +74,7 @@ def get_beamlit_deployment_from_resource(
         if arg.arg == "agent":
             if isinstance(arg.value, ast.Dict):
                 value = arg_to_dict(arg.value)
-                metadata = EnvironmentMetadata(**value.get("metadata", {}))
-                metadata.environment = settings.environment
+                metadata = Metadata(**value.get("metadata", {}))
                 spec = AgentSpec(**value.get("spec", {}))
                 agent = Agent(metadata=metadata, spec=spec)
                 if not agent.spec.prompt:
@@ -85,18 +83,17 @@ def get_beamlit_deployment_from_resource(
         if arg.arg == "function":
             if isinstance(arg.value, ast.Dict):
                 value = arg_to_dict(arg.value)
-                metadata = EnvironmentMetadata(**value.get("metadata", {}))
-                metadata.environment = settings.environment
+                metadata = Metadata(**value.get("metadata", {}))
                 spec = FunctionSpec(**value.get("spec", {}))
                 func = Function(metadata=metadata, spec=spec)
                 if not func.spec.parameters:
                     func.spec.parameters = get_parameters(resource)
                 return set_default_values(resource, func)
     if resource.type == "agent":
-        agent = Agent(metadata=EnvironmentMetadata(), spec=AgentSpec())
+        agent = Agent(metadata=Metadata(), spec=AgentSpec())
         return set_default_values(resource, agent)
     if resource.type == "function":
-        func = Function(metadata=EnvironmentMetadata(), spec=FunctionSpec())
+        func = Function(metadata=Metadata(), spec=FunctionSpec())
         func.spec.parameters = get_parameters(resource)
         return set_default_values(resource, func)
     return None

beamlit/functions/mcp/mcp.py

@@ -17,10 +17,8 @@ from mcp import ClientSession
 from mcp.client.sse import sse_client
 from mcp.types import CallToolResult, ListToolsResult
 
-
-
-from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.authentication import get_authentication_headers
+from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
 
 from .utils import create_schema_model
@@ -31,7 +29,7 @@ logger = logging.getLogger(__name__)
 
 
 class MCPClient:
-    def __init__(self, client: AuthenticatedClient, url: str):
+    def __init__(self, client: AuthenticatedClient, url: str, sse: bool = False):
         self.client = client
         self.url = url
         self._sse = False
@@ -152,6 +150,7 @@ class MCPToolkit(BaseToolkit):
                 name=tool.name,
                 description=tool.description or "",
                 args_schema=create_schema_model(tool.name, tool.inputSchema),
+                sse=self.sse,
             )
             # list_tools returns a PaginatedResult, but I don't see a way to pass the cursor to retrieve more tools
             for tool in self._tools.tools

beamlit/functions/remote/remote.py

@@ -80,14 +80,12 @@ class RemoteTool(BaseTool):
 
     @t.override
     async def _arun(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
-        settings = get_settings()
         body = {**kwargs}
         if self.kit:
             body["name"] = self.name
         result = self.client.run(
             "function",
             self.resource_name,
-            settings.environment,
             "POST",
             cloud=self.cloud,
             service_name=self.service_name,
@@ -119,10 +117,9 @@ class RemoteToolkit:
 
     def initialize(self) -> None:
         """Initialize the session and retrieve the remote function details."""
-        settings = get_settings()
         if self._function is None:
             try:
-                response = get_function.sync_detailed(self.function, client=self.client, environment=settings.environment)
+                response = get_function.sync_detailed(self.function, client=self.client)
                 function_name = self.function.upper().replace("-", "_")
                 if os.getenv(f"BL_FUNCTION_{function_name}_SERVICE_NAME"):
                     self._service_name = os.getenv(f"BL_FUNCTION_{function_name}_SERVICE_NAME")
@@ -130,7 +127,6 @@ class RemoteToolkit:
             except UnexpectedStatus as e:
                 functions = list_functions.sync_detailed(
                     client=self.client,
-                    environment=settings.environment,
                 ).parsed
                 names = [
                     f.metadata.name

beamlit/models/__init__.py

@@ -3,11 +3,6 @@
 from .acl import ACL
 from .agent import Agent
 from .agent_chain import AgentChain
-from .agent_history import AgentHistory
-from .agent_history_event import AgentHistoryEvent
-from .agent_information_request import AgentInformationRequest
-from .agent_information_response import AgentInformationResponse
-from .agent_release import AgentRelease
 from .agent_spec import AgentSpec
 from .api_key import ApiKey
 from .configuration import Configuration
@@ -22,10 +17,6 @@ from .create_workspace_service_account_response_200 import CreateWorkspaceServic
 from .delete_workspace_service_account_response_200 import DeleteWorkspaceServiceAccountResponse200
 from .entrypoint import Entrypoint
 from .entrypoint_env import EntrypointEnv
-from .environment import Environment
-from .environment_metadata import EnvironmentMetadata
-from .environment_metrics import EnvironmentMetrics
-from .environment_spec import EnvironmentSpec
 from .flavor import Flavor
 from .form import Form
 from .form_config import FormConfig
@@ -33,7 +24,6 @@ from .form_oauthomitempty import FormOauthomitempty
 from .form_secrets import FormSecrets
 from .function import Function
 from .function_kit import FunctionKit
-from .function_release import FunctionRelease
 from .function_spec import FunctionSpec
 from .get_trace_ids_response_200 import GetTraceIdsResponse200
 from .get_trace_logs_response_200 import GetTraceLogsResponse200
@@ -51,7 +41,6 @@ from .integration_model import IntegrationModel
 from .integration_repository import IntegrationRepository
 from .invite_workspace_user_body import InviteWorkspaceUserBody
 from .knowledgebase import Knowledgebase
-from .knowledgebase_release import KnowledgebaseRelease
 from .knowledgebase_spec import KnowledgebaseSpec
 from .knowledgebase_spec_options import KnowledgebaseSpecOptions
 from .last_n_requests_metric import LastNRequestsMetric
@@ -60,9 +49,6 @@ from .location_response import LocationResponse
 from .mcp_definition import MCPDefinition
 from .mcp_definition_entrypoint import MCPDefinitionEntrypoint
 from .mcp_definition_form import MCPDefinitionForm
-from .mcp_hub_artifact import MCPHubArtifact
-from .mcp_hub_artifact_entrypoint import MCPHubArtifactEntrypoint
-from .mcp_hub_artifact_form import MCPHubArtifactForm
 from .metadata import Metadata
 from .metadata_labels import MetadataLabels
 from .metric import Metric
@@ -72,7 +58,6 @@ from .metrics_request_total_per_code import MetricsRequestTotalPerCode
 from .metrics_rps_per_code import MetricsRpsPerCode
 from .model import Model
 from .model_private_cluster import ModelPrivateCluster
-from .model_release import ModelRelease
 from .model_spec import ModelSpec
 from .o_auth import OAuth
 from .owner_fields import OwnerFields
@@ -102,12 +87,11 @@ from .request_total_by_origin_metric_request_total_by_origin_and_code import (
 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_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 .resource_metrics_request_total_per_code import ResourceMetricsRequestTotalPerCode
+from .resource_metrics_rps_per_code import ResourceMetricsRpsPerCode
+from .revision_metadata import RevisionMetadata
 from .runtime import Runtime
 from .runtime_readiness_probe import RuntimeReadinessProbe
 from .runtime_resources import RuntimeResources
@@ -138,11 +122,6 @@ __all__ = (
     "ACL",
     "Agent",
     "AgentChain",
-    "AgentHistory",
-    "AgentHistoryEvent",
-    "AgentInformationRequest",
-    "AgentInformationResponse",
-    "AgentRelease",
     "AgentSpec",
     "ApiKey",
     "Configuration",
@@ -157,10 +136,6 @@ __all__ = (
     "DeleteWorkspaceServiceAccountResponse200",
     "Entrypoint",
     "EntrypointEnv",
-    "Environment",
-    "EnvironmentMetadata",
-    "EnvironmentMetrics",
-    "EnvironmentSpec",
     "Flavor",
     "Form",
     "FormConfig",
@@ -168,7 +143,6 @@ __all__ = (
     "FormSecrets",
     "Function",
     "FunctionKit",
-    "FunctionRelease",
     "FunctionSpec",
     "GetTraceIdsResponse200",
     "GetTraceLogsResponse200",
@@ -184,7 +158,6 @@ __all__ = (
     "IntegrationRepository",
     "InviteWorkspaceUserBody",
     "Knowledgebase",
-    "KnowledgebaseRelease",
     "KnowledgebaseSpec",
     "KnowledgebaseSpecOptions",
     "LastNRequestsMetric",
@@ -193,9 +166,6 @@ __all__ = (
     "MCPDefinition",
     "MCPDefinitionEntrypoint",
     "MCPDefinitionForm",
-    "MCPHubArtifact",
-    "MCPHubArtifactEntrypoint",
-    "MCPHubArtifactForm",
     "Metadata",
     "MetadataLabels",
     "Metric",
@@ -205,7 +175,6 @@ __all__ = (
     "MetricsRpsPerCode",
     "Model",
     "ModelPrivateCluster",
-    "ModelRelease",
     "ModelSpec",
     "OAuth",
     "OwnerFields",
@@ -231,10 +200,11 @@ __all__ = (
     "RequestTotalMetric",
     "RequestTotalMetricRequestTotalPerCode",
     "RequestTotalMetricRpsPerCode",
-    "ResourceEnvironmentMetrics",
-    "ResourceEnvironmentMetricsRequestTotalPerCode",
-    "ResourceEnvironmentMetricsRpsPerCode",
     "ResourceLog",
+    "ResourceMetrics",
+    "ResourceMetricsRequestTotalPerCode",
+    "ResourceMetricsRpsPerCode",
+    "RevisionMetadata",
     "Runtime",
     "RuntimeReadinessProbe",
     "RuntimeResources",

beamlit/models/agent.py

@@ -8,7 +8,7 @@ from ..types import UNSET, Unset
 if TYPE_CHECKING:
     from ..models.agent_spec import AgentSpec
     from ..models.core_event import CoreEvent
-    from ..models.environment_metadata import EnvironmentMetadata
+    from ..models.metadata import Metadata
 
 
 T = TypeVar("T", bound="Agent")
@@ -20,13 +20,13 @@ class Agent:
 
     Attributes:
         events (Union[Unset, list['CoreEvent']]): Core events
-        metadata (Union[Unset, EnvironmentMetadata]): Environment metadata
+        metadata (Union[Unset, Metadata]): Metadata
         spec (Union[Unset, AgentSpec]): Agent specification
         status (Union[Unset, str]): Agent status
     """
 
     events: Union[Unset, list["CoreEvent"]] = UNSET
-    metadata: Union[Unset, "EnvironmentMetadata"] = UNSET
+    metadata: Union[Unset, "Metadata"] = UNSET
     spec: Union[Unset, "AgentSpec"] = UNSET
     status: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -71,7 +71,7 @@ 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.environment_metadata import EnvironmentMetadata
+        from ..models.metadata import Metadata
 
         if not src_dict:
             return None
@@ -84,11 +84,11 @@ class Agent:
             events.append(componentsschemas_core_events_item)
 
         _metadata = d.pop("metadata", UNSET)
-        metadata: Union[Unset, EnvironmentMetadata]
+        metadata: Union[Unset, Metadata]
         if isinstance(_metadata, Unset):
             metadata = UNSET
         else:
-            metadata = EnvironmentMetadata.from_dict(_metadata)
+            metadata = Metadata.from_dict(_metadata)
 
         _spec = d.pop("spec", UNSET)
         spec: Union[Unset, AgentSpec]

beamlit/models/function.py

@@ -7,8 +7,8 @@ from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
     from ..models.core_event import CoreEvent
-    from ..models.environment_metadata import EnvironmentMetadata
     from ..models.function_spec import FunctionSpec
+    from ..models.metadata import Metadata
 
 
 T = TypeVar("T", bound="Function")
@@ -20,13 +20,13 @@ class Function:
 
     Attributes:
         events (Union[Unset, list['CoreEvent']]): Core events
-        metadata (Union[Unset, EnvironmentMetadata]): Environment metadata
+        metadata (Union[Unset, Metadata]): Metadata
         spec (Union[Unset, FunctionSpec]): Function specification
         status (Union[Unset, str]): Function status
     """
 
     events: Union[Unset, list["CoreEvent"]] = UNSET
-    metadata: Union[Unset, "EnvironmentMetadata"] = UNSET
+    metadata: Union[Unset, "Metadata"] = UNSET
     spec: Union[Unset, "FunctionSpec"] = UNSET
     status: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -70,8 +70,8 @@ class Function:
     @classmethod
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.core_event import CoreEvent
-        from ..models.environment_metadata import EnvironmentMetadata
         from ..models.function_spec import FunctionSpec
+        from ..models.metadata import Metadata
 
         if not src_dict:
             return None
@@ -84,11 +84,11 @@ class Function:
             events.append(componentsschemas_core_events_item)
 
         _metadata = d.pop("metadata", UNSET)
-        metadata: Union[Unset, EnvironmentMetadata]
+        metadata: Union[Unset, Metadata]
         if isinstance(_metadata, Unset):
             metadata = UNSET
         else:
-            metadata = EnvironmentMetadata.from_dict(_metadata)
+            metadata = Metadata.from_dict(_metadata)
 
         _spec = d.pop("spec", UNSET)
         spec: Union[Unset, FunctionSpec]

beamlit/models/knowledgebase.py

@@ -7,8 +7,8 @@ from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
     from ..models.core_event import CoreEvent
-    from ..models.environment_metadata import EnvironmentMetadata
     from ..models.knowledgebase_spec import KnowledgebaseSpec
+    from ..models.metadata import Metadata
 
 
 T = TypeVar("T", bound="Knowledgebase")
@@ -20,13 +20,13 @@ class Knowledgebase:
 
     Attributes:
         events (Union[Unset, list['CoreEvent']]): Core events
-        metadata (Union[Unset, EnvironmentMetadata]): Environment metadata
+        metadata (Union[Unset, Metadata]): Metadata
         spec (Union[Unset, KnowledgebaseSpec]): Knowledgebase specification
         status (Union[Unset, str]): Knowledgebase status
     """
 
     events: Union[Unset, list["CoreEvent"]] = UNSET
-    metadata: Union[Unset, "EnvironmentMetadata"] = UNSET
+    metadata: Union[Unset, "Metadata"] = UNSET
     spec: Union[Unset, "KnowledgebaseSpec"] = UNSET
     status: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -70,8 +70,8 @@ class Knowledgebase:
     @classmethod
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.core_event import CoreEvent
-        from ..models.environment_metadata import EnvironmentMetadata
         from ..models.knowledgebase_spec import KnowledgebaseSpec
+        from ..models.metadata import Metadata
 
         if not src_dict:
             return None
@@ -84,11 +84,11 @@ class Knowledgebase:
             events.append(componentsschemas_core_events_item)
 
         _metadata = d.pop("metadata", UNSET)
-        metadata: Union[Unset, EnvironmentMetadata]
+        metadata: Union[Unset, Metadata]
         if isinstance(_metadata, Unset):
             metadata = UNSET
         else:
-            metadata = EnvironmentMetadata.from_dict(_metadata)
+            metadata = Metadata.from_dict(_metadata)
 
         _spec = d.pop("spec", UNSET)
         spec: Union[Unset, KnowledgebaseSpec]

beamlit/models/last_n_requests_metric.py

@@ -14,13 +14,11 @@ class LastNRequestsMetric:
 
     Attributes:
         date (Union[Unset, str]): Timestamp
-        environment (Union[Unset, str]): Environment
         workload_type (Union[Unset, str]): Workload type
         workspace (Union[Unset, str]): Workspace
     """
 
     date: Union[Unset, str] = UNSET
-    environment: Union[Unset, str] = UNSET
     workload_type: Union[Unset, str] = UNSET
     workspace: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -28,8 +26,6 @@ class LastNRequestsMetric:
     def to_dict(self) -> dict[str, Any]:
         date = self.date
 
-        environment = self.environment
-
         workload_type = self.workload_type
 
         workspace = self.workspace
@@ -39,8 +35,6 @@ class LastNRequestsMetric:
         field_dict.update({})
         if date is not UNSET:
             field_dict["date"] = date
-        if environment is not UNSET:
-            field_dict["environment"] = environment
         if workload_type is not UNSET:
             field_dict["workloadType"] = workload_type
         if workspace is not UNSET:
@@ -55,15 +49,12 @@ class LastNRequestsMetric:
         d = src_dict.copy()
         date = d.pop("date", UNSET)
 
-        environment = d.pop("environment", UNSET)
-
         workload_type = d.pop("workloadType", UNSET)
 
         workspace = d.pop("workspace", UNSET)
 
         last_n_requests_metric = cls(
             date=date,
-            environment=environment,
             workload_type=workload_type,
             workspace=workspace,
         )

beamlit/models/model.py

@@ -7,7 +7,7 @@ from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
     from ..models.core_event import CoreEvent
-    from ..models.environment_metadata import EnvironmentMetadata
+    from ..models.metadata import Metadata
     from ..models.model_spec import ModelSpec
 
 
@@ -16,17 +16,17 @@ T = TypeVar("T", bound="Model")
 
 @_attrs_define
 class Model:
-    """Logical object representing a model, that can be instantiated in multiple environments as model deployments
+    """Logical object representing a model
 
     Attributes:
         events (Union[Unset, list['CoreEvent']]): Core events
-        metadata (Union[Unset, EnvironmentMetadata]): Environment metadata
+        metadata (Union[Unset, Metadata]): Metadata
         spec (Union[Unset, ModelSpec]): Model specification
         status (Union[Unset, str]): Model status
     """
 
     events: Union[Unset, list["CoreEvent"]] = UNSET
-    metadata: Union[Unset, "EnvironmentMetadata"] = UNSET
+    metadata: Union[Unset, "Metadata"] = UNSET
     spec: Union[Unset, "ModelSpec"] = UNSET
     status: Union[Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -70,7 +70,7 @@ class Model:
     @classmethod
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
         from ..models.core_event import CoreEvent
-        from ..models.environment_metadata import EnvironmentMetadata
+        from ..models.metadata import Metadata
         from ..models.model_spec import ModelSpec
 
         if not src_dict:
@@ -84,11 +84,11 @@ class Model:
             events.append(componentsschemas_core_events_item)
 
         _metadata = d.pop("metadata", UNSET)
-        metadata: Union[Unset, EnvironmentMetadata]
+        metadata: Union[Unset, Metadata]
         if isinstance(_metadata, Unset):
             metadata = UNSET
         else:
-            metadata = EnvironmentMetadata.from_dict(_metadata)
+            metadata = Metadata.from_dict(_metadata)
 
         _spec = d.pop("spec", UNSET)
         spec: Union[Unset, ModelSpec]

beamlit/models/{resource_environment_metrics.py → resource_metrics.py}

@@ -10,21 +10,17 @@ if TYPE_CHECKING:
     from ..models.metric import Metric
     from ..models.request_duration_over_time_metrics import RequestDurationOverTimeMetrics
     from ..models.request_total_by_origin_metric import RequestTotalByOriginMetric
-    from ..models.resource_environment_metrics_request_total_per_code import (
-        ResourceEnvironmentMetricsRequestTotalPerCode,
-    )
-    from ..models.resource_environment_metrics_rps_per_code import (
-        ResourceEnvironmentMetricsRpsPerCode,
-    )
+    from ..models.resource_metrics_request_total_per_code import ResourceMetricsRequestTotalPerCode
+    from ..models.resource_metrics_rps_per_code import ResourceMetricsRpsPerCode
     from ..models.token_rate_metrics import TokenRateMetrics
     from ..models.token_total_metric import TokenTotalMetric
 
 
-T = TypeVar("T", bound="ResourceEnvironmentMetrics")
+T = TypeVar("T", bound="ResourceMetrics")
 
 
 @_attrs_define
-class ResourceEnvironmentMetrics:
+class ResourceMetrics:
     """Metrics for a single resource deployment (eg. model deployment, function deployment)
 
     Attributes:
@@ -34,11 +30,11 @@ class ResourceEnvironmentMetrics:
         request_duration_over_time (Union[Unset, RequestDurationOverTimeMetrics]): Request duration over time metrics
         request_total (Union[Unset, float]): Number of requests for the resource globally
         request_total_by_origin (Union[Unset, RequestTotalByOriginMetric]): Request total by origin metric
-        request_total_per_code (Union[Unset, ResourceEnvironmentMetricsRequestTotalPerCode]): Number of requests for the
-            resource globally per code
+        request_total_per_code (Union[Unset, ResourceMetricsRequestTotalPerCode]): Number of requests for the resource
+            globally per code
         rps (Union[Unset, float]): Number of requests per second for the resource globally
-        rps_per_code (Union[Unset, ResourceEnvironmentMetricsRpsPerCode]): Number of requests per second for the
-            resource globally per code
+        rps_per_code (Union[Unset, ResourceMetricsRpsPerCode]): Number of requests per second for the resource globally
+            per code
         token_rate (Union[Unset, TokenRateMetrics]): Token rate metrics
         token_total (Union[Unset, TokenTotalMetric]): Token total metric
     """
@@ -49,9 +45,9 @@ class ResourceEnvironmentMetrics:
     request_duration_over_time: Union[Unset, "RequestDurationOverTimeMetrics"] = UNSET
     request_total: Union[Unset, float] = UNSET
     request_total_by_origin: Union[Unset, "RequestTotalByOriginMetric"] = UNSET
-    request_total_per_code: Union[Unset, "ResourceEnvironmentMetricsRequestTotalPerCode"] = UNSET
+    request_total_per_code: Union[Unset, "ResourceMetricsRequestTotalPerCode"] = UNSET
     rps: Union[Unset, float] = UNSET
-    rps_per_code: Union[Unset, "ResourceEnvironmentMetricsRpsPerCode"] = UNSET
+    rps_per_code: Union[Unset, "ResourceMetricsRpsPerCode"] = UNSET
     token_rate: Union[Unset, "TokenRateMetrics"] = UNSET
     token_total: Union[Unset, "TokenTotalMetric"] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -163,12 +159,10 @@ class ResourceEnvironmentMetrics:
         from ..models.metric import Metric
         from ..models.request_duration_over_time_metrics import RequestDurationOverTimeMetrics
         from ..models.request_total_by_origin_metric import RequestTotalByOriginMetric
-        from ..models.resource_environment_metrics_request_total_per_code import (
-            ResourceEnvironmentMetricsRequestTotalPerCode,
-        )
-        from ..models.resource_environment_metrics_rps_per_code import (
-            ResourceEnvironmentMetricsRpsPerCode,
+        from ..models.resource_metrics_request_total_per_code import (
+            ResourceMetricsRequestTotalPerCode,
         )
+        from ..models.resource_metrics_rps_per_code import ResourceMetricsRpsPerCode
         from ..models.token_rate_metrics import TokenRateMetrics
         from ..models.token_total_metric import TokenTotalMetric
 
@@ -213,20 +207,20 @@ class ResourceEnvironmentMetrics:
             request_total_by_origin = RequestTotalByOriginMetric.from_dict(_request_total_by_origin)
 
         _request_total_per_code = d.pop("requestTotalPerCode", UNSET)
-        request_total_per_code: Union[Unset, ResourceEnvironmentMetricsRequestTotalPerCode]
+        request_total_per_code: Union[Unset, ResourceMetricsRequestTotalPerCode]
         if isinstance(_request_total_per_code, Unset):
             request_total_per_code = UNSET
         else:
-            request_total_per_code = ResourceEnvironmentMetricsRequestTotalPerCode.from_dict(_request_total_per_code)
+            request_total_per_code = ResourceMetricsRequestTotalPerCode.from_dict(_request_total_per_code)
 
         rps = d.pop("rps", UNSET)
 
         _rps_per_code = d.pop("rpsPerCode", UNSET)
-        rps_per_code: Union[Unset, ResourceEnvironmentMetricsRpsPerCode]
+        rps_per_code: Union[Unset, ResourceMetricsRpsPerCode]
         if isinstance(_rps_per_code, Unset):
             rps_per_code = UNSET
         else:
-            rps_per_code = ResourceEnvironmentMetricsRpsPerCode.from_dict(_rps_per_code)
+            rps_per_code = ResourceMetricsRpsPerCode.from_dict(_rps_per_code)
 
         _token_rate = d.pop("tokenRate", UNSET)
         token_rate: Union[Unset, TokenRateMetrics]
@@ -242,7 +236,7 @@ class ResourceEnvironmentMetrics:
         else:
             token_total = TokenTotalMetric.from_dict(_token_total)
 
-        resource_environment_metrics = cls(
+        resource_metrics = cls(
             inference_global=inference_global,
             last_n_requests=last_n_requests,
             latency=latency,
@@ -256,8 +250,8 @@ class ResourceEnvironmentMetrics:
             token_total=token_total,
         )
 
-        resource_environment_metrics.additional_properties = d
-        return resource_environment_metrics
+        resource_metrics.additional_properties = d
+        return resource_metrics
 
     @property
     def additional_keys(self) -> list[str]:

beamlit/models/{resource_environment_metrics_request_total_per_code.py → resource_metrics_request_total_per_code.py}

@@ -3,11 +3,11 @@ from typing import Any, TypeVar
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-T = TypeVar("T", bound="ResourceEnvironmentMetricsRequestTotalPerCode")
+T = TypeVar("T", bound="ResourceMetricsRequestTotalPerCode")
 
 
 @_attrs_define
-class ResourceEnvironmentMetricsRequestTotalPerCode:
+class ResourceMetricsRequestTotalPerCode:
     """Number of requests for the resource globally per code"""
 
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
@@ -23,10 +23,10 @@ class ResourceEnvironmentMetricsRequestTotalPerCode:
         if not src_dict:
             return None
         d = src_dict.copy()
-        resource_environment_metrics_request_total_per_code = cls()
+        resource_metrics_request_total_per_code = cls()
 
-        resource_environment_metrics_request_total_per_code.additional_properties = d
-        return resource_environment_metrics_request_total_per_code
+        resource_metrics_request_total_per_code.additional_properties = d
+        return resource_metrics_request_total_per_code
 
     @property
     def additional_keys(self) -> list[str]: