langroid 0.1.205__py3-none-any.whl → 0.1.207__py3-none-any.whl

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/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.205.dist-info → langroid-0.1.207.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langroid
-Version: 0.1.205
+Version: 0.1.207
 Summary: Harness LLMs with Multi-Agent Programming
 License: MIT
 Author: Prasad Chalasani
@@ -42,7 +42,7 @@ Requires-Dist: halo (>=0.0.31,<0.0.32)
 Requires-Dist: huggingface-hub (>=0.21.2,<0.22.0) ; extra == "transformers"
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: lancedb (>=0.6.2,<0.7.0)
-Requires-Dist: litellm (>=1.29.5,<2.0.0) ; extra == "litellm"
+Requires-Dist: litellm (>=1.30.1,<2.0.0) ; extra == "litellm"
 Requires-Dist: lxml (>=4.9.3,<5.0.0)
 Requires-Dist: meilisearch (>=0.28.3,<0.29.0)
 Requires-Dist: meilisearch-python-sdk (>=2.2.3,<3.0.0)
@@ -67,6 +67,7 @@ Requires-Dist: pdfplumber (>=0.10.2,<0.11.0)
 Requires-Dist: pre-commit (>=3.3.2,<4.0.0)
 Requires-Dist: prettytable (>=3.8.0,<4.0.0)
 Requires-Dist: psycopg2 (>=2.9.7,<3.0.0) ; extra == "postgres"
+Requires-Dist: pyarrow (==15.0.0)
 Requires-Dist: pydantic (==1.10.13)
 Requires-Dist: pygithub (>=1.58.1,<2.0.0)
 Requires-Dist: pygments (>=2.15.1,<3.0.0)

{langroid-0.1.205.dist-info → langroid-0.1.207.dist-info}/RECORD

@@ -58,12 +58,12 @@ langroid/language_models/azure_openai.py,sha256=ncRCbKooqLVOY-PWQUIo9C3yTuKEFbAw
 langroid/language_models/base.py,sha256=oZskZ9oT-_4kEk1M2515jQ4VOpf31M8NFvPr5knDTEU,21008
 langroid/language_models/config.py,sha256=5UF3DzO1a-Dfsc3vghE0XGq7g9t_xDsRCsuRiU4dgBg,366
 langroid/language_models/openai_assistants.py,sha256=9K-DEAL2aSWHeXj2hwCo2RAlK9_1oCPtqX2u1wISCj8,36
-langroid/language_models/openai_gpt.py,sha256=YC5mzFLDXpOFmnEefoazpZ2XrZMPIw75QxqamETF8ck,49433
+langroid/language_models/openai_gpt.py,sha256=6CE6I_hmnHfRIMJMh4qhVeKijgKEm_LNcWNn3vLMLlM,49680
 langroid/language_models/prompt_formatter/__init__.py,sha256=9JXFF22QNMmbQV1q4nrIeQVTtA3Tx8tEZABLtLBdFyc,352
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
 langroid/language_models/prompt_formatter/hf_formatter.py,sha256=QhVj5DcJYqveLC6nE3DKjsiJ8jY-J__8--NNp-2h8vI,5216
 langroid/language_models/prompt_formatter/llama2_formatter.py,sha256=YdcO88qyBeuMENVIVvVqSYuEpvYSTndUe_jd6hVTko4,2899
-langroid/language_models/utils.py,sha256=J1Y1HoYPkwS7L-kuLRAGzjcseqAj_S8u_MaaqlOA9uk,4265
+langroid/language_models/utils.py,sha256=ivbmAUpDewWb-j9HNhnpmFeQbELQaGYRNul4wiP9p3c,4756
 langroid/mytypes.py,sha256=opL488mtHKob1uJeK_h1-kNjU5GZwkgCfXhBQCsONWU,2614
 langroid/parsing/__init__.py,sha256=bo1sjirQCFK-1voHTr__w6PAosiCmBc1MAJ8hkst_S8,597
 langroid/parsing/agent_chats.py,sha256=sbZRV9ujdM5QXvvuHVjIi2ysYSYlap-uqfMMUKulrW0,1068
@@ -115,7 +115,7 @@ langroid/vector_store/meilisearch.py,sha256=d2huA9P-NoYRuAQ9ZeXJmMKr7ry8u90RUSR2
 langroid/vector_store/momento.py,sha256=j6Eo6oIDN2fe7lsBOlCXJn3uvvERHHTFL5QJfeREeOM,10044
 langroid/vector_store/qdrant_cloud.py,sha256=3im4Mip0QXLkR6wiqVsjV1QvhSElfxdFSuDKddBDQ-4,188
 langroid/vector_store/qdrantdb.py,sha256=_egbsP9SWBwmI827EDYSSOqfIQSmwNsmJfFTxrLpWYE,13457
-langroid-0.1.205.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.1.205.dist-info/METADATA,sha256=yn62BcieoKi0Z3E-GQu3JhdtavjaXAZ6K3itnPgOcV4,46205
-langroid-0.1.205.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-langroid-0.1.205.dist-info/RECORD,,
+langroid-0.1.207.dist-info/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.1.207.dist-info/METADATA,sha256=gmjzlymopU2UOrbF294gOjxaDDmz9gXH4vvG1-ac6Ao,46239
+langroid-0.1.207.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+langroid-0.1.207.dist-info/RECORD,,