Skip to content

Add ASP as primary setup in academic-research agent#1226

Merged
zeroasterisk merged 3 commits intogoogle:mainfrom
tristanhussain:academic-research-asp
Apr 11, 2026
Merged

Add ASP as primary setup in academic-research agent#1226
zeroasterisk merged 3 commits intogoogle:mainfrom
tristanhussain:academic-research-asp

Conversation

@Almadhi07
Copy link
Copy Markdown
Contributor

@Almadhi07 Almadhi07 commented Mar 8, 2026

Summary:

  • pyproject.toml — Bumped agent-starter-pack from >=0.14.1 to >=0.32.0

  • README.md — Moved ASP setup from a bottom "Alternative" section to the primary setup option; removed the duplicate section

  • uv.lock — Regenerated to reflect the updated ASP dependency

image

@Almadhi07 Almadhi07 requested a review from gulliantonio as a code owner March 8, 2026 17:20
zeroasterisk
zeroasterisk previously approved these changes Mar 18, 2026
zeroasterisk
zeroasterisk previously approved these changes Mar 18, 2026
@zeroasterisk zeroasterisk dismissed stale reviews from themself March 18, 2026 12:42

Reverting: I was only supposed to approve the workflow runs, not the PR itself.

Copy link
Copy Markdown
Collaborator

@zeroasterisk zeroasterisk left a comment

Choose a reason for hiding this comment

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

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

  • ✅ ASP as recommended — correct positioning
  • uvx one-liner as primary — good
  • ✅ Clean README structure
  • ⚠️ Missing __init__.py auth block — No google.auth.default() + os.environ.setdefault block. This is needed for the agent to work in ASP-generated projects with ADC. See #1286 or your own #1091 for the pattern.
  • ⚠️ Verify end-to-end — Does uvx agent-starter-pack create + uv run adk run actually work for this agent? The auth block is usually what makes or breaks it.

Add the auth block in __init__.py and verify the agent runs in an ASP-scaffolded project.

@zeroasterisk
Copy link
Copy Markdown
Collaborator

Checking in — the review feedback from Mar 21 hasn't been addressed yet. Needs the google.auth.default() + os.environ.setdefault auth block in __init__.py, and verify README matches the approved template from PR #1286. Your #1091 is approved now — apply the same pattern here.

@Almadhi07 Almadhi07 force-pushed the academic-research-asp branch from 0192fc7 to a10ae37 Compare March 26, 2026 02:12
@Almadhi07
Copy link
Copy Markdown
Contributor Author

Almadhi07 commented Mar 26, 2026

Checking in — the review feedback from Mar 21 hasn't been addressed yet. Needs the google.auth.default() + os.environ.setdefault auth block in __init__.py, and verify README matches the approved template from PR #1286. Your #1091 is approved now — apply the same pattern here.

Addressed:

Google auth added

  • I stashed my local README and init.py changes first so the rebase could run cleanly.
  • I rebased academic-research-asp onto the latest upstream/main.
  • To resolve the uv.lock conflict, I removed the conflicted lockfile and regenerated it from python/agents/academic-research using uv lock.
  • After the rebase completed, I restored my local README and init.py changes with git stash pop.
  • I ran the pytest tests successfully with 1 passed.
  • ASP-first README.
  • Finally I force-pushed
  • I ran into a uv.lock merge conflict while updating this branch.
image

Copy link
Copy Markdown
Collaborator

@zeroasterisk zeroasterisk left a comment

Choose a reason for hiding this comment

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

Looks good — auth block with correct import order (from . import agent after env setup with noqa), load_dotenv before auth. Clean. ✅

@zeroasterisk
Copy link
Copy Markdown
Collaborator

Hey @Almadhi07 — this PR has merge conflicts with main. Could you rebase your branch and resolve them?

git fetch upstream
git rebase upstream/main
# resolve any conflicts
git push --force-with-lease

The PR is approved and ready to merge once conflicts are resolved. Thanks! 🙏

- load_dotenv, google.auth.default(), setdefault for project/location/vertex, then import agent

- README: uvx primary, details for pip/clone, uv run adk, uv sync --group dev
@Almadhi07 Almadhi07 force-pushed the academic-research-asp branch from 4a8df35 to 002c06f Compare April 4, 2026 15:55
@zeroasterisk zeroasterisk merged commit b62b0e3 into google:main Apr 11, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants