Merge pull request #18 from messente/travis

Release version 2.1.0

Author: krystian-wojakiewicz

.openapi-generator/FILES

@@ -49,6 +49,7 @@ docs/OmniMessageCreateSuccessResponse.md
 docs/Omnimessage.md
 docs/OmnimessageApi.md
 docs/OmnimessageMessagesInner.md
+docs/PriceInfo.md
 docs/Priority.md
 docs/SMS.md
 docs/StatisticsApi.md
@@ -123,6 +124,7 @@ messente_api/models/numbers_to_investigate.py
 messente_api/models/omni_message_create_success_response.py
 messente_api/models/omnimessage.py
 messente_api/models/omnimessage_messages_inner.py
+messente_api/models/price_info.py
 messente_api/models/priority.py
 messente_api/models/sms.py
 messente_api/models/statistics_report.py

README.md

@@ -1,7 +1,7 @@
 # Messente API Library
 
 - Messente API version: 2.0.0
-- Python package version: 2.0.0
+- Python package version: 2.1.0
 
 [Messente](https://messente.com) is a global provider of messaging and user verification services.  * Send and receive SMS, Viber, WhatsApp and Telegram messages. * Manage contacts and groups. * Fetch detailed info about phone numbers. * Blacklist phone numbers to make sure you're not sending any unwanted messages.  Messente builds [tools](https://messente.com/documentation) to help organizations connect their services to people anywhere in the world.
 

docs/DeliveryResult.md

@@ -12,6 +12,8 @@ Name | Type | Description | Notes
 **error** | **str** | Human-readable description of what went wrong, *null* in case of success or if the message has not been processed yet | [optional] 
 **err** | [**ErrorCodeOmnichannelMachine**](ErrorCodeOmnichannelMachine.md) |  | [optional] 
 **timestamp** | **datetime** | When this status was received by Omnichannel API | [optional] 
+**price_info** | [**PriceInfo**](PriceInfo.md) |  | [optional] 
+**sender** | **str** | the sender of the message | [optional] 
 
 ## Example
 

docs/PriceInfo.md

@@ -0,0 +1,32 @@
+# PriceInfo
+
+Contains price information for the message. This value is *null* if the message is still being processed
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**part_price** | **str** | price per message part - relevant mostly for SMS | 
+**parts_count** | **int** | the number of parts the message consists of | 
+**total_price** | **str** | total price for the message | 
+
+## Example
+
+```python
+from messente_api.models.price_info import PriceInfo
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of PriceInfo from a JSON string
+price_info_instance = PriceInfo.from_json(json)
+# print the JSON string representation of the object
+print(PriceInfo.to_json())
+
+# convert the object into a dict
+price_info_dict = price_info_instance.to_dict()
+# create an instance of PriceInfo from a dict
+price_info_from_dict = PriceInfo.from_dict(price_info_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

messente_api/__init__.py

@@ -15,7 +15,7 @@
 """  # noqa: E501
 
 
-__version__ = "2.0.0"
+__version__ = "2.1.0"
 
 # import apis into sdk package
 from messente_api.api.blacklist_api import BlacklistApi
@@ -77,6 +77,7 @@
 from messente_api.models.omni_message_create_success_response import OmniMessageCreateSuccessResponse
 from messente_api.models.omnimessage import Omnimessage
 from messente_api.models.omnimessage_messages_inner import OmnimessageMessagesInner
+from messente_api.models.price_info import PriceInfo
 from messente_api.models.priority import Priority
 from messente_api.models.sms import SMS
 from messente_api.models.statistics_report import StatisticsReport

messente_api/api_client.py

@@ -89,7 +89,7 @@ def __init__(
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/2.0.0/python'
+        self.user_agent = 'OpenAPI-Generator/2.1.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):

messente_api/configuration.py

@@ -395,7 +395,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2.0.0\n"\
-               "SDK Package Version: 2.0.0".\
+               "SDK Package Version: 2.1.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

messente_api/models/__init__.py

@@ -53,6 +53,7 @@
 from messente_api.models.omni_message_create_success_response import OmniMessageCreateSuccessResponse
 from messente_api.models.omnimessage import Omnimessage
 from messente_api.models.omnimessage_messages_inner import OmnimessageMessagesInner
+from messente_api.models.price_info import PriceInfo
 from messente_api.models.priority import Priority
 from messente_api.models.sms import SMS
 from messente_api.models.statistics_report import StatisticsReport

messente_api/models/delivery_result.py

@@ -23,6 +23,7 @@
 from typing import Any, ClassVar, Dict, List, Optional
 from messente_api.models.channel import Channel
 from messente_api.models.error_code_omnichannel_machine import ErrorCodeOmnichannelMachine
+from messente_api.models.price_info import PriceInfo
 from messente_api.models.status import Status
 from typing import Optional, Set
 from typing_extensions import Self
@@ -37,7 +38,9 @@ class DeliveryResult(BaseModel):
     error: Optional[StrictStr] = Field(default=None, description="Human-readable description of what went wrong, *null* in case of success or if the message has not been processed yet")
     err: Optional[ErrorCodeOmnichannelMachine] = None
     timestamp: Optional[datetime] = Field(default=None, description="When this status was received by Omnichannel API")
-    __properties: ClassVar[List[str]] = ["status", "channel", "message_id", "error", "err", "timestamp"]
+    price_info: Optional[PriceInfo] = None
+    sender: Optional[StrictStr] = Field(default=None, description="the sender of the message")
+    __properties: ClassVar[List[str]] = ["status", "channel", "message_id", "error", "err", "timestamp", "price_info", "sender"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -78,6 +81,9 @@ def to_dict(self) -> Dict[str, Any]:
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of price_info
+        if self.price_info:
+            _dict['price_info'] = self.price_info.to_dict()
         # set to None if error (nullable) is None
         # and model_fields_set contains the field
         if self.error is None and "error" in self.model_fields_set:
@@ -100,7 +106,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "message_id": obj.get("message_id"),
             "error": obj.get("error"),
             "err": obj.get("err"),
-            "timestamp": obj.get("timestamp")
+            "timestamp": obj.get("timestamp"),
+            "price_info": PriceInfo.from_dict(obj["price_info"]) if obj.get("price_info") is not None else None,
+            "sender": obj.get("sender")
         })
         return _obj
 

messente_api/models/price_info.py

@@ -0,0 +1,92 @@
+# coding: utf-8
+
+"""
+    Messente API
+
+    [Messente](https://messente.com) is a global provider of messaging and user verification services.  * Send and receive SMS, Viber, WhatsApp and Telegram messages. * Manage contacts and groups. * Fetch detailed info about phone numbers. * Blacklist phone numbers to make sure you're not sending any unwanted messages.  Messente builds [tools](https://messente.com/documentation) to help organizations connect their services to people anywhere in the world.
+
+    The version of the OpenAPI document: 2.0.0
+    Contact: [email protected]
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class PriceInfo(BaseModel):
+    """
+    Contains price information for the message. This value is *null* if the message is still being processed
+    """ # noqa: E501
+    part_price: StrictStr = Field(description="price per message part - relevant mostly for SMS")
+    parts_count: StrictInt = Field(description="the number of parts the message consists of")
+    total_price: StrictStr = Field(description="total price for the message")
+    __properties: ClassVar[List[str]] = ["part_price", "parts_count", "total_price"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of PriceInfo from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of PriceInfo from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "part_price": obj.get("part_price"),
+            "parts_count": obj.get("parts_count"),
+            "total_price": obj.get("total_price")
+        })
+        return _obj
+
+

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "messente_api"
-version = "2.0.0"
+version = "2.1.0"
 description = "Messente API"
 authors = ["Messente <[email protected]>"]
 license = "Apache-2.0"

setup.py

@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 NAME = "messente-api"
-VERSION = "2.0.0"
+VERSION = "2.1.0"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 2.1.0",