otdf-python 0.6.0__py3-none-any.whl → 0.7.3__py3-none-any.whl

otdf_python/auth_headers.py

@@ -6,6 +6,7 @@ from dataclasses import dataclass
 @dataclass
 class AuthHeaders:
     """Represents authentication headers used in token-based authorization.
+
     This class holds authorization and DPoP (Demonstrating Proof of Possession) headers
     that are used in token-based API requests.
     """

otdf_python/kas_client.py

@@ -362,6 +362,7 @@ class KASClient:
         self, policy_json, client_public_key, key_access, session_key_type=None
     ):
         """Create a signed JWT for the rewrap request.
+
         The JWT is signed with the DPoP private key.
 
         Args:
@@ -400,6 +401,7 @@ class KASClient:
 
     def _create_connect_rpc_signed_token(self, key_access, policy_json):
         """Create a signed token specifically for Connect RPC requests.
+
         For now, this delegates to the existing JWT creation method.
         """
         return self._create_signed_request_jwt(
@@ -469,6 +471,7 @@ class KASClient:
 
     def get_public_key(self, kas_info):
         """Get KAS public key using Connect RPC.
+
         Checks cache first if available.
         """
         try:
@@ -569,6 +572,7 @@ class KASClient:
 
     def _prepare_rsa_keypair(self):
         """Prepare RSA key pair for unwrapping, reusing if possible.
+
         Uses separate ephemeral keys for encryption (not DPoP keys).
 
         Returns:

otdf_python/kas_connect_rpc_client.py

@@ -1,10 +1,11 @@
 """KASConnectRPCClient: Handles Connect RPC communication with the Key Access Service (KAS).
+
 This class encapsulates all interactions with otdf_python_proto.
 """
 
 import logging
 
-import httpx
+import pyqwest
 from otdf_python_proto.kas import kas_pb2
 from otdf_python_proto.kas.kas_connect import AccessServiceClientSync
 
@@ -26,6 +27,7 @@ class KASConnectRPCClient:
         """
         self.use_plaintext = use_plaintext
         self.verify_ssl = verify_ssl
+        self._transport = None
         self._http_client = None
 
     def __enter__(self):
@@ -38,35 +40,41 @@ class KASConnectRPCClient:
         self.close()
 
     def close(self):
-        """Close HTTP client and release resources.
-
-        This method should be called when the client is no longer needed
-        to properly clean up resources. It's also called automatically
-        when using the client as a context manager.
-        """
-        if self._http_client is not None:
-            self._http_client.close()
-            self._http_client = None
+        """Close HTTP client and release resources."""
+        if self._transport is not None:
+            self._transport.close()
+            self._transport = None
+        self._http_client = None
 
     def _create_http_client(self):
-        """Create HTTP client with SSL verification configuration.
+        """Create HTTP client backed by a pyqwest.SyncHTTPTransport.
+
+        Supports plaintext (HTTP) and TLS (HTTPS) connections.
+        Custom CA/cert data is not yet supported.
 
         Returns:
-            httpx.Client configured for SSL verification settings
+            pyqwest.SyncClient configured for the current settings
+
+        Raises:
+            NotImplementedError: If verify_ssl=False is requested, as pyqwest
+                does not support disabling TLS verification. Passing custom
+                TLS certificate or CA data is also not yet implemented.
 
         """
-        if self.verify_ssl:
-            logging.info("Using SSL verification enabled HTTP client")
-            return httpx.Client()
-        else:
-            logging.info("Using SSL verification disabled HTTP client")
-            return httpx.Client(verify=False)
+        if not self.verify_ssl and not self.use_plaintext:
+            raise NotImplementedError(
+                "verify_ssl=False is not supported for HTTPS connections: pyqwest "
+                "does not expose an option to disable TLS verification. Passing "
+                "custom TLS cert or CA data is also not yet implemented."
+            )
+        self._transport = pyqwest.SyncHTTPTransport()
+        return pyqwest.SyncClient(transport=self._transport)
 
     def _get_http_client(self):
         """Get HTTP client, creating one if needed for backward compatibility.
 
         Returns:
-            httpx.Client instance
+            pyqwest.SyncClient instance
 
         """
         if self._http_client is None:
@@ -136,12 +144,9 @@ class KASConnectRPCClient:
                 f"for public key retrieval"
             )
 
-            # Get or create HTTP client
             http_client = self._get_http_client()
-
-            # Create Connect RPC client with configured HTTP client
             client = AccessServiceClientSync(
-                address=connect_rpc_base_url, session=http_client
+                address=connect_rpc_base_url, http_client=http_client
             )
 
             # Create public key request
@@ -202,12 +207,9 @@ class KASConnectRPCClient:
                 f"Creating Connect RPC client for base URL: {kas_service_url}, for unwrap"
             )
 
-            # Get or create HTTP client
             http_client = self._get_http_client()
-
-            # Create Connect RPC client with configured HTTP client
             client = AccessServiceClientSync(
-                address=kas_service_url, session=http_client
+                address=kas_service_url, http_client=http_client
             )
 
             # Create rewrap request
@@ -215,7 +217,6 @@ class KASConnectRPCClient:
                 signed_request_token=signed_token,
             )
 
-            # Debug: Log the signed token details
             logging.info(f"Connect RPC signed token: {signed_token}")
 
             # Prepare headers with authentication if available

otdf_python/kas_info.py

@@ -6,6 +6,7 @@ from dataclasses import dataclass
 @dataclass
 class KASInfo:
     """Configuration for Key Access Server (KAS) information.
+
     This class stores details about a Key Access Server including its URL,
     public key, key ID, default status, and cryptographic algorithm.
     """

otdf_python/key_type_constants.py

@@ -1,4 +1,5 @@
 """Constants for session key types used in the KAS client.
+
 This matches the Java SDK's KeyType enum pattern.
 """
 

otdf_python/nanotdf_ecdsa_struct.py

@@ -68,6 +68,7 @@ class NanoTDFECDSAStruct:
 
     def as_bytes(self) -> bytes:
         """Convert the signature structure to bytes.
+
         Raises ValueError if r_value or s_value is None.
         """
         if self.r_value is None or self.s_value is None:

otdf_python/policy_binding_serializer.py

@@ -18,6 +18,7 @@ class PolicyBinding:
 
 class PolicyBindingSerializer:
     """Handles serialization and deserialization of policy bindings.
+
     This class provides static methods to convert between JSON representations
     and PolicyBinding objects.
     """

otdf_python/sdk.py

@@ -15,6 +15,7 @@ class KAS(AbstractContextManager):
 
     def get_public_key(self, kas_info: Any) -> Any:
         """Retrieve the public key from KAS for RSA operations.
+
         If the public key is cached, returns the cached value.
         Otherwise, makes a request to the KAS.
 
@@ -217,6 +218,7 @@ class SDK(AbstractContextManager):
 
         def kas(self) -> KAS:
             """Return the KAS client for key access operations.
+
             This should be implemented to return an instance of KAS.
             """
             raise NotImplementedError

otdf_python/sdk_builder.py

@@ -8,7 +8,7 @@ import ssl
 from dataclasses import dataclass
 from pathlib import Path
 
-import httpx
+import httpx2 as httpx
 
 from otdf_python.kas_allowlist import KASAllowlist
 from otdf_python.sdk import KAS, SDK

otdf_python/tdf_reader.py

@@ -12,6 +12,7 @@ TDF_PAYLOAD_FILE_NAME = "0.payload"
 
 class TDFReader:
     """TDFReader is responsible for reading and processing Trusted Data Format (TDF) files.
+
     The class initializes with a TDF file channel, extracts the manifest and payload entries,
     and provides methods to retrieve the manifest content, read payload bytes, and read policy objects.
     """

otdf_python/token_source.py

@@ -2,7 +2,7 @@
 
 import time
 
-import httpx
+import httpx2 as httpx
 
 
 class TokenSource:

{otdf_python-0.6.0.dist-info → otdf_python-0.7.3.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: otdf-python
-Version: 0.6.0
+Version: 0.7.3
 Summary: Unofficial OpenTDF SDK for Python
 Project-URL: Homepage, https://github.com/b-long/opentdf-python-sdk
 Project-URL: Repository, https://github.com/b-long/opentdf-python-sdk
 Project-URL: Issues, https://github.com/b-long/opentdf-python-sdk/issues
 Author-email: b-long <b-long@users.noreply.github.com>
-License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -22,15 +21,12 @@ Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: connect-python<0.7,>=0.6.0
+Requires-Dist: connect-python>=0.9.0
 Requires-Dist: cryptography>=45.0.4
 Requires-Dist: grpcio-status>=1.74.0
-Requires-Dist: grpcio-tools>=1.74.0
 Requires-Dist: grpcio>=1.74.0
-Requires-Dist: httpx>=0.28.1
+Requires-Dist: httpx2>=2.3.0
 Requires-Dist: protobuf>=6.31.1
-Requires-Dist: protoc-gen-connect-python<0.7,>=0.6.0
-Requires-Dist: protoc-gen-openapiv2>=0.0.1
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: typing-extensions>=4.14.1
 Description-Content-Type: text/markdown
@@ -137,7 +133,7 @@ with open("decrypted.txt", "wb") as f:
 ## Project Structure
 
 ```
-src/otdf_python/
+packages/otdf-python/src/otdf_python/
 ├── sdk.py                  # Main SDK interface
 ├── config.py               # Configuration management
 ├── tdf.py                  # TDF format handling

{otdf_python-0.6.0.dist-info → otdf_python-0.7.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ otdf_python/address_normalizer.py,sha256=7gigfxFIFnDILi8BGQipuLl-Cr71pwi5vE72hbp
 otdf_python/aesgcm.py,sha256=jQgVSEeKM6MJuH2tvlClXIzvg11a5O_GEY9Sh56CrxE,1947
 otdf_python/assertion_config.py,sha256=rw0SIB3xG-nAeb5r_liuxLphU4tcj-zlq8rVvXncX-Y,2317
 otdf_python/asym_crypto.py,sha256=EYkMNhZJP5khH0IvICTOG2bMg_TMvd6wXDu5zW0jpj4,7234
-otdf_python/auth_headers.py,sha256=uOLflFunBCw59nwk23rdiFQWOFrS19HugQXuQPGv3xE,986
+otdf_python/auth_headers.py,sha256=onS-fXsIZN4l33yQS9VspPvoiAnfM2B0nNAVL_YIGZ0,987
 otdf_python/autoconfigure_utils.py,sha256=W5aJ0tC7HWfGb_1Mva_oxgduUzSpPoyDeaq0rPwgPAs,3689
 otdf_python/cli.py,sha256=icooiGgRh8H1IlP-_iO7paLB60IXUSaSacODABeqrS4,21165
 otdf_python/collection_store.py,sha256=sYL6VMFDBfHfCCLk14iybeC_qoUlpJFB0wOMt1bdwpY,1429
@@ -21,29 +21,29 @@ otdf_python/eckeypair.py,sha256=qcPKv0OS1lYxRICj9dhAW_eMz32anFBtpI8EJfXxpX0,2470
 otdf_python/header.py,sha256=peG14kE_KAUCW4fY82sqcWF5zTAVAnJfFXCHtC8Z0iQ,7189
 otdf_python/invalid_zip_exception.py,sha256=M_bAiXEjJdxPfA178YH-uHGRwMrNBKzjQzlQ54aDP2w,292
 otdf_python/kas_allowlist.py,sha256=0yX3J9J1od_ew0sp3pX6kfav39pTz7aBBpMnVkE5T7s,5884
-otdf_python/kas_client.py,sha256=N5mQubRUrnJCtSxTiiyjf7DEfsg2wVZ02xufuZBH_b0,27532
-otdf_python/kas_connect_rpc_client.py,sha256=cB3cBomCClmu-InUpw8R35cLyJQ8X0PoEsFvYSH0RUM,8950
-otdf_python/kas_info.py,sha256=V-5om8k4RKbhE0h1CS1Rxb18TYcHKvq_hEPP6ah8K_o,738
+otdf_python/kas_client.py,sha256=kcLpdkFDN3LVmlmSuaEm6EKtPsbOK5RCsClPdm8bpAU,27536
+otdf_python/kas_connect_rpc_client.py,sha256=Y2w0SPh4QZxLLhneKky8N20jd9UQmShmAnLo_c9kOXk,9113
+otdf_python/kas_info.py,sha256=R_zfW8m2n2PT1-Enk6NG5K8YIjWvb1g-PQ6M0bZX-o8,739
 otdf_python/kas_key_cache.py,sha256=6hfzRAg9o_IfRErWSe-_gGTG9kRyYENMizMY1Shkmfk,1548
 otdf_python/key_type.py,sha256=2gQlXOj35J3ISCcWjU3sGYUxmlZR47BMq6Xr2yoKA8k,928
-otdf_python/key_type_constants.py,sha256=MV2Dsea3A6nnnYztoD0N1QxhrbQXZfaXaqCr2rI6sqo,954
+otdf_python/key_type_constants.py,sha256=0aqG1N1Ay0Z8o5fsq7fAiJXQeD6k-fxp06If__BGcR4,955
 otdf_python/manifest.py,sha256=aglGw9EdtZZIxmwqy82sV5wum_mKkjzew4brSgxmJjc,7047
 otdf_python/nanotdf.py,sha256=y1mLktlZ-mRCup2vzGY4ZbFeNEhWpCYLOZYjzTSPEtc,33921
-otdf_python/nanotdf_ecdsa_struct.py,sha256=jTQKFAicTfMfN9CxJZYQcnEYGmtfAQoDOhz8ta-pGAQ,4066
+otdf_python/nanotdf_ecdsa_struct.py,sha256=C-qQnroJGO9yXrBb-p-rYMSxf2gS8kF6SCUvO-njAXU,4067
 otdf_python/nanotdf_type.py,sha256=3MQzT6lJ3WJKMICFyyYZXX2_cFYcZ5G4m1uif-l9Nxo,1112
-otdf_python/policy_binding_serializer.py,sha256=oOcGBYOISPTzHRtk8JszwLTraY_F2OoevOf0a53jGHA,1271
+otdf_python/policy_binding_serializer.py,sha256=hA-M5BhEa3Q0bpjbpdiaJ6mivwx9UGDdmB8HvFG7SY0,1272
 otdf_python/policy_info.py,sha256=aq74dZg9PhTZ6cMkZyFsu3D754C5YijFMiuoYEL-1bY,2076
 otdf_python/policy_object.py,sha256=LikIsahPkKr-iYA0lhgQitCbh8CsmxUBYyBs6VYfmxY,512
 otdf_python/policy_stub.py,sha256=RfU_fICqsAOnTXOHpKhtKC0RJ3KoWhDxO0XecZWM548,159
 otdf_python/resource_locator.py,sha256=bjK935XcfNq-PyqidHNq8eIiPeZEStYdQvmQ9B9GY20,6290
-otdf_python/sdk.py,sha256=-3Zuyfvf8ZM6iqxFpFDRAxCSfe35r6-TIuOOGUbPNPM,15058
-otdf_python/sdk_builder.py,sha256=xTPoBjB3eGwoWjfSgiPmiNnEZJ8g-LUQVZDmo7BM9cY,17649
+otdf_python/sdk.py,sha256=6yQbaHS6EUqiEOEn2hI3Ox4OYlYQHDuxjqHjYo8LV5A,15060
+otdf_python/sdk_builder.py,sha256=N57HrXADKLSP3bGiltYV058DxgrJyMzhsKuqNuKBqqo,17659
 otdf_python/sdk_exceptions.py,sha256=2GElGyM5LKN8Uh_lAiT6Ho4oNRWYRQsMNOK5s2jiv28,687
 otdf_python/symmetric_and_payload_config.py,sha256=iPHeZSeY9BjsQ-wkvdm6-FIR7773EgGiaIvSG-ICOHw,1158
 otdf_python/tdf.py,sha256=lqaSSGfd-nzlmjpYoXa6ZLihZIJA170dwodKt_iRko8,20799
-otdf_python/tdf_reader.py,sha256=WMetzX4CIKJ15f4J_zyFGtObQO6bQ33KC_ykIonH9ik,5228
+otdf_python/tdf_reader.py,sha256=f-LCb_Z4TwaByT8_gu-cpJIdW8lk3741jCAd-fJOLJg,5229
 otdf_python/tdf_writer.py,sha256=FLm1P26J4p6WPyKsjOb7QLYJqDIMDsBONqBW_JuFxyw,798
-otdf_python/token_source.py,sha256=YHbP7deSSXo1CvzVGJX7DkOuBgqwfP_Ockm8CE-MN0o,1011
+otdf_python/token_source.py,sha256=Ow4bZqPqVxbZx64M7pLxQarVlPfiz15ZvZr9H17_ZMY,1021
 otdf_python/version.py,sha256=uDKJKsSQoaEH-JlqAwiXDxceLRX9hkG4I3NVLEfDCHA,2025
 otdf_python/zip_reader.py,sha256=qrHv-ecs09tz99ZKdOMiWaciYf2XsQOUTiXy1JHjuEY,1705
 otdf_python/zip_writer.py,sha256=5-KChgEXCf4TKAAML-R8cqpAiap85ur1l2lJCCac6BE,2405
@@ -170,7 +170,6 @@ otdf_python_proto/wellknownconfiguration/__init__.py,sha256=xK8XUrwCL9elWuMTx6vV
 otdf_python_proto/wellknownconfiguration/wellknown_configuration_connect.py,sha256=wnfZ7K9vAB_Rub25KrdnKIfx5Yxq8yCc8c6zHjBtFH8,6358
 otdf_python_proto/wellknownconfiguration/wellknown_configuration_pb2.py,sha256=g9xSm9TxX0IPMqiFCaridJvI2TrL8PrXVFPgu8tX9VM,3863
 otdf_python_proto/wellknownconfiguration/wellknown_configuration_pb2.pyi,sha256=Zw4vROvTgomnFqsalJrYda632ojXH0FVXSzTXxerybw,1490
-otdf_python-0.6.0.dist-info/METADATA,sha256=WviQsEtDOr5SAG3xyE3vAmbwUTr9YWgYuayXjhrusCo,5175
-otdf_python-0.6.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-otdf_python-0.6.0.dist-info/licenses/LICENSE,sha256=DPrPHdI6tfZcqk9kzQ37vh1Ftk7LJYdMrUtwKl7L3Pw,1074
-otdf_python-0.6.0.dist-info/RECORD,,
+otdf_python-0.7.3.dist-info/METADATA,sha256=sg8YiLbazn2CqAfjLSApxd6P3UsjGEswjHr4FTcJDd8,5037
+otdf_python-0.7.3.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+otdf_python-0.7.3.dist-info/RECORD,,

{otdf_python-0.6.0.dist-info → otdf_python-0.7.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any

otdf_python-0.6.0.dist-info/licenses/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 to present b-long
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.