Merge 4e100960d8 into 3caab85931

aider/args.py

@@ -151,6 +151,21 @@ def get_parser(default_config_files, git_root):
         default=True,
         help="Verify the SSL cert when connecting to models (default: True)",
     )
+    group.add_argument(
+        "--client-cert",
+        type=str,
+        help="Specify the client certificate file for TLS connections",
+    )
+    group.add_argument(
+        "--client-cert-key",
+        type=str,
+        help="Specify the client certificate key file for TLS connections",
+    )
+    group.add_argument(
+        "--auth-cookie",
+        type=str,
+        help="A cookie that will be sent with all HTTP requests (e.g. for authentication)",
+    )
     group.add_argument(
         "--timeout",
         type=float,

aider/main.py

@@ -1,12 +1,14 @@
 import json
 import os
 import re
+import ssl
 import sys
 import threading
 import traceback
 import webbrowser
 from dataclasses import fields
 from pathlib import Path
+import httpx
 
 try:
     import git
@@ -516,16 +518,38 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         analytics = Analytics(permanently_disable=True)
         print("Analytics have been permanently disabled.")
 
-    if not args.verify_ssl:
-        import httpx
-
-        os.environ["SSL_VERIFY"] = ""
     litellm._load_litellm()
-        litellm._lazy_module.client_session = httpx.Client(verify=False)
+    http_client = httpx.Client()
-        litellm._lazy_module.aclient_session = httpx.AsyncClient(verify=False)
+    async_client = httpx.AsyncClient()
+    
+    if not args.verify_ssl:
+        os.environ["SSL_VERIFY"] = ""
+        http_client = httpx.Client(verify=False)
+        async_client = httpx.AsyncClient(verify=False)
         # Set verify_ssl on the model_info_manager
         models.model_info_manager.set_verify_ssl(False)
 
+    if args.client_cert:
+        if not args.client_cert_key:
+            print("Expected both --client-cert and --client-cert-key.")
+            return False
+        context = ssl.create_default_context()
+        context.load_cert_chain(certfile=args.client_cert, keyfile=args.client_cert_key)
+
+        http_client = httpx.Client(verify=context)
+        async_client = httpx.AsyncClient(verify=context)
+
+    if args.auth_cookie:
+        try:
+            cookie_name, cookie_value = args.auth_cookie.split("=", 1)
+            http_client.cookies = httpx.Cookies({cookie_name: cookie_value})
+        except ValueError:
+            print("Invalid format for --auth-cookie. Expected format: name=value")
+            return False
+
+    litellm._lazy_module.client_session = http_client
+    litellm._lazy_module.aclient_session = async_client
+    
     if args.timeout:
         models.request_timeout = args.timeout