Upgrade outlines_core and update imports

Author: RobinPicard

outlines/backends/outlines_core.py

@@ -3,8 +3,7 @@
 from typing import Callable, Dict
 
 from outlines_core import Guide, Index, Vocabulary
-# TODO: change this once the import issue is fixed in outlines_core
-from outlines_core import outlines_core
+from outlines_core.json_schema import build_regex_from_schema
 
 from outlines.backends.base import BaseBackend
 from outlines.models import SteerableModel
@@ -248,7 +247,7 @@ def get_json_schema_logits_processor(
             The logits processor to use to constrain the generation.
 
         """
-        regex = outlines_core.json_schema.build_regex_from_schema(json_schema)
+        regex = build_regex_from_schema(json_schema)
         return self.get_regex_logits_processor(regex)
 
     def get_regex_logits_processor(self, regex: str):

outlines/types/dsl.py

@@ -29,8 +29,6 @@
 )
 import jsonschema
 from genson import SchemaBuilder
-# TODO: change this once the import issue is fixed in outlines_core
-from outlines_core import outlines_core
 from pydantic import (
     BaseModel,
     GetCoreSchemaHandler,
@@ -39,6 +37,7 @@
 )
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import core_schema as cs
+from outlines_core.json_schema import build_regex_from_schema
 
 import outlines.types as types
 from outlines import grammars
@@ -916,7 +915,7 @@ def to_regex(term: Term) -> str:
     elif isinstance(term, Regex):
         return f"({term.pattern})"
     elif isinstance(term, JsonSchema):
-        regex_str = outlines_core.json_schema.build_regex_from_schema(term.schema, term.whitespace_pattern)
+        regex_str = build_regex_from_schema(term.schema, term.whitespace_pattern)
         return f"({regex_str})"
     elif isinstance(term, Choice):
         regexes = [to_regex(python_types_to_terms(item)) for item in term.items]

pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
    "jsonschema",
    "pillow",
    "typing_extensions",
-   "outlines_core==0.2.11",
+   "outlines_core==0.2.14",
    "genson",
    "jsonpath_ng",
 ]