feat: Integrate cohere models #932

Wendong-Fan · 2024-09-11T13:28:27Z

Description

Integrate cohere models

Motivation and Context

Why is this change required? What problem does it solve?
If it fixes an open issue, please link to the issue here.
You can use the syntax `close #896'

I have raised an issue to propose this change (required for new features and bug fixes)

Types of changes

What types of changes does your code introduce? Put an x in all the boxes that apply:

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds core functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Documentation (update in the documentation)
Example (update in the folder of example)

Implemented Tasks

Develop the script to interact with the Cohere model API.
Ensure Cohere model is seamlessly integrated within the Camel framework.
Write and execute unit tests to verify the functionality of the Cohere model integration.
Resolve compatibility issues between the Cohere application and the retriever component.

Checklist

Go over all the following points, and put an x in all the boxes that apply.
If you are unsure about any of these, don't hesitate to ask. We are here to help!

I have read the CONTRIBUTION guide. (required)
My change requires a change to the documentation.
I have updated the tests accordingly. (required for a bug fix or a new feature)
I have updated the documentation accordingly.

coderabbitai · 2024-09-11T13:28:34Z

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

koch3092

Thanks @NeilJohnson0930 , left some comments

camel/models/cohere_model.py

examples/models/role_playing_with_cohere.py

camel/configs/cohere_config.py

Wendong-Fan

Thanks @NeilJohnson0930 ! Left some comments below

camel/models/cohere_model.py

examples/models/cohere_model_example.py

examples/models/role_playing_with_cohere.py

Wendong-Fan

Thanks @NeilJohnson0930 ! Left some comments

camel/configs/cohere_config.py

camel/models/cohere_model.py

Wendong-Fan

Thanks @NeilJohnson0930 , left some comments below, based on the review also added one more commit here: 3886e6e feel free to check~

Wendong-Fan · 2024-11-19T17:38:35Z

camel/configs/cohere_config.py

+        documents (dict, optional): A list of relevant documents that the
+            model can cite to generate a more accurate reply. Each document is
+            either a string or document object with content and metadata.
+            (default: :obj:`None`)


from https://docs.cohere.com/reference/chat the type should be list of string or doc

Wendong-Fan · 2024-11-19T17:42:19Z

camel/models/cohere_model.py

+    def __init__(
+        self,
+        model_type: ModelType,
+        model_config_dict: Dict[str, Any],


this should be optional

Wendong-Fan · 2024-11-19T17:43:53Z

camel/models/cohere_model.py

+        super().__init__(
+            model_type, model_config_dict, api_key, url, token_counter
+        )
+        self.tool_call_id = None


we can set this in _to_cohere_chatmessage

Wendong-Fan · 2024-11-19T17:47:41Z

pyproject.toml

@@ -123,7 +123,7 @@ redis = { version = "^5.0.6", optional = true }

 # retrievers
 rank-bm25 = { version = "^0.2.2", optional = true }
-cohere = { version = "^4.56", optional = true }
+cohere = { version = "^5.11.0", optional = true }


dependency position is not correct, refer to other models like mistralai

Wendong-Fan · 2024-11-19T17:54:16Z

camel/models/cohere_model.py

+        import ast
+        import json
+        import uuid


move to upper as they don't need additional install

Wendong-Fan · 2024-11-19T18:15:17Z

camel/types/enums.py

+    COHERE_COMMAND_R = "command-r"
+    COHERE_COMMAND_LIGHT = "command-light"
+    COHERE_COMMAND = "command"
+    COHERE_COMMAND_NIGHTLY = "command-nightly"


from https://docs.cohere.com/v2/docs/models more models like command-r-plus could be supported

Wendong-Fan · 2024-11-19T18:17:19Z

camel/types/enums.py

+        elif self in {
+            ModelType.COHERE_COMMAND_R,
+            ModelType.COHERE_COMMAND_LIGHT,
+            ModelType.COHERE_COMMAND,
+            ModelType.COHERE_COMMAND_NIGHTLY,
+        }:
+            return 4_096


we have one dict for 4_096, for COHERE_COMMAND_R it should be 128k

Wendong-Fan · 2024-11-19T18:21:07Z

examples/models/cohere_model_example.py

+)
+
+# Define system message
+sys_msg = BaseMessage.make_assistant_message(


message setting could be simpified

Wendong-Fan · 2024-11-19T18:36:09Z

camel/models/cohere_model.py

+                        role="assistant",
+                        content=content,  # type: ignore[arg-type]
+                    )
+                    continue


I think here we should use else statement instead of break the whole loop

Wendong-Fan · 2024-11-19T18:37:37Z

camel/models/cohere_model.py

+                arguments_dict = ast.literal_eval(arguments)
+                arguments_json = json.dumps(arguments_dict)
+                assis_tool_call_id = str(uuid.uuid4())
+                self.tool_call_id = assis_tool_call_id  # type: ignore[assignment]


unnecessary type ignore

NeilJohnson0930 requested review from lightaime and NeilJohnson0930 September 11, 2024 14:51

NeilJohnson0930 added this to the Sprint 12 milestone Sep 11, 2024

NeilJohnson0930 linked an issue Sep 11, 2024 that may be closed by this pull request

[Feature Request] Add cohere models #896

Closed

2 tasks

NeilJohnson0930 removed their request for review September 11, 2024 15:11

Wendong-Fan assigned NeilJohnson0930 Sep 11, 2024

Wendong-Fan added Model Related to backend models New Feature labels Sep 11, 2024

NeilJohnson0930 marked this pull request as ready for review September 12, 2024 02:01

koch3092 self-requested a review September 20, 2024 10:34

koch3092 reviewed Sep 20, 2024

View reviewed changes

camel/models/cohere_model.py Outdated Show resolved Hide resolved

examples/models/role_playing_with_cohere.py Outdated Show resolved Hide resolved

WHALEEYE reviewed Sep 22, 2024

View reviewed changes

camel/configs/cohere_config.py Outdated Show resolved Hide resolved

camel/configs/cohere_config.py Outdated Show resolved Hide resolved

Wendong-Fan commented Sep 22, 2024

View reviewed changes

NeilJohnson0930 force-pushed the dev_cohere branch from 0bc66de to 3ac127b Compare September 23, 2024 15:04

NeilJohnson0930 requested review from NeilJohnson0930, koch3092 and WHALEEYE and removed request for NeilJohnson0930 September 23, 2024 15:08

Wendong-Fan commented Sep 24, 2024

View reviewed changes

camel/configs/cohere_config.py Outdated Show resolved Hide resolved

camel/models/cohere_model.py Outdated Show resolved Hide resolved

camel/models/cohere_model.py Outdated Show resolved Hide resolved

camel/models/cohere_model.py Outdated Show resolved Hide resolved

NeilJohnson0930 force-pushed the dev_cohere branch from ecb1925 to 03cd8c9 Compare October 30, 2024 09:48

fix: confilct solved

c170ab5

NeilJohnson0930 force-pushed the dev_cohere branch from f50c94c to c170ab5 Compare November 18, 2024 13:56

NeilJohnson0930 and others added 3 commits November 18, 2024 23:00

feat: Fix the search tool to use DuckDuckGo.

e463bb6

Merge branch 'master' into dev_cohere

a6b22b0

update based on review

3886e6e

Wendong-Fan commented Nov 19, 2024

View reviewed changes

Wendong-Fan added 3 commits November 20, 2024 02:41

update example

7c0d6af

udapte example

4cbdd77

fix

217ffe5

update

165b5a1

Wendong-Fan merged commit f972161 into master Nov 19, 2024
6 checks passed

Wendong-Fan deleted the dev_cohere branch November 19, 2024 19:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Integrate cohere models #932

feat: Integrate cohere models #932

Wendong-Fan commented Sep 11, 2024 •

edited

Loading

coderabbitai bot commented Sep 11, 2024

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

koch3092 left a comment

Wendong-Fan left a comment

Wendong-Fan left a comment

Wendong-Fan left a comment •

edited

Loading

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

Wendong-Fan Nov 19, 2024

feat: Integrate cohere models #932

feat: Integrate cohere models #932

Conversation

Wendong-Fan commented Sep 11, 2024 • edited Loading

Description

Motivation and Context

Types of changes

Implemented Tasks

Checklist

coderabbitai bot commented Sep 11, 2024

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

koch3092 left a comment

Choose a reason for hiding this comment

Wendong-Fan left a comment

Choose a reason for hiding this comment

Wendong-Fan left a comment

Choose a reason for hiding this comment

Wendong-Fan left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wendong-Fan commented Sep 11, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

Wendong-Fan left a comment •

edited

Loading