pangea-sdk 3.9.0__py3-none-any.whl → 4.0.0__py3-none-any.whl

pangea/asyncio/services/intel.py

@@ -67,7 +67,9 @@ class FileIntelAsync(ServiceBaseAsync):
 
         """
         input = m.FileReputationRequest(hash=hash, hash_type=hash_type, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/reputation", m.FileReputationResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/reputation", m.FileReputationResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def hash_reputation_bulk(
         self,
@@ -103,7 +105,9 @@ class FileIntelAsync(ServiceBaseAsync):
         input = m.FileReputationBulkRequest(  # type: ignore[call-arg]
             hashes=hashes, hash_type=hash_type, verbose=verbose, raw=raw, provider=provider
         )
-        return await self.request.post("v2/reputation", m.FileReputationBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v2/reputation", m.FileReputationBulkResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def filepath_reputation(
         self,
@@ -144,7 +148,9 @@ class FileIntelAsync(ServiceBaseAsync):
         hash = hashlib.sha256(data.read()).hexdigest()
 
         input = m.FileReputationRequest(hash=hash, hash_type="sha256", verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/reputation", m.FileReputationResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/reputation", m.FileReputationResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def filepath_reputation_bulk(
         self,
@@ -243,7 +249,9 @@ class DomainIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.DomainReputationRequest(domain=domain, verbose=verbose, provider=provider, raw=raw)
-        return await self.request.post("v1/reputation", m.DomainReputationResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/reputation", m.DomainReputationResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def reputation_bulk(
         self,
@@ -277,7 +285,7 @@ class DomainIntelAsync(ServiceBaseAsync):
         """
         input = m.DomainReputationBulkRequest(domains=domains, verbose=verbose, provider=provider, raw=raw)
         return await self.request.post(
-            "v2/reputation", m.DomainReputationBulkResult, data=input.dict(exclude_none=True)
+            "v2/reputation", m.DomainReputationBulkResult, data=input.model_dump(exclude_none=True)
         )
 
     async def who_is(
@@ -310,7 +318,7 @@ class DomainIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.DomainWhoIsRequest(domain=domain, verbose=verbose, provider=provider, raw=raw)  # type: ignore[call-arg]
-        return await self.request.post("v1/whois", m.DomainWhoIsResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/whois", m.DomainWhoIsResult, data=input.model_dump(exclude_none=True))
 
 
 class IpIntelAsync(ServiceBaseAsync):
@@ -369,7 +377,7 @@ class IpIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.IPReputationRequest(ip=ip, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/reputation", m.IPReputationResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/reputation", m.IPReputationResult, data=input.model_dump(exclude_none=True))
 
     async def reputation_bulk(
         self, ips: List[str], verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -398,7 +406,9 @@ class IpIntelAsync(ServiceBaseAsync):
             FIXME:
         """
         input = m.IPReputationBulkRequest(ips=ips, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v2/reputation", m.IPReputationBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v2/reputation", m.IPReputationBulkResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def geolocate(
         self, ip: str, verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -430,7 +440,7 @@ class IpIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.IPGeolocateRequest(ip=ip, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/geolocate", m.IPGeolocateResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/geolocate", m.IPGeolocateResult, data=input.model_dump(exclude_none=True))
 
     async def geolocate_bulk(
         self, ips: List[str], verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -459,7 +469,9 @@ class IpIntelAsync(ServiceBaseAsync):
             FIXME:
         """
         input = m.IPGeolocateBulkRequest(ips=ips, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v2/geolocate", m.IPGeolocateBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v2/geolocate", m.IPGeolocateBulkResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def get_domain(
         self, ip: str, verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -491,7 +503,7 @@ class IpIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.IPDomainRequest(ip=ip, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/domain", m.IPDomainResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/domain", m.IPDomainResult, data=input.model_dump(exclude_none=True))
 
     async def get_domain_bulk(
         self, ips: List[str], verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -520,7 +532,7 @@ class IpIntelAsync(ServiceBaseAsync):
             FIXME:
         """
         input = m.IPDomainBulkRequest(ips=ips, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v2/domain", m.IPDomainBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v2/domain", m.IPDomainBulkResult, data=input.model_dump(exclude_none=True))
 
     async def is_vpn(
         self, ip: str, verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -552,7 +564,7 @@ class IpIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.IPVPNRequest(ip=ip, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/vpn", m.IPVPNResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/vpn", m.IPVPNResult, data=input.model_dump(exclude_none=True))
 
     async def is_vpn_bulk(
         self, ips: List[str], verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -581,7 +593,7 @@ class IpIntelAsync(ServiceBaseAsync):
             FIXME:
         """
         input = m.IPVPNBulkRequest(ips=ips, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v2/vpn", m.IPVPNBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v2/vpn", m.IPVPNBulkResult, data=input.model_dump(exclude_none=True))
 
     async def is_proxy(
         self, ip: str, verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -613,7 +625,7 @@ class IpIntelAsync(ServiceBaseAsync):
             )
         """
         input = m.IPProxyRequest(ip=ip, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v1/proxy", m.IPProxyResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/proxy", m.IPProxyResult, data=input.model_dump(exclude_none=True))
 
     async def is_proxy_bulk(
         self, ips: List[str], verbose: Optional[bool] = None, raw: Optional[bool] = None, provider: Optional[str] = None
@@ -642,7 +654,7 @@ class IpIntelAsync(ServiceBaseAsync):
             FIXME:
         """
         input = m.IPProxyBulkRequest(ips=ips, verbose=verbose, raw=raw, provider=provider)
-        return await self.request.post("v2/proxy", m.IPProxyBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v2/proxy", m.IPProxyBulkResult, data=input.model_dump(exclude_none=True))
 
 
 class UrlIntelAsync(ServiceBaseAsync):
@@ -702,7 +714,7 @@ class UrlIntelAsync(ServiceBaseAsync):
         """
 
         input = m.URLReputationRequest(url=url, provider=provider, verbose=verbose, raw=raw)
-        return await self.request.post("v1/reputation", m.URLReputationResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/reputation", m.URLReputationResult, data=input.model_dump(exclude_none=True))
 
     async def reputation_bulk(
         self,
@@ -736,7 +748,9 @@ class UrlIntelAsync(ServiceBaseAsync):
         """
 
         input = m.URLReputationBulkRequest(urls=urls, provider=provider, verbose=verbose, raw=raw)
-        return await self.request.post("v2/reputation", m.URLReputationBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v2/reputation", m.URLReputationBulkResult, data=input.model_dump(exclude_none=True)
+        )
 
 
 class UserIntelAsync(ServiceBaseAsync):
@@ -822,7 +836,9 @@ class UserIntelAsync(ServiceBaseAsync):
             verbose=verbose,
             raw=raw,
         )
-        return await self.request.post("v1/user/breached", m.UserBreachedResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/user/breached", m.UserBreachedResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def user_breached_bulk(
         self,
@@ -876,7 +892,9 @@ class UserIntelAsync(ServiceBaseAsync):
             verbose=verbose,
             raw=raw,
         )
-        return await self.request.post("v2/user/breached", m.UserBreachedBulkResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v2/user/breached", m.UserBreachedBulkResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def password_breached(
         self,
@@ -919,7 +937,7 @@ class UserIntelAsync(ServiceBaseAsync):
             hash_type=hash_type, hash_prefix=hash_prefix, provider=provider, verbose=verbose, raw=raw
         )
         return await self.request.post(
-            "v1/password/breached", m.UserPasswordBreachedResult, data=input.dict(exclude_none=True)
+            "v1/password/breached", m.UserPasswordBreachedResult, data=input.model_dump(exclude_none=True)
         )
 
     async def password_breached_bulk(
@@ -959,5 +977,5 @@ class UserIntelAsync(ServiceBaseAsync):
             hash_type=hash_type, hash_prefixes=hash_prefixes, provider=provider, verbose=verbose, raw=raw
         )
         return await self.request.post(
-            "v2/password/breached", m.UserPasswordBreachedBulkResult, data=input.dict(exclude_none=True)
+            "v2/password/breached", m.UserPasswordBreachedBulkResult, data=input.model_dump(exclude_none=True)
         )

pangea/asyncio/services/redact.py

@@ -102,7 +102,7 @@ class RedactAsync(ServiceBaseAsync):
             return_result=return_result,
             redaction_method_overrides=redaction_method_overrides,
         )
-        return await self.request.post("v1/redact", m.RedactResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/redact", m.RedactResult, data=input.model_dump(exclude_none=True))
 
     async def redact_structured(
         self,
@@ -162,7 +162,9 @@ class RedactAsync(ServiceBaseAsync):
             return_result=return_result,
             redaction_method_overrides=redaction_method_overrides,
         )
-        return await self.request.post("v1/redact_structured", m.StructuredResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/redact_structured", m.StructuredResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def unredact(self, redacted_data: m.RedactedData, fpe_context: str) -> PangeaResponse[m.UnredactResult]:
         """
@@ -185,4 +187,4 @@ class RedactAsync(ServiceBaseAsync):
                 [API Documentation](https://pangea.cloud/docs/api/redact#unredact)
         """
         input = m.UnredactRequest(redacted_data=redacted_data, fpe_context=fpe_context)
-        return await self.request.post("v1/unredact", m.UnredactResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/unredact", m.UnredactResult, data=input.model_dump(exclude_none=True))

pangea/asyncio/services/vault.py

@@ -151,7 +151,7 @@ class VaultAsync(ServiceBaseAsync):
         input = DeleteRequest(
             id=id,
         )
-        return await self.request.post("v1/delete", DeleteResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/delete", DeleteResult, data=input.model_dump(exclude_none=True))
 
     # Get endpoint
     async def get(
@@ -198,7 +198,7 @@ class VaultAsync(ServiceBaseAsync):
             verbose=verbose,
             version_state=version_state,
         )
-        return await self.request.post("v1/get", GetResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/get", GetResult, data=input.model_dump(exclude_none=True))
 
     # List endpoint
     async def list(
@@ -254,7 +254,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = ListRequest(filter=filter, last=last, order=order, order_by=order_by, size=size)
-        return await self.request.post("v1/list", ListResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/list", ListResult, data=input.model_dump(exclude_none=True))
 
     # Update endpoint
     async def update(
@@ -335,7 +335,7 @@ class VaultAsync(ServiceBaseAsync):
             expiration=expiration,
             item_state=item_state,
         )
-        return await self.request.post("v1/update", UpdateResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/update", UpdateResult, data=input.model_dump(exclude_none=True))
 
     async def secret_store(
         self,
@@ -405,7 +405,7 @@ class VaultAsync(ServiceBaseAsync):
             rotation_state=rotation_state,
             expiration=expiration,
         )
-        return await self.request.post("v1/secret/store", SecretStoreResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/secret/store", SecretStoreResult, data=input.model_dump(exclude_none=True))
 
     async def pangea_token_store(
         self,
@@ -475,7 +475,7 @@ class VaultAsync(ServiceBaseAsync):
             rotation_state=rotation_state,
             expiration=expiration,
         )
-        return await self.request.post("v1/secret/store", SecretStoreResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/secret/store", SecretStoreResult, data=input.model_dump(exclude_none=True))
 
     # Rotate endpoint
     async def secret_rotate(
@@ -515,7 +515,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = SecretRotateRequest(id=id, secret=secret, rotation_state=rotation_state)
-        return await self.request.post("v1/secret/rotate", SecretRotateResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/secret/rotate", SecretRotateResult, data=input.model_dump(exclude_none=True))
 
     # Rotate endpoint
     async def pangea_token_rotate(self, id: str) -> PangeaResponse[SecretRotateResult]:
@@ -543,7 +543,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = SecretRotateRequest(id=id)  # type: ignore[call-arg]
-        return await self.request.post("v1/secret/rotate", SecretRotateResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/secret/rotate", SecretRotateResult, data=input.model_dump(exclude_none=True))
 
     async def symmetric_generate(
         self,
@@ -617,7 +617,9 @@ class VaultAsync(ServiceBaseAsync):
             rotation_state=rotation_state,
             expiration=expiration,
         )
-        return await self.request.post("v1/key/generate", SymmetricGenerateResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/key/generate", SymmetricGenerateResult, data=input.model_dump(exclude_none=True)
+        )
 
     async def asymmetric_generate(
         self,
@@ -691,7 +693,9 @@ class VaultAsync(ServiceBaseAsync):
             rotation_state=rotation_state,
             expiration=expiration,
         )
-        return await self.request.post("v1/key/generate", AsymmetricGenerateResult, data=input.dict(exclude_none=True))
+        return await self.request.post(
+            "v1/key/generate", AsymmetricGenerateResult, data=input.model_dump(exclude_none=True)
+        )
 
     # Store endpoints
     async def asymmetric_store(
@@ -774,7 +778,7 @@ class VaultAsync(ServiceBaseAsync):
             rotation_state=rotation_state,
             expiration=expiration,
         )
-        return await self.request.post("v1/key/store", AsymmetricStoreResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/store", AsymmetricStoreResult, data=input.model_dump(exclude_none=True))
 
     async def symmetric_store(
         self,
@@ -852,7 +856,7 @@ class VaultAsync(ServiceBaseAsync):
             rotation_state=rotation_state,
             expiration=expiration,
         )
-        return await self.request.post("v1/key/store", SymmetricStoreResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/store", SymmetricStoreResult, data=input.model_dump(exclude_none=True))
 
     # Rotate endpoint
     async def key_rotate(
@@ -901,7 +905,7 @@ class VaultAsync(ServiceBaseAsync):
         input = KeyRotateRequest(
             id=id, public_key=public_key, private_key=private_key, key=key, rotation_state=rotation_state
         )
-        return await self.request.post("v1/key/rotate", KeyRotateResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/rotate", KeyRotateResult, data=input.model_dump(exclude_none=True))
 
     # Encrypt
     async def encrypt(self, id: str, plain_text: str, version: Optional[int] = None) -> PangeaResponse[EncryptResult]:
@@ -932,8 +936,8 @@ class VaultAsync(ServiceBaseAsync):
                 version=1,
             )
         """
-        input = EncryptRequest(id=id, plain_text=plain_text, version=version)  # type: ignore[call-arg]
-        return await self.request.post("v1/key/encrypt", EncryptResult, data=input.dict(exclude_none=True))
+        input = EncryptRequest(id=id, plain_text=plain_text, version=version)
+        return await self.request.post("v1/key/encrypt", EncryptResult, data=input.model_dump(exclude_none=True))
 
     # Decrypt
     async def decrypt(self, id: str, cipher_text: str, version: Optional[int] = None) -> PangeaResponse[DecryptResult]:
@@ -964,8 +968,8 @@ class VaultAsync(ServiceBaseAsync):
                 version=1,
             )
         """
-        input = DecryptRequest(id=id, cipher_text=cipher_text, version=version)  # type: ignore[call-arg]
-        return await self.request.post("v1/key/decrypt", DecryptResult, data=input.dict(exclude_none=True))
+        input = DecryptRequest(id=id, cipher_text=cipher_text, version=version)
+        return await self.request.post("v1/key/decrypt", DecryptResult, data=input.model_dump(exclude_none=True))
 
     # Sign
     async def sign(self, id: str, message: str, version: Optional[int] = None) -> PangeaResponse[SignResult]:
@@ -997,7 +1001,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = SignRequest(id=id, message=message, version=version)
-        return await self.request.post("v1/key/sign", SignResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/sign", SignResult, data=input.model_dump(exclude_none=True))
 
     # Verify
     async def verify(
@@ -1038,7 +1042,7 @@ class VaultAsync(ServiceBaseAsync):
             signature=signature,
             version=version,
         )
-        return await self.request.post("v1/key/verify", VerifyResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/verify", VerifyResult, data=input.model_dump(exclude_none=True))
 
     async def jwt_verify(self, jws: str) -> PangeaResponse[JWTVerifyResult]:
         """
@@ -1065,7 +1069,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = JWTVerifyRequest(jws=jws)
-        return await self.request.post("v1/key/verify/jwt", JWTVerifyResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/verify/jwt", JWTVerifyResult, data=input.model_dump(exclude_none=True))
 
     async def jwt_sign(self, id: str, payload: str) -> PangeaResponse[JWTSignResult]:
         """
@@ -1094,7 +1098,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = JWTSignRequest(id=id, payload=payload)
-        return await self.request.post("v1/key/sign/jwt", JWTSignResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/key/sign/jwt", JWTSignResult, data=input.model_dump(exclude_none=True))
 
     # Get endpoint
     async def jwk_get(self, id: str, version: Optional[str] = None) -> PangeaResponse[JWKGetResult]:
@@ -1125,7 +1129,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = JWKGetRequest(id=id, version=version)
-        return await self.request.post("v1/get/jwk", JWKGetResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/get/jwk", JWKGetResult, data=input.model_dump(exclude_none=True))
 
     # State change
     async def state_change(
@@ -1164,7 +1168,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = StateChangeRequest(id=id, state=state, version=version, destroy_period=destroy_period)
-        return await self.request.post("v1/state/change", StateChangeResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/state/change", StateChangeResult, data=input.model_dump(exclude_none=True))
 
     # Folder create
     async def folder_create(
@@ -1201,7 +1205,7 @@ class VaultAsync(ServiceBaseAsync):
             )
         """
         input = FolderCreateRequest(name=name, folder=folder, metadata=metadata, tags=tags)
-        return await self.request.post("v1/folder/create", FolderCreateResult, data=input.dict(exclude_none=True))
+        return await self.request.post("v1/folder/create", FolderCreateResult, data=input.model_dump(exclude_none=True))
 
     # Encrypt structured
     async def encrypt_structured(
@@ -1249,7 +1253,7 @@ class VaultAsync(ServiceBaseAsync):
         return await self.request.post(
             "v1/key/encrypt/structured",
             EncryptStructuredResult,
-            data=input.dict(exclude_none=True),
+            data=input.model_dump(exclude_none=True),
         )
 
     # Decrypt structured
@@ -1298,7 +1302,7 @@ class VaultAsync(ServiceBaseAsync):
         return await self.request.post(
             "v1/key/decrypt/structured",
             EncryptStructuredResult,
-            data=input.dict(exclude_none=True),
+            data=input.model_dump(exclude_none=True),
         )
 
     async def encrypt_transform(
@@ -1348,7 +1352,7 @@ class VaultAsync(ServiceBaseAsync):
         return await self.request.post(
             "v1/key/encrypt/transform",
             EncryptTransformResult,
-            data=input.dict(exclude_none=True),
+            data=input.model_dump(exclude_none=True),
         )
 
     async def decrypt_transform(
@@ -1387,5 +1391,5 @@ class VaultAsync(ServiceBaseAsync):
         return await self.request.post(
             "v1/key/decrypt/transform",
             DecryptTransformResult,
-            data=input.dict(exclude_none=True),
+            data=input.model_dump(exclude_none=True),
         )

pangea/dump_audit.py

@@ -19,7 +19,7 @@ from pangea.utils import default_encoder
 
 
 def dump_event(output: io.TextIOWrapper, row: SearchEvent, resp: PangeaResponse[SearchOutput]):
-    row_data = filter_deep_none(row.dict())
+    row_data = filter_deep_none(row.model_dump())
     if resp.result and resp.result.root:
         row_data["tree_size"] = resp.result.root.size
     output.write(json.dumps(row_data, default=default_encoder) + "\n")

pangea/request.py

@@ -5,7 +5,7 @@ import copy
 import json
 import logging
 import time
-from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Type, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence, Tuple, Type, Union
 
 import requests
 from requests.adapters import HTTPAdapter, Retry
@@ -190,7 +190,7 @@ class PangeaRequestBase(object):
         raise pe.PangeaAPIException(f"{summary} ", response)
 
 
-TResult = TypeVar("TResult", bound=PangeaResponseResult, default=PangeaResponseResult)
+TResult = TypeVar("TResult", bound=PangeaResponseResult)
 
 
 class PangeaRequest(PangeaRequestBase):
@@ -324,14 +324,17 @@ class PangeaRequest(PangeaRequestBase):
         return self.session.post(url, headers=headers, data=data_send, files=files)
 
     def _http_post_process(
-        self, data: Union[str, Dict] = {}, files: Optional[List[Tuple]] = None, multipart_post: bool = True
+        self,
+        data: Union[str, Dict] = {},
+        files: Optional[Sequence[Tuple[str, Tuple[Any, str, str]]]] = None,
+        multipart_post: bool = True,
     ):
         if files:
             if multipart_post is True:
                 data_send: str = json.dumps(data, default=default_encoder) if isinstance(data, dict) else data
                 multi = [("request", (None, data_send, "application/json"))]
-                multi.extend(files)  # type: ignore[arg-type]
-                files = multi  # type: ignore[assignment]
+                multi.extend(files)
+                files = multi
                 return None, files
             else:
                 # Post to presigned url as form

pangea/response.py

@@ -7,8 +7,8 @@ from typing import Any, Dict, Generic, List, Optional, Type, Union
 
 import aiohttp
 import requests
-from pydantic import BaseModel
-from typing_extensions import TypeVar
+from pydantic import BaseModel, ConfigDict, PlainSerializer
+from typing_extensions import Annotated, TypeVar
 
 from pangea.utils import format_datetime
 
@@ -50,24 +50,17 @@ class TransferMethod(str, enum.Enum):
         return str(self.value)
 
 
+PangeaDateTime = Annotated[datetime.datetime, PlainSerializer(format_datetime)]
+
+
 # API response should accept arbitrary fields to make them accept possible new parameters
 class APIResponseModel(BaseModel):
-    class Config:
-        arbitrary_types_allowed = True
-        # allow parameters despite they are not declared in model. Make SDK accept server new parameters
-        extra = "allow"
+    model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")
 
 
 # API request models doesn't not allow arbitrary fields
 class APIRequestModel(BaseModel):
-    class Config:
-        arbitrary_types_allowed = True
-        extra = (
-            "allow"  # allow parameters despite they are not declared in model. Make SDK accept server new parameters
-        )
-        json_encoders = {
-            datetime.datetime: format_datetime,
-        }
+    model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")
 
 
 class PangeaResponseResult(APIResponseModel):
@@ -169,10 +162,10 @@ class ResponseHeader(APIResponseModel):
     """
 
 
-T = TypeVar("T", bound=PangeaResponseResult, default=PangeaResponseResult)
+T = TypeVar("T", bound=PangeaResponseResult)
 
 
-class PangeaResponse(Generic[T], ResponseHeader):
+class PangeaResponse(ResponseHeader, Generic[T]):
     raw_result: Optional[Dict[str, Any]] = None
     raw_response: Optional[Union[requests.Response, aiohttp.ClientResponse]] = None
     result: Optional[T] = None