Skip to content

Commit b3caf7b

Browse files
committed
removed pydantic filter - no longer needed
1 parent 27438cb commit b3caf7b

File tree

3 files changed

+0
-40
lines changed

3 files changed

+0
-40
lines changed

backends/exllamav2/grammar.py

-28
Original file line numberDiff line numberDiff line change
@@ -107,34 +107,6 @@ def add_json_schema_filter(
107107
# Append the filters
108108
self.filters.extend([lmfilter, prefix_filter])
109109

110-
def add_pydantic_filter(
111-
self,
112-
pydantic_model: BaseModel,
113-
model: ExLlamaV2,
114-
tokenizer:ExLlamaV2Tokenizer
115-
):
116-
"""Adds an ExllamaV2 filter based on a Pydantic model"""
117-
# Create the parser
118-
try:
119-
schema_parser = JsonSchemaParser(pydantic_model.model_json_schema())
120-
except Exception:
121-
traceback.print_exc()
122-
logger.error(
123-
"Skipping because the pydantic model couldn't be used. "
124-
"Please read the above error for more information."
125-
)
126-
127-
return
128-
129-
json_prefixes = ["[", "{"]
130-
131-
lmfilter = ExLlamaV2TokenEnforcerFilter(
132-
schema_parser, _get_lmfe_tokenizer_data(tokenizer)
133-
)
134-
prefix_filter = ExLlamaV2PrefixFilter(model, tokenizer, json_prefixes)
135-
136-
self.filters.extend([lmfilter, prefix_filter])
137-
138110
def add_regex_filter(
139111
self,
140112
pattern: str,

backends/exllamav2/model.py

-7
Original file line numberDiff line numberDiff line change
@@ -1080,13 +1080,6 @@ async def generate_gen(
10801080
json_schema, self.model, self.tokenizer
10811081
)
10821082

1083-
# Add pydantic filter if it exists
1084-
pydantic_model = unwrap(kwargs.get("pydantic_model"))
1085-
if pydantic_model:
1086-
grammar_handler.add_pydantic_filter(
1087-
pydantic_model, self.model, self.tokenizer
1088-
)
1089-
10901083
# Add regex filter if it exists
10911084
regex_pattern = unwrap(kwargs.get("regex_pattern"))
10921085
if regex_pattern:

common/sampling.py

-5
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@ class BaseSamplerRequest(BaseModel):
183183
default_factory=lambda: get_default_sampler_value("json_schema"),
184184
)
185185

186-
pydantic_model: Optional[Type[BaseModel]] = Field(
187-
default_factory=lambda: get_default_sampler_value("pydantic_model"),
188-
)
189-
190186
regex_pattern: Optional[str] = Field(
191187
default_factory=lambda: get_default_sampler_value("regex_pattern"),
192188
)
@@ -346,7 +342,6 @@ def to_gen_params(self, **kwargs):
346342
"cfg_scale": self.cfg_scale,
347343
"negative_prompt": self.negative_prompt,
348344
"json_schema": self.json_schema,
349-
"pydantic_model": self.pydantic_model,
350345
"regex_pattern": self.regex_pattern,
351346
"grammar_string": self.grammar_string,
352347
"speculative_ngram": self.speculative_ngram,

0 commit comments

Comments
 (0)