Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lmdeploy/serve/openai/harmony_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
from typing import List

import shortuuid
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding

from lmdeploy.serve.openai.protocol import (ChatMessage, DeltaFunctionCall, DeltaMessage, DeltaToolCall, FunctionCall,
ToolCall)

try:
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
except (ImportError, ModuleNotFoundError):
pass

_harmony_encoding = None


Expand Down
12 changes: 4 additions & 8 deletions lmdeploy/tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,10 @@ class GptOssTokenizer(HuggingFaceTokenizer):

def __init__(self, model_dir: str):
super(GptOssTokenizer, self).__init__(model_dir)
try:
import openai_harmony # noqa: F401
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
self.role = Role.ASSISTANT
self.parser = partial(StreamableParser, encoding, role=Role.ASSISTANT)
except ImportError:
raise ImportError('Please install openai_harmony by `pip install openai_harmony`')
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
self.role = Role.ASSISTANT
self.parser = partial(StreamableParser, encoding, role=Role.ASSISTANT)

def detokenize_incrementally(self,
all_input_ids: Sequence[int],
Expand Down
1 change: 1 addition & 0 deletions requirements/runtime_ascend.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ fire
mmengine-lite
numpy
openai
openai_harmony
outlines<0.1.0
partial_json_parser
peft<=0.11.1
Expand Down
1 change: 1 addition & 0 deletions requirements/runtime_camb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ fire
mmengine-lite
numpy
openai
openai_harmony
outlines<0.1.0
partial_json_parser
peft<=0.11.1
Expand Down
1 change: 1 addition & 0 deletions requirements/runtime_cuda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ fire
mmengine-lite
numpy
openai
openai_harmony
outlines
partial_json_parser
peft<=0.14.0
Expand Down
1 change: 1 addition & 0 deletions requirements/runtime_maca.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ fire
mmengine-lite
numpy
openai
openai_harmony
outlines<0.1.0
partial_json_parser
peft<=0.11.1
Expand Down
1 change: 1 addition & 0 deletions requirements/runtime_rocm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ fire
mmengine-lite
numpy
openai
openai_harmony
outlines
partial_json_parser
peft<=0.14.0
Expand Down