Release candidate for 1.5.x

Author: abnegate

README.md

@@ -6,7 +6,7 @@
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
 
-**This SDK is compatible with Appwrite server version 1.4.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-python/releases).**
+**This SDK is compatible with Appwrite server version 1.5.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-python/releases).**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Python SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)
 

appwrite/client.py

@@ -1,21 +1,23 @@
 import io
-import requests
+import json
 import os
+import requests
 from .input_file import InputFile
 from .exception import AppwriteException
+from .encoders.value_class_encoder import ValueClassEncoder
 
 class Client:
     def __init__(self):
         self._chunk_size = 5*1024*1024
         self._self_signed = False
-        self._endpoint = 'https://HOSTNAME/v1'
+        self._endpoint = 'https://cloud.appwrite.io/v1'
         self._global_headers = {
             'content-type': '',
-            'user-agent' : 'AppwritePythonSDK/4.1.0 (${os.uname().sysname}; ${os.uname().version}; ${os.uname().machine})',
+            'user-agent' : 'AppwritePythonSDK/5.0.0-rc.2 (${os.uname().sysname}; ${os.uname().version}; ${os.uname().machine})',
             'x-sdk-name': 'Python',
             'x-sdk-platform': 'server',
             'x-sdk-language': 'python',
-            'x-sdk-version': '4.1.0',
+            'x-sdk-version': '5.0.0-rc.2',
             'X-Appwrite-Response-Format' : '1.4.0',
         }
 
@@ -53,6 +55,24 @@ def set_locale(self, value):
         self._global_headers['x-appwrite-locale'] = value
         return self
 
+    def set_session(self, value):
+        """The user session to authenticate with"""
+
+        self._global_headers['x-appwrite-session'] = value
+        return self
+
+    def set_forwarded_for(self, value):
+        """The IP address of the client that made the request"""
+
+        self._global_headers['x-forwarded-for'] = value
+        return self
+
+    def set_forwarded_user_agent(self, value):
+        """The user agent string of the client that made the request"""
+
+        self._global_headers['x-forwarded-user-agent'] = value
+        return self
+
     def call(self, method, path='', headers=None, params=None):
         if headers is None:
             headers = {}
@@ -63,7 +83,6 @@ def call(self, method, path='', headers=None, params=None):
         params = {k: v for k, v in params.items() if v is not None}  # Remove None values from params dictionary
 
         data = {}
-        json = {}
         files = {}
         stringify = False
 
@@ -74,8 +93,7 @@ def call(self, method, path='', headers=None, params=None):
             params = {}
 
         if headers['content-type'].startswith('application/json'):
-            json = data
-            data = {}
+            data = json.dumps(data, cls=ValueClassEncoder)
 
         if headers['content-type'].startswith('multipart/form-data'):
             del headers['content-type']
@@ -84,14 +102,14 @@ def call(self, method, path='', headers=None, params=None):
                 if isinstance(data[key], InputFile):
                     files[key] = (data[key].filename, data[key].data)
                     del data[key]
+            data = self.flatten(data, stringify=stringify)
         response = None
         try:
             response = requests.request(  # call method dynamically https://stackoverflow.com/a/4246075/2299554
                 method=method,
                 url=self._endpoint + path,
                 params=self.flatten(params, stringify=stringify),
-                data=self.flatten(data),
-                json=json,
+                data=data,
                 files=files,
                 headers=headers,
                 verify=(not self._self_signed),

appwrite/encoders/__init__.py

@@ -0,0 +1 @@
+ 

appwrite/encoders/value_class_encoder.py

@@ -0,0 +1,81 @@
+import json
+from ..enums.factor import Factor
+from ..enums.type import Type
+from ..enums.o_auth_provider import OAuthProvider
+from ..enums.browser import Browser
+from ..enums.credit_card import CreditCard
+from ..enums.flag import Flag
+from ..enums.relationship_type import RelationshipType
+from ..enums.relation_mutate import RelationMutate
+from ..enums.index_type import IndexType
+from ..enums.runtime import Runtime
+from ..enums.execution_method import ExecutionMethod
+from ..enums.name import Name
+from ..enums.message_status import MessageStatus
+from ..enums.smtp_encryption import SMTPEncryption
+from ..enums.compression import Compression
+from ..enums.image_gravity import ImageGravity
+from ..enums.image_format import ImageFormat
+from ..enums.password_hash import PasswordHash
+from ..enums.messaging_provider_type import MessagingProviderType
+
+class ValueClassEncoder(json.JSONEncoder):
+    def default(self, o):
+        if isinstance(o, Factor):
+            return o.value
+
+        if isinstance(o, Type):
+            return o.value
+
+        if isinstance(o, OAuthProvider):
+            return o.value
+
+        if isinstance(o, Browser):
+            return o.value
+
+        if isinstance(o, CreditCard):
+            return o.value
+
+        if isinstance(o, Flag):
+            return o.value
+
+        if isinstance(o, RelationshipType):
+            return o.value
+
+        if isinstance(o, RelationMutate):
+            return o.value
+
+        if isinstance(o, IndexType):
+            return o.value
+
+        if isinstance(o, Runtime):
+            return o.value
+
+        if isinstance(o, ExecutionMethod):
+            return o.value
+
+        if isinstance(o, Name):
+            return o.value
+
+        if isinstance(o, MessageStatus):
+            return o.value
+
+        if isinstance(o, SMTPEncryption):
+            return o.value
+
+        if isinstance(o, Compression):
+            return o.value
+
+        if isinstance(o, ImageGravity):
+            return o.value
+
+        if isinstance(o, ImageFormat):
+            return o.value
+
+        if isinstance(o, PasswordHash):
+            return o.value
+
+        if isinstance(o, MessagingProviderType):
+            return o.value
+
+        return super().default(o)

appwrite/enums/__init__.py

@@ -0,0 +1 @@
+ 

appwrite/enums/browser.py

@@ -0,0 +1,17 @@
+from enum import Enum
+
+class Browser(Enum):
+    AVANT_BROWSER = "aa"
+    ANDROID_WEBVIEW_BETA = "an"
+    GOOGLE_CHROME = "ch"
+    GOOGLE_CHROME_IOS = "ci"
+    GOOGLE_CHROME_MOBILE = "cm"
+    CHROMIUM = "cr"
+    MOZILLA_FIREFOX = "ff"
+    SAFARI = "sf"
+    MOBILE_SAFARI = "mf"
+    MICROSOFT_EDGE = "ps"
+    MICROSOFT_EDGE_IOS = "oi"
+    OPERA_MINI = "om"
+    OPERA = "op"
+    OPERA_NEXT = "on"

appwrite/enums/compression.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+class Compression(Enum):
+    NONE = "none"
+    GZIP = "gzip"
+    ZSTD = "zstd"

appwrite/enums/credit_card.py

@@ -0,0 +1,19 @@
+from enum import Enum
+
+class CreditCard(Enum):
+    AMERICAN_EXPRESS = "amex"
+    ARGENCARD = "argencard"
+    CABAL = "cabal"
+    CONSOSUD = "censosud"
+    DINERS_CLUB = "diners"
+    DISCOVER = "discover"
+    ELO = "elo"
+    HIPERCARD = "hipercard"
+    JCB = "jcb"
+    MASTERCARD = "mastercard"
+    NARANJA = "naranja"
+    TARJETA_SHOPPING = "targeta-shopping"
+    UNION_CHINA_PAY = "union-china-pay"
+    VISA = "visa"
+    MIR = "mir"
+    MAESTRO = "maestro"

appwrite/enums/execution_method.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+class ExecutionMethod(Enum):
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    OPTIONS = "OPTIONS"

appwrite/enums/factor.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+class Factor(Enum):
+    TOTP = "totp"
+    PHONE = "phone"
+    EMAIL = "email"