Skip to content

Commit 39ea699

Browse files
authored
fix: set google.ai.generativelanguage_v1beta3 as the default import (#11677)
Here are the steps that I followed to generate this PR - Update the `default_version` in `.repo-metadata.json` here https://github.com/googleapis/google-cloud-python/blob/eca60c3027820c97fc12590d0709b8fe3eb54034/packages/google-ai-generativelanguage/.repo-metadata.json#L14 - Work around the docs issue mentioned in https://github.com/googleapis/gapic-generator-python/issues/1776 by applying this change locally - Build the `v1beta2` and `v1beta3` clients locally in a clone of [googleapis/googleapis](https://github.com/googleapis/googleapis) using `bazel build //google/ai/generativelanguage/v1beta3:ai-generativelanguage-v1beta2-py` and `bazel build //google/ai/generativelanguage/v1beta3:ai-generativelanguage-v1beta3-py` - Run the docker containers for the owlbot copy-code and owlbot post processor ``` docker run --rm --user $(id -u):$(id -g) -v $(pwd):/repo -v /usr/local/google/home/partheniou/git/googleapis/bazel-bin:/bazel-bin gcr.io/cloud-devrel-public-resources/owlbot-cli:latest copy-bazel-bin --config-file=packages/google-apps-script-type/.OwlBot.yaml --source-dir /bazel-bin --dest /repo ``` ``` docker run --user $(id -u):$(id -g) --rm -v $(pwd):/repo -w /repo gcr.io/cloud-devrel-public-resources/owlbot-python-mono-repo:latest ``` I also had to fix a bug in synthtool for the owlbot post processing: googleapis/synthtool#1861. Without this fix, the [docs/index.rst](https://github.com/googleapis/google-cloud-python/blob/main/packages/google-ai-generativelanguage/docs/index.rst) file would list `v1beta2` as the default import instead of `v1beta3`. Fixes #11676 🦕
1 parent c7c3e41 commit 39ea699

File tree

7 files changed

+98
-30
lines changed

7 files changed

+98
-30
lines changed

packages/google-ai-generativelanguage/.repo-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"repo": "googleapis/google-cloud-python",
1212
"distribution_name": "google-ai-generativelanguage",
1313
"api_id": "generativelanguage.googleapis.com",
14-
"default_version": "v1beta2",
14+
"default_version": "v1beta3",
1515
"codeowner_team": "",
1616
"api_shortname": "generativelanguage"
1717
}

packages/google-ai-generativelanguage/docs/index.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
.. include:: multiprocessing.rst
44

55
This package includes clients for multiple versions of Generative Language API.
6-
By default, you will get version ``generativelanguage_v1beta2``.
6+
By default, you will get version ``generativelanguage_v1beta3``.
77

88

99
API Reference
1010
-------------
1111
.. toctree::
1212
:maxdepth: 2
1313

14-
generativelanguage_v1beta2/services
15-
generativelanguage_v1beta2/types
14+
generativelanguage_v1beta3/services
15+
generativelanguage_v1beta3/types
1616

1717
API Reference
1818
-------------
1919
.. toctree::
2020
:maxdepth: 2
2121

22-
generativelanguage_v1beta3/services
23-
generativelanguage_v1beta3/types
22+
generativelanguage_v1beta2/services
23+
generativelanguage_v1beta2/types
2424

2525

2626
Changelog

packages/google-ai-generativelanguage/google/ai/generativelanguage/__init__.py

Lines changed: 80 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,35 @@
1818
__version__ = package_version.__version__
1919

2020

21-
from google.ai.generativelanguage_v1beta2.services.discuss_service.async_client import (
21+
from google.ai.generativelanguage_v1beta3.services.discuss_service.async_client import (
2222
DiscussServiceAsyncClient,
2323
)
24-
from google.ai.generativelanguage_v1beta2.services.discuss_service.client import (
24+
from google.ai.generativelanguage_v1beta3.services.discuss_service.client import (
2525
DiscussServiceClient,
2626
)
27-
from google.ai.generativelanguage_v1beta2.services.model_service.async_client import (
27+
from google.ai.generativelanguage_v1beta3.services.model_service.async_client import (
2828
ModelServiceAsyncClient,
2929
)
30-
from google.ai.generativelanguage_v1beta2.services.model_service.client import (
30+
from google.ai.generativelanguage_v1beta3.services.model_service.client import (
3131
ModelServiceClient,
3232
)
33-
from google.ai.generativelanguage_v1beta2.services.text_service.async_client import (
33+
from google.ai.generativelanguage_v1beta3.services.permission_service.async_client import (
34+
PermissionServiceAsyncClient,
35+
)
36+
from google.ai.generativelanguage_v1beta3.services.permission_service.client import (
37+
PermissionServiceClient,
38+
)
39+
from google.ai.generativelanguage_v1beta3.services.text_service.async_client import (
3440
TextServiceAsyncClient,
3541
)
36-
from google.ai.generativelanguage_v1beta2.services.text_service.client import (
42+
from google.ai.generativelanguage_v1beta3.services.text_service.client import (
3743
TextServiceClient,
3844
)
39-
from google.ai.generativelanguage_v1beta2.types.citation import (
45+
from google.ai.generativelanguage_v1beta3.types.citation import (
4046
CitationMetadata,
4147
CitationSource,
4248
)
43-
from google.ai.generativelanguage_v1beta2.types.discuss_service import (
49+
from google.ai.generativelanguage_v1beta3.types.discuss_service import (
4450
CountMessageTokensRequest,
4551
CountMessageTokensResponse,
4652
Example,
@@ -49,20 +55,42 @@
4955
Message,
5056
MessagePrompt,
5157
)
52-
from google.ai.generativelanguage_v1beta2.types.model import Model
53-
from google.ai.generativelanguage_v1beta2.types.model_service import (
58+
from google.ai.generativelanguage_v1beta3.types.model import Model
59+
from google.ai.generativelanguage_v1beta3.types.model_service import (
60+
CreateTunedModelMetadata,
61+
CreateTunedModelRequest,
62+
DeleteTunedModelRequest,
5463
GetModelRequest,
64+
GetTunedModelRequest,
5565
ListModelsRequest,
5666
ListModelsResponse,
67+
ListTunedModelsRequest,
68+
ListTunedModelsResponse,
69+
UpdateTunedModelRequest,
5770
)
58-
from google.ai.generativelanguage_v1beta2.types.safety import (
71+
from google.ai.generativelanguage_v1beta3.types.permission import Permission
72+
from google.ai.generativelanguage_v1beta3.types.permission_service import (
73+
CreatePermissionRequest,
74+
DeletePermissionRequest,
75+
GetPermissionRequest,
76+
ListPermissionsRequest,
77+
ListPermissionsResponse,
78+
TransferOwnershipRequest,
79+
TransferOwnershipResponse,
80+
UpdatePermissionRequest,
81+
)
82+
from google.ai.generativelanguage_v1beta3.types.safety import (
5983
ContentFilter,
6084
HarmCategory,
6185
SafetyFeedback,
6286
SafetyRating,
6387
SafetySetting,
6488
)
65-
from google.ai.generativelanguage_v1beta2.types.text_service import (
89+
from google.ai.generativelanguage_v1beta3.types.text_service import (
90+
BatchEmbedTextRequest,
91+
BatchEmbedTextResponse,
92+
CountTextTokensRequest,
93+
CountTextTokensResponse,
6694
Embedding,
6795
EmbedTextRequest,
6896
EmbedTextResponse,
@@ -71,12 +99,24 @@
7199
TextCompletion,
72100
TextPrompt,
73101
)
102+
from google.ai.generativelanguage_v1beta3.types.tuned_model import (
103+
Dataset,
104+
Hyperparameters,
105+
TunedModel,
106+
TunedModelSource,
107+
TuningExample,
108+
TuningExamples,
109+
TuningSnapshot,
110+
TuningTask,
111+
)
74112

75113
__all__ = (
76114
"DiscussServiceClient",
77115
"DiscussServiceAsyncClient",
78116
"ModelServiceClient",
79117
"ModelServiceAsyncClient",
118+
"PermissionServiceClient",
119+
"PermissionServiceAsyncClient",
80120
"TextServiceClient",
81121
"TextServiceAsyncClient",
82122
"CitationMetadata",
@@ -89,19 +129,47 @@
89129
"Message",
90130
"MessagePrompt",
91131
"Model",
132+
"CreateTunedModelMetadata",
133+
"CreateTunedModelRequest",
134+
"DeleteTunedModelRequest",
92135
"GetModelRequest",
136+
"GetTunedModelRequest",
93137
"ListModelsRequest",
94138
"ListModelsResponse",
139+
"ListTunedModelsRequest",
140+
"ListTunedModelsResponse",
141+
"UpdateTunedModelRequest",
142+
"Permission",
143+
"CreatePermissionRequest",
144+
"DeletePermissionRequest",
145+
"GetPermissionRequest",
146+
"ListPermissionsRequest",
147+
"ListPermissionsResponse",
148+
"TransferOwnershipRequest",
149+
"TransferOwnershipResponse",
150+
"UpdatePermissionRequest",
95151
"ContentFilter",
96152
"SafetyFeedback",
97153
"SafetyRating",
98154
"SafetySetting",
99155
"HarmCategory",
156+
"BatchEmbedTextRequest",
157+
"BatchEmbedTextResponse",
158+
"CountTextTokensRequest",
159+
"CountTextTokensResponse",
100160
"Embedding",
101161
"EmbedTextRequest",
102162
"EmbedTextResponse",
103163
"GenerateTextRequest",
104164
"GenerateTextResponse",
105165
"TextCompletion",
106166
"TextPrompt",
167+
"Dataset",
168+
"Hyperparameters",
169+
"TunedModel",
170+
"TunedModelSource",
171+
"TuningExample",
172+
"TuningExamples",
173+
"TuningSnapshot",
174+
"TuningTask",
107175
)

packages/google-ai-generativelanguage/google/ai/generativelanguage/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.3.2" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta2/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.3.2" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta3/services/permission_service/transports/rest.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,11 @@ def __call__(
395395
role is a superset of the previous
396396
role's permitted operations:
397397
398-
- reader can use the resource (e.g.
398+
- reader can use the resource (e.g.
399399
tuned model) for inference
400-
- writer has reader's permissions and
400+
- writer has reader's permissions and
401401
additionally can edit and share
402-
- owner has writer's permissions and
402+
- owner has writer's permissions and
403403
additionally can delete
404404
405405
"""
@@ -592,11 +592,11 @@ def __call__(
592592
role is a superset of the previous
593593
role's permitted operations:
594594
595-
- reader can use the resource (e.g.
595+
- reader can use the resource (e.g.
596596
tuned model) for inference
597-
- writer has reader's permissions and
597+
- writer has reader's permissions and
598598
additionally can edit and share
599-
- owner has writer's permissions and
599+
- owner has writer's permissions and
600600
additionally can delete
601601
602602
"""
@@ -891,11 +891,11 @@ def __call__(
891891
role is a superset of the previous
892892
role's permitted operations:
893893
894-
- reader can use the resource (e.g.
894+
- reader can use the resource (e.g.
895895
tuned model) for inference
896-
- writer has reader's permissions and
896+
- writer has reader's permissions and
897897
additionally can edit and share
898-
- owner has writer's permissions and
898+
- owner has writer's permissions and
899899
additionally can delete
900900
901901
"""

packages/google-ai-generativelanguage/samples/generated_samples/snippet_metadata_google.ai.generativelanguage.v1beta2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-ai-generativelanguage",
11-
"version": "0.3.2"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

0 commit comments

Comments
 (0)