Skip to content

Commit 8abf592

Browse files
authored
add openai_harmony to requirements (#4006)
* add openai_harmony to requirements * remove try-except
1 parent d18ab56 commit 8abf592

File tree

7 files changed

+10
-13
lines changed

7 files changed

+10
-13
lines changed

lmdeploy/serve/openai/harmony_utils.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
from typing import List
44

55
import shortuuid
6+
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
67

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

10-
try:
11-
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
12-
except (ImportError, ModuleNotFoundError):
13-
pass
14-
1511
_harmony_encoding = None
1612

1713

lmdeploy/tokenizer.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -384,14 +384,10 @@ class GptOssTokenizer(HuggingFaceTokenizer):
384384

385385
def __init__(self, model_dir: str):
386386
super(GptOssTokenizer, self).__init__(model_dir)
387-
try:
388-
import openai_harmony # noqa: F401
389-
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
390-
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
391-
self.role = Role.ASSISTANT
392-
self.parser = partial(StreamableParser, encoding, role=Role.ASSISTANT)
393-
except ImportError:
394-
raise ImportError('Please install openai_harmony by `pip install openai_harmony`')
387+
from openai_harmony import HarmonyEncodingName, Role, StreamableParser, load_harmony_encoding
388+
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
389+
self.role = Role.ASSISTANT
390+
self.parser = partial(StreamableParser, encoding, role=Role.ASSISTANT)
395391

396392
def detokenize_incrementally(self,
397393
all_input_ids: Sequence[int],

requirements/runtime_ascend.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ fire
66
mmengine-lite
77
numpy
88
openai
9+
openai_harmony
910
outlines<0.1.0
1011
partial_json_parser
1112
peft<=0.11.1

requirements/runtime_camb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ fire
55
mmengine-lite
66
numpy
77
openai
8+
openai_harmony
89
outlines<0.1.0
910
partial_json_parser
1011
peft<=0.11.1

requirements/runtime_cuda.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ fire
66
mmengine-lite
77
numpy
88
openai
9+
openai_harmony
910
outlines
1011
partial_json_parser
1112
peft<=0.14.0

requirements/runtime_maca.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ fire
55
mmengine-lite
66
numpy
77
openai
8+
openai_harmony
89
outlines<0.1.0
910
partial_json_parser
1011
peft<=0.11.1

requirements/runtime_rocm.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ fire
55
mmengine-lite
66
numpy
77
openai
8+
openai_harmony
89
outlines
910
partial_json_parser
1011
peft<=0.14.0

0 commit comments

Comments
 (0)