Add support to outlines 1.x (#66)

Author: EdAbati

.github/workflows/test.yml

@@ -13,11 +13,10 @@ concurrency:
 env:
   PYTHONUNBUFFERED: "1"
   FORCE_COLOR: "1"
-  UV_SYSTEM_PYTHON: "true"
 
 jobs:
-  run:
-    name: Python ${{ matrix.python-version }} on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
+  unit-tests:
+    name: Test with Python ${{ matrix.python-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -42,10 +41,43 @@ jobs:
         with:
           version: "latest"
 
-      # - name: Run mypy types checking
-      #   run: uv run --python "${{ matrix.python-version }}" task typing
-      #   shell: bash
+      - name: Install dependencies
+        run: |
+          uv sync --group core --group testing --python ${{ matrix.python-version }}
 
       - name: Run unit tests
-        run: uv run --python "${{ matrix.python-version }}" poe test-cov
+        run: uv run coverage run -m pytest
+        shell: bash
+
+  min-haystack-version:
+    name: Test Min Haystack ${{ matrix.min-haystack-version }} - Python ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: ["3.12"]
+        min-haystack-version: ["2.15.0"]
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "latest"
+
+      - name: Install with minimum Haystack version
+        run: |
+          uv sync --group core --group testing --python ${{ matrix.python-version }}
+          uv add "haystack-ai==${{ matrix.min-haystack-version }}"
+        shell: bash
+
+      - name: Run unit tests with minimum Haystack version
+        run: uv run pytest
         shell: bash

.gitignore

@@ -157,7 +157,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 # VSCode
 .vscode/

README.md

@@ -54,7 +54,6 @@ This library currently supports the following generators:
 ### JSON Generation
 
 ```python
->>> from enum import Enum
 >>> from pydantic import BaseModel
 >>> from outlines_haystack.generators.transformers import TransformersJSONGenerator
 
@@ -66,11 +65,10 @@ This library currently supports the following generators:
 ...     model_name="microsoft/Phi-3-mini-4k-instruct",
 ...     schema_object=User,
 ...     device="cuda",
-...     sampling_algorithm_kwargs={"temperature": 0.5},
 ... )
 >>> generator.warm_up()
 >>> generator.run(prompt="Create a user profile with the fields name, last_name")
-{'structured_replies': [{'name': 'John', 'last_name': 'Doe'}]}
+{'structured_replies': ['{"name": "John", "last_name": "Doe"}']}
 ```
 
 ### Choice Generation
@@ -82,7 +80,6 @@ This library currently supports the following generators:
 ...     model_name="microsoft/Phi-3-mini-4k-instruct",
 ...     choices=["Positive", "Negative"],
 ...     device="cuda",
-...     sampling_algorithm_kwargs={"temperature": 0.5},
 ... )
 >>> generator.warm_up()
 >>> generator.run(prompt="Classify the following statement: 'I love pizza'")
@@ -101,11 +98,10 @@ This library currently supports the following generators:
 >>> generator = TransformersTextGenerator(
 ...     model_name="microsoft/Phi-3-mini-4k-instruct",
 ...     device="cuda",
-...     sampling_algorithm_kwargs={"temperature": 0.5},
 ... )
 >>> generator.warm_up()
 >>> generator.run(prompt="What is the capital of Italy?")
-{'replies': ['\n\n# Answer\nThe capital of Italy is Rome.']}
+{'replies': ['The capital of Italy is Rome.']}
 ```
 
 ## License