-
Notifications
You must be signed in to change notification settings - Fork 1.7k
update WorkforceLogger with log_message #3485
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
zshanhui
wants to merge
11
commits into
camel-ai:master
Choose a base branch
from
zshanhui:issue/3351-refactor-workforce-decouple-logging-via-callbacks-2nd
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+95
−10
Open
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
8809095
update WorkforceLogger with log_message
zshanhui 6bc550f
replace a couple print statements with log_message
zshanhui 81a6ca1
update existing example
zshanhui 51104ef
Merge branch 'master' into issue/3351-refactor-workforce-decouple-log…
zshanhui 263e215
address pr comments
zshanhui 9bd8caa
Merge branch 'master' into issue/3351-refactor-workforce-decouple-log…
zshanhui b773b00
address comments
zshanhui 59da217
fix typing
zshanhui f877a68
Merge branch 'master' into issue/3351-refactor-workforce-decouple-log…
zshanhui c69c39c
Merge branch 'master' into issue/3351-refactor-workforce-decouple-log…
fengju0213 c0bc641
Merge branch 'master' into issue/3351-refactor-workforce-decouple-log…
zshanhui File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,9 +15,12 @@ | |
| from datetime import datetime, timezone | ||
| from typing import Any, Dict, List, Optional | ||
|
|
||
| from colorama import Fore | ||
|
|
||
| from camel.logger import get_logger | ||
| from camel.societies.workforce.events import ( | ||
| AllTasksCompletedEvent, | ||
| LogEvent, | ||
| QueueStatusEvent, | ||
| TaskAssignedEvent, | ||
| TaskCompletedEvent, | ||
|
|
@@ -34,6 +37,16 @@ | |
|
|
||
| logger = get_logger(__name__) | ||
|
|
||
| _COLOR_MAP = { | ||
| "yellow": Fore.YELLOW, | ||
| "red": Fore.RED, | ||
| "green": Fore.GREEN, | ||
| "cyan": Fore.CYAN, | ||
| "magenta": Fore.MAGENTA, | ||
| "gray": Fore.LIGHTBLACK_EX, | ||
| "black": Fore.BLACK, | ||
| } | ||
|
|
||
|
|
||
| class WorkforceLogger(WorkforceCallback, WorkforceMetrics): | ||
| r"""Logs events and metrics for a Workforce instance.""" | ||
|
|
@@ -50,6 +63,27 @@ def __init__(self, workforce_id: str): | |
| self._worker_information: Dict[str, Dict[str, Any]] = {} | ||
| self._initial_worker_logs: List[Dict[str, Any]] = [] | ||
|
|
||
| def _get_color_message(self, event: LogEvent) -> str: | ||
| r"""Gets a colored message for a log event.""" | ||
| if event.color is None or event.color not in _COLOR_MAP: | ||
| return event.message | ||
| color = _COLOR_MAP.get(event.color) | ||
| return f"{color}{event.message}{Fore.RESET}" | ||
|
|
||
| def log_message(self, event: LogEvent) -> None: | ||
zshanhui marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| r"""Logs a message to the console with color.""" | ||
| colored_message = self._get_color_message(event) | ||
| if event.level == 'debug': | ||
| logger.debug(colored_message) | ||
| if event.level == 'info': | ||
| logger.info(colored_message) | ||
|
||
| if event.level == 'warning': | ||
| logger.warning(colored_message) | ||
| if event.level == 'error': | ||
| logger.error(colored_message) | ||
| if event.level == 'critical': | ||
| logger.critical(colored_message) | ||
|
|
||
| def _log_event(self, event_type: str, **kwargs: Any) -> None: | ||
| r"""Internal method to create and store a log entry. | ||
|
|
||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move
_get_color_messageand_COLOR_MAPinto WorkforceCallback. Also rename_COLOR_MAPto__COLOR_MAPto mark it as a private attribute