Migrate to UV

.github/workflows/pyright.yml

@@ -21,29 +21,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-poetry-
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1.3.1
-
-      - name: Install dependencies
-        run: poetry install --with dev,anthropic
-
-      - name: Add poetry to PATH
-        run: echo "$(poetry env info --path)/bin" >> $GITHUB_PATH
-
-      - uses: jakebailey/pyright-action@v2
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
         with:
-          version: 1.1.373
+          enable-cache: true
+      - name: Set up Python
+        run: uv python install ${{ matrix.python-version }}
+      - name: Install the project
+        run: uv sync --all-extras
+      - name: Run pyright
+        run: uv run pyright

.github/workflows/python-publish.yml

@@ -21,21 +21,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
         with:
-          python-version: '3.10' 
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1.3.1
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+          enable-cache: true
+      - name: Set up Python
+        run: uv python install 3.10
+      - name: Install the project
+        run: uv sync --all-extras
 
       - name: Get release version
         run: echo "RELEASE_VERSION=$(poetry version | awk '{print $2}')" >> $GITHUB_ENV
 
       - name: Build and publish Python package
-        run: poetry publish --build
+        run: uv publish
         env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}

.github/workflows/ruff.yml

@@ -20,16 +20,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Environment setup
-        uses: actions/setup-python@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
         with:
-          python-version: 3.9
-          cache: "pip"
-      - name: Install dev dependencies
-        run: |
-          python3 -m pip install --upgrade pip setuptools wheel
-          python3 -m pip install -r requirements.txt
-          python3 -m pip install -r requirements-doc.txt
+          enable-cache: true
+      - name: Set up Python
+        run: uv python install 3.9
+      - name: Install the project
+        run: uv sync --all-extras
       - name: Run Continuous Integration Action
         uses: astral-sh/ruff-action@v1
       - name: Upload Artifacts

.github/workflows/test.yml

@@ -15,45 +15,34 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
         with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-poetry-
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1.3.1
-
-      - name: Install dependencies
-        run: poetry install --with dev,anthropic
-
+          enable-cache: true
+      - name: Set up Python
+        run: uv python install ${{ matrix.python-version }}
+      - name: Install the project
+        run: uv sync --all-extras
       - name: Run tests
         if: matrix.python-version != '3.11'
-        run: poetry run pytest tests/ -k 'not llm and not openai and not gemini and not anthropic and not cohere and not vertexai' && poetry run pytest tests/llm/test_cohere
+        run: uv run pytest tests/ -k 'not llm and not openai and not gemini and not anthropic and not cohere and not vertexai'
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
 
       - name: Run Gemini Tests
-        run: poetry run pytest tests/llm/test_gemini
+        if: matrix.python-version == '3.11'
+        run: uv run pytest tests/llm/test_gemini
         env:
           GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
 
       - name: Generate coverage report
         if: matrix.python-version == '3.11'
         run: |
-          poetry run coverage run -m pytest tests/ -k "not docs and not anthropic and not gemini and not cohere and not vertexai and not fireworks"
-          poetry run coverage report
-          poetry run coverage html
+          uv run coverage run -m pytest tests/ -k "not docs and not anthropic and not gemini and not cohere and not vertexai and not fireworks"
+          uv run coverage report
+          uv run coverage html
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}

.github/workflows/test_docs.yml

@@ -28,18 +28,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: "poetry"
-
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-poetry-
-
-      - name: Install dependencies
-        run: poetry install --with dev,docs,test-docs,anthropic,google-generativeai
-
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+      - name: Install the project
+        run: uv sync --all-extras
       - name: Run tests
         run: poetry run pytest tests/llm/test_openai/docs
         env:

instructor/client.py

@@ -373,7 +373,7 @@ def __init__(
         self.provider = provider
         self.hooks = hooks or Hooks()
 
-    async def create(
+    async def create(  # type: ignore[override]
         self,
         response_model: type[T] | None,
         messages: list[ChatCompletionMessageParam],
@@ -395,7 +395,7 @@ async def create(
             **kwargs,
         )
 
-    async def create_partial(
+    async def create_partial(  # type: ignore[override]
         self,
         response_model: type[T],
         messages: list[ChatCompletionMessageParam],
@@ -419,7 +419,7 @@ async def create_partial(
         ):
             yield item
 
-    async def create_iterable(
+    async def create_iterable(  # type: ignore[override]
         self,
         messages: list[ChatCompletionMessageParam],
         response_model: type[T],
@@ -443,7 +443,7 @@ async def create_iterable(
         ):
             yield item
 
-    async def create_with_completion(
+    async def create_with_completion(  # type: ignore[override]
         self,
         messages: list[ChatCompletionMessageParam],
         response_model: type[T],

instructor/client_mistral.py

@@ -11,19 +11,18 @@
 def from_mistral(
     client: Mistral,
     mode: instructor.Mode = instructor.Mode.MISTRAL_TOOLS,
-    use_async: Literal[False] = False,
+    use_async: Literal[True] = True,
     **kwargs: Any,
-) -> instructor.Instructor: ...
+) -> instructor.AsyncInstructor: ...
 
 
 @overload
 def from_mistral(
     client: Mistral,
     mode: instructor.Mode = instructor.Mode.MISTRAL_TOOLS,
-    use_async: Literal[True] = True,
+    use_async: Literal[False] = False,
     **kwargs: Any,
-) -> instructor.AsyncInstructor: ...
-
+) -> instructor.Instructor: ...
 
 def from_mistral(
     client: Mistral,
@@ -35,6 +34,8 @@ def from_mistral(
         instructor.Mode.MISTRAL_TOOLS,
     }, "Mode be one of {instructor.Mode.MISTRAL_TOOLS}"
 
+
+
     assert isinstance(
         client, Mistral
     ), "Client must be an instance of mistralai.Mistral"

instructor/distil.py

@@ -203,7 +203,7 @@ def _distil(*args: P.args, **kwargs: P.kwargs) -> T_Retval:
             return _dispatch if mode == "dispatch" else _distil
 
         if len(args) == 1 and callable(args[0]):
-            return _wrap_distil(args[0])
+            return _wrap_distil(args[0]) # type: ignore
 
         return _wrap_distil