mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-08 15:48:29 +00:00
Resolved merge conflicts: - agent.py: kept main's docker validation, restored get_platform_tools method, fixed KnowledgeRetrievalStartedEvent position - agent_utils.py: merged both LLM and LiteAgent imports - test_cache_hitting.yaml: accepted main's test recordings - Removed 4 deprecated test cassettes from old tests/ directory Key changes from main: - Enhanced knowledge event handling with from_agent/from_task parameters - Updated LLMMessage typing in kickoff methods - Added guardrail parameter to async kickoff - Restored runtime validation in guardrail.py
4.7 KiB
4.7 KiB