fix: multipart testing

loks0n · loks0n · commit 6c28b14e9966 · 2024-10-01T21:28:53.000+01:00
diff --git a/appwrite/client.py b/appwrite/client.py
@@ -12,11 +12,11 @@ def __init__(self):
         self._endpoint = 'https://cloud.appwrite.io/v1'
         self._global_headers = {
             'content-type': '',
-            'user-agent' : 'AppwritePythonSDK/7.0.0-rc1 (${os.uname().sysname}; ${os.uname().version}; ${os.uname().machine})',
+            'user-agent' : 'AppwritePythonSDK/7.0.0 (${os.uname().sysname}; ${os.uname().version}; ${os.uname().machine})',
             'x-sdk-name': 'Python',
             'x-sdk-platform': 'server',
             'x-sdk-language': 'python',
-            'x-sdk-version': '7.0.0-rc1',
+            'x-sdk-version': '7.0.0',
             'X-Appwrite-Response-Format' : '1.6.0',
         }
 
@@ -96,9 +96,9 @@ def call(self, method, path='', headers=None, params=None, response_type='json')
                 if isinstance(data[key], Payload):
                     if data[key].filename:
                         files[key] = (data[key].filename, data[key].to_binary())
+                        del data[key]
                     else:
-                        data[key] = data[key].to_binary()
-                    del data[key]
+                        data[key] = data[key].to_string()  
             data = self.flatten(data, stringify=stringify)
 
         response = None
diff --git a/appwrite/multipart.py b/appwrite/multipart.py
@@ -1,6 +1,7 @@
 from email.parser import BytesParser
 from email.policy import default
 from .payload import Payload
+import json
 
 class MultipartParser:
     def __init__(self, multipart_bytes, content_type):
@@ -38,7 +39,7 @@ def to_dict(self):
                 result[name] = Payload.from_binary(part["contents"])
             elif name == "responseHeaders":
                 headers_str = part["contents"].decode('utf-8', errors='replace')
-                result[name] = dict(line.split(": ", 1) for line in headers_str.split("\r\n") if line)
+                result[name] = json.loads(headers_str)
             elif name == "responseStatusCode":
                 result[name] = int(part["contents"])
             elif name == "duration":
diff --git a/appwrite/payload.py b/appwrite/payload.py
@@ -2,43 +2,52 @@
 import os, json
 
 class Payload:
-    size: int
     filename: Optional[str] = None
 
     _path: Optional[str] = None 
     _data: Optional[bytes] = None
+    _size: int = 0
+
+    @property
+    def size(self) -> int:
+        return self._size
 
     def __init__(self, path: Optional[str] = None, data: Optional[bytes] = None, filename: Optional[str] = None):
-        if not path and not data:
+        if path is None and data is None:
             raise ValueError("One of path or data must be provided")
 
         self._path = path
         self._data = data
 
         self.filename = filename
-        if not self._data:
-            self.size = os.path.getsize(self._path)
+        if self._data is None:
+            self._size = os.path.getsize(self._path)
         else:
-            self.size = len(self._data)
-  
+            self._size = len(self._data)
+
     def to_binary(self, offset: Optional[int] = 0, length: Optional[int] = None) -> bytes:
-        if not length:
-            length = self.size
-        
-        if not self._data:
+        if length is None:
+            length = self._size
+
+        if self._data is None:
             with open(self._path, 'rb') as f:
                 f.seek(offset)
                 return f.read(length)
-        
+
         return self._data[offset:offset + length]
-    
-    def to_string(self) -> str:
-        return str(self.to_binary())
+
+    def to_string(self, encoding="utf-8") -> str:
+        return self.to_binary().decode(encoding)
+
+    def __str__(self) -> str:
+        return self.to_string()
 
     def to_json(self) -> Dict[str, Any]:
         return json.loads(self.to_string())
-    
-    def to_file(self, path: str) -> None: # in the client SDKs, this is def to_file() -> File:
+
+    def to_file(self, path: str) -> None:
+        os.makedirs(os.path.dirname(path), exist_ok=True)
+
         with open(path, 'wb') as f:
             return f.write(self.to_binary())
 
@@ -49,7 +58,7 @@ def from_binary(cls, data: bytes, filename: Optional[str] = None) -> 'Payload':
     @classmethod
     def from_string(cls, data: str) -> 'Payload':
         return cls(data=data.encode())
-       
+
     @classmethod
     def from_file(cls, path: str, filename: Optional[str] = None) -> 'Payload':
         if not os.path.exists(path):
@@ -59,5 +68,5 @@ def from_file(cls, path: str, filename: Optional[str] = None) -> 'Payload':
         return cls(path=path, filename=filename)
 
     @classmethod
-    def from_json(cls, json: Dict[str, Any]) -> 'Payload':
-        return cls(data=json.dumps(json))
+    def from_json(cls, data: Dict[str, Any]) -> 'Payload':
+        return cls.from_string(json.dumps(data))
diff --git a/appwrite/services/account.py b/appwrite/services/account.py
@@ -57,7 +57,7 @@ def update_email(self, email, password):
         }, api_params)
 
     def list_identities(self, queries = None):
-        """List Identities"""        
+        """List identities"""        
         api_path = '/account/identities'
         api_params = {}
 
@@ -116,7 +116,7 @@ def update_mfa(self, mfa):
         }, api_params)
 
     def create_mfa_authenticator(self, type):
-        """Create Authenticator"""        
+        """Create authenticator"""        
         api_path = '/account/mfa/authenticators/{type}'
         api_params = {}
         if type is None:
@@ -130,7 +130,7 @@ def create_mfa_authenticator(self, type):
         }, api_params)
 
     def update_mfa_authenticator(self, type, otp):
-        """Verify Authenticator"""        
+        """Verify authenticator"""        
         api_path = '/account/mfa/authenticators/{type}'
         api_params = {}
         if type is None:
@@ -148,7 +148,7 @@ def update_mfa_authenticator(self, type, otp):
         }, api_params)
 
     def delete_mfa_authenticator(self, type):
-        """Delete Authenticator"""        
+        """Delete authenticator"""        
         api_path = '/account/mfa/authenticators/{type}'
         api_params = {}
         if type is None:
@@ -162,7 +162,7 @@ def delete_mfa_authenticator(self, type):
         }, api_params)
 
     def create_mfa_challenge(self, factor):
-        """Create MFA Challenge"""        
+        """Create MFA challenge"""        
         api_path = '/account/mfa/challenge'
         api_params = {}
         if factor is None:
@@ -176,7 +176,7 @@ def create_mfa_challenge(self, factor):
         }, api_params)
 
     def update_mfa_challenge(self, challenge_id, otp):
-        """Create MFA Challenge (confirmation)"""        
+        """Create MFA challenge (confirmation)"""        
         api_path = '/account/mfa/challenge'
         api_params = {}
         if challenge_id is None:
@@ -194,7 +194,7 @@ def update_mfa_challenge(self, challenge_id, otp):
         }, api_params)
 
     def list_mfa_factors(self):
-        """List Factors"""        
+        """List factors"""        
         api_path = '/account/mfa/factors'
         api_params = {}
 
@@ -203,7 +203,7 @@ def list_mfa_factors(self):
         }, api_params)
 
     def get_mfa_recovery_codes(self):
-        """Get MFA Recovery Codes"""        
+        """Get MFA recovery codes"""        
         api_path = '/account/mfa/recovery-codes'
         api_params = {}
 
@@ -212,7 +212,7 @@ def get_mfa_recovery_codes(self):
         }, api_params)
 
     def create_mfa_recovery_codes(self):
-        """Create MFA Recovery Codes"""        
+        """Create MFA recovery codes"""        
         api_path = '/account/mfa/recovery-codes'
         api_params = {}
 
@@ -221,7 +221,7 @@ def create_mfa_recovery_codes(self):
         }, api_params)
 
     def update_mfa_recovery_codes(self):
-        """Regenerate MFA Recovery Codes"""        
+        """Regenerate MFA recovery codes"""        
         api_path = '/account/mfa/recovery-codes'
         api_params = {}
 
diff --git a/appwrite/services/locale.py b/appwrite/services/locale.py
@@ -16,7 +16,7 @@ def get(self):
         }, api_params)
 
     def list_codes(self):
-        """List Locale Codes"""        
+        """List locale codes"""        
         api_path = '/locale/codes'
         api_params = {}
 
diff --git a/appwrite/services/storage.py b/appwrite/services/storage.py
@@ -180,7 +180,7 @@ def update_file(self, bucket_id, file_id, name = None, permissions = None):
         }, api_params)
 
     def delete_file(self, bucket_id, file_id):
-        """Delete File"""        
+        """Delete file"""        
         api_path = '/storage/buckets/{bucketId}/files/{fileId}'
         api_params = {}
         if bucket_id is None:
diff --git a/appwrite/services/users.py b/appwrite/services/users.py
@@ -83,7 +83,7 @@ def create_bcrypt_user(self, user_id, email, password, name = None):
         }, api_params)
 
     def list_identities(self, queries = None, search = None):
-        """List Identities"""        
+        """List identities"""        
         api_path = '/users/identities'
         api_params = {}
 
@@ -384,7 +384,7 @@ def update_mfa(self, user_id, mfa):
         }, api_params)
 
     def delete_mfa_authenticator(self, user_id, type):
-        """Delete Authenticator"""        
+        """Delete authenticator"""        
         api_path = '/users/{userId}/mfa/authenticators/{type}'
         api_params = {}
         if user_id is None:
@@ -402,7 +402,7 @@ def delete_mfa_authenticator(self, user_id, type):
         }, api_params)
 
     def list_mfa_factors(self, user_id):
-        """List Factors"""        
+        """List factors"""        
         api_path = '/users/{userId}/mfa/factors'
         api_params = {}
         if user_id is None:
@@ -416,7 +416,7 @@ def list_mfa_factors(self, user_id):
         }, api_params)
 
     def get_mfa_recovery_codes(self, user_id):
-        """Get MFA Recovery Codes"""        
+        """Get MFA recovery codes"""        
         api_path = '/users/{userId}/mfa/recovery-codes'
         api_params = {}
         if user_id is None:
@@ -430,7 +430,7 @@ def get_mfa_recovery_codes(self, user_id):
         }, api_params)
 
     def update_mfa_recovery_codes(self, user_id):
-        """Regenerate MFA Recovery Codes"""        
+        """Regenerate MFA recovery codes"""        
         api_path = '/users/{userId}/mfa/recovery-codes'
         api_params = {}
         if user_id is None:
@@ -444,7 +444,7 @@ def update_mfa_recovery_codes(self, user_id):
         }, api_params)
 
     def create_mfa_recovery_codes(self, user_id):
-        """Create MFA Recovery Codes"""        
+        """Create MFA recovery codes"""        
         api_path = '/users/{userId}/mfa/recovery-codes'
         api_params = {}
         if user_id is None:
@@ -622,7 +622,7 @@ def update_status(self, user_id, status):
         }, api_params)
 
     def list_targets(self, user_id, queries = None):
-        """List User Targets"""        
+        """List user targets"""        
         api_path = '/users/{userId}/targets'
         api_params = {}
         if user_id is None:
@@ -637,7 +637,7 @@ def list_targets(self, user_id, queries = None):
         }, api_params)
 
     def create_target(self, user_id, target_id, provider_type, identifier, provider_id = None, name = None):
-        """Create User Target"""        
+        """Create user target"""        
         api_path = '/users/{userId}/targets'
         api_params = {}
         if user_id is None:
@@ -665,7 +665,7 @@ def create_target(self, user_id, target_id, provider_type, identifier, provider_
         }, api_params)
 
     def get_target(self, user_id, target_id):
-        """Get User Target"""        
+        """Get user target"""        
         api_path = '/users/{userId}/targets/{targetId}'
         api_params = {}
         if user_id is None:
@@ -683,7 +683,7 @@ def get_target(self, user_id, target_id):
         }, api_params)
 
     def update_target(self, user_id, target_id, identifier = None, provider_id = None, name = None):
-        """Update User target"""        
+        """Update user target"""        
         api_path = '/users/{userId}/targets/{targetId}'
         api_params = {}
         if user_id is None:
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     'appwrite/encoders',
     'appwrite/enums',
   ],
-  version = '7.0.0-rc1',
+  version = '7.0.0',
   license='BSD-3-Clause',
   description = 'Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API',
   long_description = long_description,
@@ -23,7 +23,7 @@
   maintainer = 'Appwrite Team',
   maintainer_email = 'team@appwrite.io',
   url = 'https://appwrite.io/support',
-  download_url='https://github.com/appwrite/sdk-for-python/archive/7.0.0-rc1.tar.gz',
+  download_url='https://github.com/appwrite/sdk-for-python/archive/7.0.0.tar.gz',
   install_requires=[
     'requests',
   ],
