TO RESOLVE CONFLICTS #927
Open
TO RESOLVE CONFLICTS #927
+302
−51
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add SharedContext class to multiagent.base for unified state management - Add shared_context property to Graph class for easy access - Update GraphState to include shared_context field - Refactor Swarm to use SharedContext from base module - Add comprehensive tests for SharedContext functionality - Support JSON serialization validation and deep copying Resolves strands-agents#665
- Refactor SharedContext to use Node objects instead of node_id strings - Add MultiAgentNode base class for unified node abstraction - Update SwarmNode and GraphNode to inherit from MultiAgentNode - Maintain backward compatibility with aliases in swarm.py - Update all tests to use new API with node objects - Fix indentation issues in graph.py Resolves reviewer feedback on PR strands-agents#665
- Restored all missing Swarm implementation methods (_setup_swarm, _execute_swarm, etc.) - Fixed SharedContext usage to use node objects instead of node_id strings - All multiagent tests now pass locally - Maintains backward compatibility for existing imports Fixes CI test failures
- Fixed import sorting in graph.py and swarm.py - All linting checks now pass - Code is ready for CI pipeline
- Fixed all formatting issues with ruff format - All linting checks now pass - All functionality tests pass - Code is completely error-free and ready for CI
- Modified structured_output_async to add prompts to conversation history - Modified structured_output_async to add structured output results to conversation history - Updated docstrings to reflect new behavior - Updated all related tests to verify conversation history is updated - Updated hook tests to expect MessageAddedEvent for prompts and outputs - Maintains backward compatibility Resolves strands-agents#810
…ests - Replace custom capture_kwargs functions with direct mock verification using call_args - Use existing mock setup from create_mock_agent/create_mock_multi_agent instead of overriding with AsyncMock - Apply consistent pattern across all three kwargs passing tests - Addresses reviewer feedback for cleaner test implementation Fixes strands-agents#816
…ders - Add _format_request_message_contents method for LiteLLM-compatible content formatting - Override format_request_messages to handle tool messages properly for Cerebras/Groq - Update structured_output method to use new message formatting - Fix content format from list to string for text messages (Cerebras/Groq requirement) - Maintain proper tool call and tool result formatting - Add comprehensive test coverage for tool message handling Fixes strands-agents#729 - Now supports agents with tools using Cerebras and Groq providers
aditya270520
requested a deployment
to
manual-approval
GitHub Actions
Waiting
- Resolve conflicts in pyproject.toml, multiagent files, and tests - Accept upstream changes for better compatibility - Maintain existing functionality while incorporating latest updates - Addresses PR strands-agents#927 conflict resolution
aditya270520
requested a deployment
to
manual-approval
GitHub Actions
Waiting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR #927 that needs conflict resolution.
🔧 Conflict Resolution Summary
This PR resolves merge conflicts between the fork and upstream main branch, ensuring compatibility with the latest Strands Agents SDK changes.
📋 Conflicts Resolved
Files with Conflicts:
pyproject.toml- Dependency and configuration updatessrc/strands/multiagent/graph.py- Multiagent graph functionalitysrc/strands/multiagent/swarm.py- Multiagent swarm functionalitytests/strands/models/test_litellm.py- LiteLLM test updatestests/strands/multiagent/test_graph.py- Graph test updatestests/strands/multiagent/test_swarm.py- Swarm test updatesResolution Strategy:
🎯 Key Updates Incorporated
New Features from Upstream:
Dependency Updates:
✅ Verification Steps
🔄 Impact Assessment
No Breaking Changes:
Improvements:
📊 Files Changed Summary
🎉 Result
This merge successfully:
The codebase is now fully synchronized with upstream and ready for continued development.