Resolve merge conflict between postgres and main #1854
Merged
Conversation
This file contains 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
Handle uncaught exceptions in aggregate_ai_critique() and in evaluate()
Evaluations are initially Queued and only move to Started when the worker actually starts on the task.
Improve stacktrace quality in evaluations. Still not shown in UI.
…handle unknown values_
Catch None-related issue in Optional[...] field: EvaluationResult.correct_answers Adds logger.error(e) for exception in evaluation router
…ng-in-evaluation Improve error handling in evaluation
Func errors used to be set as func result. Now they are propagated up by forwarding the exception up (raise e).
Remove redundant celery state updates, update celery configuration, use enum properly.
Standardizes stacktrace to traceback.format_exc() (in all three files) and message to str(exc) (in aggregation_service.py)
Fix issue where Evaluation Results don't load when individual Evaluation Scenarios fail
…tions Fix two likely causes of infinitely running evaluations
docs: add jp-agenta as a contributor for code, and bug
…essage fix(sdk): AGE-272 Propagate func errors up in @ag.instrument() wrappers
Bump versions
…by making use of Pydantic objects in their dict format
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
dosubot
bot
added
the
size:XL
aybruhm
changed the title
aakrem
approved these changes
Jul 7, 2024
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.
Description
This PR resolves the merge conflict between the
postgresbranch andmaindue to changes in the evaluation service logic. The conflicts arose because of modifications made in the main branch involving evaluation service. This update ensures that all changes are correctly in sync and the service functions as expected.See last four commits for the resolved conflicts.