Merge pull request #473 from appwrite/feat-python-input-file

Update python input file

Author: TorstenDittmann

src/SDK/Language/Python.php

@@ -302,7 +302,7 @@ public function getParamExample(array $param)
                     $output .= '{}';
                     break;
                 case self::TYPE_FILE:
-                    $output .= "'file.png'"; 
+                    $output .= "InputFile.from_path('file.png')";
                     break;
             }
         }
@@ -321,7 +321,7 @@ public function getParamExample(array $param)
                     $output .= "'{$example}'";
                     break;
                 case self::TYPE_FILE:
-                    $output .= "'file.png'"; 
+                    $output .= "InputFile.from_path('file.png')";
                     break;
             }
         }

templates/python/package/client.py.twig

@@ -66,7 +66,7 @@ class Client:
             stringify = True
             for key in data.copy():
                 if isinstance(data[key], InputFile):
-                    files[key] = (data[key].name, data[key].file)
+                    files[key] = (data[key].filename, data[key].data)
                     del data[key]
         response = None
         try:
@@ -108,21 +108,27 @@ class Client:
         on_progress = None,
         upload_id = ''
     ):
-        file_path = str(params[param_name])
-        file_name = os.path.basename(file_path)
-        size = os.stat(file_path).st_size
+        input_file = params[param_name]
+
+        if input_file.source_type == 'path':
+            size = os.stat(input_file.path).st_size
+            input = open(input_file.path, 'rb')
+        elif input_file.source_type == 'bytes':
+            size = len(input_file.data)
+            input = input_file.data
 
         if size < self._chunk_size:
-            slice = open(file_path, 'rb').read()
-            params[param_name] = InputFile(file_path, file_name, slice)
+            if input_file.source_type == 'path':
+                input_file.data = input.read()
+
+            params[param_name] = input_file
             return self.call(
                 'post',
                 path,
                 headers,
                 params
             )
 
-        input = open(file_path, 'rb')
         offset = 0
         counter = 0
 
@@ -138,9 +144,16 @@ class Client:
             input.seek(offset)
 
         while offset < size:
-            slice = input.read(self._chunk_size) or input.read(size - offset)
+            if input_file.source_type == 'path':
+                input_file.data = input.read(self._chunk_size) or input.read(size - offset)
+            elif input_file.source_type == 'bytes':
+                if offset + self._chunk_size < size:
+                    end = offset + self._chunk_size
+                else:
+                    end = size - offset
+                input_file.data = input[offset:end]
 
-            params[param_name] = InputFile(file_path, file_name, slice)
+            params[param_name] = input_file
             headers["content-range"] = f'bytes {offset}-{min((offset + self._chunk_size) - 1, size)}/{size}'
 
             result = self.call(

templates/python/package/input_file.py.twig

@@ -1,5 +1,21 @@
+import os
+import mimetypes
+
 class InputFile:
-    def __init__(self, path, name, file):
-        self.path = path
-        self.name = name
-        self.file = file
+    @classmethod
+    def from_path(cls, path):
+        instance = cls()
+        instance.path = path
+        instance.filename = os.path.basename(path)
+        instance.mime_type = mimetypes.guess_type(path)
+        instance.source_type = 'path'
+        return instance
+
+    @classmethod
+    def from_bytes(cls, bytes, filename = None, mime_type = None):
+        instance = cls()
+        instance.data = bytes
+        instance.filename = filename
+        instance.mime_type = mime_type
+        instance.source_type = 'bytes'
+        return instance

tests/Python310Test.php

@@ -19,6 +19,8 @@ class Python310Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES,
     ];
 }

tests/Python38Test.php

@@ -19,6 +19,8 @@ class Python38Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES,
     ];
 }

tests/Python39Test.php

@@ -19,6 +19,8 @@ class Python39Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES,
     ];
 }

tests/languages/python/tests.py

@@ -3,6 +3,7 @@
 from appwrite.services.bar import Bar
 from appwrite.services.general import General
 from appwrite.exception import AppwriteException
+from appwrite.input_file import InputFile
 import os.path
 
 
@@ -55,10 +56,18 @@
 response = general.redirect()
 print(response['result'])
 
-response = general.upload('string', 123, ['string in array'], './tests/resources/file.png')
+response = general.upload('string', 123, ['string in array'], InputFile.from_path('./tests/resources/file.png'))
 print(response['result'])
 
-response = general.upload('string', 123, ['string in array'], './tests/resources/large_file.mp4')
+response = general.upload('string', 123, ['string in array'], InputFile.from_path('./tests/resources/large_file.mp4'))
+print(response['result'])
+
+data = open('./tests/resources/file.png', 'rb').read()
+response = general.upload('string', 123, ['string in array'], InputFile.from_bytes(data, 'file.png', 'image/png'))
+print(response['result'])
+
+data = open('./tests/resources/large_file.mp4', 'rb').read()
+response = general.upload('string', 123, ['string in array'], InputFile.from_bytes(data, 'large_file.mp4','video/mp4'))
 print(response['result'])
 
 try: