pangea-sdk 3.7.0__py3-none-any.whl → 3.7.1__py3-none-any.whl

pangea/services/audit/audit.py

@@ -2,12 +2,15 @@
 # Author: Pangea Cyber Corporation
 import datetime
 import json
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, Union
 
 import pangea.exceptions as pexc
 from pangea.response import PangeaResponse
 from pangea.services.audit.exceptions import AuditException, EventCorruption
 from pangea.services.audit.models import (
+    DownloadFormat,
+    DownloadRequest,
+    DownloadResult,
     Event,
     EventEnvelope,
     EventVerification,
@@ -50,7 +53,7 @@ class AuditBase:
     def __init__(
         self, private_key_file: str = "", public_key_info: Dict[str, str] = {}, tenant_id: Optional[str] = None
     ):
-        self.pub_roots: Dict[int, Root] = {}
+        self.pub_roots: Dict[int, PublishedRoot] = {}
         self.buffer_data: Optional[str] = None
         self.signer: Optional[Signer] = Signer(private_key_file) if private_key_file else None
         self.public_key_info = public_key_info
@@ -182,8 +185,6 @@ class AuditBase:
         unpublished_root = response.result.unpublished_root  # type: ignore[union-attr]
 
         if verify_consistency:
-            self.update_published_roots(response.result)  # type: ignore[arg-type]
-
             for search_event in response.result.events:  # type: ignore[union-attr]
                 # verify membership proofs
                 if self.can_verify_membership_proof(search_event):
@@ -201,22 +202,9 @@ class AuditBase:
 
         return response
 
-    def update_published_roots(self, result: SearchOutput):
-        """Fetches series of published root hashes from Arweave
-
-        This is used for subsequent calls to verify_consistency_proof(). Root hashes
-        are published on [Arweave](https://arweave.net).
-
-        Args:
-            result (SearchOutput): PangeaResponse object from previous call to audit.search()
-
-        Raises:
-            AuditException: If an audit based api exception happens
-            PangeaAPIException: If an API Error happens
-        """
-
+    def _get_tree_sizes_and_roots(self, result: SearchResultOutput) -> Tuple[Set[int], Dict[int, PublishedRoot]]:
         if not result.root:
-            return
+            return set(), {}
 
         tree_sizes = set()
         for search_event in result.events:
@@ -230,22 +218,11 @@ 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))  # + [result.count])
+            arweave_roots = get_arweave_published_roots(result.root.tree_name, list(tree_sizes))
         else:
             arweave_roots = {}
 
-        # fill the missing roots from the server (if allowed)
-        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.source = RootSource.ARWEAVE
-            elif self.allow_server_roots:
-                resp = self.root(tree_size=tree_size)  # type: ignore[attr-defined]
-                if resp.success:
-                    pub_root = PublishedRoot(**resp.result.data.dict(exclude_none=True))
-                    pub_root.source = RootSource.PANGEA
-            self.pub_roots[tree_size] = pub_root  # type: ignore[assignment]
+        return tree_sizes, arweave_roots
 
     def can_verify_membership_proof(self, event: SearchEvent) -> bool:
         """
@@ -303,7 +280,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, Root], event: SearchEvent) -> bool:
+    def verify_consistency_proof(self, pub_roots: Dict[int, PublishedRoot], event: SearchEvent) -> bool:
         """
         Verify consistency proof
 
@@ -329,7 +306,7 @@ class AuditBase:
             return False
 
         if not self.allow_server_roots and (
-            curr_root.source != RootSource.ARWEAVE or prev_root.source != RootSource.ARWEAVE  # type: ignore[attr-defined]
+            curr_root.source != RootSource.ARWEAVE or prev_root.source != RootSource.ARWEAVE
         ):
             return False
 
@@ -518,8 +495,8 @@ class Audit(ServiceBase, AuditBase):
         """
 
         input = self._get_log_request(event, sign_local=sign_local, verify=verify, verbose=verbose)
-        response = self.request.post("v1/log", LogResult, data=input.dict(exclude_none=True))
-        if response.success:
+        response: PangeaResponse[LogResult] = self.request.post("v1/log", LogResult, data=input.dict(exclude_none=True))
+        if response.success and response.result is not None:
             self._process_log_result(response.result, verify=verify)
         return response
 
@@ -557,9 +534,11 @@ class Audit(ServiceBase, AuditBase):
         """
 
         input = self._get_log_request(events, sign_local=sign_local, verify=False, verbose=verbose)
-        response = self.request.post("v2/log", LogBulkResult, data=input.dict(exclude_none=True))
+        response: PangeaResponse[LogBulkResult] = self.request.post(
+            "v2/log", LogBulkResult, data=input.dict(exclude_none=True)
+        )
 
-        if response.success:
+        if response.success and response.result is not None:
             for result in response.result.results:
                 self._process_log_result(result, verify=True)
         return response
@@ -599,13 +578,13 @@ class Audit(ServiceBase, AuditBase):
 
         try:
             # Calling to v2 methods will return always a 202.
-            response = self.request.post(
+            response: PangeaResponse[LogBulkResult] = self.request.post(
                 "v2/log_async", LogBulkResult, data=input.dict(exclude_none=True), poll_result=False
             )
         except pexc.AcceptedRequestException as e:
             return e.response
 
-        if response.success:
+        if response.success and response.result is not None:
             for result in response.result.results:
                 self._process_log_result(result, verify=True)
         return response
@@ -619,7 +598,7 @@ class Audit(ServiceBase, AuditBase):
         end: Optional[Union[datetime.datetime, str]] = None,
         limit: Optional[int] = None,
         max_results: Optional[int] = None,
-        search_restriction: Optional[dict] = None,
+        search_restriction: Optional[Dict[str, Sequence[str]]] = None,
         verbose: Optional[bool] = None,
         verify_consistency: bool = False,
         verify_events: bool = True,
@@ -648,7 +627,7 @@ class Audit(ServiceBase, AuditBase):
             end (datetime, optional): An RFC-3339 formatted timestamp, or relative time adjustment from the current time.
             limit (int, optional): Optional[int] = None,
             max_results (int, optional): Maximum number of results to return.
-            search_restriction (dict, optional): A list of keys to restrict the search results to. Useful for partitioning data available to the query string.
+            search_restriction (Dict[str, Sequence[str]], optional): A list of keys to restrict the search results to. Useful for partitioning data available to the query string.
             verbose (bool, optional): If true, response include root and membership and consistency proofs.
             verify_consistency (bool): True to verify logs consistency
             verify_events (bool): True to verify hash events and signatures
@@ -687,7 +666,11 @@ class Audit(ServiceBase, AuditBase):
             verbose=verbose,
         )
 
-        response = self.request.post("v1/search", SearchOutput, data=input.dict(exclude_none=True))
+        response: PangeaResponse[SearchOutput] = self.request.post(
+            "v1/search", SearchOutput, data=input.dict(exclude_none=True)
+        )
+        if verify_consistency and response.result is not None:
+            self.update_published_roots(response.result)
         return self.handle_search_response(response, verify_consistency, verify_events)
 
     def results(
@@ -695,6 +678,7 @@ class Audit(ServiceBase, AuditBase):
         id: str,
         limit: Optional[int] = 20,
         offset: Optional[int] = 0,
+        assert_search_restriction: Optional[Dict[str, Sequence[str]]] = None,
         verify_consistency: bool = False,
         verify_events: bool = True,
     ) -> PangeaResponse[SearchResultOutput]:
@@ -709,6 +693,7 @@ class Audit(ServiceBase, AuditBase):
             id (string): the id of a search action, found in `response.result.id`
             limit (integer, optional): the maximum number of results to return, default is 20
             offset (integer, optional): the position of the first result to return, default is 0
+            assert_search_restriction (Dict[str, Sequence[str]], optional): Assert the requested search results were queried with the exact same search restrictions, to ensure the results comply to the expected restrictions.
             verify_consistency (bool): True to verify logs consistency
             verify_events (bool): True to verify hash events and signatures
         Raises:
@@ -733,8 +718,13 @@ class Audit(ServiceBase, AuditBase):
             id=id,
             limit=limit,
             offset=offset,
+            assert_search_restriction=assert_search_restriction,
+        )
+        response: PangeaResponse[SearchResultOutput] = self.request.post(
+            "v1/results", SearchResultOutput, data=input.dict(exclude_none=True)
         )
-        response = self.request.post("v1/results", SearchResultOutput, data=input.dict(exclude_none=True))
+        if verify_consistency and response.result is not None:
+            self.update_published_roots(response.result)
         return self.handle_results_response(response, verify_consistency, verify_events)
 
     def root(self, tree_size: Optional[int] = None) -> PangeaResponse[RootResult]:
@@ -760,3 +750,67 @@ class Audit(ServiceBase, AuditBase):
         """
         input = RootRequest(tree_size=tree_size)
         return self.request.post("v1/root", RootResult, data=input.dict(exclude_none=True))
+
+    def download_results(
+        self, result_id: str, format: Optional[DownloadFormat] = None
+    ) -> PangeaResponse[DownloadResult]:
+        """
+        Download search results
+
+        Get all search results as a compressed (gzip) CSV file.
+
+        OperationId: audit_post_v1_download_results
+
+        Args:
+            result_id: ID returned by the search API.
+            format: Format for the records.
+
+        Returns:
+            URL where search results can be downloaded.
+
+        Raises:
+            AuditException: If an Audit-based API exception occurs.
+            PangeaAPIException: If an API exception occurs.
+
+        Examples:
+            response = audit.download_results(
+                result_id="pas_[...]",
+                format=DownloadFormat.JSON,
+            )
+        """
+
+        input = DownloadRequest(result_id=result_id, format=format)
+        return self.request.post("v1/download_results", DownloadResult, data=input.dict(exclude_none=True))
+
+    def update_published_roots(self, result: SearchResultOutput):
+        """Fetches series of published root hashes from Arweave
+
+        This is used for subsequent calls to verify_consistency_proof(). Root hashes
+        are published on [Arweave](https://arweave.net).
+
+        Args:
+            result (SearchResultOutput): Result object from previous call to Audit.search() or Audit.results()
+
+        Raises:
+            AuditException: If an audit based api exception happens
+            PangeaAPIException: If an API Error happens
+        """
+
+        if not result.root:
+            return
+
+        tree_sizes, arweave_roots = self._get_tree_sizes_and_roots(result)
+
+        # fill the missing roots from the server (if allowed)
+        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.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.source = RootSource.PANGEA
+            if pub_root is not None:
+                self.pub_roots[tree_size] = pub_root

pangea/services/audit/exceptions.py

@@ -1,6 +1,5 @@
 from pangea.exceptions import PangeaException
-
-from .models import EventEnvelope
+from pangea.services.audit.models import EventEnvelope
 
 
 # Audit SDK Specific Exceptions

pangea/services/audit/models.py

@@ -2,7 +2,7 @@
 # Author: Pangea Cyber Corporation
 import datetime
 import enum
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Sequence, Union
 
 from pangea.response import APIRequestModel, APIResponseModel, PangeaResponseResult
 
@@ -206,7 +206,7 @@ class SearchRestriction(APIResponseModel):
     Arguments:
     actor -- List of actors to include in search. If empty include all.
     action -- List of action to include in search. If empty include all.
-    source -- List of sourcers to include in search. If empty include all.
+    source -- List of sources to include in search. If empty include all.
     status -- List of status to include in search. If empty include all.
     target -- List of targets to include in search. If empty include all.
     """
@@ -279,7 +279,7 @@ class SearchRequest(APIRequestModel):
     end: Optional[str] = None
     limit: Optional[int] = None
     max_results: Optional[int] = None
-    search_restriction: Optional[dict] = None
+    search_restriction: Optional[Dict[str, Sequence[str]]] = None
     verbose: Optional[bool] = None
 
 
@@ -373,7 +373,24 @@ class SearchEvent(APIResponseModel):
     signature_verification: EventVerification = EventVerification.NONE
 
 
-class SearchOutput(PangeaResponseResult):
+class SearchResultOutput(PangeaResponseResult):
+    """
+    Return class after a pagination search
+
+    Arguments:
+    count -- The total number of results that were returned by the search.
+    events -- A list of matching audit records.
+    root -- A root of a Merkle Tree.
+    unpublished_root -- Root of a unpublished Merkle Tree
+    """
+
+    count: int
+    events: List[SearchEvent]
+    root: Optional[Root] = None
+    unpublished_root: Optional[Root] = None
+
+
+class SearchOutput(SearchResultOutput):
     """
     Result class after an audit search action
 
@@ -386,12 +403,8 @@ class SearchOutput(PangeaResponseResult):
     unpublished_root -- Root of a unpublished Merkle Tree
     """
 
-    count: int
-    events: List[SearchEvent]
     id: str
     expires_at: datetime.datetime
-    root: Optional[Root] = None
-    unpublished_root: Optional[Root] = None
 
 
 class SearchResultRequest(APIRequestModel):
@@ -402,25 +415,37 @@ class SearchResultRequest(APIRequestModel):
     id -- A search results identifier returned by the search call.
     limit -- Number of audit records to include from the first page of the results.
     offset -- Offset from the start of the result set to start returning results from.
+    assert_search_restriction -- Assert the requested search results were queried with the exact same search restrictions, to ensure the results comply to the expected restrictions.
     """
 
     id: str
     limit: Optional[int] = 20
     offset: Optional[int] = 0
+    assert_search_restriction: Optional[Dict[str, Sequence[str]]] = None
 
 
-class SearchResultOutput(PangeaResponseResult):
-    """
-    Return class after a pagination search
+class DownloadFormat(str, enum.Enum):
+    JSON = "json"
+    """JSON."""
 
-    Arguments:
-    count -- The total number of results that were returned by the search.
-    events -- A list of matching audit records.
-    root -- A root of a Merkle Tree.
-    unpublished_root -- Root of a unpublished Merkle Tree
-    """
+    CSV = "csv"
+    """CSV."""
 
-    count: int
-    events: List[SearchEvent]
-    root: Optional[Root] = None
-    unpublished_root: Optional[Root] = None
+    def __str__(self):
+        return str(self.value)
+
+    def __repr__(self):
+        return str(self.value)
+
+
+class DownloadRequest(APIRequestModel):
+    result_id: str
+    """ID returned by the search API."""
+
+    format: Optional[str] = None
+    """Format for the records."""
+
+
+class DownloadResult(PangeaResponseResult):
+    dest_url: str
+    """URL where search results can be downloaded."""

pangea/services/audit/signing.py

@@ -7,6 +7,7 @@ from cryptography import exceptions
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import ed25519
 from cryptography.hazmat.primitives.asymmetric.types import PrivateKeyTypes, PublicKeyTypes
+
 from pangea.exceptions import PangeaException
 from pangea.services.audit.util import b64decode, b64decode_ascii, b64encode_ascii
 from pangea.services.vault.models.common import AsymmetricAlgorithm

pangea/services/audit/util.py

@@ -10,6 +10,7 @@ from hashlib import sha256
 from typing import Dict, List, Optional
 
 import requests
+
 from pangea.services.audit.models import Event, EventEnvelope, PublishedRoot
 from pangea.utils import default_encoder, format_datetime
 

pangea/services/authn/authn.py

@@ -113,6 +113,10 @@ class AuthN(ServiceBase):
             Examples:
                 response = authn.session.list()
             """
+
+            if isinstance(filter, dict):
+                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))
 
@@ -267,6 +271,10 @@ class AuthN(ServiceBase):
                         token="ptu_wuk7tvtpswyjtlsx52b7yyi2l7zotv4a",
                     )
                 """
+
+                if isinstance(filter, dict):
+                    filter = m.SessionListFilter(**filter)
+
                 input = m.ClientSessionListRequest(
                     token=token, filter=filter, last=last, order=order, order_by=order_by, size=size
                 )
@@ -589,6 +597,10 @@ class AuthN(ServiceBase):
             Examples:
                 response = authn.user.list()
             """
+
+            if isinstance(filter, dict):
+                filter = m.UserListFilter(**filter)
+
             input = m.UserListRequest(
                 filter=filter,
                 last=last,
@@ -638,6 +650,9 @@ class AuthN(ServiceBase):
                 Examples:
                     response = authn.user.invites.list()
                 """
+                if isinstance(filter, dict):
+                    filter = m.UserInviteListFilter(**filter)
+
                 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)
@@ -1061,6 +1076,9 @@ class AuthN(ServiceBase):
                 response = authn.agreements.list()
             """
 
+            if isinstance(filter, dict):
+                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))
 

pangea/services/authn/models.py

@@ -51,7 +51,7 @@ class Intelligence(PangeaResponseResult):
     user_intel: bool
 
 
-class SessionToken(APIResponseModel):
+class SessionToken(PangeaResponseResult):
     id: str
     type: str
     life: int
@@ -68,8 +68,8 @@ class LoginToken(SessionToken):
     token: str
 
 
-class ClientTokenCheckResult(LoginToken):
-    pass
+class ClientTokenCheckResult(SessionToken):
+    token: Optional[str]
 
 
 class IDProvider(str, enum.Enum):
@@ -234,7 +234,7 @@ class UserListFilter(APIRequestModel):
 
 
 class UserListRequest(APIRequestModel):
-    filter: Optional[Union[Dict, UserListFilter]] = None
+    filter: Optional[UserListFilter] = None
     last: Optional[str] = None
     order: Optional[ItemOrder] = None
     order_by: Optional[UserListOrderBy] = None
@@ -289,7 +289,7 @@ class UserInviterOrderBy(enum.Enum):
 
 
 class UserInviteListFilter(APIRequestModel):
-    callback: Optional[str] = None
+    callback: Optional[str]
     callback__contains: Optional[List[str]] = None
     callback__in: Optional[List[str]] = None
     created_at: Optional[str] = None
@@ -322,7 +322,7 @@ class UserInviteListFilter(APIRequestModel):
 
 
 class UserInviteListRequest(APIRequestModel):
-    filter: Optional[Union[Dict, UserInviteListFilter]] = None
+    filter: Optional[UserInviteListFilter] = None
     last: Optional[str] = None
     order: Optional[ItemOrder] = None
     order_by: Optional[UserInviterOrderBy] = None
@@ -607,7 +607,7 @@ class SessionListFilter(APIRequestModel):
 
 class ClientSessionListRequest(APIRequestModel):
     token: str
-    filter: Optional[Union[Dict, SessionListFilter]] = None
+    filter: Optional[SessionListFilter] = None
     last: Optional[str] = None
     order: Optional[ItemOrder] = None
     order_by: Optional[SessionListOrderBy] = None
@@ -663,7 +663,7 @@ class SessionInvalidateResult(PangeaResponseResult):
 
 
 class SessionListRequest(APIRequestModel):
-    filter: Optional[Union[Dict, SessionListFilter]] = None
+    filter: Optional[SessionListFilter] = None
     last: Optional[str] = None
     order: Optional[ItemOrder] = None
     order_by: Optional[SessionListOrderBy] = None
@@ -760,7 +760,7 @@ class AgreementListFilter(APIRequestModel):
 
 
 class AgreementListRequest(APIRequestModel):
-    filter: Optional[Union[Dict, AgreementListFilter]] = None
+    filter: Optional[AgreementListFilter] = None
     last: Optional[str] = None
     order: Optional[ItemOrder] = None
     order_by: Optional[AgreementListOrderBy] = None

pangea/services/base.py

@@ -3,13 +3,13 @@
 
 import copy
 import logging
-from typing import Optional, Type, Union
+from typing import Dict, Optional, Type, Union
 
 from pangea.asyncio.request import PangeaRequestAsync
 from pangea.config import PangeaConfig
 from pangea.exceptions import AcceptedRequestException
 from pangea.request import PangeaRequest
-from pangea.response import PangeaResponse, PangeaResponseResult
+from pangea.response import AttachedFile, PangeaResponse, PangeaResponseResult
 
 
 class ServiceBase(object):
@@ -21,12 +21,12 @@ class ServiceBase(object):
         if not token:
             raise Exception("No token provided")
 
-        self.config = config if copy.deepcopy(config) else PangeaConfig()
+        self.config = copy.deepcopy(config) if config is not None else PangeaConfig()
         self.logger = logging.getLogger(logger_name)
         self._token = token
-        self.config_id: Optional[None] = config_id  # type: ignore[assignment]
-        self._request: Union[PangeaRequest, PangeaRequestAsync] = None  # type: ignore[assignment]
-        extra_headers = {}  # type: ignore[var-annotated]
+        self.config_id: Optional[str] = config_id
+        self._request: Optional[Union[PangeaRequest, PangeaRequestAsync]] = None
+        extra_headers: Dict = {}
         self.request.set_extra_headers(extra_headers)
 
     @property
@@ -38,8 +38,8 @@ class ServiceBase(object):
         self._token = value
 
     @property
-    def request(self):
-        if not self._request:
+    def request(self) -> PangeaRequest:
+        if self._request is None or isinstance(self._request, PangeaRequestAsync):
             self._request = PangeaRequest(
                 config=self.config,
                 token=self.token,
@@ -55,7 +55,7 @@ class ServiceBase(object):
         exception: Optional[AcceptedRequestException] = None,
         response: Optional[PangeaResponse] = None,
         request_id: Optional[str] = None,
-        result_class: Union[Type[PangeaResponseResult], dict] = dict,  # type: ignore[assignment]
+        result_class: Union[Type[PangeaResponseResult], Type[Dict]] = dict,
     ) -> PangeaResponse:
         """
         Poll result
@@ -82,3 +82,6 @@ class ServiceBase(object):
             return self.request.poll_result_by_id(request_id=request_id, result_class=result_class, check_response=True)
         else:
             raise AttributeError("Need to set exception, response or request_id")
+
+    def download_file(self, url: str, filename: Optional[str] = None) -> AttachedFile:
+        return self.request.download_file(url=url, filename=filename)

pangea/services/embargo.py

@@ -3,8 +3,7 @@
 from typing import Any, Dict, List
 
 from pangea.response import APIRequestModel, APIResponseModel, PangeaResponse, PangeaResponseResult
-
-from .base import ServiceBase
+from pangea.services.base import ServiceBase
 
 
 class IPCheckRequest(APIRequestModel):

pangea/services/file_scan.py

@@ -2,14 +2,13 @@
 # Author: Pangea Cyber Corporation
 import io
 import logging
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Tuple
 
 from pangea.request import PangeaConfig, PangeaRequest
 from pangea.response import APIRequestModel, PangeaResponse, PangeaResponseResult, TransferMethod
+from pangea.services.base import ServiceBase
 from pangea.utils import FileUploadParams, get_file_upload_params
 
-from .base import ServiceBase
-
 
 class FileScanRequest(APIRequestModel):
     """
@@ -129,7 +128,7 @@ class FileScan(ServiceBase):
                 size = params.size
             else:
                 crc, sha, size = None, None, None
-            files = [("upload", ("filename", file, "application/octet-stream"))]
+            files: List[Tuple] = [("upload", ("filename", file, "application/octet-stream"))]
         else:
             raise ValueError("Need to set file_path or file arguments")
 

pangea/services/intel.py

@@ -6,10 +6,9 @@ from typing import Dict, List, Optional
 
 from pangea.exceptions import PangeaException
 from pangea.response import APIRequestModel, PangeaResponse, PangeaResponseResult
+from pangea.services.base import ServiceBase
 from pangea.utils import hash_256_filepath
 
-from .base import ServiceBase
-
 
 class IntelCommonRequest(APIRequestModel):
     """

pangea/services/redact.py

@@ -5,8 +5,7 @@ import enum
 from typing import Dict, List, Optional, Union
 
 from pangea.response import APIRequestModel, APIResponseModel, PangeaResponse, PangeaResponseResult
-
-from .base import ServiceBase
+from pangea.services.base import ServiceBase
 
 
 class RedactFormat(str, enum.Enum):