Merge pull request #1 from Amele9/master

ripreal · web-flow · commit 95fe2d0ec1f5 · 2022-11-22T16:45:54.000+03:00
The GreenAPI class has been updated
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ pip install whatsapp-api-client-python
 ## Import 
 
 ```
-from whatsapp_api_client_python import API
+from whatsapp_api_client_python import GreenAPI
 ```
 ## Authorization
 
@@ -32,7 +32,7 @@ To send a message or to exacute some other Green-API method, you have to have th
 ### How to initialize an object
 
 ```
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 ```
 
 ### Sending a text message to a WhatsApp number
diff --git a/README_RUS.md b/README_RUS.md
@@ -18,7 +18,7 @@ pip install whatsapp-api-client-python
 ## Import 
 
 ```
-from whatsapp_api_client_python import API
+from whatsapp_api_client_python import GreenAPI
 ```
 ## Авторизация 
 
@@ -29,7 +29,7 @@ from whatsapp_api_client_python import API
 ### Как инициализировать объект
 
 ```
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = API.GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 ```
 
 ### Отправка текстового сообщения на номер WhatsApp
diff --git a/examples/createGroupAndSendMessage.py b/examples/createGroupAndSendMessage.py
@@ -1,12 +1,12 @@
 from os import environ
 
-from whatsapp_api_client_python import API as API
+from whatsapp_api_client_python import GreenAPI
 
 # First you need to set the environment variables
 ID_INSTANCE = environ['ID_INSTANCE']
 API_TOKEN_INSTANCE = environ['API_TOKEN_INSTANCE']
 
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 
 def main():
     chatIds = [
diff --git a/examples/receiveNotification.py b/examples/receiveNotification.py
@@ -1,13 +1,13 @@
 from os import environ
 from datetime import datetime
 import json
-from whatsapp_api_client_python import API as API
+from whatsapp_api_client_python import GreenAPI
 
 
 ID_INSTANCE = environ['ID_INSTANCE']
 API_TOKEN_INSTANCE = environ['API_TOKEN_INSTANCE']
 
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 
 def main():
    greenAPI.webhooks.startReceivingNotifications(onEvent)
diff --git a/examples/sendPictureByLink.py b/examples/sendPictureByLink.py
@@ -1,11 +1,11 @@
 from os import environ
 
-from whatsapp_api_client_python import API as API
+from whatsapp_api_client_python import GreenAPI
 
 ID_INSTANCE = environ['ID_INSTANCE']
 API_TOKEN_INSTANCE = environ['API_TOKEN_INSTANCE']
 
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 
 def main():
     result = greenAPI.sending.sendFileByUrl('79001234567@c.us', 
diff --git a/examples/sendPictureByUpload.py b/examples/sendPictureByUpload.py
@@ -1,11 +1,11 @@
 from os import environ
 
-from whatsapp_api_client_python import API as API
+from whatsapp_api_client_python import GreenAPI
 
 ID_INSTANCE = environ['ID_INSTANCE']
 API_TOKEN_INSTANCE = environ['API_TOKEN_INSTANCE']
 
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 
 def main():
     result = greenAPI.sending.sendFileByUpload('79001234567@c.us', 
diff --git a/examples/sendTextMessage.py b/examples/sendTextMessage.py
@@ -1,11 +1,11 @@
 from os import environ
 
-from whatsapp_api_client_python import API as API
+from whatsapp_api_client_python import GreenAPI
 
 ID_INSTANCE = environ['ID_INSTANCE']
 API_TOKEN_INSTANCE = environ['API_TOKEN_INSTANCE']
 
-greenAPI = API.GreenApi(ID_INSTANCE, API_TOKEN_INSTANCE)
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
 
 def main():
     result = greenAPI.sending.sendMessage('79001234567@c.us', 'Message text')
diff --git a/tests/test_library.py b/tests/test_library.py
@@ -0,0 +1,25 @@
+import unittest
+from os import environ
+
+from whatsapp_api_client_python import GreenAPI
+
+ID_INSTANCE = environ["ID_INSTANCE"]
+API_TOKEN_INSTANCE = environ["API_TOKEN_INSTANCE"]
+
+greenAPI = GreenAPI(ID_INSTANCE, API_TOKEN_INSTANCE)
+
+
+class GreenAPITestCase(unittest.TestCase):
+    def test_getSettings(self):
+        response = greenAPI.account.getSettings()
+
+        self.assertEqual(response.status_code, 200, response.error)
+
+    def test_getStateInstance(self):
+        response = greenAPI.account.getSettings()
+
+        self.assertEqual(response.status_code, 200, response.error)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/test_main.py b/tests/test_main.py
diff --git a/whatsapp_api_client_python/API.py b/whatsapp_api_client_python/API.py
diff --git a/whatsapp_api_client_python/__init__.py b/whatsapp_api_client_python/__init__.py
@@ -0,0 +1,3 @@
+from .api import GreenAPI
+
+__all__ = ["GreenAPI"]
diff --git a/whatsapp_api_client_python/api.py b/whatsapp_api_client_python/api.py
@@ -0,0 +1,103 @@
+import array
+import json
+import typing
+
+import requests
+
+from whatsapp_api_client_python.response import Response
+from whatsapp_api_client_python.tools import (
+    account,
+    device,
+    groups,
+    journals,
+    marking,
+    queues,
+    receiving,
+    sending,
+    serviceMethods,
+    webhooks
+)
+
+
+class GreenAPI:
+    """REST API class"""
+
+    def __init__(self, id_instance: str, token: str, host: str = "https://api.green-api.com") -> None:
+        self.id_instance = id_instance
+        self.token = token
+        self.host = host
+
+    @property
+    def account(self) -> account.Account:
+        return account.Account(self)
+
+    @property
+    def device(self) -> device.Device:
+        return device.Device(self)
+
+    @property
+    def groups(self) -> groups.Groups:
+        return groups.Groups(self)
+
+    @property
+    def journals(self) -> journals.Journals:
+        return journals.Journals(self)
+
+    @property
+    def marking(self) -> marking.Marking:
+        return marking.Marking(self)
+
+    @property
+    def queues(self) -> queues.Queues:
+        return queues.Queues(self)
+
+    @property
+    def receiving(self) -> receiving.Receiving:
+        return receiving.Receiving(self)
+
+    @property
+    def sending(self) -> sending.Sending:
+        return sending.Sending(self)
+
+    @property
+    def service_methods(self) -> serviceMethods.ServiceMethods:
+        return serviceMethods.ServiceMethods(self)
+
+    @property
+    def webhooks(self) -> webhooks.Webhooks:
+        return webhooks.Webhooks(self)
+
+    def request(
+            self,
+            method: typing.Literal["DELETE", "GET", "POST"],
+            url: str,
+            payload: typing.Optional[typing.Any] = None,
+            files: typing.Optional[array.array] = None
+    ):
+        url = url.replace('{{host}}', self.host)
+        url = url.replace('{{idInstance}}', self.id_instance)
+        url = url.replace('{{apiTokenInstance}}', self.token)
+
+        headers = {}
+        payload_data = None
+        if payload:
+            if not files:
+                headers["Content-Type"] = "application/json"
+                payload_data = json.dumps(payload)
+            else:
+                payload_data = payload
+
+        response = requests.request(
+            method, url, headers=headers, data=payload_data, files=files
+        )
+
+        status_code = response.status_code
+        text = response.text
+        try:
+            response.raise_for_status()
+        except requests.HTTPError:
+            return Response(status_code, text)
+        except Exception as error:
+            status_code = 0
+            text = f'Other error occurred: {error}'
+        return Response(status_code, text)
diff --git a/whatsapp_api_client_python/response.py b/whatsapp_api_client_python/response.py
@@ -1,16 +1,15 @@
 import json
+import typing
 
 
 class Response:
-    code: int
-    data: json
-    error: str
+    data: typing.Optional[typing.Union[dict, list]] = None
+    error: typing.Optional[str] = None
+    status_code: int
 
-    def __init__(self, code: int, text: str) -> None:
-        self.code = code
-        if code == 200:
+    def __init__(self, status_code: int, text: str) -> None:
+        self.status_code = status_code
+        if status_code == 200:
             self.data = json.loads(text)
-            self.error = None
         else:
             self.error = text
-            self.data = None
