Skip to content

Commit bbd5af3

Browse files
authored
Image gen (#549)
* Add more enum samples Change-Id: I743d5967cc1cc91576b8ddf5a60db1767d94508d * format Change-Id: I8f6f9389f1cae0a7c934217968d4e2e20bb9590e * From: https://github.com/googleapis/python-aiplatform/tree/v1.65.0/vertexai/vision_models Change-Id: I693579ccf2994212f25d0354d091d3210fbf3212 * clear out extra classes Change-Id: I64dec6a71f3f04fa834f2174e4a6b2d4740f4e90 * remove gcs_uri Change-Id: Ieafe776bde8e79e1747ab6cf252b49a001ab66bf * IPython reprs Change-Id: I586876f524684dc3d0ee0ea8510b56bc5153642b * remove output_gce_uri Change-Id: Ic4424d06a705bf94f0fade34468160566cb3a6be * remove IPython reprs Change-Id: I474c76c1e73d7a92a653932d1984c02de7e3b71a * remove more gcs_uri. Change-Id: I9f6b8c879dc8f38c5193ddb1e271a62984c7f020 * handle instances converversion to Value protos. Change-Id: Id33f8d2d6a4cffbfb7b0d37955cc800a867a70d5 * Basically works. Change-Id: I28364ab70b2a263b29026f2cf2d1d4f807d88f53 * add _repr_png_ Change-Id: I436170460e17983637283d0086ebc232c9c425ce * Remoive "add watermark" switch. Change-Id: I6580ae1b508a458c9813fdf161a08329cd676c08 * Remove seed (it doesn't work without watermark), +fix upscale Change-Id: I4c394cd861d2646cd663224f0bbeec52580bc0bd * remove edit and upscale Change-Id: Ic9c270279ee020baef2c3b2117199ff17b066d88 * remove upscale Change-Id: I84f3b603732c3c1e91da9d5abf38c332b24772cb * skip bad test Change-Id: Ief70d4fdc9d7478b402cf2f790817f98e336b25a * format Change-Id: I4d00cad9d0e6485f5b710d2ffcec82a9b738e2b0 * check enums Change-Id: I8e7b92fc15d3941b7fa74a97b95d2577be9d6c1f * Remove * unpackng Change-Id: Iddc42b906dfab12dfa500f0f9774d58521684548 * ignore typing errors, these are incorrect Change-Id: Idc4e594811e52aa3d17562851ef02808e6dd5633 * fix typing? Change-Id: I5005dd38b7d3a03edc1c54d42f3a6c8f959d7274 * fix lazy loading with typing Change-Id: I2ebb3afbe3df93f918ffe5f66dac20392665c6cc * Revert "fix lazy loading with typing" This reverts commit 0baabfe. * Use if TYPE_CHECKING Change-Id: I63c4c7909f7d7060a4b557f41cff4ba9010e004c * format Change-Id: I446692905361c56505b070d72d94ea7fecdaede8
1 parent 8f77cc6 commit bbd5af3

File tree

7 files changed

+565
-3
lines changed

7 files changed

+565
-3
lines changed

google/generativeai/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
from google.generativeai.generative_models import GenerativeModel
6060
from google.generativeai.generative_models import ChatSession
6161

62+
from google.generativeai.vision_models import *
63+
6264
from google.generativeai.models import list_models
6365
from google.generativeai.models import list_tuned_models
6466

google/generativeai/client.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,3 +384,11 @@ def get_default_permission_client() -> glm.PermissionServiceClient:
384384

385385
def get_default_permission_async_client() -> glm.PermissionServiceAsyncClient:
386386
return _client_manager.get_default_client("permission_async")
387+
388+
389+
def get_default_prediction_client() -> glm.PermissionServiceClient:
390+
return _client_manager.get_default_client("prediction")
391+
392+
393+
def get_default_prediction_async_client() -> glm.PermissionServiceAsyncClient:
394+
return _client_manager.get_default_client("prediction_async")

google/generativeai/generative_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from collections.abc import Iterable
66
import textwrap
7-
from typing import Any, Union, overload
7+
from typing import Any, Literal, Union, overload
88
import reprlib
99

1010
# pylint: disable=bad-continuation, line-too-long
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
"""Classes for working with vision models."""
16+
17+
from google.generativeai.vision_models._vision_models import (
18+
Image,
19+
GeneratedImage,
20+
ImageGenerationModel,
21+
ImageGenerationResponse,
22+
)
23+
24+
__all__ = [
25+
"Image",
26+
"GeneratedImage",
27+
"ImageGenerationModel",
28+
"ImageGenerationResponse",
29+
]

0 commit comments

Comments
 (0)