* Enhance embedding configuration with custom embedder support
- Add support for custom embedding functions in EmbeddingConfigurator
- Update type hints for embedder configuration
- Extend configuration options for various embedding providers
- Add optional embedder configuration to Memory class
* added docs
* Refine custom embedder configuration support
- Update custom embedder configuration method to handle custom embedding functions
- Modify type hints for embedder configuration
- Remove unused model_name parameter in custom embedder configuration
* Added functionality to have json format as well for the logs
* Added additional comments, refractored logging functionality
* Fixed documentation to include the new paramter
* Fixed typo
* Added a Pydantic Error Check between output_log_file and save_as_json parameter
* Removed the save_to_json parameter, incorporated the functionality directly with output_log_file
* Fixed typo
* Sorted the imports using isort
---------
Co-authored-by: Vidit Ostwal <vidit.ostwal@piramal.com>
Co-authored-by: Brandon Hancock (bhancock_ai) <109994880+bhancockio@users.noreply.github.com>
* Update embedding_configurator.py
Modified _configure_bedrock method to use user submitted model_name rather than default amazon.titan-embed-text-v1.
Sending model_name in short_term_memory (embedder_config/config) was not working.
# Passing model_name to use model_name provide by user than using default. Added if/else for backward compatibility
* Update embedding_configurator.py
Incorporated review comments
---------
Co-authored-by: Brandon Hancock (bhancock_ai) <109994880+bhancockio@users.noreply.github.com>
* Fixing training while refactoring code
* improve prompts
* make sure to raise an error when missing training data
* Drop comment
* fix failing tests
* add clear
* drop bad code
* fix failing test
* Fix type issues pointed out by lorenze
* simplify training
* fix breakage when cloning agent/crew using knowledge_sources
* fixed typo
* better
* ensure use of other knowledge storage works
* fix copy and custom storage
* added tests
* normalized name
* updated cassette
* fix test
* remove fixture
* fixed test
* fix
* add fixture to this
* add fixture to this
* patch twice since
* fix again
* with fixtures
* better mocks
* fix
* simple
* try
* another
* hopefully fixes test
* hopefully fixes test
* this should fix it !
* WIP: test check with prints
* try this
* exclude knowledge
* fixes
* just drop clone for now
* rm print statements
* printing agent_copy
* checker
* linted
* cleanup
* better docs
---------
Co-authored-by: Brandon Hancock (bhancock_ai) <109994880+bhancockio@users.noreply.github.com>
* fix: ensure persisted state overrides class defaults
- Remove early return in Flow.__init__ to allow proper state initialization
- Add test_flow_default_override.py to verify state override behavior
- Fix issue where default values weren't being overridden by persisted state
Fixes the issue where persisted state values weren't properly overriding
class defaults when restarting a flow with a previously saved state ID.
Co-Authored-By: Joe Moura <joao@crewai.com>
* test: improve state restoration verification with has_set_count flag
Co-Authored-By: Joe Moura <joao@crewai.com>
* test: add has_set_count field to PoemState
Co-Authored-By: Joe Moura <joao@crewai.com>
* refactoring test
* fix: ensure persisted state overrides class defaults
- Remove early return in Flow.__init__ to allow proper state initialization
- Add test_flow_default_override.py to verify state override behavior
- Fix issue where default values weren't being overridden by persisted state
Fixes the issue where persisted state values weren't properly overriding
class defaults when restarting a flow with a previously saved state ID.
Co-Authored-By: Joe Moura <joao@crewai.com>
* test: improve state restoration verification with has_set_count flag
Co-Authored-By: Joe Moura <joao@crewai.com>
* test: add has_set_count field to PoemState
Co-Authored-By: Joe Moura <joao@crewai.com>
* refactoring test
* Fixing flow state
* fixing peristed stateful flows
* linter
* type fix
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Joe Moura <joao@crewai.com>
* Fix nested pydantic model issue
* fix failing tests
* add in vcr
* cleanup
* drop prints
* Fix vcr issues
* added new recordings
* trying to fix vcr
* add in fix from lorenze.
* Fix SQLite log handling issue causing ValueError: Logs cannot be None in tests
- Add proper error handling in SQLite storage operations
- Set up isolated test environment with temporary storage directory
- Ensure consistent error messages across all database operations
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Sort imports in conftest.py
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Convert TokenProcess counters to instance variables to fix callback tracking
Co-Authored-By: Joe Moura <joao@crewai.com>
* refactor: Replace print statements with logging and improve error handling
- Add proper logging setup in kickoff_task_outputs_storage.py
- Replace self._printer.print() with logger calls
- Use appropriate log levels (error/warning)
- Add directory validation in test environment setup
- Maintain consistent error messages with DatabaseError format
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Comprehensive improvements to database and token handling
- Fix SQLite database path handling in storage classes
- Add proper directory creation and error handling
- Improve token tracking with robust type checking
- Convert TokenProcess counters to instance variables
- Add standardized database error handling
- Set up isolated test environment with temporary storage
Resolves test failures in PR #1899
Co-Authored-By: Joe Moura <joao@crewai.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Joe Moura <joao@crewai.com>
Co-authored-by: João Moura <joaomdmoura@gmail.com>
* Add @persist decorator with SQLite persistence
- Add FlowPersistence abstract base class
- Implement SQLiteFlowPersistence backend
- Add @persist decorator for flow state persistence
- Add tests for flow persistence functionality
Co-Authored-By: Joe Moura <joao@crewai.com>
* Fix remaining merge conflicts in uv.lock
- Remove stray merge conflict markers
- Keep main's comprehensive platform-specific resolution markers
- Preserve all required dependencies for persistence functionality
Co-Authored-By: Joe Moura <joao@crewai.com>
* Fix final CUDA dependency conflicts in uv.lock
- Resolve NVIDIA CUDA solver dependency conflicts
- Use main's comprehensive platform checks
- Ensure all merge conflict markers are removed
- Preserve persistence-related dependencies
Co-Authored-By: Joe Moura <joao@crewai.com>
* Fix nvidia-cusparse-cu12 dependency conflicts in uv.lock
- Resolve NVIDIA CUSPARSE dependency conflicts
- Use main's comprehensive platform checks
- Complete systematic check of entire uv.lock file
- Ensure all merge conflict markers are removed
Co-Authored-By: Joe Moura <joao@crewai.com>
* Fix triton filelock dependency conflicts in uv.lock
- Resolve triton package filelock dependency conflict
- Use main's comprehensive platform checks
- Complete final systematic check of entire uv.lock file
- Ensure TOML file structure is valid
Co-Authored-By: Joe Moura <joao@crewai.com>
* Fix merge conflict in crew_test.py
- Remove duplicate assertion in test_multimodal_agent_live_image_analysis
- Clean up conflict markers
- Preserve test functionality
Co-Authored-By: Joe Moura <joao@crewai.com>
* Clean up trailing merge conflict marker in crew_test.py
- Remove remaining conflict marker at end of file
- Preserve test functionality
- Complete conflict resolution
Co-Authored-By: Joe Moura <joao@crewai.com>
* Improve type safety in persistence implementation and resolve merge conflicts
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Add explicit type casting in _create_initial_state method
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Improve type safety in flow state handling with proper validation
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Improve type system with proper TypeVar scoping and validation
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Improve state restoration logic and add comprehensive tests
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Initialize FlowState instances without passing id to constructor
Co-Authored-By: Joe Moura <joao@crewai.com>
* feat: Add class-level flow persistence decorator with SQLite default
- Add class-level @persist decorator support
- Set SQLiteFlowPersistence as default backend
- Use db_storage_path for consistent database location
- Improve async method handling and type safety
- Add comprehensive docstrings and examples
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Sort imports in decorators.py to fix lint error
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Organize imports according to PEP 8 standard
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Format typing imports with line breaks for better readability
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Simplify import organization to fix lint error
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Fix import sorting using Ruff auto-fix
Co-Authored-By: Joe Moura <joao@crewai.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Joe Moura <joao@crewai.com>
Co-authored-by: João Moura <joaomdmoura@gmail.com>
* drop litellm version to prevent windows issue
* Fix failing tests
* Trying to fix tests
* clean up
* Trying to fix tests
* Drop token calc handler changes
* fix failing test
* Fix failing test
---------
Co-authored-by: João Moura <joaomdmoura@gmail.com>
* worked on foundation for new conversational crews. Now going to work on chatting.
* core loop should be working and ready for testing.
* high level chat working
* its alive!!
* Added in Joaos feedback to steer crew chats back towards the purpose of the crew
* properly return tool call result
* accessing crew directly instead of through uv commands
* everything is working for conversation now
* Fix linting
* fix llm_utils.py and other type errors
* fix more type errors
* fixing type error
* More fixing of types
* fix failing tests
* Fix more failing tests
* adding tests. cleaing up pr.
* improve
* drop old functions
* improve type hintings
* test: Add test demonstrating knowledge not included in planning process
Issue #1703: Add test to verify that agent knowledge sources are not currently
included in the planning process. This test will help validate the fix once
implemented.
- Creates agent with knowledge sources
- Verifies knowledge context missing from planning
- Checks other expected components are present
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Include agent knowledge in planning process
Issue #1703: Integrate agent knowledge sources into planning summaries
- Add agent_knowledge field to task summaries in planning_handler
- Update test to verify knowledge inclusion
- Ensure knowledge context is available during planning phase
The planning agent now has access to agent knowledge when creating
task execution plans, allowing for better informed planning decisions.
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Fix import sorting in test_knowledge_planning.py
- Reorganize imports according to ruff linting rules
- Fix I001 linting error
Co-Authored-By: Joe Moura <joao@crewai.com>
* test: Update task summary assertions to include knowledge field
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Update ChromaDB mock path and fix knowledge string formatting
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Improve knowledge integration in planning process with error handling
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Update task summary format for empty tools and knowledge
- Change empty tools message to 'agent has no tools'
- Remove agent_knowledge field when empty
- Update test assertions to match new format
- Improve test messages for clarity
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Update string formatting for agent tools in task summary
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Update string formatting for agent tools in task summary
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Update string formatting for agent tools and knowledge in task summary
Co-Authored-By: Joe Moura <joao@crewai.com>
* fix: Update knowledge field formatting in task summary
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Fix import sorting in test_planning_handler.py
Co-Authored-By: Joe Moura <joao@crewai.com>
* style: Fix import sorting order in test_planning_handler.py
Co-Authored-By: Joe Moura <joao@crewai.com>
* test: Add ChromaDB mocking to test_create_tasks_summary_with_knowledge_and_tools
Co-Authored-By: Joe Moura <joao@crewai.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Joe Moura <joao@crewai.com>
Co-authored-by: João Moura <joaomdmoura@gmail.com>
* apply agent ops changes and resolve merge conflicts
* Trying to fix tests
* add back in vcr
* update tools
* remove pkg_resources which was causing issues
* Fix tests
* experimenting to see if unique content is an issue with knowledge
* experimenting to see if unique content is an issue with knowledge
* update chromadb which seems to have issues with upsert
* generate new yaml for failing test
* Investigating upsert
* Drop patch
* Update casettes
* Fix duplicate document issue
* more fixes
* add back in vcr
* new cassette for test
---------
Co-authored-by: Lorenze Jay <lorenzejaytech@gmail.com>
* incorporate #1683
* add in --version flag to cli. closes#1679.
* Fix env issue
* Add in suggestions from @caike to make sure ragstorage doesnt exceed os file limit. Also, included additional checks to support windows.
* remove poetry.lock as pointed out by @sanders41 in #1574.
* Incorporate feedback from crewai reviewer
* Incorporate @lorenzejay feedback
* v1 of HITL working
* Drop print statements
* HITL code more robust. Still needs to be refactored.
* refactor and more clear messages
* Fix type issue
* fix tests
* Fix test again
* Drop extra print
* Knowledge project directory standard
* fixed types
* comment fix
* made base file knowledge source an abstract class
* cleaner validator on model_post_init
* fix type checker
* cleaner refactor
* better template
* V1 working
* clean up imports and prints
* more clean up and add tests
* fixing tests
* fix test
* fix linting
* Fix tests
* Fix linting
* add doc string as requested by eduardo
* initial knowledge
* WIP
* Adding core knowledge sources
* Improve types and better support for file paths
* added additional sources
* fix linting
* update yaml to include optional deps
* adding in lorenze feedback
* ensure embeddings are persisted
* improvements all around Knowledge class
* return this
* properly reset memory
* properly reset memory+knowledge
* consolodation and improvements
* linted
* cleanup rm unused embedder
* fix test
* fix duplicate
* generating cassettes for knowledge test
* updated default embedder
* None embedder to use default on pipeline cloning
* improvements
* fixed text_file_knowledge
* mypysrc fixes
* type check fixes
* added extra cassette
* just mocks
* linted
* mock knowledge query to not spin up db
* linted
* verbose run
* put a flag
* fix
* adding docs
* better docs
* improvements from review
* more docs
* linted
* rm print
* more fixes
* clearer docs
* added docstrings and type hints for cli
---------
Co-authored-by: João Moura <joaomdmoura@gmail.com>
Co-authored-by: Lorenze Jay <lorenzejaytech@gmail.com>
