-
Notifications
You must be signed in to change notification settings - Fork 1.6k
feat: add CAMEL abstraction for future support of new API style #3328
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
MuggleJinx
wants to merge
6
commits into
master
Choose a base branch
from
response-api-phase-0-1
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.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1b6ee86
add abstraction of camel layer
MuggleJinx ce19def
enrich Camel message design
MuggleJinx f8b8d8e
fix _choice_tool_calls_to_camel
MuggleJinx 389cb6e
Merge branch 'master' into response-api-phase-0-1
MuggleJinx 3196cfa
add response api model
MuggleJinx 00dc3ff
Update camel/models/openai_responses_model.py
MuggleJinx 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,6 +84,10 @@ | |
| ) | ||
| from camel.prompts import TextPrompt | ||
| from camel.responses import ChatAgentResponse | ||
| from camel.responses.adapters.chat_completions import ( | ||
| adapt_chat_to_camel_response, | ||
| ) | ||
| from camel.responses.model_response import CamelModelResponse | ||
| from camel.storages import JsonStorage | ||
| from camel.toolkits import FunctionTool, RegisteredAgentToolkit | ||
| from camel.types import ( | ||
|
|
@@ -2566,12 +2570,8 @@ def _get_model_response( | |
| f"[{current_iteration}]: {sanitized}" | ||
| ) | ||
|
|
||
| if not isinstance(response, ChatCompletion): | ||
| raise TypeError( | ||
| f"Expected ChatCompletion, got {type(response).__name__}" | ||
| ) | ||
|
|
||
| return self._handle_batch_response(response) | ||
| camel_resp = self._normalize_to_camel_response(response) | ||
| return self._handle_camel_response(camel_resp) | ||
|
|
||
| @observe() | ||
| async def _aget_model_response( | ||
|
|
@@ -2631,12 +2631,8 @@ async def _aget_model_response( | |
| f"[{current_iteration}]: {sanitized}" | ||
| ) | ||
|
|
||
| if not isinstance(response, ChatCompletion): | ||
| raise TypeError( | ||
| f"Expected ChatCompletion, got {type(response).__name__}" | ||
| ) | ||
|
|
||
| return self._handle_batch_response(response) | ||
| camel_resp = self._normalize_to_camel_response(response) | ||
| return self._handle_camel_response(camel_resp) | ||
|
|
||
| def _sanitize_messages_for_logging( | ||
| self, messages, prev_num_openai_messages: int | ||
|
|
@@ -2907,6 +2903,93 @@ def _handle_batch_response( | |
| response_id=response.id or "", | ||
| ) | ||
|
|
||
| def _normalize_to_camel_response(self, resp: Any) -> CamelModelResponse: | ||
| """Normalize backend response into CamelModelResponse. | ||
|
|
||
| Accepts ChatCompletion (legacy) or already-normalized | ||
| CamelModelResponse. | ||
| """ | ||
| if isinstance(resp, CamelModelResponse): | ||
| return resp | ||
| # Best-effort detect ChatCompletion without tight import coupling | ||
| try: | ||
| from camel.types import ( | ||
| ChatCompletion as _CC, # local import to avoid cycles | ||
| ) | ||
|
|
||
| if isinstance(resp, _CC): | ||
| return adapt_chat_to_camel_response(resp) | ||
| except Exception: | ||
| pass | ||
| raise TypeError( | ||
| f"Unsupported response type for normalization: {type(resp).__name__}" # noqa:E501 | ||
| ) | ||
|
Comment on lines
+2922
to
+2926
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. likewise |
||
|
|
||
| def _handle_camel_response( | ||
| self, response: CamelModelResponse | ||
| ) -> ModelResponse: | ||
| """Process a CamelModelResponse and build the legacy ModelResponse. | ||
|
|
||
| Mirrors _handle_batch_response semantics to keep behavior identical. | ||
| """ | ||
| output_messages: List[BaseMessage] = [] | ||
| for msg in response.output_messages: | ||
| # Re-wrap to preserve agent role naming convention | ||
| chat_message = BaseMessage( | ||
| role_name=self.role_name, | ||
| role_type=self.role_type, | ||
| meta_dict=msg.meta_dict, | ||
| content=msg.content, | ||
| parsed=msg.parsed, | ||
| ) | ||
| output_messages.append(chat_message) | ||
|
|
||
| finish_reasons = response.finish_reasons or [] | ||
|
|
||
| usage: Dict[str, Any] = {} | ||
| if response.usage and response.usage.raw: | ||
| usage = dict(response.usage.raw) | ||
| else: | ||
| # Synthesize from normalized fields if raw missing | ||
| usage = { | ||
| "prompt_tokens": response.usage.input_tokens | ||
| if response.usage | ||
| else 0, | ||
| "completion_tokens": response.usage.output_tokens | ||
| if response.usage | ||
| else 0, | ||
| "total_tokens": response.usage.total_tokens | ||
| if response.usage | ||
| else 0, | ||
| } | ||
|
|
||
| tool_call_requests: Optional[List[ToolCallRequest]] = None | ||
| if response.tool_call_requests: | ||
| tool_call_requests = [] | ||
| for tc in response.tool_call_requests: | ||
| tool_call_requests.append( | ||
| ToolCallRequest( | ||
| tool_name=tc.name, | ||
| args=tc.args, | ||
| tool_call_id=tc.id, | ||
| ) | ||
| ) | ||
|
|
||
| # For compatibility, return original provider payload when available | ||
| provider_payload = getattr(response, "raw", None) | ||
| response_id = response.id or "" | ||
|
|
||
| return ModelResponse( | ||
| response=provider_payload | ||
| if provider_payload is not None | ||
| else response, | ||
| tool_call_requests=tool_call_requests, | ||
| output_messages=output_messages, | ||
| finish_reasons=finish_reasons, | ||
| usage_dict=usage, | ||
| response_id=response_id, | ||
| ) | ||
|
|
||
| def _step_terminate( | ||
| self, | ||
| num_tokens: int, | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. ========= | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. ========= | ||
| """Core abstractions for CAMEL runtime. | ||
|
|
||
| This package hosts model-agnostic message types that can be adapted to | ||
| either legacy Chat Completions or the newer OpenAI Responses API. | ||
| """ | ||
|
|
||
| __all__: list[str] = [] |
Oops, something went wrong.
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.
maybe we can unify _handle_camel_response and _handle_batch_response