langroid 0.1.206__tar.gz → 0.1.207__tar.gz

{langroid-0.1.206 → langroid-0.1.207}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.206
+Version: 0.1.207
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani

{langroid-0.1.206 → langroid-0.1.207}/langroid/language_models/openai_gpt.py

@@ -60,6 +60,7 @@ else:
     OLLAMA_BASE_URL = "http://localhost:11434/v1"
 
 OLLAMA_API_KEY = "ollama"
+DUMMY_API_KEY = "xxx"
 
 
 class OpenAIChatModel(str, Enum):
@@ -210,7 +211,7 @@ class OpenAIGPTConfig(LLMConfig):
     """
 
     type: str = "openai"
-    api_key: str = ""  # CAUTION: set this ONLY via env var OPENAI_API_KEY
+    api_key: str = DUMMY_API_KEY  # CAUTION: set this ONLY via env var OPENAI_API_KEY
     organization: str = ""
     api_base: str | None = None  # used for local or other non-OpenAI models
     litellm: bool = False  # use litellm api?
@@ -441,7 +442,12 @@ class OpenAIGPT(LanguageModel):
         # Pydantic's BaseSettings will automatically pick it up from the
         # .env file
         # The config.api_key is ignored when not using an OpenAI model
-        self.api_key = config.api_key if self.is_openai_chat_model() else "xxx"
+        if self.is_openai_completion_model() or self.is_openai_chat_model():
+            self.api_key = config.api_key
+            if self.api_key == DUMMY_API_KEY:
+                self.api_key = os.getenv("OPENAI_API_KEY", DUMMY_API_KEY)
+        else:
+            self.api_key = DUMMY_API_KEY
         self.client = OpenAI(
             api_key=self.api_key,
             base_url=self.api_base,

{langroid-0.1.206 → langroid-0.1.207}/langroid/language_models/utils.py

@@ -25,6 +25,7 @@ def retry_with_exponential_backoff(
         requests.exceptions.RequestException,
         openai.APITimeoutError,
         openai.RateLimitError,
+        openai.AuthenticationError,
         openai.APIError,
         aiohttp.ServerTimeoutError,
         asyncio.TimeoutError,
@@ -47,6 +48,10 @@ def retry_with_exponential_backoff(
                 # e.g. when context is too long
                 logger.error(f"OpenAI API request failed with error: {e}.")
                 raise e
+            except openai.AuthenticationError as e:
+                # do not retry when there's an auth error
+                logger.error(f"OpenAI API request failed with error: {e}.")
+                raise e
 
             # Retry on specified errors
             except errors as e:
@@ -85,6 +90,7 @@ def async_retry_with_exponential_backoff(
     errors: tuple = (  # type: ignore
         openai.APITimeoutError,
         openai.RateLimitError,
+        openai.AuthenticationError,
         openai.APIError,
         aiohttp.ServerTimeoutError,
         asyncio.TimeoutError,
@@ -108,7 +114,10 @@ def async_retry_with_exponential_backoff(
                 # e.g. when context is too long
                 logger.error(f"OpenAI API request failed with error: {e}.")
                 raise e
-
+            except openai.AuthenticationError as e:
+                # do not retry when there's an auth error
+                logger.error(f"OpenAI API request failed with error: {e}.")
+                raise e
             # Retry on specified errors
             except errors as e:
                 # Increment retries

{langroid-0.1.206 → langroid-0.1.207}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langroid"
-version = "0.1.206"
+version = "0.1.207"
 description = "Harness LLMs with Multi-Agent Programming"
 authors = ["Prasad Chalasani <pchalasani@gmail.com>"]
 readme = "README.md"