diff --git a/site-packages/devchat-0.2.10.dist-info/RECORD b/site-packages/devchat-0.2.10.dist-info/RECORD index 664d4ef..c5e2538 100644 --- a/site-packages/devchat-0.2.10.dist-info/RECORD +++ b/site-packages/devchat-0.2.10.dist-info/RECORD @@ -112,7 +112,7 @@ devchat/openai/__pycache__/openai_chat.cpython-38.pyc,, devchat/openai/__pycache__/openai_message.cpython-38.pyc,, devchat/openai/__pycache__/openai_prompt.cpython-38.pyc,, devchat/openai/http_openai.py,sha256=JvACEqVO7ZUYEOAJHtL_dZ6owP48Gfg14J4FWcBpG8s,2823 -devchat/openai/openai_chat.py,sha256=GbkLzNIgWAHFCVbVsvz5BOUlNu58MayR1ax6lNYyqpc,5095 +devchat/openai/openai_chat.py,sha256=4QHPbJWiMVrPIZ-AEj69_Fp__waMzG5V8u5taPrqGrk,5139 devchat/openai/openai_message.py,sha256=HHBSLVxgEFpoiX47Ao4jtQj31X0LQ4CKgo9sLHPpxxY,3310 devchat/openai/openai_prompt.py,sha256=vg4hj6MChn4Dhcxq3wLLZ6jAL2b-BpeZaa9R2KQN28k,10663 devchat/prompt.py,sha256=ZMdyRE4WIidg46_S3-VwpZ6D52bVYpP5ANhzvSJyY8c,9492 diff --git a/site-packages/devchat/openai/openai_chat.py b/site-packages/devchat/openai/openai_chat.py index 46cf245..70e76ec 100755 --- a/site-packages/devchat/openai/openai_chat.py +++ b/site-packages/devchat/openai/openai_chat.py @@ -99,7 +99,10 @@ class OpenAIChat(Chat): api_key = os.environ.get("OPENAI_API_KEY", None) base_url = os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1/") - if not os.environ.get("USE_TIKTOKEN", False) and base_url != "https://api.openai.com/v1/": + if ( + not os.environ.get("USE_TIKTOKEN", False) + and base_url.find("https://api.openai.com/v1") == -1 + ): config_params = self.config.dict(exclude_unset=True) if prompt.get_functions(): config_params["functions"] = prompt.get_functions() diff --git a/site-packages/requests-2.32.2.dist-info/INSTALLER b/site-packages/requests-2.32.3.dist-info/INSTALLER similarity index 100% rename from site-packages/requests-2.32.2.dist-info/INSTALLER rename to site-packages/requests-2.32.3.dist-info/INSTALLER diff --git a/site-packages/requests-2.32.2.dist-info/LICENSE b/site-packages/requests-2.32.3.dist-info/LICENSE similarity index 100% rename from site-packages/requests-2.32.2.dist-info/LICENSE rename to site-packages/requests-2.32.3.dist-info/LICENSE diff --git a/site-packages/requests-2.32.2.dist-info/METADATA b/site-packages/requests-2.32.3.dist-info/METADATA similarity index 99% rename from site-packages/requests-2.32.2.dist-info/METADATA rename to site-packages/requests-2.32.3.dist-info/METADATA index 7b0c91c..72d9dc5 100644 --- a/site-packages/requests-2.32.2.dist-info/METADATA +++ b/site-packages/requests-2.32.3.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: requests -Version: 2.32.2 +Version: 2.32.3 Summary: Python HTTP for Humans. Home-page: https://requests.readthedocs.io Author: Kenneth Reitz diff --git a/site-packages/requests-2.32.2.dist-info/RECORD b/site-packages/requests-2.32.3.dist-info/RECORD similarity index 78% rename from site-packages/requests-2.32.2.dist-info/RECORD rename to site-packages/requests-2.32.3.dist-info/RECORD index 534ee90..36ac9d1 100644 --- a/site-packages/requests-2.32.2.dist-info/RECORD +++ b/site-packages/requests-2.32.3.dist-info/RECORD @@ -1,9 +1,9 @@ -requests-2.32.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -requests-2.32.2.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142 -requests-2.32.2.dist-info/METADATA,sha256=MHhYw_HeCA9Vd-ZGjXa5fcwFzTcN7YJ34XL88bHEmi0,4610 -requests-2.32.2.dist-info/RECORD,, -requests-2.32.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -requests-2.32.2.dist-info/top_level.txt,sha256=fMSVmHfb5rbGOo6xv-O_tUX6j-WyixssE-SnwcDRxNQ,9 +requests-2.32.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 +requests-2.32.3.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142 +requests-2.32.3.dist-info/METADATA,sha256=ZY7oRUweLnb7jCEnEW9hFWs7IpQbNVnAA4ncpwA4WBo,4610 +requests-2.32.3.dist-info/RECORD,, +requests-2.32.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 +requests-2.32.3.dist-info/top_level.txt,sha256=fMSVmHfb5rbGOo6xv-O_tUX6j-WyixssE-SnwcDRxNQ,9 requests/__init__.py,sha256=4xaAERmPDIBPsa2PsjpU9r06yooK-2mZKHTZAhWRWts,5072 requests/__pycache__/__init__.cpython-38.pyc,, requests/__pycache__/__version__.cpython-38.pyc,, @@ -23,9 +23,9 @@ requests/__pycache__/sessions.cpython-38.pyc,, requests/__pycache__/status_codes.cpython-38.pyc,, requests/__pycache__/structures.cpython-38.pyc,, requests/__pycache__/utils.cpython-38.pyc,, -requests/__version__.py,sha256=y2HyN_RyS717n28XyZQNO7rR4xnuXq-Uh74jBgFHGE0,435 +requests/__version__.py,sha256=FVfglgZmNQnmYPXpOohDU58F5EUb_-VnSTaAesS187g,435 requests/_internal_utils.py,sha256=nMQymr4hs32TqVo5AbCrmcJEhvPUh7xXlluyqwslLiQ,1495 -requests/adapters.py,sha256=-qb2_zoNTnqXWn67yhuNj7Cm2zzLZTHHKXT7KPyZfr0,23949 +requests/adapters.py,sha256=KIcecscqam6reOCXRl4DwP4jX8Jcl8sd57ft17KR2cQ,27451 requests/api.py,sha256=_Zb9Oa7tzVIizTKwFrPjDEY9ejtm_OnSRERnADxGsQs,6449 requests/auth.py,sha256=kF75tqnLctZ9Mf_hm9TZIj4cQWnN5uxRz8oWsx5wmR0,10186 requests/certs.py,sha256=Z9Sb410Anv6jUFTyss0jFFhU6xst8ctELqfy8Ev23gw,429 diff --git a/site-packages/requests-2.32.2.dist-info/WHEEL b/site-packages/requests-2.32.3.dist-info/WHEEL similarity index 100% rename from site-packages/requests-2.32.2.dist-info/WHEEL rename to site-packages/requests-2.32.3.dist-info/WHEEL diff --git a/site-packages/requests-2.32.2.dist-info/top_level.txt b/site-packages/requests-2.32.3.dist-info/top_level.txt similarity index 100% rename from site-packages/requests-2.32.2.dist-info/top_level.txt rename to site-packages/requests-2.32.3.dist-info/top_level.txt diff --git a/site-packages/requests/__version__.py b/site-packages/requests/__version__.py index 24829c4..2c105ac 100644 --- a/site-packages/requests/__version__.py +++ b/site-packages/requests/__version__.py @@ -5,8 +5,8 @@ __title__ = "requests" __description__ = "Python HTTP for Humans." __url__ = "https://requests.readthedocs.io" -__version__ = "2.32.2" -__build__ = 0x023202 +__version__ = "2.32.3" +__build__ = 0x023203 __author__ = "Kenneth Reitz" __author_email__ = "me@kennethreitz.org" __license__ = "Apache-2.0" diff --git a/site-packages/requests/adapters.py b/site-packages/requests/adapters.py index 42fabe5..9a58b16 100644 --- a/site-packages/requests/adapters.py +++ b/site-packages/requests/adapters.py @@ -73,26 +73,44 @@ DEFAULT_POOLSIZE = 10 DEFAULT_RETRIES = 0 DEFAULT_POOL_TIMEOUT = None -_preloaded_ssl_context = create_urllib3_context() -_preloaded_ssl_context.load_verify_locations( - extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH) -) + +try: + import ssl # noqa: F401 + + _preloaded_ssl_context = create_urllib3_context() + _preloaded_ssl_context.load_verify_locations( + extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH) + ) +except ImportError: + # Bypass default SSLContext creation when Python + # interpreter isn't built with the ssl module. + _preloaded_ssl_context = None def _urllib3_request_context( request: "PreparedRequest", verify: "bool | str | None", client_cert: "typing.Tuple[str, str] | str | None", + poolmanager: "PoolManager", ) -> "(typing.Dict[str, typing.Any], typing.Dict[str, typing.Any])": host_params = {} pool_kwargs = {} parsed_request_url = urlparse(request.url) scheme = parsed_request_url.scheme.lower() port = parsed_request_url.port + + # Determine if we have and should use our default SSLContext + # to optimize performance on standard requests. + poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {}) + has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context") + should_use_default_ssl_context = ( + _preloaded_ssl_context is not None and not has_poolmanager_ssl_context + ) + cert_reqs = "CERT_REQUIRED" if verify is False: cert_reqs = "CERT_NONE" - elif verify is True: + elif verify is True and should_use_default_ssl_context: pool_kwargs["ssl_context"] = _preloaded_ssl_context elif isinstance(verify, str): if not os.path.isdir(verify): @@ -375,23 +393,83 @@ class HTTPAdapter(BaseAdapter): return response + def build_connection_pool_key_attributes(self, request, verify, cert=None): + """Build the PoolKey attributes used by urllib3 to return a connection. + + This looks at the PreparedRequest, the user-specified verify value, + and the value of the cert parameter to determine what PoolKey values + to use to select a connection from a given urllib3 Connection Pool. + + The SSL related pool key arguments are not consistently set. As of + this writing, use the following to determine what keys may be in that + dictionary: + + * If ``verify`` is ``True``, ``"ssl_context"`` will be set and will be the + default Requests SSL Context + * If ``verify`` is ``False``, ``"ssl_context"`` will not be set but + ``"cert_reqs"`` will be set + * If ``verify`` is a string, (i.e., it is a user-specified trust bundle) + ``"ca_certs"`` will be set if the string is not a directory recognized + by :py:func:`os.path.isdir`, otherwise ``"ca_certs_dir"`` will be + set. + * If ``"cert"`` is specified, ``"cert_file"`` will always be set. If + ``"cert"`` is a tuple with a second item, ``"key_file"`` will also + be present + + To override these settings, one may subclass this class, call this + method and use the above logic to change parameters as desired. For + example, if one wishes to use a custom :py:class:`ssl.SSLContext` one + must both set ``"ssl_context"`` and based on what else they require, + alter the other keys to ensure the desired behaviour. + + :param request: + The PreparedReqest being sent over the connection. + :type request: + :class:`~requests.models.PreparedRequest` + :param verify: + Either a boolean, in which case it controls whether + we verify the server's TLS certificate, or a string, in which case it + must be a path to a CA bundle to use. + :param cert: + (optional) Any user-provided SSL certificate for client + authentication (a.k.a., mTLS). This may be a string (i.e., just + the path to a file which holds both certificate and key) or a + tuple of length 2 with the certificate file path and key file + path. + :returns: + A tuple of two dictionaries. The first is the "host parameters" + portion of the Pool Key including scheme, hostname, and port. The + second is a dictionary of SSLContext related parameters. + """ + return _urllib3_request_context(request, verify, cert, self.poolmanager) + def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None): """Returns a urllib3 connection for the given request and TLS settings. This should not be called from user code, and is only exposed for use when subclassing the :class:`HTTPAdapter `. - :param request: The :class:`PreparedRequest ` object - to be sent over the connection. - :param verify: Either a boolean, in which case it controls whether - we verify the server's TLS certificate, or a string, in which case it - must be a path to a CA bundle to use. - :param proxies: (optional) The proxies dictionary to apply to the request. - :param cert: (optional) Any user-provided SSL certificate to be trusted. - :rtype: urllib3.ConnectionPool + :param request: + The :class:`PreparedRequest ` object to be sent + over the connection. + :param verify: + Either a boolean, in which case it controls whether we verify the + server's TLS certificate, or a string, in which case it must be a + path to a CA bundle to use. + :param proxies: + (optional) The proxies dictionary to apply to the request. + :param cert: + (optional) Any user-provided SSL certificate to be used for client + authentication (a.k.a., mTLS). + :rtype: + urllib3.ConnectionPool """ proxy = select_proxy(request.url, proxies) try: - host_params, pool_kwargs = _urllib3_request_context(request, verify, cert) + host_params, pool_kwargs = self.build_connection_pool_key_attributes( + request, + verify, + cert, + ) except ValueError as e: raise InvalidURL(e, request=request) if proxy: