diff --git a/outlines/models/base.py b/outlines/models/base.py index 4b948a56d..2ad0407f3 100644 --- a/outlines/models/base.py +++ b/outlines/models/base.py @@ -117,7 +117,7 @@ def __call__( The response generated by the model. """ - from outlines import Generator + from outlines.generator import Generator return Generator(self, output_type, backend)(model_input, **inference_kwargs) diff --git a/outlines/models/transformers.py b/outlines/models/transformers.py index 2b8fca13e..a67426096 100644 --- a/outlines/models/transformers.py +++ b/outlines/models/transformers.py @@ -303,7 +303,6 @@ def generate( """ prompts, inputs = self._prepare_model_inputs(model_input, False) logits_processor = self.type_adapter.format_output_type(output_type) - generated_ids = self._generate_output_seq( prompts, inputs, diff --git a/outlines/types/dsl.py b/outlines/types/dsl.py index 548c837ff..4af1c6257 100644 --- a/outlines/types/dsl.py +++ b/outlines/types/dsl.py @@ -827,7 +827,7 @@ def to_regex(term: Term) -> str: """ if isinstance(term, String): - return re.escape(term.value) + return f'"{re.escape(term.value)}"' if term.value not in "[]" else re.escape(term.value) elif isinstance(term, Regex): return f"({term.pattern})" elif isinstance(term, JsonSchema):