google-cloud-agentplatform 2.6.0__tar.gz → 2.7.0__tar.gz

{google_cloud_agentplatform-2.6.0/google_cloud_agentplatform.egg-info → google_cloud_agentplatform-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-agentplatform
-Version: 2.6.0
+Version: 2.7.0
 Summary: Google Cloud Agent Platform Client Library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0}/agentplatform/_genai/_runtimes_utils.py

@@ -1294,11 +1294,6 @@ def _upload_runtime(
                     "`from a2a import types`."
                 )
             raise TypeError(error_msg) from e
-    with blob.open("rb") as f:
-        try:
-            _ = cloudpickle.load(f)
-        except Exception as e:
-            raise TypeError("agent runtime serialized to an invalid format") from e
     dir_name = f"gs://{gcs_bucket.name}/{gcs_dir_name}"
     logger.info(f"Wrote to {dir_name}/{_BLOB_FILENAME}")
 

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0}/agentplatform/_genai/model_garden.py

@@ -1157,6 +1157,33 @@ class ModelGarden(_api_module.BaseModule):
     _DEFAULT_DEPLOY_TIMEOUT_SECONDS = 2 * 60 * 60
     _DEFAULT_DEPLOY_POLL_INTERVAL_SECONDS = 30
 
+    # Model Garden catalog reads (ListPublisherModels, GetPublisherModel) are
+    # served from us-central1, as in vertexai.model_garden. Other regional
+    # endpoints return a partial catalog (e.g. no deploy configs for models that
+    # deploy fine there, since Deploy reads the global model configs).
+    _CATALOG_BASE_URL = "https://us-central1-aiplatform.googleapis.com/"
+
+    @staticmethod
+    def _catalog_http_options(
+        api_client: Any,
+    ) -> Optional[genai_types.HttpOptions]:
+        """Returns ``http_options`` that send catalog reads to us-central1.
+
+        Only the catalog reads are routed this way; deploy, export and batch
+        requests still go to the client's location.
+
+        Args:
+          api_client: The client's API client.
+
+        Returns:
+          ``HttpOptions`` with the us-central1 base URL, or None when the client
+          was created with a custom ``base_url`` (e.g. a proxy or private
+          endpoint), which is then left unchanged.
+        """
+        if api_client.custom_base_url:
+            return None
+        return genai_types.HttpOptions(base_url=ModelGarden._CATALOG_BASE_URL)
+
     @staticmethod
     def _build_filter_str(
         model_filter: Optional[str],
@@ -1573,9 +1600,11 @@ class ModelGarden(_api_module.BaseModule):
         endpoint_config = types.DeployRequestEndpointConfig(
             endpoint_display_name=config.endpoint_display_name,
         )
-        disabled = config.dedicated_endpoint_disabled
-        if disabled is not None:
-            endpoint_config.dedicated_endpoint_enabled = not disabled
+        # Send the current field, as vertexai.model_garden does. The deprecated
+        # dedicated_endpoint_enabled cannot express "off": False is its proto3
+        # default, so the backend would keep its default (dedicated endpoint on).
+        if config.dedicated_endpoint_disabled:
+            endpoint_config.dedicated_endpoint_disabled = True
         if config.enable_private_service_connect:
             endpoint_config.private_service_connect_config = (
                 types.PrivateServiceConnectConfig(
@@ -1598,6 +1627,10 @@ class ModelGarden(_api_module.BaseModule):
                 max_replica_count=config.max_replica_count,
                 spot=config.spot,
             )
+        elif config.spot:
+            # Without a machine shape the backend deploys the model's default
+            # verified config and applies spot to it, as with vertexai.model_garden.
+            deploy_config.dedicated_resources = types.DedicatedResources(spot=True)
 
         return model_config, endpoint_config, deploy_config
 
@@ -1710,6 +1743,7 @@ class ModelGarden(_api_module.BaseModule):
                     filter=api_config.filter,
                     list_all_versions=api_config.list_all_versions,
                     page_token=page_token,
+                    http_options=api_config.http_options,
                 )
             response = self._list_publisher_models(
                 parent="publishers/*",
@@ -1746,6 +1780,7 @@ class ModelGarden(_api_module.BaseModule):
         api_config = types.ListPublisherModelsConfig(
             filter=filter_str,
             list_all_versions=True,
+            http_options=ModelGarden._catalog_http_options(self._api_client),
         )
 
         models = self._list_all_publisher_models(api_config)
@@ -1859,6 +1894,7 @@ class ModelGarden(_api_module.BaseModule):
         get_publisher_model_config = types.GetPublisherModelConfig(
             is_hugging_face_model=self._is_hugging_face_model(model),
             include_equivalent_model_garden_model_deployment_configs=True,
+            http_options=ModelGarden._catalog_http_options(self._api_client),
         )
         publisher_model = self._get_publisher_model(
             name=self._reconcile_model_name(model),
@@ -3189,6 +3225,7 @@ class AsyncModelGarden(_api_module.BaseModule):
                     filter=api_config.filter,
                     list_all_versions=api_config.list_all_versions,
                     page_token=page_token,
+                    http_options=api_config.http_options,
                 )
             response = await self._list_publisher_models(
                 parent="publishers/*",
@@ -3225,6 +3262,7 @@ class AsyncModelGarden(_api_module.BaseModule):
         api_config = types.ListPublisherModelsConfig(
             filter=filter_str,
             list_all_versions=True,
+            http_options=ModelGarden._catalog_http_options(self._api_client),
         )
 
         models = await self._list_all_publisher_models(api_config)
@@ -3336,6 +3374,7 @@ class AsyncModelGarden(_api_module.BaseModule):
         api_config = types.GetPublisherModelConfig(
             is_hugging_face_model=ModelGarden._is_hugging_face_model(model),
             include_equivalent_model_garden_model_deployment_configs=True,
+            http_options=ModelGarden._catalog_http_options(self._api_client),
         )
         publisher_model = await self._get_publisher_model(
             name=ModelGarden._reconcile_model_name(model), config=api_config

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0}/agentplatform/_genai/sandboxes.py

@@ -1403,9 +1403,9 @@ class Sandboxes(_api_module.BaseModule):
         if not connection_info:
             raise ValueError("Connection info is not available.")
         if psc_endpoint:
-            # VPC-SC path: caller has provisioned a PSC endpoint against
-            # connection_info.service_attachment and passes its host here.
-            endpoint = "https://" + psc_endpoint
+            # VPC-SC path: PSC endpoint routes to the router pod, which serves
+            # plain HTTP on `port`.
+            endpoint = f"http://{psc_endpoint}:{port}"
         elif connection_info.load_balancer_hostname:
             endpoint = "https://" + connection_info.load_balancer_hostname
         elif connection_info.load_balancer_ip:
@@ -1489,7 +1489,8 @@ class Sandboxes(_api_module.BaseModule):
 
         connection_info = sandbox_environment.connection_info
         if psc_endpoint:
-            ws_base_url = "wss://" + psc_endpoint
+            # VPC-SC path: see send_command for rationale.
+            ws_base_url = f"ws://{psc_endpoint}:{port}"
         elif connection_info.load_balancer_hostname:
             ws_base_url = "wss://" + connection_info.load_balancer_hostname
         elif connection_info.load_balancer_ip:

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0}/agentplatform/_genai/types/common.py

@@ -32128,7 +32128,11 @@ class DeployPublisherModelConfig(_common.BaseModel):
     accelerator_count: Optional[int] = Field(
         default=None, description="""Number of accelerators per replica."""
     )
-    spot: Optional[bool] = Field(default=None, description="""Schedule on Spot VMs.""")
+    spot: Optional[bool] = Field(
+        default=None,
+        description="""Schedule on Spot VMs. Without ``machine_type``, applies to the
+      model's default machine.""",
+    )
     dedicated_endpoint_disabled: Optional[bool] = Field(
         default=None,
         description="""Set True to serve predictions via the shared endpoint DNS
@@ -32217,7 +32221,8 @@ class DeployPublisherModelConfigDict(TypedDict, total=False):
     """Number of accelerators per replica."""
 
     spot: Optional[bool]
-    """Schedule on Spot VMs."""
+    """Schedule on Spot VMs. Without ``machine_type``, applies to the
+      model's default machine."""
 
     dedicated_endpoint_disabled: Optional[bool]
     """Set True to serve predictions via the shared endpoint DNS

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0}/agentplatform/frameworks/adk.py

@@ -114,6 +114,7 @@ if TYPE_CHECKING:
 
 _DEFAULT_APP_NAME = "default_app_name"
 _DEFAULT_USER_ID = "default-user-id"
+_UPSTREAM_SESSION_ID_KEY = "agent_engine:upstream_session_id"
 _TELEMETRY_API_DISABLED_WARNING = """\
 Tracing integration for Agent Engine has migrated to a new API.
 The 'telemetry.googleapis.com' has not been enabled in project %s.
@@ -984,14 +985,18 @@ class AdkApp:
         session_service: "BaseSessionService",
         artifact_service: "BaseArtifactService",
         request: _StreamRunRequest,
+        state: Optional[Dict[str, Any]] = None,
     ):
         """Initializes the session, and returns the session id."""
         from google.adk.events.event import Event
 
-        session = await session_service.create_session(
-            app_name=self._app_name(),
-            user_id=request.user_id,
-        )
+        create_session_kwargs: Dict[str, Any] = {
+            "app_name": self._app_name(),
+            "user_id": request.user_id,
+        }
+        if state is not None:
+            create_session_kwargs["state"] = state
+        session = await session_service.create_session(**create_session_kwargs)
         if not session:
             raise RuntimeError("Create session failed.")
         if request.events:
@@ -1530,6 +1535,11 @@ class AdkApp:
         you have defined for the AdkApp. This method is primarily meant for
         invocation from AgentSpace.
 
+        When `request_json` includes a `session_id` that is not found in
+        `session_service`, a new fallback session is created and the caller's
+        `session_id` is stored in `session.state` under
+        `agent_engine:upstream_session_id` (`_UPSTREAM_SESSION_ID_KEY`).
+
         Args:
             request_json (str):
                 Required. The request to stream responses for.
@@ -1594,6 +1604,7 @@ class AdkApp:
                     session_service=session_service,
                     artifact_service=artifact_service,
                     request=request,
+                    state={_UPSTREAM_SESSION_ID_KEY: request.session_id},
                 )
         else:
             # Not providing a session ID will create a new in-memory session.

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0}/agentplatform/version.py

@@ -14,4 +14,4 @@
 #
 """Version file for agentplatform."""
 
-__version__ = "2.6.0"
+__version__ = "2.7.0"

{google_cloud_agentplatform-2.6.0 → google_cloud_agentplatform-2.7.0/google_cloud_agentplatform.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-agentplatform
-Version: 2.6.0
+Version: 2.7.0
 Summary: Google Cloud Agent Platform Client Library
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0