langroid 0.48.2__py3-none-any.whl → 0.49.0__py3-none-any.whl

langroid/language_models/openai_gpt.py

@@ -227,6 +227,16 @@ class OpenAICallParams(BaseModel):
         return {k: v for k, v in self.dict().items() if v is not None}
 
 
+class LiteLLMProxyConfig(BaseSettings):
+    """Configuration for LiteLLM proxy connection."""
+
+    api_key: str = ""  # read from env var LITELLM_API_KEY if set
+    api_base: str = ""  # read from env var LITELLM_API_BASE if set
+
+    class Config:
+        env_prefix = "LITELLM_"
+
+
 class OpenAIGPTConfig(LLMConfig):
     """
     Class for any LLM with an OpenAI-like API: besides the OpenAI models this includes:
@@ -250,6 +260,7 @@ class OpenAIGPTConfig(LLMConfig):
     organization: str = ""
     api_base: str | None = None  # used for local or other non-OpenAI models
     litellm: bool = False  # use litellm api?
+    litellm_proxy: LiteLLMProxyConfig = LiteLLMProxyConfig()
     ollama: bool = False  # use ollama's OpenAI-compatible endpoint?
     min_output_tokens: int = 1
     use_chat_for_completion = True  # do not change this, for OpenAI models!
@@ -520,6 +531,7 @@ class OpenAIGPT(LanguageModel):
         self.is_glhf = self.config.chat_model.startswith("glhf/")
         self.is_openrouter = self.config.chat_model.startswith("openrouter/")
         self.is_langdb = self.config.chat_model.startswith("langdb/")
+        self.is_litellm_proxy = self.config.chat_model.startswith("litellm-proxy/")
 
         if self.is_groq:
             # use groq-specific client
@@ -546,7 +558,14 @@ class OpenAIGPT(LanguageModel):
             )
         else:
             # in these cases, there's no specific client: OpenAI python client suffices
-            if self.is_gemini:
+            if self.is_litellm_proxy:
+                self.config.chat_model = self.config.chat_model.replace(
+                    "litellm-proxy/", ""
+                )
+                if self.api_key == OPENAI_API_KEY:
+                    self.api_key = self.config.litellm_proxy.api_key or self.api_key
+                self.api_base = self.config.litellm_proxy.api_base or self.api_base
+            elif self.is_gemini:
                 self.config.chat_model = self.config.chat_model.replace("gemini/", "")
                 if self.api_key == OPENAI_API_KEY:
                     self.api_key = os.getenv("GEMINI_API_KEY", DUMMY_API_KEY)

langroid/mytypes.py

@@ -3,7 +3,7 @@ from textwrap import dedent
 from typing import Any, Callable, Dict, List, Union
 from uuid import uuid4
 
-from langroid.pydantic_v1 import BaseModel, Extra, Field, validator
+from langroid.pydantic_v1 import BaseModel, Extra, Field
 
 Number = Union[int, float]
 Embedding = List[Number]
@@ -51,13 +51,6 @@ class DocMetaData(BaseModel):
     id: str = Field(default_factory=lambda: str(uuid4()))
     window_ids: List[str] = []  # for RAG: ids of chunks around this one
 
-    @validator("source", "source_content", "id", "title", "published_date")
-    def ensure_not_empty(cls, v: str) -> str:
-        """Ensure required string fields are not empty."""
-        if not v:
-            raise ValueError("Field cannot be empty")
-        return v
-
     def dict_bool_int(self, *args: Any, **kwargs: Any) -> Dict[str, Any]:
         """
         Special dict method to convert bool fields to int, to appease some

{langroid-0.48.2.dist-info → langroid-0.49.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.48.2
+Version: 0.49.0
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT

{langroid-0.48.2.dist-info → langroid-0.49.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 langroid/__init__.py,sha256=z_fCOLQJPOw3LLRPBlFB5-2HyCjpPgQa4m4iY5Fvb8Y,1800
 langroid/exceptions.py,sha256=OPjece_8cwg94DLPcOGA1ddzy5bGh65pxzcHMnssTz8,2995
-langroid/mytypes.py,sha256=yzsPpDQqfndMP8ZX9zuQY_oLuUTkW2VJ_iLPARmKoLE,3268
+langroid/mytypes.py,sha256=1mt21xiczAu1WgfZIptBKN9WpqYgpVeo8cAXvs6drKA,2986
 langroid/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/__init__.py,sha256=ll0Cubd2DZ-fsCMl7e10hf9ZjFGKzphfBco396IKITY,786
 langroid/agent/base.py,sha256=U-UjdpxIFqkzRIB5-LYwHrhMSNI3sDbfnNRqIhrtsyI,79568
@@ -72,7 +72,7 @@ langroid/language_models/base.py,sha256=mDYmFCBCLdq8_Uvws4MiewwEgcOCP8Qb0e5yUXr3
 langroid/language_models/config.py,sha256=9Q8wk5a7RQr8LGMT_0WkpjY8S4ywK06SalVRjXlfCiI,378
 langroid/language_models/mock_lm.py,sha256=5BgHKDVRWFbUwDT_PFgTZXz9-k8wJSA2e3PZmyDgQ1k,4022
 langroid/language_models/model_info.py,sha256=tfBBxL0iUf2mVN6CjcvqflzFUVg2oZqOJZexZ8jHTYA,12216
-langroid/language_models/openai_gpt.py,sha256=JJXLw7iuQFbW0CkcKiYjX4agRllRhDaGT9Q8OCdEK-8,79559
+langroid/language_models/openai_gpt.py,sha256=Vcs2g2N3dT6Oc8WfbIXckuzmYWUCrN8TPYw0yyyTWNM,80378
 langroid/language_models/utils.py,sha256=L4_CbihDMTGcsg0TOG1Yd5JFEto46--h7CX_14m89sQ,5016
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
@@ -127,7 +127,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=O6dSBoDZ0jzfeVBd7LLvsXu083xs2fxXtPa9gGX3JX4,18443
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.48.2.dist-info/METADATA,sha256=kCjeNq2-TNlc0DM8DRitNPJsHUhubpKGNJ2q-Mp6rY4,63606
-langroid-0.48.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.48.2.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.48.2.dist-info/RECORD,,
+langroid-0.49.0.dist-info/METADATA,sha256=hheI5QVNzEyGlA-p2gJVGsgOuN1jP8piUAxXnv05CTg,63606
+langroid-0.49.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.49.0.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.49.0.dist-info/RECORD,,