Merge pull request #8 from exituser/feature/update-version

updated version

.github/workflows/ci.yml

@@ -23,15 +23,15 @@ jobs:
       - name: Build package
         run: python setup.py sdist bdist_wheel
 
-#      - name: Publish package
-#        uses: pypa/gh-action-pypi-publish@release/v1
-#        with:
-#          user: __token__
-#          password: ${{ secrets.PYPI_API_TOKEN }}
-
-      - name: Publish package to TestPyPI
+      - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          repository-url: https://test.pypi.org/legacy/
+          password: ${{ secrets.PYPI_API_TOKEN }}
+
+#      - name: Publish package to TestPyPI
+#        uses: pypa/gh-action-pypi-publish@release/v1
+#        with:
+#          user: __token__
+#          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+#          repository-url: https://test.pypi.org/legacy/

prosto_sms/__init__.py

@@ -0,0 +1,79 @@
+from typing import Optional
+
+import requests
+from loguru import logger
+
+from . import exceptions
+from . import methods
+
+
+class API:
+    """
+    Main api class
+    """
+
+    def __init__(
+        self,
+        email: str = None,
+        password: str = None,
+        key: str = None
+    ):
+        """
+        Initializing the API
+
+        :param email: account email address
+        :param password: account password
+        :param key: api key
+        """
+
+        self.email = email
+        self.password = password
+        self.key = key
+        self.api_url = "https://ssl.bs00.ru"
+        self.methods = methods.Methods(self)
+
+    def request(self, method: str, data: dict = None) -> Optional[dict]:
+        """
+        Method for requesting information
+
+        :param method: required method
+        :param data: request parameters
+        :return: response data
+        """
+
+        if data is None:
+            data = {}
+
+        data["format"] = "json"
+        if not data.get("method"):
+            data["method"] = method
+
+        if self.key and not (self.email and self.password):
+            data["key"] = self.key
+        elif (self.email and self.password) and not self.key:
+            data["email"] = self.email
+            data["password"] = self.password
+        else:
+            raise exceptions.NoAuthData(
+                "email and password OR key is required"
+            )
+
+        try:
+            result = requests.get(
+                url=self.api_url,
+                params=data,
+                timeout=30
+            )
+            result.raise_for_status()
+
+            result = result.json()
+        except Exception as err:
+            logger.exception(err)
+            return
+
+        if result["response"]["msg"].get("type") == "error":
+            raise exceptions.RequestError(
+                result["response"]["msg"]["text"]
+            )
+
+        return result["response"]["data"]

prosto_sms/api.py

@@ -1,79 +0,0 @@
-from typing import Optional
-
-import requests
-from loguru import logger
-
-from . import exceptions
-from . import methods
-
-
-class API:
-    """
-    Main api class
-    """
-
-    def __init__(
-        self,
-        email: str = None,
-        password: str = None,
-        key: str = None
-    ):
-        """
-        Initializing the API
-
-        :param email: account email address
-        :param password: account password
-        :param key: api key
-        """
-
-        self.email = email
-        self.password = password
-        self.key = key
-        self.api_url = "https://ssl.bs00.ru"
-        self.methods = methods.Methods(self)
-
-    def request(self, method: str, data: dict = None) -> Optional[dict]:
-        """
-        Method for requesting information
-
-        :param method: required method
-        :param data: request parameters
-        :return: response data
-        """
-
-        if data is None:
-            data = {}
-
-        data["format"] = "json"
-        if not data.get("method"):
-            data["method"] = method
-
-        if self.key and not (self.email and self.password):
-            data["key"] = self.key
-        elif (self.email and self.password) and not self.key:
-            data["email"] = self.email
-            data["password"] = self.password
-        else:
-            raise exceptions.NoAuthData(
-                "email and password OR key is required"
-            )
-
-        try:
-            result = requests.get(
-                url=self.api_url,
-                params=data,
-                timeout=30
-            )
-            result.raise_for_status()
-
-            result = result.json()
-        except Exception as err:
-            logger.exception(err)
-            return
-
-        if result["response"]["msg"].get("type") == "error":
-            raise exceptions.ApiError(
-                result["response"]["msg"]["text"]
-            )
-
-        return result["data"]

prosto_sms/exceptions.py

@@ -10,5 +10,5 @@ class NoAuthData(ApiException):
     pass
 
 
-class ApiError(ApiException):
+class RequestError(ApiException):
     pass

prosto_sms/methods.py

@@ -81,7 +81,7 @@ class Methods:
     def get_prices(
         self,
         *,
-        group_directions: int = None
+        group_directions: str = None
     ) -> models.GetPricesData:
         """
         Implementation of get_prices

prosto_sms/models.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 
 
 class GetPricesData(BaseModel):
-    group_directions: str
+    group_directions: dict
 
 
 class GetMessageReportData(BaseModel):

setup.py

@@ -5,7 +5,7 @@ with open('requirements.txt') as f:
 
 setup(
     name='prosto_sms',
-    version='0.0.1',
+    version='0.0.3',
 
     author='Alex Dennitsev',
     author_email='me@chydo.dev',