langroid 0.58.1__py3-none-any.whl → 0.58.3__py3-none-any.whl

langroid/language_models/client_cache.py

@@ -49,6 +49,8 @@ def get_openai_client(
     organization: Optional[str] = None,
     timeout: Union[float, Timeout] = 120.0,
     default_headers: Optional[Dict[str, str]] = None,
+    http_client: Optional[Any] = None,
+    http_client_config: Optional[Dict[str, Any]] = None,
 ) -> OpenAI:
     """
     Get or create a singleton OpenAI client with the given configuration.
@@ -59,6 +61,8 @@ def get_openai_client(
         organization: Optional organization ID
         timeout: Request timeout
         default_headers: Optional default headers
+        http_client: Optional httpx.Client instance
+        http_client_config: Optional config dict for creating httpx.Client
 
     Returns:
         OpenAI client instance
@@ -66,6 +70,32 @@ def get_openai_client(
     if isinstance(timeout, (int, float)):
         timeout = Timeout(timeout)
 
+    # If http_client is provided directly, don't cache (complex object)
+    if http_client is not None:
+        client = OpenAI(
+            api_key=api_key,
+            base_url=base_url,
+            organization=organization,
+            timeout=timeout,
+            default_headers=default_headers,
+            http_client=http_client,
+        )
+        _all_clients.add(client)
+        return client
+
+    # If http_client_config is provided, create client from config and cache
+    created_http_client = None
+    if http_client_config is not None:
+        try:
+            from httpx import Client
+
+            created_http_client = Client(**http_client_config)
+        except ImportError:
+            raise ValueError(
+                "httpx is required to use http_client_config. "
+                "Install it with: pip install httpx"
+            )
+
     cache_key = _get_cache_key(
         "openai",
         api_key=api_key,
@@ -73,6 +103,7 @@ def get_openai_client(
         organization=organization,
         timeout=timeout,
         default_headers=default_headers,
+        http_client_config=http_client_config,  # Include config in cache key
     )
 
     if cache_key in _client_cache:
@@ -84,6 +115,7 @@ def get_openai_client(
         organization=organization,
         timeout=timeout,
         default_headers=default_headers,
+        http_client=created_http_client,  # Use the client created from config
     )
 
     _client_cache[cache_key] = client
@@ -97,6 +129,8 @@ def get_async_openai_client(
     organization: Optional[str] = None,
     timeout: Union[float, Timeout] = 120.0,
     default_headers: Optional[Dict[str, str]] = None,
+    http_client: Optional[Any] = None,
+    http_client_config: Optional[Dict[str, Any]] = None,
 ) -> AsyncOpenAI:
     """
     Get or create a singleton AsyncOpenAI client with the given configuration.
@@ -107,6 +141,8 @@ def get_async_openai_client(
         organization: Optional organization ID
         timeout: Request timeout
         default_headers: Optional default headers
+        http_client: Optional httpx.AsyncClient instance
+        http_client_config: Optional config dict for creating httpx.AsyncClient
 
     Returns:
         AsyncOpenAI client instance
@@ -114,6 +150,32 @@ def get_async_openai_client(
     if isinstance(timeout, (int, float)):
         timeout = Timeout(timeout)
 
+    # If http_client is provided directly, don't cache (complex object)
+    if http_client is not None:
+        client = AsyncOpenAI(
+            api_key=api_key,
+            base_url=base_url,
+            organization=organization,
+            timeout=timeout,
+            default_headers=default_headers,
+            http_client=http_client,
+        )
+        _all_clients.add(client)
+        return client
+
+    # If http_client_config is provided, create async client from config and cache
+    created_http_client = None
+    if http_client_config is not None:
+        try:
+            from httpx import AsyncClient
+
+            created_http_client = AsyncClient(**http_client_config)
+        except ImportError:
+            raise ValueError(
+                "httpx is required to use http_client_config. "
+                "Install it with: pip install httpx"
+            )
+
     cache_key = _get_cache_key(
         "async_openai",
         api_key=api_key,
@@ -121,6 +183,7 @@ def get_async_openai_client(
         organization=organization,
         timeout=timeout,
         default_headers=default_headers,
+        http_client_config=http_client_config,  # Include config in cache key
     )
 
     if cache_key in _client_cache:
@@ -132,6 +195,7 @@ def get_async_openai_client(
         organization=organization,
         timeout=timeout,
         default_headers=default_headers,
+        http_client=created_http_client,  # Use the client created from config
     )
 
     _client_cache[cache_key] = client

langroid/language_models/openai_gpt.py

@@ -287,6 +287,9 @@ class OpenAIGPTConfig(LLMConfig):
     langdb_params: LangDBParams = LangDBParams()
     portkey_params: PortkeyParams = PortkeyParams()
     headers: Dict[str, str] = {}
+    http_client_factory: Optional[Callable[[], Any]] = None  # Factory for httpx.Client
+    http_verify_ssl: bool = True  # Simple flag for SSL verification
+    http_client_config: Optional[Dict[str, Any]] = None  # Config dict for httpx.Client
 
     def __init__(self, **kwargs) -> None:  # type: ignore
         local_model = "api_base" in kwargs and kwargs["api_base"] is not None
@@ -631,6 +634,32 @@ class OpenAIGPT(LanguageModel):
                 # Add Portkey-specific headers
                 self.config.headers.update(self.config.portkey_params.get_headers())
 
+            # Create http_client if needed - Priority order:
+            # 1. http_client_factory (most flexibility, not cacheable)
+            # 2. http_client_config (cacheable, moderate flexibility)
+            # 3. http_verify_ssl=False (cacheable, simple SSL bypass)
+            http_client = None
+            async_http_client = None
+            http_client_config_used = None
+
+            if self.config.http_client_factory is not None:
+                # Use the factory to create http_client (not cacheable)
+                http_client = self.config.http_client_factory()
+                # Don't set async_http_client from sync client - create separately
+                # This avoids type mismatch issues
+                async_http_client = None
+            elif self.config.http_client_config is not None:
+                # Use config dict (cacheable)
+                http_client_config_used = self.config.http_client_config
+            elif not self.config.http_verify_ssl:
+                # Simple SSL bypass (cacheable)
+                http_client_config_used = {"verify": False}
+                logging.warning(
+                    "SSL verification has been disabled. This is insecure and "
+                    "should only be used in trusted environments (e.g., "
+                    "corporate networks with self-signed certificates)."
+                )
+
             if self.config.use_cached_client:
                 self.client = get_openai_client(
                     api_key=self.api_key,
@@ -638,6 +667,8 @@ class OpenAIGPT(LanguageModel):
                     organization=self.config.organization,
                     timeout=Timeout(self.config.timeout),
                     default_headers=self.config.headers,
+                    http_client=http_client,
+                    http_client_config=http_client_config_used,
                 )
                 self.async_client = get_async_openai_client(
                     api_key=self.api_key,
@@ -645,23 +676,56 @@ class OpenAIGPT(LanguageModel):
                     organization=self.config.organization,
                     timeout=Timeout(self.config.timeout),
                     default_headers=self.config.headers,
+                    http_client=async_http_client,
+                    http_client_config=http_client_config_used,
                 )
             else:
                 # Create new clients without caching
-                self.client = OpenAI(
+                client_kwargs: Dict[str, Any] = dict(
                     api_key=self.api_key,
                     base_url=self.api_base,
                     organization=self.config.organization,
                     timeout=Timeout(self.config.timeout),
                     default_headers=self.config.headers,
                 )
-                self.async_client = AsyncOpenAI(
+                if http_client is not None:
+                    client_kwargs["http_client"] = http_client
+                elif http_client_config_used is not None:
+                    # Create http_client from config for non-cached scenario
+                    try:
+                        from httpx import Client
+
+                        client_kwargs["http_client"] = Client(**http_client_config_used)
+                    except ImportError:
+                        raise ValueError(
+                            "httpx is required to use http_client_config. "
+                            "Install it with: pip install httpx"
+                        )
+                self.client = OpenAI(**client_kwargs)
+
+                async_client_kwargs: Dict[str, Any] = dict(
                     api_key=self.api_key,
                     base_url=self.api_base,
                     organization=self.config.organization,
                     timeout=Timeout(self.config.timeout),
                     default_headers=self.config.headers,
                 )
+                if async_http_client is not None:
+                    async_client_kwargs["http_client"] = async_http_client
+                elif http_client_config_used is not None:
+                    # Create async http_client from config for non-cached scenario
+                    try:
+                        from httpx import AsyncClient
+
+                        async_client_kwargs["http_client"] = AsyncClient(
+                            **http_client_config_used
+                        )
+                    except ImportError:
+                        raise ValueError(
+                            "httpx is required to use http_client_config. "
+                            "Install it with: pip install httpx"
+                        )
+                self.async_client = AsyncOpenAI(**async_client_kwargs)
 
         self.cache: CacheDB | None = None
         use_cache = self.config.cache_config is not None

langroid/parsing/url_loader.py

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
         from crawl4ai.extraction_strategy import ExtractionStrategy
         from crawl4ai.markdown_generation_strategy import MarkdownGenerationStrategy
     except ImportError:
-        raise LangroidImportError("crawl4ai", "crawl-4-ai")
+        raise LangroidImportError("crawl4ai", "crawl4ai")
 
 load_dotenv()
 

{langroid-0.58.1.dist-info → langroid-0.58.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.58.1
+Version: 0.58.3
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT
@@ -94,8 +94,8 @@ Requires-Dist: chainlit<3.0.0,>=2.0.1; extra == 'chainlit'
 Requires-Dist: python-socketio<6.0.0,>=5.11.0; extra == 'chainlit'
 Provides-Extra: chromadb
 Requires-Dist: chromadb<=0.4.23,>=0.4.21; extra == 'chromadb'
-Provides-Extra: crawl-4-ai
-Requires-Dist: crawl4ai>=0.6.3; extra == 'crawl-4-ai'
+Provides-Extra: crawl4ai
+Requires-Dist: crawl4ai>=0.6.3; extra == 'crawl4ai'
 Provides-Extra: db
 Requires-Dist: psycopg2-binary>=2.9.10; extra == 'db'
 Requires-Dist: psycopg2<3.0.0,>=2.9.7; extra == 'db'

{langroid-0.58.1.dist-info → langroid-0.58.3.dist-info}/RECORD

@@ -74,11 +74,11 @@ langroid/embedding_models/protoc/embeddings_pb2_grpc.py,sha256=9dYQqkW3JPyBpSEje
 langroid/language_models/__init__.py,sha256=3aD2qC1lz8v12HX4B-dilv27gNxYdGdeu1QvDlkqqHs,1095
 langroid/language_models/azure_openai.py,sha256=SW0Fp_y6HpERr9l6TtF6CYsKgKwjUf_hSL_2mhTV4wI,5034
 langroid/language_models/base.py,sha256=r0MckcZGmuv_opKR2xvjzOz94mmWCzn9LJKgqyBjJ7c,28559
-langroid/language_models/client_cache.py,sha256=YtGcpalYkS_ckMU12J7VmUOGmVv1wzuLUBxgIagcpmA,6896
+langroid/language_models/client_cache.py,sha256=c8tAUTKxbd-CVGRy9WPYhI1pLtarFWWwX6-qm4ZXaqk,9399
 langroid/language_models/config.py,sha256=9Q8wk5a7RQr8LGMT_0WkpjY8S4ywK06SalVRjXlfCiI,378
 langroid/language_models/mock_lm.py,sha256=tA9JpURznsMZ59iRhFYMmaYQzAc0D0BT-PiJIV58sAk,4079
 langroid/language_models/model_info.py,sha256=LzRfZsWmOm7WF6KGJfcN0aVdRqk0URNuDGMMz6cFt50,17121
-langroid/language_models/openai_gpt.py,sha256=fYRZlfpo1CF8ePF1Cuy2CtStxDhpq6AeTxwuqK-z_T8,89329
+langroid/language_models/openai_gpt.py,sha256=xlMqji6yA5RgbDjY8uMXkl5xsko4oXBuJBrb5kD6LVY,92727
 langroid/language_models/provider_params.py,sha256=fX25NAmYUIc1-nliMKpmTGZO6D6RpyTXtSDdZCZdb5w,5464
 langroid/language_models/utils.py,sha256=n55Oe2_V_4VNGhytvPWLYC-0tFS07RTjN83KWl-p_MI,6032
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
@@ -102,7 +102,7 @@ langroid/parsing/routing.py,sha256=-FcnlqldzL4ZoxuDwXjQPNHgBe9F9-F4R6q7b_z9CvI,1
 langroid/parsing/search.py,sha256=0NJ5-Rou_BbrHAD7O9b20bKjZJnbadjObvGm4Zq8Kis,9818
 langroid/parsing/spider.py,sha256=hAVM6wxh1pQ0EN4tI5wMBtAjIk0T-xnpi-ZUzWybhos,3258
 langroid/parsing/table_loader.py,sha256=qNM4obT_0Y4tjrxNBCNUYjKQ9oETCZ7FbolKBTcz-GM,3410
-langroid/parsing/url_loader.py,sha256=ELLSimgdf0-oscmtnDxXJcL-W9jVdLDNfQ90ouCDfHE,25402
+langroid/parsing/url_loader.py,sha256=zSvYV1wY5Clf-uTuoJ9fksR9oVPJVJLQ8tEAxMckM8M,25400
 langroid/parsing/urls.py,sha256=Tjzr64YsCusiYkY0LEGB5-rSuX8T2P_4DVoOFKAeKuI,8081
 langroid/parsing/utils.py,sha256=WwqzOhbQRlorbVvddDIZKv9b1KqZCBDm955lgIHDXRw,12828
 langroid/parsing/web_search.py,sha256=atk8wIpOfiGTvW8yL_26TvjvyY2zD24xIHIi0QjEklI,8599
@@ -139,7 +139,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=ZYrT9mxoUCx_67Qzb5xnkWuFG12rfe30yAg4NgG2ueA,19168
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.58.1.dist-info/METADATA,sha256=mkfwCAdL_zIZxy4v12_ikK7AZLMmbHwwEkh_RJNt3QE,66270
-langroid-0.58.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.58.1.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.58.1.dist-info/RECORD,,
+langroid-0.58.3.dist-info/METADATA,sha256=Crx8SyajMne8W50NYBeoal3XH0GyMUQk363RqBCRir8,66266
+langroid-0.58.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.58.3.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.58.3.dist-info/RECORD,,