beamlit 0.0.56rc104__py3-none-any.whl → 0.0.56rc105__py3-none-any.whl

beamlit/deploy/deploy.py

@@ -59,6 +59,7 @@ def set_default_values(resource: Resource, deployment: Agent | Function):
     return deployment
 
 def get_beamlit_deployment_from_resource(
+    settings: Settings,
     resource: Resource,
 ) -> Agent | Function:
     """
@@ -75,6 +76,7 @@ def get_beamlit_deployment_from_resource(
             if isinstance(arg.value, ast.Dict):
                 value = arg_to_dict(arg.value)
                 metadata = EnvironmentMetadata(**value.get("metadata", {}))
+                metadata.environment = settings.environment
                 spec = AgentSpec(**value.get("spec", {}))
                 agent = Agent(metadata=metadata, spec=spec)
                 if not agent.spec.prompt:
@@ -84,6 +86,7 @@ def get_beamlit_deployment_from_resource(
             if isinstance(arg.value, ast.Dict):
                 value = arg_to_dict(arg.value)
                 metadata = EnvironmentMetadata(**value.get("metadata", {}))
+                metadata.environment = settings.environment
                 spec = FunctionSpec(**value.get("spec", {}))
                 func = Function(metadata=metadata, spec=spec)
                 if not func.spec.parameters:
@@ -265,13 +268,13 @@ def generate_beamlit_deployment(directory: str, name: str):
     functions: list[tuple[Resource, Function]] = []
     agents: list[tuple[Resource, Agent]] = []
     for resource in get_resources("agent", settings.server.directory):
-        agent = get_beamlit_deployment_from_resource(resource)
+        agent = get_beamlit_deployment_from_resource(settings, resource)
         if name and agent.metadata.name != name:
             agent.metadata.name = slugify(name)
         if agent:
             agents.append((resource, agent))
     for resource in get_resources("function", settings.server.directory):
-        function = get_beamlit_deployment_from_resource(resource)
+        function = get_beamlit_deployment_from_resource(settings, resource)
         if function:
             functions.append((resource, function))
 

beamlit/functions/remote/remote.py

@@ -4,13 +4,15 @@ It includes classes for creating dynamic schemas based on function parameters an
 """
 
 import asyncio
+import os
 import warnings
 from dataclasses import dataclass
 from typing import Callable
-import os
 
 import pydantic
 import typing_extensions as t
+from langchain_core.tools.base import BaseTool, ToolException
+
 from beamlit.api.functions import get_function, list_functions
 from beamlit.authentication.authentication import AuthenticatedClient
 from beamlit.common.settings import get_settings
@@ -18,7 +20,6 @@ from beamlit.errors import UnexpectedStatus
 from beamlit.functions.mcp.mcp import MCPClient, MCPToolkit
 from beamlit.models import Function, StoreFunctionParameter
 from beamlit.run import RunClient
-from langchain_core.tools.base import BaseTool, ToolException
 
 
 def create_dynamic_schema(name: str, parameters: list[StoreFunctionParameter]) -> type[pydantic.BaseModel]:

beamlit/models/__init__.py

@@ -5,6 +5,8 @@ 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
@@ -18,11 +20,17 @@ from .create_api_key_for_service_account_body import CreateApiKeyForServiceAccou
 from .create_workspace_service_account_body import CreateWorkspaceServiceAccountBody
 from .create_workspace_service_account_response_200 import CreateWorkspaceServiceAccountResponse200
 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
+from .form_oauthomitempty import FormOauthomitempty
+from .form_secrets import FormSecrets
 from .function import Function
 from .function_kit import FunctionKit
 from .function_release import FunctionRelease
@@ -49,6 +57,12 @@ from .knowledgebase_spec_options import KnowledgebaseSpecOptions
 from .last_n_requests_metric import LastNRequestsMetric
 from .latency_metric import LatencyMetric
 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
@@ -60,6 +74,7 @@ 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
 from .pending_invitation import PendingInvitation
 from .pending_invitation_accept import PendingInvitationAccept
@@ -125,6 +140,8 @@ __all__ = (
     "AgentChain",
     "AgentHistory",
     "AgentHistoryEvent",
+    "AgentInformationRequest",
+    "AgentInformationResponse",
     "AgentRelease",
     "AgentSpec",
     "ApiKey",
@@ -138,11 +155,17 @@ __all__ = (
     "CreateWorkspaceServiceAccountBody",
     "CreateWorkspaceServiceAccountResponse200",
     "DeleteWorkspaceServiceAccountResponse200",
+    "Entrypoint",
+    "EntrypointEnv",
     "Environment",
     "EnvironmentMetadata",
     "EnvironmentMetrics",
     "EnvironmentSpec",
     "Flavor",
+    "Form",
+    "FormConfig",
+    "FormOauthomitempty",
+    "FormSecrets",
     "Function",
     "FunctionKit",
     "FunctionRelease",
@@ -167,6 +190,12 @@ __all__ = (
     "LastNRequestsMetric",
     "LatencyMetric",
     "LocationResponse",
+    "MCPDefinition",
+    "MCPDefinitionEntrypoint",
+    "MCPDefinitionForm",
+    "MCPHubArtifact",
+    "MCPHubArtifactEntrypoint",
+    "MCPHubArtifactForm",
     "Metadata",
     "MetadataLabels",
     "Metric",
@@ -178,6 +207,7 @@ __all__ = (
     "ModelPrivateCluster",
     "ModelRelease",
     "ModelSpec",
+    "OAuth",
     "OwnerFields",
     "PendingInvitation",
     "PendingInvitationAccept",

beamlit/models/agent_information_request.py

@@ -0,0 +1,63 @@
+from typing import Any, TypeVar, Union, cast
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AgentInformationRequest")
+
+
+@_attrs_define
+class AgentInformationRequest:
+    """generation agent information request
+
+    Attributes:
+        functions (Union[Unset, list[Any]]): Functions to generate information for
+    """
+
+    functions: Union[Unset, list[Any]] = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        functions: Union[Unset, list[Any]] = UNSET
+        if not isinstance(self.functions, Unset):
+            functions = self.functions
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if functions is not UNSET:
+            field_dict["functions"] = functions
+
+        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()
+        functions = cast(list[Any], d.pop("functions", UNSET))
+
+        agent_information_request = cls(
+            functions=functions,
+        )
+
+        agent_information_request.additional_properties = d
+        return agent_information_request
+
+    @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/agent_information_response.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="AgentInformationResponse")
+
+
+@_attrs_define
+class AgentInformationResponse:
+    """generation agent information response
+
+    Attributes:
+        description (Union[Unset, str]): Description of the agent
+        display_name (Union[Unset, str]): Display name of the agent
+        name (Union[Unset, str]): Name of the agent
+        prompt (Union[Unset, str]): Prompt of the agent
+    """
+
+    description: Union[Unset, str] = UNSET
+    display_name: Union[Unset, str] = UNSET
+    name: Union[Unset, str] = UNSET
+    prompt: Union[Unset, str] = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        description = self.description
+
+        display_name = self.display_name
+
+        name = self.name
+
+        prompt = self.prompt
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if description is not UNSET:
+            field_dict["description"] = description
+        if display_name is not UNSET:
+            field_dict["displayName"] = display_name
+        if name is not UNSET:
+            field_dict["name"] = name
+        if prompt is not UNSET:
+            field_dict["prompt"] = prompt
+
+        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()
+        description = d.pop("description", UNSET)
+
+        display_name = d.pop("displayName", UNSET)
+
+        name = d.pop("name", UNSET)
+
+        prompt = d.pop("prompt", UNSET)
+
+        agent_information_response = cls(
+            description=description,
+            display_name=display_name,
+            name=name,
+            prompt=prompt,
+        )
+
+        agent_information_response.additional_properties = d
+        return agent_information_response
+
+    @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/agent_spec.py

@@ -37,6 +37,7 @@ class AgentSpec:
         agent_chain (Union[Unset, list['AgentChain']]): Agent chain
         description (Union[Unset, str]): Description, small description computed from the prompt
         functions (Union[Unset, list[str]]):
+        knowledgebase (Union[Unset, str]): Knowledgebase Name
         model (Union[Unset, str]): Model name
         prompt (Union[Unset, str]): Prompt, describe what your agent does
         repository (Union[Unset, Repository]): Repository
@@ -56,6 +57,7 @@ class AgentSpec:
     agent_chain: Union[Unset, list["AgentChain"]] = UNSET
     description: Union[Unset, str] = UNSET
     functions: Union[Unset, list[str]] = UNSET
+    knowledgebase: Union[Unset, str] = UNSET
     model: Union[Unset, str] = UNSET
     prompt: Union[Unset, str] = UNSET
     repository: Union[Unset, "Repository"] = UNSET
@@ -137,6 +139,8 @@ class AgentSpec:
         if not isinstance(self.functions, Unset):
             functions = self.functions
 
+        knowledgebase = self.knowledgebase
+
         model = self.model
 
         prompt = self.prompt
@@ -178,6 +182,8 @@ class AgentSpec:
             field_dict["description"] = description
         if functions is not UNSET:
             field_dict["functions"] = functions
+        if knowledgebase is not UNSET:
+            field_dict["knowledgebase"] = knowledgebase
         if model is not UNSET:
             field_dict["model"] = model
         if prompt is not UNSET:
@@ -264,6 +270,8 @@ class AgentSpec:
 
         functions = cast(list[str], d.pop("functions", UNSET))
 
+        knowledgebase = d.pop("knowledgebase", UNSET)
+
         model = d.pop("model", UNSET)
 
         prompt = d.pop("prompt", UNSET)
@@ -291,6 +299,7 @@ class AgentSpec:
             agent_chain=agent_chain,
             description=description,
             functions=functions,
+            knowledgebase=knowledgebase,
             model=model,
             prompt=prompt,
             repository=repository,

beamlit/models/entrypoint.py

@@ -0,0 +1,96 @@
+from typing import TYPE_CHECKING, Any, TypeVar, Union, cast
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+from ..types import UNSET, Unset
+
+if TYPE_CHECKING:
+    from ..models.entrypoint_env import EntrypointEnv
+
+
+T = TypeVar("T", bound="Entrypoint")
+
+
+@_attrs_define
+class Entrypoint:
+    """Entrypoint of the artifact
+
+    Attributes:
+        args (Union[Unset, list[Any]]): Args of the entrypoint
+        command (Union[Unset, str]): Command of the entrypoint
+        env (Union[Unset, EntrypointEnv]): Env of the entrypoint
+    """
+
+    args: Union[Unset, list[Any]] = UNSET
+    command: Union[Unset, str] = UNSET
+    env: Union[Unset, "EntrypointEnv"] = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        args: Union[Unset, list[Any]] = UNSET
+        if not isinstance(self.args, Unset):
+            args = self.args
+
+        command = self.command
+
+        env: Union[Unset, dict[str, Any]] = UNSET
+        if self.env and not isinstance(self.env, Unset) and not isinstance(self.env, dict):
+            env = self.env.to_dict()
+        elif self.env and isinstance(self.env, dict):
+            env = self.env
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if args is not UNSET:
+            field_dict["args"] = args
+        if command is not UNSET:
+            field_dict["command"] = command
+        if env is not UNSET:
+            field_dict["env"] = env
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+        from ..models.entrypoint_env import EntrypointEnv
+
+        if not src_dict:
+            return None
+        d = src_dict.copy()
+        args = cast(list[Any], d.pop("args", UNSET))
+
+        command = d.pop("command", UNSET)
+
+        _env = d.pop("env", UNSET)
+        env: Union[Unset, EntrypointEnv]
+        if isinstance(_env, Unset):
+            env = UNSET
+        else:
+            env = EntrypointEnv.from_dict(_env)
+
+        entrypoint = cls(
+            args=args,
+            command=command,
+            env=env,
+        )
+
+        entrypoint.additional_properties = d
+        return entrypoint
+
+    @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/entrypoint_env.py

@@ -0,0 +1,45 @@
+from typing import Any, TypeVar
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+T = TypeVar("T", bound="EntrypointEnv")
+
+
+@_attrs_define
+class EntrypointEnv:
+    """Env of the entrypoint"""
+
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+
+        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()
+        entrypoint_env = cls()
+
+        entrypoint_env.additional_properties = d
+        return entrypoint_env
+
+    @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/form.py

@@ -0,0 +1,120 @@
+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.form_config import FormConfig
+    from ..models.form_oauthomitempty import FormOauthomitempty
+    from ..models.form_secrets import FormSecrets
+
+
+T = TypeVar("T", bound="Form")
+
+
+@_attrs_define
+class Form:
+    """Form of the artifact
+
+    Attributes:
+        config (Union[Unset, FormConfig]): Config of the artifact
+        oauthomitempty (Union[Unset, FormOauthomitempty]): OAuth of the artifact
+        secrets (Union[Unset, FormSecrets]): Secrets of the artifact
+    """
+
+    config: Union[Unset, "FormConfig"] = UNSET
+    oauthomitempty: Union[Unset, "FormOauthomitempty"] = UNSET
+    secrets: Union[Unset, "FormSecrets"] = UNSET
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        config: Union[Unset, dict[str, Any]] = UNSET
+        if self.config and not isinstance(self.config, Unset) and not isinstance(self.config, dict):
+            config = self.config.to_dict()
+        elif self.config and isinstance(self.config, dict):
+            config = self.config
+
+        oauthomitempty: Union[Unset, dict[str, Any]] = UNSET
+        if (
+            self.oauthomitempty
+            and not isinstance(self.oauthomitempty, Unset)
+            and not isinstance(self.oauthomitempty, dict)
+        ):
+            oauthomitempty = self.oauthomitempty.to_dict()
+        elif self.oauthomitempty and isinstance(self.oauthomitempty, dict):
+            oauthomitempty = self.oauthomitempty
+
+        secrets: Union[Unset, dict[str, Any]] = UNSET
+        if self.secrets and not isinstance(self.secrets, Unset) and not isinstance(self.secrets, dict):
+            secrets = self.secrets.to_dict()
+        elif self.secrets and isinstance(self.secrets, dict):
+            secrets = self.secrets
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if config is not UNSET:
+            field_dict["config"] = config
+        if oauthomitempty is not UNSET:
+            field_dict["oauth,omitempty"] = oauthomitempty
+        if secrets is not UNSET:
+            field_dict["secrets"] = secrets
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+        from ..models.form_config import FormConfig
+        from ..models.form_oauthomitempty import FormOauthomitempty
+        from ..models.form_secrets import FormSecrets
+
+        if not src_dict:
+            return None
+        d = src_dict.copy()
+        _config = d.pop("config", UNSET)
+        config: Union[Unset, FormConfig]
+        if isinstance(_config, Unset):
+            config = UNSET
+        else:
+            config = FormConfig.from_dict(_config)
+
+        _oauthomitempty = d.pop("oauth,omitempty", UNSET)
+        oauthomitempty: Union[Unset, FormOauthomitempty]
+        if isinstance(_oauthomitempty, Unset):
+            oauthomitempty = UNSET
+        else:
+            oauthomitempty = FormOauthomitempty.from_dict(_oauthomitempty)
+
+        _secrets = d.pop("secrets", UNSET)
+        secrets: Union[Unset, FormSecrets]
+        if isinstance(_secrets, Unset):
+            secrets = UNSET
+        else:
+            secrets = FormSecrets.from_dict(_secrets)
+
+        form = cls(
+            config=config,
+            oauthomitempty=oauthomitempty,
+            secrets=secrets,
+        )
+
+        form.additional_properties = d
+        return form
+
+    @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/form_config.py

@@ -0,0 +1,45 @@
+from typing import Any, TypeVar
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+T = TypeVar("T", bound="FormConfig")
+
+
+@_attrs_define
+class FormConfig:
+    """Config of the artifact"""
+
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+
+        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()
+        form_config = cls()
+
+        form_config.additional_properties = d
+        return form_config
+
+    @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