Skip to content

Conversation

@dandye
Copy link
Collaborator

@dandye dandye commented Jul 3, 2025

Summary

  • Test branch created from agentspace_deploy_test
  • Contains restructured ADK agent architecture and comprehensive documentation

Test plan

  • Verify branch merges cleanly into agentspace_deploy
  • Validate no conflicts with target branch

dandye added 3 commits July 3, 2025 11:24
- Add env-setup target to Makefile for creating .env from .env.example
- Update .env.example with optimized model and timeout settings
- Enhance env_manager.py with better validation for UUIDs and URLs
- Fix server name reference from 'soar' to 'secops_soar' in env_manager
- Update .gitignore to exclude markdown library files
- Improve adk-deploy target in Makefile with better lib handling and bucket generation
- Fix agent.py initialization to avoid global variable issues
- Streamline env_manager.py by removing unnecessary agent_engine requirements
- Add automatic cleanup of copied libs after deployment
This commit fixes multiple deployment issues that prevented MCP tools from loading properly:

**Cloud Run Deployment:**
- Fixed cloudrun_deploy.py to point to correct agents directory structure
- Added Python path configuration for libs imports
- Updated cloudrun_deploy_run.sh to handle correct file paths and cleanup
- Fixed Makefile to read environment variables from .env file for deployment

**ADK Local Testing:**
- Updated run-adk-agent.sh to specify agents directory for adk web
- Added automatic libs copying for local testing
- Fixed Python path in agent.py to find local libs directory

**MCP Server Loading:**
- Fixed environment variable mapping for all MCP servers (secops, gti, soar, scc)
- Added proper server entry point handling (scc uses scc_mcp.py, others use server.py)
- Added comprehensive logging for debugging MCP server initialization
- Fixed BASE_DIR and SERVER_DIR path detection for both local and Cloud Run environments

**Agent Configuration:**
- Added default values for GOOGLE_MODEL and DEFAULT_PROMPT to prevent validation errors
- Improved .env file path detection for different deployment environments
- Added flexible path handling for both local development and container deployment

**Makefile Improvements:**
- Fixed cloudrun-logs target to properly read project/region from .env
- Updated adk-deploy target to read environment variables correctly
- Removed dangerous server directory cleanup that could delete original files

All MCP tools (SCC, SecOps, GTI, SOAR) now load correctly in both local and Cloud Run deployments.
@dandye dandye merged commit 6e791c0 into agentspace_deploy Jul 3, 2025
1 check passed
@dandye dandye deleted the agentspace_deploy_test branch July 3, 2025 20:14
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.

1 participant