Skip to content

Commit 213430a

Browse files
committed
Model/Grammar: Remove lmfe checks
lmfe is a required dependency, so checks are no longer needed. Signed-off-by: kingbri <bdashore3@proton.me>
1 parent b255847 commit 213430a

1 file changed

Lines changed: 2 additions & 34 deletions

File tree

backends/exllamav2/grammar.py

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
from exllamav2 import ExLlamaV2, ExLlamaV2Tokenizer
33
from exllamav2.generator import ExLlamaV2Sampler
44
from exllamav2.generator.filters import ExLlamaV2Filter, ExLlamaV2PrefixFilter
5+
from lmformatenforcer import JsonSchemaParser, RegexParser
6+
from lmformatenforcer.integrations.exllamav2 import ExLlamaV2TokenEnforcerFilter
57
from loguru import logger
68

79

@@ -61,23 +63,6 @@ def add_json_schema_filter(
6163
):
6264
"""Adds an ExllamaV2 filter based on a JSON schema."""
6365

64-
# Import optional dependencies
65-
try:
66-
from lmformatenforcer import JsonSchemaParser
67-
from lmformatenforcer.integrations.exllamav2 import (
68-
ExLlamaV2TokenEnforcerFilter,
69-
)
70-
except ImportError:
71-
logger.error(
72-
"Skipping JSON schema parsing because "
73-
"lm-format-enforcer is not installed.\n"
74-
"Please run the following command in your environment "
75-
"to reinstall dependencies:\n"
76-
"pip install -U ."
77-
)
78-
79-
return
80-
8166
# Create the parser
8267
try:
8368
schema_parser = JsonSchemaParser(json_schema)
@@ -105,23 +90,6 @@ def add_regex_filter(
10590
):
10691
"""Adds an ExllamaV2 filter based on regular expressions."""
10792

108-
# Import optional dependencies
109-
try:
110-
from lmformatenforcer import RegexParser
111-
from lmformatenforcer.integrations.exllamav2 import (
112-
ExLlamaV2TokenEnforcerFilter,
113-
)
114-
except ImportError:
115-
logger.error(
116-
"Skipping regex parsing because "
117-
"lm-format-enforcer is not installed.\n"
118-
"Please run the following command in your environment "
119-
"to reinstall dependencies:\n"
120-
"pip install -U ."
121-
)
122-
123-
return
124-
12593
# Create the parser
12694
try:
12795
pattern_parser = RegexParser(pattern)

0 commit comments

Comments
 (0)