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

pangea/services/audit/audit.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import datetime
 import json
-from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, Union
+from typing import Any, Dict, Iterable, List, Optional, Sequence, Set, Tuple, Union
 
 import pangea.exceptions as pexc
 from pangea.config import PangeaConfig
@@ -199,7 +199,7 @@ class AuditBase:
 
                 # verify consistency proofs
                 if self.can_verify_consistency_proof(search_event):
-                    if self.verify_consistency_proof(self.pub_roots, search_event):
+                    if search_event.leaf_index is not None and self.verify_consistency_proof(search_event.leaf_index):
                         search_event.consistency_verification = EventVerification.PASS
                     else:
                         search_event.consistency_verification = EventVerification.FAIL
@@ -222,7 +222,7 @@ class AuditBase:
         tree_sizes.difference_update(self.pub_roots.keys())
 
         if tree_sizes:
-            arweave_roots = get_arweave_published_roots(result.root.tree_name, list(tree_sizes))
+            arweave_roots = get_arweave_published_roots(result.root.tree_name, tree_sizes)
         else:
             arweave_roots = {}
 
@@ -284,7 +284,7 @@ class AuditBase:
         """
         return event.published and event.leaf_index is not None and event.leaf_index >= 0  # type: ignore[return-value]
 
-    def verify_consistency_proof(self, pub_roots: Dict[int, PublishedRoot], event: SearchEvent) -> bool:
+    def verify_consistency_proof(self, tree_size: int) -> bool:
         """
         Verify consistency proof
 
@@ -293,18 +293,17 @@ class AuditBase:
         Read more at: [What is a consistency proof?](https://pangea.cloud/docs/audit/merkle-trees#what-is-a-consistency-proof)
 
         Args:
-            pub_roots (dict[int, Root]): list of published root hashes across time
-            event (SearchEvent): Audit event to be verified.
+            leaf_index (int): The tree size of the root to be verified.
 
         Returns:
             bool: True if consistency proof is verified, False otherwise.
         """
 
-        if event.leaf_index == 0:
+        if tree_size == 0:
             return True
 
-        curr_root = pub_roots.get(event.leaf_index + 1)  # type: ignore[operator]
-        prev_root = pub_roots.get(event.leaf_index)  # type: ignore[arg-type]
+        curr_root = self.pub_roots.get(tree_size + 1)
+        prev_root = self.pub_roots.get(tree_size)
 
         if not curr_root or not prev_root:
             return False
@@ -314,9 +313,12 @@ class AuditBase:
         ):
             return False
 
+        if curr_root.consistency_proof is None:
+            return False
+
         curr_root_hash = decode_hash(curr_root.root_hash)
         prev_root_hash = decode_hash(prev_root.root_hash)
-        proof = decode_consistency_proof(curr_root.consistency_proof)  # type: ignore[arg-type]
+        proof = decode_consistency_proof(curr_root.consistency_proof)
 
         return verify_consistency_proof(curr_root_hash, prev_root_hash, proof)
 
@@ -519,7 +521,9 @@ class Audit(ServiceBase, AuditBase):
         """
 
         input = self._get_log_request(event, sign_local=sign_local, verify=verify, verbose=verbose)
-        response: PangeaResponse[LogResult] = self.request.post("v1/log", LogResult, data=input.dict(exclude_none=True))
+        response: PangeaResponse[LogResult] = self.request.post(
+            "v1/log", LogResult, data=input.model_dump(exclude_none=True)
+        )
         if response.success and response.result is not None:
             self._process_log_result(response.result, verify=verify)
         return response
@@ -559,7 +563,7 @@ class Audit(ServiceBase, AuditBase):
 
         input = self._get_log_request(events, sign_local=sign_local, verify=False, verbose=verbose)
         response: PangeaResponse[LogBulkResult] = self.request.post(
-            "v2/log", LogBulkResult, data=input.dict(exclude_none=True)
+            "v2/log", LogBulkResult, data=input.model_dump(exclude_none=True)
         )
 
         if response.success and response.result is not None:
@@ -603,7 +607,7 @@ class Audit(ServiceBase, AuditBase):
         try:
             # Calling to v2 methods will return always a 202.
             response: PangeaResponse[LogBulkResult] = self.request.post(
-                "v2/log_async", LogBulkResult, data=input.dict(exclude_none=True), poll_result=False
+                "v2/log_async", LogBulkResult, data=input.model_dump(exclude_none=True), poll_result=False
             )
         except pexc.AcceptedRequestException as e:
             return e.response
@@ -694,7 +698,7 @@ class Audit(ServiceBase, AuditBase):
         )
 
         response: PangeaResponse[SearchOutput] = self.request.post(
-            "v1/search", SearchOutput, data=input.dict(exclude_none=True)
+            "v1/search", SearchOutput, data=input.model_dump(exclude_none=True)
         )
         if verify_consistency and response.result is not None:
             self.update_published_roots(response.result)
@@ -751,7 +755,7 @@ class Audit(ServiceBase, AuditBase):
             return_context=return_context,
         )
         response: PangeaResponse[SearchResultOutput] = self.request.post(
-            "v1/results", SearchResultOutput, data=input.dict(exclude_none=True)
+            "v1/results", SearchResultOutput, data=input.model_dump(exclude_none=True)
         )
         if verify_consistency and response.result is not None:
             self.update_published_roots(response.result)
@@ -813,7 +817,7 @@ class Audit(ServiceBase, AuditBase):
         )
         try:
             return self.request.post(
-                "v1/export", PangeaResponseResult, data=input.dict(exclude_none=True), poll_result=False
+                "v1/export", PangeaResponseResult, data=input.model_dump(exclude_none=True), poll_result=False
             )
         except pexc.AcceptedRequestException as e:
             return e.response
@@ -880,7 +884,7 @@ class Audit(ServiceBase, AuditBase):
             response = audit.root(tree_size=7)
         """
         input = RootRequest(tree_size=tree_size)
-        return self.request.post("v1/root", RootResult, data=input.dict(exclude_none=True))
+        return self.request.post("v1/root", RootResult, data=input.model_dump(exclude_none=True))
 
     def download_results(
         self,
@@ -922,7 +926,7 @@ class Audit(ServiceBase, AuditBase):
         input = DownloadRequest(
             request_id=request_id, result_id=result_id, format=format, return_context=return_context
         )
-        return self.request.post("v1/download_results", DownloadResult, data=input.dict(exclude_none=True))
+        return self.request.post("v1/download_results", DownloadResult, data=input.model_dump(exclude_none=True))
 
     def update_published_roots(self, result: SearchResultOutput):
         """Fetches series of published root hashes from Arweave
@@ -947,12 +951,31 @@ class Audit(ServiceBase, AuditBase):
         for tree_size in tree_sizes:
             pub_root = None
             if tree_size in arweave_roots:
-                pub_root = PublishedRoot(**arweave_roots[tree_size].dict(exclude_none=True))
+                pub_root = PublishedRoot(**arweave_roots[tree_size].model_dump(exclude_none=True))
                 pub_root.source = RootSource.ARWEAVE
             elif self.allow_server_roots:
                 resp = self.root(tree_size=tree_size)
                 if resp.success and resp.result is not None:
-                    pub_root = PublishedRoot(**resp.result.data.dict(exclude_none=True))
+                    pub_root = PublishedRoot(**resp.result.data.model_dump(exclude_none=True))
                     pub_root.source = RootSource.PANGEA
             if pub_root is not None:
                 self.pub_roots[tree_size] = pub_root
+
+        self.fix_consistency_proofs(tree_sizes)
+
+    def fix_consistency_proofs(self, tree_sizes: Iterable[int]):
+        # on very rare occasions, the consistency proof in Arweave may be wrong
+        # override it with the proof from pangea (not the root hash, just the proof)
+        for tree_size in tree_sizes:
+            if tree_size not in self.pub_roots or tree_size - 1 not in self.pub_roots:
+                continue
+
+            if self.pub_roots[tree_size].source == RootSource.PANGEA:
+                continue
+
+            if self.verify_consistency_proof(tree_size):
+                continue
+
+            resp = self.root(tree_size=tree_size)
+            if resp.success and resp.result is not None and resp.result.data is not None:
+                self.pub_roots[tree_size].consistency_proof = resp.result.data.consistency_proof

pangea/services/audit/models.py

@@ -6,7 +6,7 @@ import datetime
 import enum
 from typing import Any, Dict, List, Optional, Sequence, Union
 
-from pangea.response import APIRequestModel, APIResponseModel, PangeaResponseResult
+from pangea.response import APIRequestModel, APIResponseModel, PangeaDateTime, PangeaResponseResult
 
 
 class EventVerification(str, enum.Enum):
@@ -126,7 +126,7 @@ class EventEnvelope(APIResponseModel):
     event: Dict[str, Any]
     signature: Optional[str] = None
     public_key: Optional[str] = None
-    received_at: datetime.datetime
+    received_at: PangeaDateTime
 
 
 class LogRequest(APIRequestModel):
@@ -410,7 +410,7 @@ class SearchOutput(SearchResultOutput):
     """
 
     id: str
-    expires_at: datetime.datetime
+    expires_at: PangeaDateTime
 
 
 class SearchResultRequest(APIRequestModel):

pangea/services/audit/util.py

@@ -7,7 +7,7 @@ from binascii import hexlify, unhexlify
 from dataclasses import dataclass
 from datetime import datetime
 from hashlib import sha256
-from typing import Dict, List, Optional
+from typing import Collection, Dict, List, Optional
 
 import requests
 
@@ -61,7 +61,7 @@ def verify_hash(hash1: str, hash2: str) -> bool:
 
 
 def verify_envelope_hash(envelope: EventEnvelope, hash: str):
-    return verify_hash(hash_dict(normalize_log(envelope.dict(exclude_none=True))), hash)
+    return verify_hash(hash_dict(normalize_log(envelope.model_dump(exclude_none=True))), hash)
 
 
 def canonicalize_event(event: Event) -> bytes:
@@ -192,7 +192,7 @@ def arweave_graphql_url():
     return f"{ARWEAVE_BASE_URL}/graphql"
 
 
-def get_arweave_published_roots(tree_name: str, tree_sizes: List[int]) -> Dict[int, PublishedRoot]:
+def get_arweave_published_roots(tree_name: str, tree_sizes: Collection[int]) -> Dict[int, PublishedRoot]:
     if len(tree_sizes) == 0:
         return {}
 

pangea/services/authn/authn.py

@@ -96,7 +96,7 @@ class AuthN(ServiceBase):
             """
             input = m.SessionInvalidateRequest(session_id=session_id)
             return self.request.post(
-                "v2/session/invalidate", m.SessionInvalidateResult, data=input.dict(exclude_none=True)
+                "v2/session/invalidate", m.SessionInvalidateResult, data=input.model_dump(exclude_none=True)
             )
 
         def list(
@@ -134,7 +134,7 @@ class AuthN(ServiceBase):
                 filter = m.SessionListFilter(**filter)
 
             input = m.SessionListRequest(filter=filter, last=last, order=order, order_by=order_by, size=size)
-            return self.request.post("v2/session/list", m.SessionListResults, data=input.dict(exclude_none=True))
+            return self.request.post("v2/session/list", m.SessionListResults, data=input.model_dump(exclude_none=True))
 
         def logout(self, user_id: str) -> PangeaResponse[m.SessionLogoutResult]:
             """
@@ -156,7 +156,9 @@ class AuthN(ServiceBase):
                 )
             """
             input = m.SessionLogoutRequest(user_id=user_id)
-            return self.request.post("v2/session/logout", m.SessionLogoutResult, data=input.dict(exclude_none=True))
+            return self.request.post(
+                "v2/session/logout", m.SessionLogoutResult, data=input.model_dump(exclude_none=True)
+            )
 
     class Client(ServiceBase):
         service_name = SERVICE_NAME
@@ -194,7 +196,9 @@ class AuthN(ServiceBase):
                 )
             """
             input = m.ClientUserinfoRequest(code=code)
-            return self.request.post("v2/client/userinfo", m.ClientUserinfoResult, data=input.dict(exclude_none=True))
+            return self.request.post(
+                "v2/client/userinfo", m.ClientUserinfoResult, data=input.model_dump(exclude_none=True)
+            )
 
         def jwks(
             self,
@@ -250,7 +254,9 @@ class AuthN(ServiceBase):
                 """
                 input = m.ClientSessionInvalidateRequest(token=token, session_id=session_id)
                 return self.request.post(
-                    "v2/client/session/invalidate", m.ClientSessionInvalidateResult, data=input.dict(exclude_none=True)
+                    "v2/client/session/invalidate",
+                    m.ClientSessionInvalidateResult,
+                    data=input.model_dump(exclude_none=True),
                 )
 
             def list(
@@ -295,7 +301,7 @@ class AuthN(ServiceBase):
                     token=token, filter=filter, last=last, order=order, order_by=order_by, size=size
                 )
                 return self.request.post(
-                    "v2/client/session/list", m.ClientSessionListResults, data=input.dict(exclude_none=True)
+                    "v2/client/session/list", m.ClientSessionListResults, data=input.model_dump(exclude_none=True)
                 )
 
             def logout(self, token: str) -> PangeaResponse[m.ClientSessionLogoutResult]:
@@ -319,7 +325,7 @@ class AuthN(ServiceBase):
                 """
                 input = m.ClientSessionLogoutRequest(token=token)
                 return self.request.post(
-                    "v2/client/session/logout", m.ClientSessionLogoutResult, data=input.dict(exclude_none=True)
+                    "v2/client/session/logout", m.ClientSessionLogoutResult, data=input.model_dump(exclude_none=True)
                 )
 
             def refresh(
@@ -349,7 +355,7 @@ class AuthN(ServiceBase):
                 """
                 input = m.ClientSessionRefreshRequest(refresh_token=refresh_token, user_token=user_token)
                 return self.request.post(
-                    "v2/client/session/refresh", m.ClientSessionRefreshResult, data=input.dict(exclude_none=True)
+                    "v2/client/session/refresh", m.ClientSessionRefreshResult, data=input.model_dump(exclude_none=True)
                 )
 
         class Password(ServiceBase):
@@ -390,7 +396,7 @@ class AuthN(ServiceBase):
                 """
                 input = m.ClientPasswordChangeRequest(token=token, old_password=old_password, new_password=new_password)
                 return self.request.post(
-                    "v2/client/password/change", m.ClientPasswordChangeResult, data=input.dict(exclude_none=True)
+                    "v2/client/password/change", m.ClientPasswordChangeResult, data=input.model_dump(exclude_none=True)
                 )
 
         class Token(ServiceBase):
@@ -427,7 +433,7 @@ class AuthN(ServiceBase):
                 """
                 input = m.ClientTokenCheckRequest(token=token)
                 return self.request.post(
-                    "v2/client/token/check", m.ClientTokenCheckResult, data=input.dict(exclude_none=True)
+                    "v2/client/token/check", m.ClientTokenCheckResult, data=input.model_dump(exclude_none=True)
                 )
 
     class User(ServiceBase):
@@ -482,7 +488,7 @@ class AuthN(ServiceBase):
                 profile=profile,
                 username=username,
             )
-            return self.request.post("v2/user/create", m.UserCreateResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/user/create", m.UserCreateResult, data=input.model_dump(exclude_none=True))
 
         def delete(
             self, email: str | None = None, id: str | None = None, *, username: str | None = None
@@ -506,7 +512,7 @@ class AuthN(ServiceBase):
                 authn.user.delete(email="example@example.com")
             """
             input = m.UserDeleteRequest(email=email, id=id, username=username)
-            return self.request.post("v2/user/delete", m.UserDeleteResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/user/delete", m.UserDeleteResult, data=input.model_dump(exclude_none=True))
 
         def invite(
             self,
@@ -547,7 +553,7 @@ class AuthN(ServiceBase):
                 callback=callback,
                 state=state,
             )
-            return self.request.post("v2/user/invite", m.UserInviteResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/user/invite", m.UserInviteResult, data=input.model_dump(exclude_none=True))
 
         def update(
             self,
@@ -592,7 +598,7 @@ class AuthN(ServiceBase):
                 username=username,
             )
 
-            return self.request.post("v2/user/update", m.UserUpdateResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/user/update", m.UserUpdateResult, data=input.model_dump(exclude_none=True))
 
         def list(
             self,
@@ -635,7 +641,7 @@ class AuthN(ServiceBase):
                 order_by=order_by,
                 size=size,
             )
-            return self.request.post("v2/user/list", m.UserListResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/user/list", m.UserListResult, data=input.model_dump(exclude_none=True))
 
         class Invites(ServiceBase):
             service_name = SERVICE_NAME
@@ -682,7 +688,7 @@ class AuthN(ServiceBase):
 
                 input = m.UserInviteListRequest(filter=filter, last=last, order=order, order_by=order_by, size=size)
                 return self.request.post(
-                    "v2/user/invite/list", m.UserInviteListResult, data=input.dict(exclude_none=True)
+                    "v2/user/invite/list", m.UserInviteListResult, data=input.model_dump(exclude_none=True)
                 )
 
             def delete(self, id: str) -> PangeaResponse[m.UserInviteDeleteResult]:
@@ -706,7 +712,7 @@ class AuthN(ServiceBase):
                 """
                 input = m.UserInviteDeleteRequest(id=id)
                 return self.request.post(
-                    "v2/user/invite/delete", m.UserInviteDeleteResult, data=input.dict(exclude_none=True)
+                    "v2/user/invite/delete", m.UserInviteDeleteResult, data=input.model_dump(exclude_none=True)
                 )
 
         class Authenticators(ServiceBase):
@@ -756,7 +762,7 @@ class AuthN(ServiceBase):
                 return self.request.post(
                     "v2/user/authenticators/delete",
                     m.UserAuthenticatorsDeleteResult,
-                    data=input.dict(exclude_none=True),
+                    data=input.model_dump(exclude_none=True),
                 )
 
             def list(
@@ -786,7 +792,9 @@ class AuthN(ServiceBase):
                 """
                 input = m.UserAuthenticatorsListRequest(email=email, id=id, username=username)
                 return self.request.post(
-                    "v2/user/authenticators/list", m.UserAuthenticatorsListResult, data=input.dict(exclude_none=True)
+                    "v2/user/authenticators/list",
+                    m.UserAuthenticatorsListResult,
+                    data=input.model_dump(exclude_none=True),
                 )
 
         class Profile(ServiceBase):
@@ -827,7 +835,7 @@ class AuthN(ServiceBase):
                 """
                 input = m.UserProfileGetRequest(id=id, email=email, username=username)
                 return self.request.post(
-                    "v2/user/profile/get", m.UserProfileGetResult, data=input.dict(exclude_none=True)
+                    "v2/user/profile/get", m.UserProfileGetResult, data=input.model_dump(exclude_none=True)
                 )
 
             def update(
@@ -871,7 +879,7 @@ class AuthN(ServiceBase):
                     username=username,
                 )
                 return self.request.post(
-                    "v2/user/profile/update", m.UserProfileUpdateResult, data=input.dict(exclude_none=True)
+                    "v2/user/profile/update", m.UserProfileUpdateResult, data=input.model_dump(exclude_none=True)
                 )
 
     class Flow(ServiceBase):
@@ -907,7 +915,7 @@ class AuthN(ServiceBase):
                 )
             """
             input = m.FlowCompleteRequest(flow_id=flow_id)
-            return self.request.post("v2/flow/complete", m.FlowCompleteResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/flow/complete", m.FlowCompleteResult, data=input.model_dump(exclude_none=True))
 
         def restart(
             self, flow_id: str, choice: m.FlowChoice, data: m.FlowRestartData = {}
@@ -939,7 +947,7 @@ class AuthN(ServiceBase):
             """
 
             input = m.FlowRestartRequest(flow_id=flow_id, choice=choice, data=data)
-            return self.request.post("v2/flow/restart", m.FlowRestartResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/flow/restart", m.FlowRestartResult, data=input.model_dump(exclude_none=True))
 
         def start(
             self,
@@ -978,7 +986,7 @@ class AuthN(ServiceBase):
                 )
             """
             input = m.FlowStartRequest(cb_uri=cb_uri, email=email, flow_types=flow_types, invitation=invitation)
-            return self.request.post("v2/flow/start", m.FlowStartResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/flow/start", m.FlowStartResult, data=input.model_dump(exclude_none=True))
 
         def update(
             self, flow_id: str, choice: m.FlowChoice, data: m.FlowUpdateData = {}
@@ -1012,7 +1020,7 @@ class AuthN(ServiceBase):
             """
 
             input = m.FlowUpdateRequest(flow_id=flow_id, choice=choice, data=data)
-            return self.request.post("v2/flow/update", m.FlowUpdateResult, data=input.dict(exclude_none=True))
+            return self.request.post("v2/flow/update", m.FlowUpdateResult, data=input.model_dump(exclude_none=True))
 
     class Agreements(ServiceBase):
         service_name = SERVICE_NAME
@@ -1056,7 +1064,7 @@ class AuthN(ServiceBase):
 
             input = m.AgreementCreateRequest(type=type, name=name, text=text, active=active)
             return self.request.post(
-                "v2/agreements/create", m.AgreementCreateResult, data=input.dict(exclude_none=True)
+                "v2/agreements/create", m.AgreementCreateResult, data=input.model_dump(exclude_none=True)
             )
 
         def delete(self, type: m.AgreementType, id: str) -> PangeaResponse[m.AgreementDeleteResult]:
@@ -1083,7 +1091,7 @@ class AuthN(ServiceBase):
 
             input = m.AgreementDeleteRequest(type=type, id=id)
             return self.request.post(
-                "v2/agreements/delete", m.AgreementDeleteResult, data=input.dict(exclude_none=True)
+                "v2/agreements/delete", m.AgreementDeleteResult, data=input.model_dump(exclude_none=True)
             )
 
         def list(
@@ -1121,7 +1129,9 @@ class AuthN(ServiceBase):
                 filter = m.AgreementListFilter(**filter)
 
             input = m.AgreementListRequest(filter=filter, last=last, order=order, order_by=order_by, size=size)
-            return self.request.post("v2/agreements/list", m.AgreementListResult, data=input.dict(exclude_none=True))
+            return self.request.post(
+                "v2/agreements/list", m.AgreementListResult, data=input.model_dump(exclude_none=True)
+            )
 
         def update(
             self,
@@ -1161,5 +1171,5 @@ class AuthN(ServiceBase):
 
             input = m.AgreementUpdateRequest(type=type, id=id, name=name, text=text, active=active)
             return self.request.post(
-                "v2/agreements/update", m.AgreementUpdateResult, data=input.dict(exclude_none=True)
+                "v2/agreements/update", m.AgreementUpdateResult, data=input.model_dump(exclude_none=True)
             )

pangea/services/authn/models.py

@@ -1,10 +1,13 @@
 # Copyright 2022 Pangea Cyber Corporation
 # Author: Pangea Cyber Corporation
+
 from __future__ import annotations
 
 import enum
 from typing import Dict, List, NewType, Optional, Union
 
+from pydantic import BaseModel, ConfigDict
+
 import pangea.services.intel as im
 from pangea.response import APIRequestModel, APIResponseModel, PangeaResponseResult
 from pangea.services.vault.models.common import JWK, JWKec, JWKrsa
@@ -12,11 +15,13 @@ from pangea.services.vault.models.common import JWK, JWKec, JWKrsa
 Scopes = NewType("Scopes", List[str])
 
 
-class Profile(Dict[str, str]):
+class Profile(BaseModel):
     first_name: str
-    last_name: str
+    last_name: Optional[str] = None
     phone: Optional[str] = None
 
+    model_config = ConfigDict(extra="allow")
+
 
 class ClientPasswordChangeRequest(APIRequestModel):
     token: str
@@ -70,7 +75,7 @@ class LoginToken(SessionToken):
 
 
 class ClientTokenCheckResult(SessionToken):
-    token: Optional[str]
+    token: Optional[str] = None
 
 
 class IDProvider(str, enum.Enum):
@@ -324,7 +329,7 @@ class UserInviterOrderBy(enum.Enum):
 
 
 class UserInviteListFilter(APIRequestModel):
-    callback: Optional[str]
+    callback: Optional[str] = None
     callback__contains: Optional[List[str]] = None
     callback__in: Optional[List[str]] = None
     created_at: Optional[str] = None

pangea/services/authz.py

@@ -113,7 +113,7 @@ class CheckRequest(APIRequestModel):
 class DebugPath(APIResponseModel):
     type: str
     id: str
-    action: Optional[str]
+    action: Optional[str] = None
 
 
 class Debug(APIResponseModel):
@@ -202,7 +202,7 @@ class AuthZ(ServiceBase):
         """
 
         input_data = TupleCreateRequest(tuples=tuples)
-        return self.request.post("v1/tuple/create", TupleCreateResult, data=input_data.dict(exclude_none=True))
+        return self.request.post("v1/tuple/create", TupleCreateResult, data=input_data.model_dump(exclude_none=True))
 
     def tuple_list(
         self,
@@ -237,9 +237,9 @@ class AuthZ(ServiceBase):
             authz.tuple_list(TupleListFilter(subject_type="user", subject_id="user_1"))
         """
         input_data = TupleListRequest(
-            filter=filter.dict(exclude_none=True), size=size, last=last, order=order, order_by=order_by
+            filter=filter.model_dump(exclude_none=True), size=size, last=last, order=order, order_by=order_by
         )
-        return self.request.post("v1/tuple/list", TupleListResult, data=input_data.dict(exclude_none=True))
+        return self.request.post("v1/tuple/list", TupleListResult, data=input_data.model_dump(exclude_none=True))
 
     def tuple_delete(self, tuples: List[Tuple]) -> PangeaResponse[TupleDeleteResult]:
         """Delete tuples.
@@ -270,7 +270,7 @@ class AuthZ(ServiceBase):
         """
 
         input_data = TupleDeleteRequest(tuples=tuples)
-        return self.request.post("v1/tuple/delete", TupleDeleteResult, data=input_data.dict(exclude_none=True))
+        return self.request.post("v1/tuple/delete", TupleDeleteResult, data=input_data.model_dump(exclude_none=True))
 
     def check(
         self,
@@ -309,7 +309,7 @@ class AuthZ(ServiceBase):
         """
 
         input_data = CheckRequest(resource=resource, action=action, subject=subject, debug=debug, attributes=attributes)
-        return self.request.post("v1/check", CheckResult, data=input_data.dict(exclude_none=True))
+        return self.request.post("v1/check", CheckResult, data=input_data.model_dump(exclude_none=True))
 
     def list_resources(self, type: str, action: str, subject: Subject) -> PangeaResponse[ListResourcesResult]:
         """List resources.
@@ -339,7 +339,9 @@ class AuthZ(ServiceBase):
         """
 
         input_data = ListResourcesRequest(type=type, action=action, subject=subject)
-        return self.request.post("v1/list-resources", ListResourcesResult, data=input_data.dict(exclude_none=True))
+        return self.request.post(
+            "v1/list-resources", ListResourcesResult, data=input_data.model_dump(exclude_none=True)
+        )
 
     def list_subjects(self, resource: Resource, action: str) -> PangeaResponse[ListSubjectsResult]:
         """List subjects.
@@ -367,4 +369,4 @@ class AuthZ(ServiceBase):
         """
 
         input_data = ListSubjectsRequest(resource=resource, action=action)
-        return self.request.post("v1/list-subjects", ListSubjectsResult, data=input_data.dict(exclude_none=True))
+        return self.request.post("v1/list-subjects", ListSubjectsResult, data=input_data.model_dump(exclude_none=True))

pangea/services/embargo.py

@@ -103,7 +103,7 @@ class Embargo(ServiceBase):
             response = embargo.ip_check("190.6.64.94")
         """
         input = IPCheckRequest(ip=ip)
-        return self.request.post("v1/ip/check", EmbargoResult, data=input.dict())
+        return self.request.post("v1/ip/check", EmbargoResult, data=input.model_dump())
 
     def iso_check(self, iso_code: str) -> PangeaResponse[EmbargoResult]:
         """
@@ -130,4 +130,4 @@ class Embargo(ServiceBase):
             response = embargo.iso_check("CU")
         """
         input = ISOCheckRequest(iso_code=iso_code)
-        return self.request.post("v1/iso/check", result_class=EmbargoResult, data=input.dict())
+        return self.request.post("v1/iso/check", result_class=EmbargoResult, data=input.model_dump())

pangea/services/file_scan.py

@@ -142,7 +142,7 @@ class FileScan(ServiceBase):
             transfer_method=transfer_method,
             source_url=source_url,
         )
-        data = input.dict(exclude_none=True)
+        data = input.model_dump(exclude_none=True)
         return self.request.post("v1/scan", FileScanResult, data=data, files=files, poll_result=sync_call)
 
     def request_upload_url(
@@ -164,7 +164,7 @@ class FileScan(ServiceBase):
             input.sha256 = params.sha256_hex
             input.size = params.size
 
-        data = input.dict(exclude_none=True)
+        data = input.model_dump(exclude_none=True)
         return self.request.request_presigned_url("v1/scan", FileScanResult, data=data)