diff --git a/agentplatform/__init__.py b/agentplatform/__init__.py index 1c76745e93..feb8436449 100644 --- a/agentplatform/__init__.py +++ b/agentplatform/__init__.py @@ -17,10 +17,17 @@ import importlib import sys -from google.cloud.aiplatform import init -from google.cloud.aiplatform import version as aiplatform_version +try: + from google.cloud.aiplatform import init +except ImportError: + init = None -__version__ = aiplatform_version.__version__ +try: + from google.cloud.aiplatform import version as aiplatform_version + + __version__ = aiplatform_version.__version__ +except ImportError: + from .version import __version__ # noqa: F401 _genai_client = None _genai_types = None @@ -60,3 +67,6 @@ def __getattr__(name): # type: ignore[no-untyped-def] "Client", "types", ] + +if init is None: + __all__.remove("init") diff --git a/agentplatform/_genai/_gcs_utils.py b/agentplatform/_genai/_gcs_utils.py index 0ab1b52aa2..f28d7416b4 100644 --- a/agentplatform/_genai/_gcs_utils.py +++ b/agentplatform/_genai/_gcs_utils.py @@ -13,16 +13,17 @@ # limitations under the License. # +from importlib.metadata import version as get_version import io import json import logging from typing import Any, Union +import uuid from google.cloud import storage # type: ignore[attr-defined] -from google.cloud.aiplatform.utils.gcs_utils import blob_from_uri from google.genai._api_client import BaseApiClient +from packaging.version import Version import pandas as pd -import uuid logger = logging.getLogger(__name__) @@ -31,6 +32,36 @@ GCS_PREFIX = "gs://" +# Detect google-cloud-storage version once at module load +try: + _GCS_VERSION = Version(get_version("google-cloud-storage")) +except Exception: + # Fallback if version detection fails (should not happen in normal use) + _GCS_VERSION = Version("3.0.0") + +_USE_FROM_URI = _GCS_VERSION >= Version("3.0.0") + + +def blob_from_uri(uri: str, client: storage.Client) -> storage.Blob: + """Create a Blob from a GCS URI, compatible with v2 and v3. + + This function provides compatibility across google-cloud-storage versions: + - v3.x: Uses Blob.from_uri() + - v2.x: Uses Blob.from_string() (deprecated in v3) + + Args: + uri: GCS URI (e.g., 'gs://bucket/path/to/blob') + client: Storage client instance + + Returns: + storage.Blob: Blob instance + """ + if _USE_FROM_URI: + return storage.Blob.from_uri(uri, client=client) + else: + return storage.Blob.from_string(uri, client=client) + + class GcsUtils: """Handles File I/O operations with Google Cloud Storage (GCS)""" diff --git a/agentplatform/_genai/client.py b/agentplatform/_genai/client.py index 57e043c7f4..043d20830d 100644 --- a/agentplatform/_genai/client.py +++ b/agentplatform/_genai/client.py @@ -16,16 +16,17 @@ import asyncio import importlib import sys -from typing import Optional, Union, TYPE_CHECKING -from types import TracebackType, ModuleType +from types import ModuleType, TracebackType +from typing import Optional, TYPE_CHECKING, Union import google.auth -from google.cloud.aiplatform import version as aip_version +from agentplatform import __version__ +from google.genai import _api_client as genai_api_client from google.genai import _common from google.genai import client as genai_client from google.genai import types from google.genai import version as genai_version -from google.genai import _api_client as genai_api_client + from . import live if TYPE_CHECKING: @@ -60,7 +61,7 @@ def _custom_append_library_version_headers(headers: dict[str, str]) -> None: """Overridde GenAI SDK header injection to use custom vertex-genai-modules header.""" genai_sdk_version = genai_version.__version__ - module_version = aip_version.__version__ + module_version = __version__ python_version = sys.version.split()[0] combined_label = f"google-genai-sdk/{genai_sdk_version}+{_GENAI_MODULES_TELEMETRY_HEADER}/{module_version}" diff --git a/agentplatform/version.py b/agentplatform/version.py new file mode 100644 index 0000000000..7ae7b983c8 --- /dev/null +++ b/agentplatform/version.py @@ -0,0 +1,17 @@ +# Copyright 2026 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +"""Version file for agentplatform.""" + +__version__ = "1.165.1" diff --git a/pypi/google_cloud_agentplatform/LICENSE b/pypi/google_cloud_agentplatform/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/pypi/google_cloud_agentplatform/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pypi/google_cloud_agentplatform/README.md b/pypi/google_cloud_agentplatform/README.md new file mode 100644 index 0000000000..3136098585 --- /dev/null +++ b/pypi/google_cloud_agentplatform/README.md @@ -0,0 +1,17 @@ +# Google Cloud Agent Platform + +This is the packaging directory for `google-cloud-agentplatform`. + +## Installation + +```bash +# Core installation +pip install google-cloud-agentplatform + +# With specific extras +pip install google-cloud-agentplatform[adk] +pip install google-cloud-agentplatform[langchain] +pip install google-cloud-agentplatform[evaluation] +pip install google-cloud-agentplatform[bigquery] +pip install google-cloud-agentplatform[all] +``` diff --git a/pypi/google_cloud_agentplatform/build_and_copy_package.sh b/pypi/google_cloud_agentplatform/build_and_copy_package.sh new file mode 100755 index 0000000000..e24b6f5c99 --- /dev/null +++ b/pypi/google_cloud_agentplatform/build_and_copy_package.sh @@ -0,0 +1,72 @@ +#!/bin/bash +# Copyright 2026 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -exu + +# Optional destination folder in GCS +folder="${1:-}" + +TEMP_DIR=$(mktemp -d) +echo "Temporary directory: $TEMP_DIR" + +cleanup() { + echo "Cleaning up..." + rm -rf "$TEMP_DIR" +} +trap cleanup EXIT + +# Get directory of this script +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +RUN_DIR="$PWD" + +# Resolve google3 directory and workspace root +GOOGLE3_DIR=$(cd "$SCRIPT_DIR/../../../../../../../" && pwd) +COPYBARA_SKY="$SCRIPT_DIR/../../copy.bara.sky" + +# Run Copybara to temporary directory +/google/bin/releases/copybara/public/copybara/copybara \ + "$COPYBARA_SKY" \ + folder_to_folder \ + "$GOOGLE3_DIR/.." \ + --folder-dir="$TEMP_DIR" \ + --ignore-noop + +# Go to the package directory in the temp dir +cd "$TEMP_DIR/pypi/google_cloud_agentplatform" + +# setuptools will not carry sources from outside the project root into an +# sdist. Leaving the package at the repo root produces an sdist with no code, +# and `build` makes the wheel from that sdist, so it ships empty. Stage the +# package inside the project instead. +cp -r "$TEMP_DIR/agentplatform" ./agentplatform + +# Build the sdist and wheel (requires setuptools to be installed in the environment) +python3 -m build --no-isolation --outdir ./whl-output + +# Get version from the transformed source +version_file="./agentplatform/version.py" +pkg_version=$(grep '__version__' "$version_file" | sed -E "s/__version__\s*=\s*['\"]([^'\"]+)['\"].*/\1/") +whl_file="./whl-output/google_cloud_agentplatform-$pkg_version-py3-none-any.whl" +sdist_file="./whl-output/google_cloud_agentplatform-$pkg_version.tar.gz" + +# Copy or upload +if [[ -n "$folder" ]]; then + echo "Uploading to gs://unified-genai-dev/$folder/" + gcloud storage cp "$whl_file" "$sdist_file" "gs://unified-genai-dev/$folder/" +else + echo "Copying distributions to original directory..." + cp "$whl_file" "$sdist_file" "$RUN_DIR/" + echo "Distributions copied to $RUN_DIR/" +fi diff --git a/pypi/google_cloud_agentplatform/pyproject.toml b/pypi/google_cloud_agentplatform/pyproject.toml new file mode 100644 index 0000000000..9c8b4121f0 --- /dev/null +++ b/pypi/google_cloud_agentplatform/pyproject.toml @@ -0,0 +1,96 @@ +[build-system] +requires = ["setuptools>=61.0"] +build-backend = "setuptools.build_meta" + +[project] +name = "google-cloud-agentplatform" +dynamic = ["version"] +description = "Google Cloud Agent Platform Client Library" +authors = [ + {name = "Google LLC", email = "googleapis-packages@google.com"} +] +readme = "README.md" +requires-python = ">=3.8" +license = {text = "Apache-2.0"} +classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", +] +dependencies = [ + "google-auth", + "google-api-core", + "proto-plus", + "protobuf", + "packaging", + "pydantic < 3", + "typing_extensions", + "google-genai", +] + +[project.optional-dependencies] +agent_engines = [ + "cloudpickle >= 3.0, < 4.0", + "google-cloud-storage >= 1.32.0, < 4.0.0", +] +adk = [ + "google-cloud-agentplatform[agent_engines]", + "google-adk >= 1.5.0, < 3.0.0", + "aiohttp", +] +langchain = [ + "google-cloud-agentplatform[agent_engines]", + "langchain >= 1.0.0, < 2.0.0", + "langchain-core >= 1.0.0, < 2.0.0", + "langchain-google-genai >= 4.0.0", + "langgraph >= 1.0.0, < 2.0.0", +] +ag2 = [ + "google-cloud-agentplatform[agent_engines]", + "autogen[gemini] >= 0.14.1, < 1", +] +llama_index = [ + "google-cloud-agentplatform[agent_engines]", + "llama-index", + "llama-index-llms-google-genai", +] +evaluation = [ + "pandas >= 1.0.0", + "tqdm >= 4.23.0", + "pyyaml", + "litellm >= 1.83.7, < 1.97.0", + "google-cloud-storage >= 1.32.0, < 4.0.0", +] +bigquery = [ + "google-cloud-bigquery >= 1.15.0, < 4.0.0", + "bigframes", + "pandas >= 1.0.0", +] +live = [ + "websockets", +] +all = [ + "google-cloud-agentplatform[agent_engines,adk,langchain,ag2,llama_index,evaluation,bigquery,live]", +] + +[tool.setuptools.dynamic] +version = {attr = "agentplatform.version.__version__"} + +[tool.setuptools.packages.find] +where = ["."] +include = ["agentplatform", "agentplatform._genai*"] +exclude = [ + "agentplatform.agent_engines*", + "agentplatform.rag*", + "agentplatform.private*", + "agentplatform.model_garden*", + "agentplatform.preview*", + "agentplatform.resources*", + "agentplatform.batch_prediction*", +] diff --git a/pypi/google_cloud_agentplatform/verify_imports.py b/pypi/google_cloud_agentplatform/verify_imports.py new file mode 100644 index 0000000000..eed2a57956 --- /dev/null +++ b/pypi/google_cloud_agentplatform/verify_imports.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Copyright 2026 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +"""Verification script for google-cloud-agentplatform imports.""" + +import importlib +import logging +import sys + +# This runs against an installed wheel outside google3, so it configures the +# stdlib root logger rather than using absl. The exit code is the signal for +# callers; the messages are for whoever is watching the build. +logging.basicConfig(stream=sys.stdout, level=logging.INFO, format="%(message)s") + +# Loaded by name: copy.bara.sky rewrites spelled-out agentplatform imports in +# both directions, and a literal one here fails its reversibility check. +_PACKAGE = "agentplatform" + + +def main(): + logging.info("Importing %s...", _PACKAGE) + try: + package = importlib.import_module(_PACKAGE) + except ImportError as e: + logging.error("Failed to import %s: %s", _PACKAGE, e) + sys.exit(1) + logging.info("Successfully imported %s.", _PACKAGE) + + logging.info("Instantiating %s.Client...", _PACKAGE) + try: + # Use dummy project and location for import verification. + package.Client(project="dummy-project", location="us-central1") + except Exception as e: + logging.error("Failed to instantiate %s.Client: %s", _PACKAGE, e) + sys.exit(1) + logging.info("Successfully instantiated %s.Client.", _PACKAGE) + + logging.info("Verification passed.") + + +if __name__ == "__main__": + main() diff --git a/release-please-config.json b/release-please-config.json index eb1f551bfd..df89565425 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -25,6 +25,7 @@ "google/cloud/aiplatform/v1beta1/schema/predict/instance_v1beta1/gapic_version.py", "google/cloud/aiplatform_v1beta1/gapic_version.py", "pypi/_vertex_ai_placeholder/version.py", + "agentplatform/version.py", { "type": "json", "path": "samples/generated_samples/snippet_metadata_google.cloud.aiplatform.v1beta1.json",