client v2.2.1

client/astra_assistants/__init__.py

@@ -1,17 +1,5 @@
-import sys
-
-import openai
-
 from .async_openai_with_default_key import AsyncOpenAIWithDefaultKey
 from .openai_with_default_key import OpenAIWithDefaultKey
 from .patch import patch
 
-OpenAI = OpenAIWithDefaultKey
-openai.OpenAI = OpenAI
-sys.modules['openai'].OpenAI = OpenAI
-
-AsyncOpenAI = AsyncOpenAIWithDefaultKey
-openai.AsyncOpenAI = AsyncOpenAI
-sys.modules['openai'].AsyncOpenAI = AsyncOpenAI
-
-__all__ = ["OpenAI", "AsyncOpenAI", "patch"]
+__all__ = ["OpenAIWithDefaultKey", "AsyncOpenAIWithDefaultKey", "patch"]

client/astra_assistants/async_openai_with_default_key.py

@@ -7,6 +7,8 @@
 
 class AsyncOpenAIWithDefaultKey(AsyncOpenAI):
     def __init__(self, *args, **kwargs):
+        if kwargs.get("api_key") is not None:
+            return super(AsyncOpenAIWithDefaultKey, self).__init__(*args, **kwargs)
         key = os.environ.get("OPENAI_API_KEY", "dummy")
         if key == "dummy":
             logger.debug("OPENAI_API_KEY is unset. Setting it to 'dummy' so openai doesn't kill the "

client/astra_assistants/openai_with_default_key.py

@@ -6,6 +6,8 @@
 
 class OpenAIWithDefaultKey(OpenAI):
     def __init__(self, *args, **kwargs):
+        #if kwargs.get("api_key") is not None:
+        #    return super(OpenAIWithDefaultKey, self).__init__(*args, **kwargs)
         key = os.environ.get("OPENAI_API_KEY", "dummy")
         if key == "dummy":
             logger.debug("OPENAI_API_KEY is unset. Setting it to 'dummy' so openai doesn't kill the "