external-systems 0.101.0rc2__tar.gz → 0.103.0rc1__tar.gz

{external_systems-0.101.0rc2 → external_systems-0.103.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: external-systems
-Version: 0.101.0rc2
+Version: 0.103.0rc1
 Summary: A Python library for interacting with Foundry Sources
 License: Apache-2.0
 Keywords: Palantir,Foundry,Sources,Compute Modules,Python Functions,Transforms

{external_systems-0.101.0rc2 → external_systems-0.103.0rc1}/external_systems/_version.py

@@ -16,4 +16,4 @@
 # The version is set during the publishing step (since we can't know the version in advance)
 # using the autorelease bot
 
-__version__ = "0.101.0-rc2"
+__version__ = "0.103.0-rc1"

{external_systems-0.101.0rc2 → external_systems-0.103.0rc1}/external_systems/sources/_proxies.py

@@ -20,18 +20,20 @@ from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
 
-class WrappedSession(Session):
+class CustomCaBundleSession(Session):
     """
     A wrapper for requests.Session to override 'verify' property, ignoring REQUESTS_CA_BUNDLE environment variable.
 
-    This is a workaround for https://github.com/kennethreitz/requests/issues/3829 (will be fixed in requests 3.0.0)
+    This is a workaround for https://github.com/psf/requests/issues/3829 (will be fixed in requests 3.0.0)
     """
 
     def merge_environment_settings(self, url, proxies, stream, verify, *args, **kwargs):  # type: ignore[no-untyped-def]
         if isinstance(self.verify, str):
             verify = self.verify
 
-        return super(WrappedSession, self).merge_environment_settings(url, proxies, stream, verify, *args, **kwargs)
+        return super(CustomCaBundleSession, self).merge_environment_settings(
+            url, proxies, stream, verify, *args, **kwargs
+        )
 
 
 class RetryingTimeoutHttpAdapter(HTTPAdapter):
@@ -97,7 +99,7 @@ def create_proxy_session(proxy_url: str, proxy_token: str) -> Session:
     """
 
     adapter = ProxyAdapter(proxy_auth={proxy_url: f"Bearer {proxy_token}"})
-    session = WrappedSession()
+    session = CustomCaBundleSession()
     session.mount("http://", adapter)
     session.mount("https://", adapter)
     session.proxies = {"all": proxy_url}
@@ -124,7 +126,7 @@ def create_session(
         timeout (Optional[Union[float, tuple[float, float], tuple[float, None]]]): Timeout settings for the session.
     """
 
-    session = WrappedSession()
+    session = CustomCaBundleSession()
 
     if cert:
         session.cert = cert

{external_systems-0.101.0rc2 → external_systems-0.103.0rc1}/external_systems/sources/_sources.py

@@ -29,7 +29,6 @@ from ._connections import HttpsConnection
 from ._proxies import create_proxy_session
 from ._refreshable import DefaultSessionCredentialsManager, Refreshable, RefreshHandler
 from ._sockets import create_socket
-from ._utils import read_file
 
 log = logging.getLogger(__name__)
 
@@ -85,26 +84,19 @@ class Source:
         if self._source_parameters.server_certificates is None:
             return None
 
-        new_ca_contents = []
-
-        # If a custom CA bundle path is provided, use it.
-        # Otherwise, use the requests CA bundle path if it is set.
+        # Precedence of which CA bundle to use for the Session object:
+        # 1. Custom CA bundle path (if provided we assume PEM format)
+        # 2. Requests CA bundle path
+        # 3. Temporary file
         ca_bundle_path = (
             self._custom_ca_bundle_path
-            if self._custom_ca_bundle_path is not None
-            else os.environ.get("REQUESTS_CA_BUNDLE")
+            or os.environ.get("REQUESTS_CA_BUNDLE")
+            or NamedTemporaryFile(delete=False, mode="w").name
         )
 
-        # Copy the CA bundle contents to the new CA bundle file.
-        if ca_bundle_path:
-            new_ca_contents.append(read_file(ca_bundle_path))
-
-        # Add all CAs for the source
-        for required_ca in self._source_parameters.server_certificates.values():
-            new_ca_contents.append(required_ca)
-
-        with NamedTemporaryFile(delete=False, mode="w") as ca_bundle_file:
-            ca_bundle_file.write("".join(new_ca_contents) + os.linesep)
+        server_certificates = self._source_parameters.server_certificates.values()
+        with open(ca_bundle_path, "a") as ca_bundle_file:
+            ca_bundle_file.write(os.linesep.join(server_certificates) + os.linesep)
             return ca_bundle_file.name
 
     @cached_property

{external_systems-0.101.0rc2 → external_systems-0.103.0rc1}/external_systems/sources/_utils.py

@@ -23,8 +23,3 @@ def has_expiration_property(source_credentials: SourceCredentials) -> bool:
     """
 
     return hasattr(source_credentials, "expiration")
-
-
-def read_file(path: str) -> str:
-    with open(path) as file:
-        return file.read()

{external_systems-0.101.0rc2 → external_systems-0.103.0rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "external-systems"
-version = "0.101.0-rc2"
+version = "0.103.0-rc1"
 description = "A Python library for interacting with Foundry Sources"
 authors = ["Palantir Technologies, Inc."]
 license = "Apache-2.0"