From 0bb837ff7c872f597e3e2b4be5d1fa846c376647 Mon Sep 17 00:00:00 2001
From: Jason Liu <jason@jxnl.co>
Date: Fri, 15 Dec 2023 11:23:29 -0500
Subject: [PATCH] move tests

---
 .github/workflows/test.yml |  2 +-
 tests/openai/conftest.py   | 17 -----------------
 tests/openai/util.py       | 22 +++++++---------------
 3 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3f512e1..6a8ecbc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,7 +38,7 @@ jobs:
         run: poetry install --with dev
 
       - name: Run tests
-        run: poetry run pytest tests/ -k "not evals"
+        run: poetry run pytest tests/ -k "not openai"
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 
diff --git a/tests/openai/conftest.py b/tests/openai/conftest.py
index b41f260..6039834 100644
--- a/tests/openai/conftest.py
+++ b/tests/openai/conftest.py
@@ -22,15 +22,6 @@ def client():
                 base_url="https://braintrustproxy.com/v1",
             )
         )
-    elif (
-        os.environ.get("OPENAI_BASE_URL", None)
-        == "https://api.endpoints.anyscale.com/v1"
-    ):
-        yield OpenAI(
-            api_key=os.environ["OPENAI_API_KEY"],
-            base_url="https://api.endpoints.anyscale.com/v1",
-        )
-
     else:
         yield OpenAI()
 
@@ -44,13 +35,5 @@ def aclient():
                 base_url="https://braintrustproxy.com/v1",
             )
         )
-    elif (
-        os.environ.get("OPENAI_BASE_URL", None)
-        == "https://api.endpoints.anyscale.com/v1"
-    ):
-        yield AsyncOpenAI(
-            api_key=os.environ["OPENAI_API_KEY"],
-            base_url="https://api.endpoints.anyscale.com/v1",
-        )
     else:
         yield AsyncOpenAI()
diff --git a/tests/openai/util.py b/tests/openai/util.py
index e6a8e62..4455bac 100644
--- a/tests/openai/util.py
+++ b/tests/openai/util.py
@@ -1,18 +1,10 @@
 import os
 import instructor
 
-if os.getenv("OPENAI_BASE_URL", None) == "https://api.endpoints.anyscale.com/v1":
-    models = ["mistralai/Mistral-7B-Instruct-v0.1"]
-    modes = [instructor.Mode.JSON_SCHEMA]
-else:
-    models = ["gpt-3.5-turbo-1106", "gpt-4", "gpt-4-1106-preview"]
-    modes = [
-        instructor.Mode.FUNCTIONS,
-        instructor.Mode.JSON,
-        instructor.Mode.TOOLS,
-        instructor.Mode.MD_JSON,
-    ]
-
-if __name__ == "__main__":
-    print(models)
-    print(modes)
+models = ["gpt-3.5-turbo-1106", "gpt-4", "gpt-4-1106-preview"]
+modes = [
+    instructor.Mode.FUNCTIONS,
+    instructor.Mode.JSON,
+    instructor.Mode.TOOLS,
+    instructor.Mode.MD_JSON,
+]