update llm

jxnl · Mar 29, 2024 · d4a3fdb · d4a3fdb
1 parent de8746c
commit d4a3fdb
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,21 +33,23 @@ jobs:
         uses: snok/install-poetry@v1.3.1
 
       - name: Install dependencies
-        run: poetry install --with dev anthropic
+        run: poetry install --with dev,anthropic
 
       - name: Run tests
-        run: poetry run pytest tests/ -k "not openai"
+        run: poetry run pytest tests/ -k "not llm"
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
 
       - name: Generate coverage report
         if: matrix.python-version == '3.11'
         run: |
-          poetry run coverage run -m pytest tests/ -k "not openai"
+          poetry run coverage run -m pytest tests/ -k "not llm"
           poetry run coverage report
           poetry run coverage html
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
 
       - name: Coveralls GitHub Action
         if: matrix.python-version == '3.11'

diff --git a/tests/openai/__init__.py → tests/llm/test_anthropic/__init__.py b/tests/openai/__init__.py → tests/llm/test_anthropic/__init__.py
diff --git a/tests/anthropic/test_simple.py → tests/llm/test_anthropic/test_simple.py b/tests/anthropic/test_simple.py → tests/llm/test_anthropic/test_simple.py
diff --git a/tests/llm/test_openai/__init__.py b/tests/llm/test_openai/__init__.py
diff --git a/tests/openai/conftest.py → tests/llm/test_openai/conftest.py b/tests/openai/conftest.py → tests/llm/test_openai/conftest.py
diff --git a/tests/openai/docs/test_docs.py → tests/llm/test_openai/docs/test_docs.py b/tests/openai/docs/test_docs.py → tests/llm/test_openai/docs/test_docs.py
diff --git a/tests/openai/docs/test_hub.py → tests/llm/test_openai/docs/test_hub.py b/tests/openai/docs/test_hub.py → tests/llm/test_openai/docs/test_hub.py
diff --git a/tests/openai/docs/test_mkdocs.py → tests/llm/test_openai/docs/test_mkdocs.py b/tests/openai/docs/test_mkdocs.py → tests/llm/test_openai/docs/test_mkdocs.py
diff --git a/tests/llm/test_openai/evals/__init__.py b/tests/llm/test_openai/evals/__init__.py
diff --git a/tests/openai/evals/readme.md → tests/llm/test_openai/evals/readme.md b/tests/openai/evals/readme.md → tests/llm/test_openai/evals/readme.md
diff --git a/...openai/evals/test_classification_enums.py → ...openai/evals/test_classification_enums.py b/...openai/evals/test_classification_enums.py → ...openai/evals/test_classification_enums.py
@@ -8,7 +8,7 @@
 from pydantic import BaseModel
 
 from instructor.function_calls import Mode
-from tests.openai.util import models, modes
+from ..util import models, modes
 
 
 class Labels(str, enum.Enum):

diff --git a/...nai/evals/test_classification_literals.py → ...nai/evals/test_classification_literals.py b/...nai/evals/test_classification_literals.py → ...nai/evals/test_classification_literals.py
@@ -7,7 +7,7 @@
 from pydantic import BaseModel
 
 from instructor.function_calls import Mode
-from tests.openai.util import models, modes
+from ..util import models, modes
 
 
 class SinglePrediction(BaseModel):

diff --git a/tests/openai/evals/test_entities.py → tests/llm/test_openai/evals/test_entities.py b/tests/openai/evals/test_entities.py → tests/llm/test_openai/evals/test_entities.py
@@ -6,7 +6,7 @@
 import instructor
 
 from instructor.function_calls import Mode
-from tests.openai.util import models, modes
+from ..util import models, modes
 
 
 class Property(BaseModel):

diff --git a/tests/openai/evals/test_extract_users.py → ...m/test_openai/evals/test_extract_users.py b/tests/openai/evals/test_extract_users.py → ...m/test_openai/evals/test_extract_users.py
@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 import instructor
 from instructor.function_calls import Mode
-from tests.openai.util import models, modes
+from ..util import models, modes
 
 
 class UserDetails(BaseModel):

diff --git a/tests/openai/test_modes.py → tests/llm/test_openai/test_modes.py b/tests/openai/test_modes.py → tests/llm/test_openai/test_modes.py
@@ -5,7 +5,7 @@
 import pytest
 
 import instructor
-from tests.openai.util import models, modes
+from .util import models, modes
 
 
 class Item(BaseModel):

diff --git a/tests/openai/test_multitask.py → tests/llm/test_openai/test_multitask.py b/tests/openai/test_multitask.py → tests/llm/test_openai/test_multitask.py
@@ -4,7 +4,7 @@
 import pytest
 
 import instructor
-from tests.openai.util import models, modes
+from .util import models, modes
 
 
 class User(BaseModel):

diff --git a/tests/openai/test_parallel.py → tests/llm/test_openai/test_parallel.py b/tests/openai/test_parallel.py → tests/llm/test_openai/test_parallel.py
diff --git a/tests/openai/test_patch.py → tests/llm/test_openai/test_patch.py b/tests/openai/test_patch.py → tests/llm/test_openai/test_patch.py
@@ -4,7 +4,7 @@
 import pytest
 import instructor
 
-from tests.openai.util import models, modes
+from .util import models, modes
 
 
 class UserExtract(BaseModel):

diff --git a/tests/openai/test_retries.py → tests/llm/test_openai/test_retries.py b/tests/openai/test_retries.py → tests/llm/test_openai/test_retries.py
@@ -3,7 +3,7 @@
 import pytest
 import instructor
 from itertools import product
-from tests.openai.util import models, modes
+from .util import models, modes
 
 
 def uppercase_validator(v):

diff --git a/tests/openai/test_simple_types.py → tests/llm/test_openai/test_simple_types.py b/tests/openai/test_simple_types.py → tests/llm/test_openai/test_simple_types.py
diff --git a/tests/openai/test_stream.py → tests/llm/test_openai/test_stream.py b/tests/openai/test_stream.py → tests/llm/test_openai/test_stream.py
@@ -5,7 +5,7 @@
 import instructor
 from instructor.dsl.partial import Partial
 
-from tests.openai.util import models, modes
+from .util import models, modes
 
 
 class UserExtract(BaseModel):

diff --git a/tests/openai/test_validators.py → tests/llm/test_openai/test_validators.py b/tests/openai/test_validators.py → tests/llm/test_openai/test_validators.py
@@ -7,7 +7,7 @@
 from pydantic import BaseModel, AfterValidator, BeforeValidator, ValidationError
 
 from instructor.dsl.validators import llm_validator
-from tests.openai.util import models, modes
+from .util import models, modes
 
 
 def test_patch_completes_successfully(client):

diff --git a/tests/openai/util.py → tests/llm/test_openai/util.py b/tests/openai/util.py → tests/llm/test_openai/util.py