Skip to content
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

Check server input #2719

Merged
merged 8 commits into from
Nov 13, 2024
Merged

Check server input #2719

merged 8 commits into from
Nov 13, 2024

Conversation

irexyc
Copy link
Collaborator

@irexyc irexyc commented Nov 6, 2024

Thanks for your contribution and we appreciate it a lot. The following instructions would make your pull request more healthy and more easily receiving feedbacks. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.

Motivation

Please describe the motivation of this PR and the goal you want to achieve through this PR.

Modification

Please briefly describe what modification is made in this PR.

BC-breaking (Optional)

Does the modification introduce changes that break the backward-compatibility of the downstream repositories?
If so, please describe how it breaks the compatibility and how the downstream projects should modify their code to keep compatibility with this PR.

Use cases (Optional)

If this PR introduces a new feature, it is better to list some use cases here, and update the documentation.

Checklist

  1. Pre-commit or other linting tools are used to fix the potential lint issues.
  2. The modification is covered by complete unit tests. If not, please add more unit tests to ensure the correctness.
  3. If the modification has a dependency on downstream projects of a newer version, this PR should be tested with all supported versions of downstream projects.
  4. The documentation has been modified accordingly, like docstring or example tutorials.

@@ -219,7 +226,7 @@ def messages2prompt(self, messages, sequence_start=True, **kwargs):
ret += f'{self.system}{self.meta_instruction}{self.eosys}'
for message in messages:
role = message['role']
content = message['content']
content = get_text(message['content'])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it for the GPT4V messages?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the content part could be str or ChatCompletionContentPartTextParam

content: Union[str, List[ContentPartParam]]


ChatCompletionMessage = Union[SystemMessage, UserMessage, AssistantMessage]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is the best way to validate them. There are also other roles like tool, and maybe more in the future.

@@ -334,6 +335,13 @@ async def chat_completions_v1(request: ChatCompletionRequest,
error_check_ret = await check_request(request)
if error_check_ret is not None:
return error_check_ret
try:
_ = ChatCompletionRequestMessage(messages=request.messages)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The messages will converted to list of class if replace the type hint, however the messages2prompt function needs the messages to be list of dict.

@AllentDan
Copy link
Collaborator

There are also other roles like environment for InternLM and ipython for llama3. Role should be a custom variable for users.

@@ -240,7 +240,6 @@ class CompletionRequest(BaseModel):
stream_options: Optional[StreamOptions] = Field(default=None,
examples=[None])
top_p: Optional[float] = 1.0
logprobs: Optional[int] = None
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is is as expected?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a duplicated logprobs

@@ -18,6 +18,15 @@ def random_uuid() -> str:
return str(uuid.uuid4().hex)


def get_text(content: Union[str, List[dict]]):
"""openai format support Union[str,
List[ChatCompletionContentPartTextParam]] input."""
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may get updated

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@irexyc May update the docstring as follows:
"""Within the OpenAI API, the content field may be specified as either a string or a list of ChatCompletionContentPartTextParam (defined in openai). When a list is provided, lmdeploy selects the first element to incorporate into the chat template, as the manner in which OpenAI processes lists is not explicitly defined.
"""

Copy link
Collaborator

@AllentDan AllentDan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May add UT

@lvhan028 lvhan028 merged commit 9f6ff9b into InternLM:main Nov 13, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants