spaceId and MessageType in file ops

Author: seba-aln

pubnub/endpoints/file_operations/publish_file_message.py

@@ -3,6 +3,8 @@
 from pubnub import utils
 from pubnub.models.consumer.file import PNPublishFileMessageResult
 from pubnub.endpoints.mixins import TimeTokenOverrideMixin
+from pubnub.models.consumer.message_type import PNMessageType
+from typing import Union
 
 
 class PublishFileMessage(FileOperationEndpoint, TimeTokenOverrideMixin):
@@ -20,6 +22,8 @@ def __init__(self, pubnub):
         self._cipher_key = None
         self._replicate = None
         self._ptto = None
+        self._message_type = None
+        self._space_id = None
 
     def meta(self, meta):
         self._meta = meta
@@ -49,6 +53,14 @@ def file_name(self, file_name):
         self._file_name = file_name
         return self
 
+    def message_type(self, message_type: Union[PNMessageType, str]):
+        self._message_type = message_type
+        return self
+
+    def space_id(self, space_id):
+        self._space_id = str(space_id)
+        return self
+
     def _encrypt_message(self, message):
         if self._cipher_key or self._pubnub.config.cipher_key:
             return self._pubnub.config.crypto.encrypt(
@@ -87,6 +99,12 @@ def custom_params(self):
             "ttl": self._ttl,
             "store": 1 if self._should_store else 0
         })
+        if self._message_type is not None:
+            params['type'] = str(self._message_type)
+
+        if self._space_id is not None:
+            params['space-id'] = str(self._space_id)
+
         return params
 
     def is_auth_required(self):

pubnub/endpoints/file_operations/send_file.py

@@ -1,13 +1,13 @@
 from pubnub.endpoints.file_operations.file_based_endpoint import FileOperationEndpoint
-
 from pubnub.crypto import PubNubFileCrypto
 from pubnub.enums import HttpMethod, PNOperationType
 from pubnub.models.consumer.file import PNSendFileResult
 from pubnub.endpoints.file_operations.publish_file_message import PublishFileMessage
 from pubnub.endpoints.file_operations.fetch_upload_details import FetchFileUploadS3Data
 from pubnub.request_handlers.requests_handler import RequestsRequestHandler
 from pubnub.endpoints.mixins import TimeTokenOverrideMixin
-
+from pubnub.models.consumer.message_type import PNMessageType
+from typing import Union
 
 class SendFileNative(FileOperationEndpoint, TimeTokenOverrideMixin):
     def __init__(self, pubnub):
@@ -23,6 +23,8 @@ def __init__(self, pubnub):
         self._file_object = None
         self._replicate = None
         self._ptto = None
+        self._message_type = None
+        self._space_id = None
 
     def file_object(self, fd):
         self._file_object = fd
@@ -69,7 +71,16 @@ def is_compressable(self):
         return True
 
     def custom_params(self):
-        return {}
+        import ipdb
+        ipdb.set_trace()
+        params = {}
+        if self._message_type is not None:
+            params['type'] = str(self._message_type)
+
+        if self._space_id is not None:
+            params['space-id'] = str(self._space_id)
+
+        return params
 
     def validate_params(self):
         self.validate_subscribe_key()
@@ -110,6 +121,14 @@ def cipher_key(self, cipher_key):
         self._cipher_key = cipher_key
         return self
 
+    def message_type(self, message_type: Union[PNMessageType, str]):
+        self._message_type = message_type
+        return self
+
+    def space_id(self, space_id):
+        self._space_id = str(space_id)
+        return self
+
     def create_response(self, envelope, data=None):
         return PNSendFileResult(envelope, self._file_upload_envelope)