From 454adf6b20b52db4a1427cf2cfcabcb418716e04 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 20 Sep 2023 14:20:39 +0000 Subject: [PATCH] fix: set google.ai.generativelanguage_v1beta3 as the default import --- .../.repo-metadata.json | 2 +- .../docs/index.rst | 10 +- .../google/ai/generativelanguage/__init__.py | 92 ++++++++++++++++--- .../ai/generativelanguage/gapic_version.py | 2 +- .../gapic_version.py | 2 +- .../permission_service/transports/rest.py | 18 ++-- ..._google.ai.generativelanguage.v1beta2.json | 2 +- 7 files changed, 98 insertions(+), 30 deletions(-) diff --git a/packages/google-ai-generativelanguage/.repo-metadata.json b/packages/google-ai-generativelanguage/.repo-metadata.json index eb86a6058cd6..bc3075ddf66f 100644 --- a/packages/google-ai-generativelanguage/.repo-metadata.json +++ b/packages/google-ai-generativelanguage/.repo-metadata.json @@ -11,7 +11,7 @@ "repo": "googleapis/google-cloud-python", "distribution_name": "google-ai-generativelanguage", "api_id": "generativelanguage.googleapis.com", - "default_version": "v1beta2", + "default_version": "v1beta3", "codeowner_team": "", "api_shortname": "generativelanguage" } diff --git a/packages/google-ai-generativelanguage/docs/index.rst b/packages/google-ai-generativelanguage/docs/index.rst index 4c7f05ce43b3..8babfe306f9b 100644 --- a/packages/google-ai-generativelanguage/docs/index.rst +++ b/packages/google-ai-generativelanguage/docs/index.rst @@ -3,7 +3,7 @@ .. include:: multiprocessing.rst This package includes clients for multiple versions of Generative Language API. -By default, you will get version ``generativelanguage_v1beta2``. +By default, you will get version ``generativelanguage_v1beta3``. API Reference @@ -11,16 +11,16 @@ API Reference .. toctree:: :maxdepth: 2 - generativelanguage_v1beta2/services - generativelanguage_v1beta2/types + generativelanguage_v1beta3/services + generativelanguage_v1beta3/types API Reference ------------- .. toctree:: :maxdepth: 2 - generativelanguage_v1beta3/services - generativelanguage_v1beta3/types + generativelanguage_v1beta2/services + generativelanguage_v1beta2/types Changelog diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage/__init__.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage/__init__.py index dc3079d1cc4c..f81250e3fbf4 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage/__init__.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage/__init__.py @@ -18,29 +18,35 @@ __version__ = package_version.__version__ -from google.ai.generativelanguage_v1beta2.services.discuss_service.async_client import ( +from google.ai.generativelanguage_v1beta3.services.discuss_service.async_client import ( DiscussServiceAsyncClient, ) -from google.ai.generativelanguage_v1beta2.services.discuss_service.client import ( +from google.ai.generativelanguage_v1beta3.services.discuss_service.client import ( DiscussServiceClient, ) -from google.ai.generativelanguage_v1beta2.services.model_service.async_client import ( +from google.ai.generativelanguage_v1beta3.services.model_service.async_client import ( ModelServiceAsyncClient, ) -from google.ai.generativelanguage_v1beta2.services.model_service.client import ( +from google.ai.generativelanguage_v1beta3.services.model_service.client import ( ModelServiceClient, ) -from google.ai.generativelanguage_v1beta2.services.text_service.async_client import ( +from google.ai.generativelanguage_v1beta3.services.permission_service.async_client import ( + PermissionServiceAsyncClient, +) +from google.ai.generativelanguage_v1beta3.services.permission_service.client import ( + PermissionServiceClient, +) +from google.ai.generativelanguage_v1beta3.services.text_service.async_client import ( TextServiceAsyncClient, ) -from google.ai.generativelanguage_v1beta2.services.text_service.client import ( +from google.ai.generativelanguage_v1beta3.services.text_service.client import ( TextServiceClient, ) -from google.ai.generativelanguage_v1beta2.types.citation import ( +from google.ai.generativelanguage_v1beta3.types.citation import ( CitationMetadata, CitationSource, ) -from google.ai.generativelanguage_v1beta2.types.discuss_service import ( +from google.ai.generativelanguage_v1beta3.types.discuss_service import ( CountMessageTokensRequest, CountMessageTokensResponse, Example, @@ -49,20 +55,42 @@ Message, MessagePrompt, ) -from google.ai.generativelanguage_v1beta2.types.model import Model -from google.ai.generativelanguage_v1beta2.types.model_service import ( +from google.ai.generativelanguage_v1beta3.types.model import Model +from google.ai.generativelanguage_v1beta3.types.model_service import ( + CreateTunedModelMetadata, + CreateTunedModelRequest, + DeleteTunedModelRequest, GetModelRequest, + GetTunedModelRequest, ListModelsRequest, ListModelsResponse, + ListTunedModelsRequest, + ListTunedModelsResponse, + UpdateTunedModelRequest, ) -from google.ai.generativelanguage_v1beta2.types.safety import ( +from google.ai.generativelanguage_v1beta3.types.permission import Permission +from google.ai.generativelanguage_v1beta3.types.permission_service import ( + CreatePermissionRequest, + DeletePermissionRequest, + GetPermissionRequest, + ListPermissionsRequest, + ListPermissionsResponse, + TransferOwnershipRequest, + TransferOwnershipResponse, + UpdatePermissionRequest, +) +from google.ai.generativelanguage_v1beta3.types.safety import ( ContentFilter, HarmCategory, SafetyFeedback, SafetyRating, SafetySetting, ) -from google.ai.generativelanguage_v1beta2.types.text_service import ( +from google.ai.generativelanguage_v1beta3.types.text_service import ( + BatchEmbedTextRequest, + BatchEmbedTextResponse, + CountTextTokensRequest, + CountTextTokensResponse, Embedding, EmbedTextRequest, EmbedTextResponse, @@ -71,12 +99,24 @@ TextCompletion, TextPrompt, ) +from google.ai.generativelanguage_v1beta3.types.tuned_model import ( + Dataset, + Hyperparameters, + TunedModel, + TunedModelSource, + TuningExample, + TuningExamples, + TuningSnapshot, + TuningTask, +) __all__ = ( "DiscussServiceClient", "DiscussServiceAsyncClient", "ModelServiceClient", "ModelServiceAsyncClient", + "PermissionServiceClient", + "PermissionServiceAsyncClient", "TextServiceClient", "TextServiceAsyncClient", "CitationMetadata", @@ -89,14 +129,34 @@ "Message", "MessagePrompt", "Model", + "CreateTunedModelMetadata", + "CreateTunedModelRequest", + "DeleteTunedModelRequest", "GetModelRequest", + "GetTunedModelRequest", "ListModelsRequest", "ListModelsResponse", + "ListTunedModelsRequest", + "ListTunedModelsResponse", + "UpdateTunedModelRequest", + "Permission", + "CreatePermissionRequest", + "DeletePermissionRequest", + "GetPermissionRequest", + "ListPermissionsRequest", + "ListPermissionsResponse", + "TransferOwnershipRequest", + "TransferOwnershipResponse", + "UpdatePermissionRequest", "ContentFilter", "SafetyFeedback", "SafetyRating", "SafetySetting", "HarmCategory", + "BatchEmbedTextRequest", + "BatchEmbedTextResponse", + "CountTextTokensRequest", + "CountTextTokensResponse", "Embedding", "EmbedTextRequest", "EmbedTextResponse", @@ -104,4 +164,12 @@ "GenerateTextResponse", "TextCompletion", "TextPrompt", + "Dataset", + "Hyperparameters", + "TunedModel", + "TunedModelSource", + "TuningExample", + "TuningExamples", + "TuningSnapshot", + "TuningTask", ) diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage/gapic_version.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage/gapic_version.py index 78e859312100..360a0d13ebdd 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage/gapic_version.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.3.2" # {x-release-please-version} +__version__ = "0.0.0" # {x-release-please-version} diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/gapic_version.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/gapic_version.py index 78e859312100..360a0d13ebdd 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/gapic_version.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.3.2" # {x-release-please-version} +__version__ = "0.0.0" # {x-release-please-version} diff --git a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py index 12af3b148a45..352dfe0983f9 100644 --- a/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py +++ b/packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py @@ -395,11 +395,11 @@ def __call__( role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -592,11 +592,11 @@ def __call__( role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ @@ -891,11 +891,11 @@ def __call__( role is a superset of the previous role's permitted operations: - - reader can use the resource (e.g. + - reader can use the resource (e.g. tuned model) for inference - - writer has reader's permissions and + - writer has reader's permissions and additionally can edit and share - - owner has writer's permissions and + - owner has writer's permissions and additionally can delete """ diff --git a/packages/google-ai-generativelanguage/samples/generated_samples/snippet_metadata_google.ai.generativelanguage.v1beta2.json b/packages/google-ai-generativelanguage/samples/generated_samples/snippet_metadata_google.ai.generativelanguage.v1beta2.json index 0232fad494d8..5b7d0a0509b4 100644 --- a/packages/google-ai-generativelanguage/samples/generated_samples/snippet_metadata_google.ai.generativelanguage.v1beta2.json +++ b/packages/google-ai-generativelanguage/samples/generated_samples/snippet_metadata_google.ai.generativelanguage.v1beta2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-ai-generativelanguage", - "version": "0.3.2" + "version": "0.1.0" }, "snippets": [ {