Flatten python package

torymur · torymur · commit 81828687ce31 · 2025-01-28T20:04:41.000Z
diff --git a/benchmarks/bench_json_schema.py b/benchmarks/bench_json_schema.py
@@ -1,5 +1,5 @@
-from outlines_core.fsm import Index, Vocabulary
-from outlines_core.fsm.json_schema import build_regex_from_schema
+from outlines_core import Index, Vocabulary
+from outlines_core.json_schema import build_regex_from_schema
 
 simple_schema = """{
         "$defs": {
diff --git a/benchmarks/bench_regex_guide.py b/benchmarks/bench_regex_guide.py
@@ -2,7 +2,7 @@
 from concurrent.futures import ThreadPoolExecutor
 
 import psutil
-from outlines_core.fsm import Guide, Index, Vocabulary
+from outlines_core import Guide, Index, Vocabulary
 
 regex_samples = {
     "email": r"[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?",
diff --git a/python/outlines_core/__init__.py b/python/outlines_core/__init__.py
@@ -1,6 +1,8 @@
-"""Outlines is a Generative Model Programming Framework."""
+"""This package provides core functionality for structured generation, formerly implemented in Outlines."""
 from importlib.metadata import PackageNotFoundError, version
 
+from .outlines_core_rs import Guide, Index, Vocabulary
+
 try:
     __version__ = version("outlines_core")
 except PackageNotFoundError:
diff --git a/python/outlines_core/fsm/__init__.py b/python/outlines_core/fsm/__init__.py
diff --git a/python/outlines_core/json_schema.py b/python/outlines_core/json_schema.py
diff --git a/python/outlines_core/outlines_core_rs.pyi b/python/outlines_core/outlines_core_rs.pyi
diff --git a/setup.cfg b/setup.cfg
@@ -4,6 +4,6 @@ select = C,E,F,W
 ignore = E203,E231,E501,E741,W503,W504,C901,E731
 per-file-ignores =
     **/__init__.py:F401,F403
-    tests/fsm/test_json_schema.py: E201
+    tests/test_json_schema.py: E201
 exclude =
     outlines_core/_version.py
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 rust_extensions = [
     RustExtension(
-        "outlines_core.fsm.outlines_core_rs",
+        "outlines_core.outlines_core_rs",
         f"{CURRENT_DIR}/Cargo.toml",
         binding=Binding.PyO3,
         features=["python-bindings"],
diff --git a/src/python_bindings/mod.rs b/src/python_bindings/mod.rs
@@ -21,7 +21,7 @@ macro_rules! type_name {
     };
 }
 
-#[pyclass(name = "Guide", module = "outlines_core.fsm.outlines_core_rs")]
+#[pyclass(name = "Guide", module = "outlines_core.outlines_core_rs")]
 #[derive(Clone, Debug, PartialEq, Encode, Decode)]
 pub struct PyGuide {
     state: StateId,
@@ -90,8 +90,8 @@ impl PyGuide {
 
     fn __reduce__(&self) -> PyResult<(PyObject, (Vec<u8>,))> {
         Python::with_gil(|py| {
-            let cls = PyModule::import_bound(py, "outlines_core.fsm.outlines_core_rs")?
-                .getattr("Guide")?;
+            let cls =
+                PyModule::import_bound(py, "outlines_core.outlines_core_rs")?.getattr("Guide")?;
             let binary_data: Vec<u8> =
                 bincode::encode_to_vec(self, config::standard()).map_err(|e| {
                     PyErr::new::<PyValueError, _>(format!("Serialization of Guide failed: {}", e))
@@ -110,7 +110,7 @@ impl PyGuide {
     }
 }
 
-#[pyclass(name = "Index", module = "outlines_core.fsm.outlines_core_rs")]
+#[pyclass(name = "Index", module = "outlines_core.outlines_core_rs")]
 #[derive(Clone, Debug, PartialEq, Encode, Decode)]
 pub struct PyIndex(Arc<Index>);
 
@@ -166,8 +166,8 @@ impl PyIndex {
 
     fn __reduce__(&self) -> PyResult<(PyObject, (Vec<u8>,))> {
         Python::with_gil(|py| {
-            let cls = PyModule::import_bound(py, "outlines_core.fsm.outlines_core_rs")?
-                .getattr("Index")?;
+            let cls =
+                PyModule::import_bound(py, "outlines_core.outlines_core_rs")?.getattr("Index")?;
             let binary_data: Vec<u8> = bincode::encode_to_vec(&self.0, config::standard())
                 .map_err(|e| {
                     PyErr::new::<PyValueError, _>(format!("Serialization of Index failed: {}", e))
@@ -186,7 +186,7 @@ impl PyIndex {
     }
 }
 
-#[pyclass(name = "Vocabulary", module = "outlines_core.fsm.outlines_core_rs")]
+#[pyclass(name = "Vocabulary", module = "outlines_core.outlines_core_rs")]
 #[derive(Clone, Debug, Encode, Decode)]
 pub struct PyVocabulary(Vocabulary);
 
@@ -299,7 +299,7 @@ impl PyVocabulary {
 
     fn __reduce__(&self) -> PyResult<(PyObject, (Vec<u8>,))> {
         Python::with_gil(|py| {
-            let cls = PyModule::import_bound(py, "outlines_core.fsm.outlines_core_rs")?
+            let cls = PyModule::import_bound(py, "outlines_core.outlines_core_rs")?
                 .getattr("Vocabulary")?;
             let binary_data: Vec<u8> =
                 bincode::encode_to_vec(self, config::standard()).map_err(|e| {
diff --git a/tests/test_guide.py b/tests/test_guide.py
@@ -3,7 +3,7 @@
 from typing import Dict, List, Union
 
 import pytest
-from outlines_core.fsm import Guide, Index, Vocabulary
+from outlines_core import Guide, Index, Vocabulary
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/test_index.py b/tests/test_index.py
@@ -4,7 +4,7 @@
 from typing import Dict, List, Union
 
 import pytest
-from outlines_core.fsm import Index, Vocabulary
+from outlines_core import Index, Vocabulary
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/test_json_schema.py b/tests/test_json_schema.py
@@ -2,7 +2,7 @@
 import re
 
 import pytest
-from outlines_core.fsm.json_schema import build_regex_from_schema
+from outlines_core.json_schema import build_regex_from_schema
 from pydantic import BaseModel
 
 
@@ -32,7 +32,7 @@ def test_invalid_json():
 
 
 def test_types_presence_and_not_emptyness():
-    from outlines_core.fsm.json_schema import (
+    from outlines_core.json_schema import (
         BOOLEAN,
         DATE,
         DATE_TIME,
diff --git a/tests/test_statistical.py b/tests/test_statistical.py
@@ -1,7 +1,7 @@
 from typing import Callable, List, Optional
 
 import numpy as np
-from outlines_core.fsm import Guide, Index, Vocabulary
+from outlines_core import Guide, Index, Vocabulary
 from pytest import approx
 from scipy.stats import ks_2samp
 
diff --git a/tests/test_vocabulary.py b/tests/test_vocabulary.py
@@ -2,7 +2,7 @@
 import pickle
 
 import pytest
-from outlines_core.fsm import Vocabulary
+from outlines_core import Vocabulary
 
 
 @pytest.fixture(scope="session")
