Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Imagen #4

Merged
merged 6 commits into from
Jan 10, 2025
Merged

Imagen #4

merged 6 commits into from
Jan 10, 2025

Conversation

meslubi2021
Copy link
Collaborator

@meslubi2021 meslubi2021 commented Jan 10, 2025 •
edited
Loading

Description of the change

Motivation

Type of change

Choose one: (Bug fix | Feature request | Documentation | Other)

Checklist

  • I have performed a self-review of my code.
  • I have added detailed comments to my code where applicable.
  • I have verified that my change does not break existing code.
  • My PR is based on the latest changes of the main branch (if unsure, please run git pull --rebase upstream main).
  • I am familiar with the Google Style Guide for the language I have coded in.
  • I have read through the Contributing Guide and signed the Contributor License Agreement.

MarkDaoust and others added 6 commits October 2, 2024 09:47
@MarkDaoust
Image gen (#549)
bbd5af3 
* 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
@MarkDaoust
Remove block_fewest (#581)
0da9b2d 
* Remove block_fewest

* Format.

Change-Id: Ib65044811345a97078723bb74092913007f517e6

* Remove allow_all
@MarkDaoust
Update safety filter levels
e09b902 
Change-Id: Idf5990bf6ebf33da07318c0348a42bb7efd04582
@MarkDaoust @markmcd
watermark (#603)
aae0caf 
* watermark

Change-Id: I271993e07bfc034d89cd74013339046a21d0b472

* fix typing

Change-Id: Ib026f3b66fb44c6ad35a15030b03204306b35443

* format

Change-Id: I24304a80e6689b4fcec3155f7274e24db712b402

* fix test

Change-Id: I68cb74f8ee5f224942417ea4e5fc4232ec688977

* make check_watermark a stand alone function

Change-Id: I2d72620359dcc70fe8e720a14f78d83f75a42d90

* simplify typing.

Change-Id: I1b901cc40b4b029cb09699fc6eac77690622b6e8

* Update google/generativeai/vision_models/_vision_models.py

* Typo

Co-authored-by: Mark McDonald <[email protected]>

---------

Co-authored-by: Mark McDonald <[email protected]>
@MarkDaoust
Image feedback (#608)
c72aa6b 
* Allow the use of generated images as inputs

Change-Id: I0956fb78272a8a8af2c5219d80a26dec944040a8

# Conflicts:
#	google/generativeai/vision_models/_vision_models.py

* types + formatting

Change-Id: I0cac4ba1de764d3c02c5eab7556d8324aeda1f93

* add files

Change-Id: Ie7f91cef171c1f813b52ff1b2a4daedf7ea19edd

* Fix 3.9

Change-Id: If9ff9ebc0b2bf16b91e741d862a9e2808c7a738a

* Fix 3.9

Change-Id: Iee02352ca21fa66da9b097d4dfa9454b67609e79

* fix pytype

Change-Id: Ic5c250f3f3ded2374abfbdbee6d62ea4cfb0f799

* fix pytype

Change-Id: I431c66e45e7582218b5de7a90eeeee01b80df664

* typo

Change-Id: I1bb15e1363c652f9c0b4a60dad834fce65a4f0a1

* reapply commits lost in merge

Change-Id: I7bfebdeaa217d93ed5d11aca31cf0b20afd38c02

* Update google/generativeai/client.py

* Remove GCS reference

Change-Id: I5c1b8cbccee0e13d8aca70582a76e0c089e040ed

* black .

Change-Id: I2c24f8798cb8103d35474e7e6d2e4fc3100825aa
@MarkDaoust
Remove watermark (#631)
2786f33 
* Remove watermark

Change-Id: Ie8f26fb7c4eb26c4cf7bdd746b608a652dfbd5a6

* format

Change-Id: Id839dd464fbb8413f4a07603d8f6af1626353b7a
@meslubi2021 meslubi2021 self-assigned this Jan 10, 2025
@meslubi2021 meslubi2021 merged commit 0c000dd into Unity-google-new:main Jan 10, 2025
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@meslubi2021 meslubi2021

Labels
component:python sdk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@meslubi2021 @MarkDaoust