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

[Vertex AI] Align text and add close keyboard function in Sample Project #12887

Merged
merged 127 commits into from May 14, 2024
Merged

[Vertex AI] Align text and add close keyboard function in Sample Project #12887

merged 127 commits into from May 14, 2024

Conversation

1998code
Copy link
Contributor

@1998code 1998code commented May 2, 2024 •
edited

Discussion

  • The keyboard should be hidden automatically in the Text and Multi-modal sections to prevent blocking content.
  • The text and input field are not aligned in Text section.
  • The input field sticks directly on the keyboard without any padding in Chat and ``Function Calling``` sections.

Testing

Just alignment and padding updated. Everything is working fine.

API Changes

N/A

andrewheard and others added 30 commits April 2, 2024 09:13
@andrewheard @paulb777
Add prototype for Firebase Vertex AI
e290ab4
@andrewheard @paulb777
Update generative-ai-swift dependency
da7e247
@andrewheard @paulb777
Use Swift 5.9 AccessLevelOnImport
0d87151
@andrewheard @paulb777
Set Vertex AI endpoint in RequestOptions
71ac326
@andrewheard @paulb777
Revert "Use Swift 5.9 AccessLevelOnImport"
0f0d35a 
This reverts commit af7d783.

# Conflicts:
#	FirebaseVertexAI/Sources/VertexAI.swift
#	Package.swift
@andrewheard @paulb777
Add alternative API surface that returns GenerativeModel instances
7c5e5c3
@andrewheard @paulb777
Add sample apps using Vertex AI
ee6651c
@andrewheard @paulb777
Update generative-ai-swift dependency
202192f
@andrewheard @paulb777
Fix optional VertexAIProvider unwrapping
9698be2
@andrewheard @paulb777
Update generative-ai-swift dependency
d0b4d1b
@andrewheard @paulb777
Prototype and sample fixes
25bda5a
@andrewheard @paulb777
Fork google-generative-ai for Firebase (firebase#12564)
6174462
@andrewheard @paulb777
Use forked google-generative-ai in Vertex AI samples (firebase#12574)
575a69b
@andrewheard @paulb777
Add CI workflow for Vertex AI (firebase#12577)
6f9a344
@andrewheard @paulb777
Fork generative-ai-swift tests for Vertex AI (firebase#12584)
cb2f143
@morganchen12 @paulb777
Add local App Check package to sample targets (firebase#12576)
1626fb7
@andrewheard @paulb777
Use generative-ai-swift tests in Vertex AI (firebase#12585)
3b4b436
@andrewheard @paulb777
Add App Check tests in GenerativeModelTests (firebase#12590)
f8d4278
@andrewheard @paulb777
Make generativeModel an instance method of VertexAI (firebase#12599)
8d46fe3
@andrewheard @paulb777
Update test JSON payloads with Vertex AI output (firebase#12615)
38ddd25
@paulb777
Build Sample in CI (firebase#12616)
237485f
@andrewheard @paulb777
Fix CitationMetadata parsing in Vertex AI (firebase#12626)
05f3d4f
@paulb777
Manage location on VertexAI instead of model (firebase#12630)
4e3a4d1
@paulb777
VertexAI Component tests; fix instance generation for different regio…
a89956f 
…ns (firebase#12631)
@andrewheard @paulb777
Add function calling support in Vertex AI (firebase#12633)
19b2004
@andrewheard @paulb777
Add -Preview suffix to FirebaseVertexAI library name (firebase#12641
27617c4 
)
@andrewheard @paulb777
Fix model name in Vertex AI multi-modal sample (firebase#12645)
950c4c8
@andrewheard @paulb777
Add totalBillableCharacters to CountTokensResponse in Vertex AI (f…
9812055 
…irebase#12646)
@andrewheard @paulb777
Rename the Vertex AI parameter region to location (firebase#12656)
39ea53a
@andrewheard @paulb777
Update to prod endpoint in Vertex AI (firebase#12657)
c3ad6f1
@1998code
Copy link
Contributor Author

1998code commented May 14, 2024 •
edited

Rebased from main 🙏

@1998code
Copy link
Contributor Author

Screenshot 2024-05-14 at 10 25 18 AM

CLA checking seems failed.

@paulb777 paulb777 changed the base branch from vertex-ai to main May 14, 2024 03:19
@paulb777 paulb777 changed the base branch from main to vertex-ai May 14, 2024 03:19
@paulb777 paulb777 changed the base branch from vertex-ai to main May 14, 2024 03:20
@paulb777
Copy link
Member

Looks like we don't have a clean rebase

@1998code
Copy link
Contributor Author

🤔 Should we simply copy the updated code and open a new PR?

@paulb777
Copy link
Member

Maybe. There is a way to do it in git with git rebase --onto and another parameter, but either way is fine.

@1998code
Copy link
Contributor Author

Okay. Let me try again.

@1998code
Copy link
Contributor Author

Please see if everything is okay 🙏

andrewheard
andrewheard requested changes May 14, 2024
View reviewed changes
Copy link
Contributor

@andrewheard andrewheard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @1998code! Other than the re-added GenerativeAISwift.swift file this LGTM.

FirebaseVertexAI/Sources/GenerativeAISwift.swift Outdated Show resolved Hide resolved
@paulb777 paulb777 requested a review from andrewheard May 14, 2024 17:09
peterfriese
peterfriese approved these changes May 14, 2024
View reviewed changes
Copy link
Contributor

@peterfriese peterfriese left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contribution!

andrewheard
andrewheard approved these changes May 14, 2024
View reviewed changes
Copy link
Contributor

@andrewheard andrewheard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your contribution (and patience with our reviews), @1998code!

@1998code
Copy link
Contributor Author

Thanks all. Happy GoogleIO day ♥️

@paulb777 paulb777 merged commit 5a1763b into firebase:main May 14, 2024
37 checks passed
@andrewheard
Copy link
Contributor

@1998code If you're interested in making a contribution in another repository, we have nearly the same sample app for the Google AI SDK: https://github.com/google-gemini/generative-ai-swift/tree/main/Examples/GenerativeAISample

No pressure though, I'd be happy to copy your improvements there.

@1998code 1998code mentioned this pull request May 16, 2024
Merged
6 tasks
@1998code
Copy link
Contributor Author

Updated 😊 @andrewheard
Please review google-gemini/generative-ai-swift#172

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterfriese peterfriese peterfriese approved these changes

@andrewheard andrewheard andrewheard approved these changes

Assignees

@andrewheard andrewheard

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@1998code @paulb777 @andrewheard @peterfriese @morganchen12