Feature/integrate brand aligner by MoisesRBitton · Pull Request #1288 · google/adk-samples

MoisesRBitton · 2026-03-18T15:01:35Z

Implemented ASP for brand-aligner and cleaned up the project so it actually runs/tests reliably.

ASP config + dependency added
uv-based setup/testing flow
fixed env init/import order
fixed enum issue causing python 3.12 test collection errors
updated README

@zeroasterisk

Signed-off-by: Moises Bitton Simana <162650235+MoisesRBitton@users.noreply.github.com>

…ussain/adk-samples-capstone into feature/integrate-brand-aligner

zeroasterisk · 2026-03-19T14:54:31Z

+packages = ["financial_advisor"]

-[tool.ruff.lint.pydocstyle]
-convention = "google"


why was this removed? is it not in the other files? aim for consistency and intentional changes

zeroasterisk · 2026-03-19T14:55:02Z

-indent-style = "space"
-quote-style = "double"
-skip-magic-trailing-comma = false
-docstring-code-format = true


why was this removed? is it not in the other files? aim for consistency and intentional changes

zeroasterisk · 2026-03-19T14:55:22Z


-[[tool.uv.index]]
-url = "https://pypi.org/simple"
-default = true


why was this removed? is it not in the other files? aim for consistency and intentional changes

I'll actually say, I think we do want to keep this. I believe we (Googlers) need it to avoid some package mirror errors

zeroasterisk · 2026-03-19T14:58:45Z

    ```

 2. **Configure `.env`:** Open the newly created `.env` file and fill in the required values (Project ID, Region, GCS Bucket, Model Name, etc.).



PR #1286 has a pretty good README, we should standardize the UV install block and the getting started to all be about the same. @maeve2024 to collaborate

zeroasterisk · 2026-03-19T14:59:13Z

 * **`ge_register.sh`**: Registers the deployed agent with Gemini Enterprise.
 * **`ge_unregister.sh`**: Unregisters the agent from Gemini Enterprise.

+### Alternative: Using Agent Starter Pack (ASP)


ASP should be the default, not the alternative

zeroasterisk · 2026-03-19T15:00:03Z



-class Category(str, StrEnum):
+class Category(StrEnum):


please confirm this change is necessary, and that the agent is fully functional via the adk web UI going through a secenario.

zeroasterisk · 2026-03-19T15:01:06Z

 load_dotenv(override=True)
+_, project_id = google.auth.default()
+os.environ.setdefault("GOOGLE_CLOUD_PROJECT", project_id)
+os.environ["GOOGLE_CLOUD_LOCATION"] = "global"


should this be a default as well? confirm with other samples

zeroasterisk

ASP Integration Checklist (ref: PR #1286 as approved template)

✅ ASP section added, __init__.py auth block added
⚠️ ASP listed as "Alternative" — Should be the recommended path. Flip the structure: ASP first with uvx one-liner as the primary command, then collapse the manual setup in <details>. See #1286 for the exact pattern.
⚠️ pip/venv is primary, uvx is collapsed — This is backwards. uvx one-liner should be the main visible command, pip/venv in a collapsed <details> block.
⚠️ os.environ["GOOGLE_CLOUD_LOCATION"] = "global" is a hard override — Use os.environ.setdefault("GOOGLE_CLOUD_LOCATION", "global") instead. Hard assignment silently overwrites user-configured values.

Main fixes needed: flip ASP to recommended (not alternative), and fix setdefault.

zeroasterisk · 2026-03-25T16:43:08Z

Checking in — the review feedback from Mar 21 hasn't been addressed yet. Key changes needed:

Flip ASP to recommended (not "Alternative") — uvx one-liner first, pip/venv collapsed
os.environ["GOOGLE_CLOUD_LOCATION"] → os.environ.setdefault("GOOGLE_CLOUD_LOCATION", "global")

See PR #1286 for the exact pattern to follow.

…ance * restore ruff pydocstyle and format blocks for pyproject consistency * keep tool.uv.index to avoid package mirror issues * make Agent Starter Pack the recommended setup path with uvx one-liner first * move pip or venv setup into collapsed alternative section * change GOOGLE_CLOUD_LOCATION assignment to setdefault to avoid overriding user config * align enum implementation with StrEnum in models for clearer intent

…tristanhussain/adk-samples-capstone into feature/integrate-brand-aligner

zeroasterisk

A few things to adjust:

Simplify __init__.py imports: Currently importing everything (from . import agent, auth, models, services, tools, utils). This can cause circular imports and slows down package initialization. Simplify to just the auth block + from . import agent (or just the auth block if the agent is imported elsewhere).
Bump agent-starter-pack to >=0.32.0
Position ASP as recommended in README — currently it reads more like an alternative. Make it the primary/recommended setup path, with manual clone in a collapsed <details> block.

Ref: PR #1368 for a clean example of the pattern.

…sible section fix: remove unused imports in __init__.py deps: bump agent-starter-pack version to 0.32.0 in pyproject.toml and uv.lock

Signed-off-by: Moises Bitton Simana <162650235+MoisesRBitton@users.noreply.github.com>

MoisesRBitton · 2026-04-05T21:13:09Z

Thanks for the feedback Alan. I’ve addressed all three items in the latest commit and pushed:

Simplified package initialization imports to avoid loading everything at import time:
init.py now only keeps the auth/env setup and imports agent.
Bumped Agent Starter Pack version:
Updated to agent-starter-pack>=0.32.0 in pyproject.toml.
Updated README setup flow to match the ASP-first pattern:
ASP is now the recommended primary path.
Manual clone/local setup was moved into a collapsed "details" alternative section.
Could you take another look when you have a chance?

zeroasterisk

Changes look great, thank you! ✅

zeroasterisk

Changes look great, thank you! ✅

zeroasterisk

Changes look great, thank you! ✅

zeroasterisk

Changes look great, thank you! ✅

MoisesRBitton and others added 8 commits January 31, 2026 20:49

Integrate brand-aligner with Agent Starter Pack

5bc09f4

Fix: Replace internal Google lockfile with public dependencies

e0e9d45

Merge branch 'google:main' into feature/integrate-brand-aligner

b632aab

Merge branch 'main' into feature/integrate-brand-aligner

a8418ef

Signed-off-by: Moises Bitton Simana <162650235+MoisesRBitton@users.noreply.github.com>

Merge branch 'google:main' into feature/integrate-brand-aligner

6126b86

Merge branch 'main' into feature/integrate-brand-aligner

7dbd195

Refactor code structure for improved readability and maintainability

5fd1778

Merge branch 'main' into feature/integrate-brand-aligner

7dfce1e

MoisesRBitton marked this pull request as ready for review March 18, 2026 15:13

MoisesRBitton and others added 3 commits March 18, 2026 11:27

add missing ASP setup section to README

fdf077b

Merge branch 'feature/integrate-brand-aligner' of github.com:tristanh…

bf2ca3f

…ussain/adk-samples-capstone into feature/integrate-brand-aligner

Merge branch 'main' into feature/integrate-brand-aligner

bc8e93f

zeroasterisk requested changes Mar 19, 2026

View reviewed changes

zeroasterisk requested changes Mar 24, 2026

View reviewed changes

MoisesRBitton and others added 3 commits March 25, 2026 19:33

Merge branch 'feature/integrate-brand-aligner' of https://github.com/…

fcecbc9

…tristanhussain/adk-samples-capstone into feature/integrate-brand-aligner

Merge branch 'main' into feature/integrate-brand-aligner

96dfaea

zeroasterisk requested changes Apr 3, 2026

View reviewed changes

MoisesRBitton and others added 2 commits April 5, 2026 17:04

docs: update README for local development instructions and add collap…

8be05fe

…sible section fix: remove unused imports in __init__.py deps: bump agent-starter-pack version to 0.32.0 in pyproject.toml and uv.lock

Merge branch 'main' into feature/integrate-brand-aligner

70bd597

Signed-off-by: Moises Bitton Simana <162650235+MoisesRBitton@users.noreply.github.com>

Merge branch 'main' into feature/integrate-brand-aligner

25ef971

zeroasterisk approved these changes Apr 8, 2026

View reviewed changes

zeroasterisk added 3 commits April 10, 2026 08:59

Merge branch 'main' into feature/integrate-brand-aligner

f1948c0

Merge branch 'main' into feature/integrate-brand-aligner

6b53ec4

Merge branch 'main' into feature/integrate-brand-aligner

f12b86f

zeroasterisk merged commit 5b40edb into google:main Apr 10, 2026
7 of 10 checks passed

		```

		2. Configure `.env`: Open the newly created `.env` file and fill in the required values (Project ID, Region, GCS Bucket, Model Name, etc.).

Conversation

MoisesRBitton commented Mar 18, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zeroasterisk left a comment

Choose a reason for hiding this comment

Uh oh!

zeroasterisk commented Mar 25, 2026

Uh oh!

zeroasterisk left a comment

Choose a reason for hiding this comment

Uh oh!

MoisesRBitton commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zeroasterisk left a comment

Choose a reason for hiding this comment

Uh oh!

zeroasterisk left a comment

Choose a reason for hiding this comment

Uh oh!

zeroasterisk left a comment

Choose a reason for hiding this comment

Uh oh!

zeroasterisk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MoisesRBitton commented Apr 5, 2026 •

edited

Loading