django-chelseru 2.0.0__tar.gz → 2.0.1__tar.gz

{django_chelseru-2.0.0/django_chelseru.egg-info → django_chelseru-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 2.0.0
+Version: 2.0.1
 Summary: Authentication system, online and real-time chat, SMS & BANK system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
 Author: Sobhan Bahman Rashnu

{django_chelseru-2.0.0 → django_chelseru-2.0.1/django_chelseru.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 2.0.0
+Version: 2.0.1
 Summary: Authentication system, online and real-time chat, SMS & BANK system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
 Author: Sobhan Bahman Rashnu

{django_chelseru-2.0.0 → django_chelseru-2.0.1}/drfchelseru/services.py

@@ -116,10 +116,37 @@ class KavenegarCom:
     
     def __init__(self, mobile, options, *args, **kwargs):
         self.RECEIVER = mobile
-        if options and 'api_key' in options and 'from' in options:
+        if options and 'api_key' in options:
             self.API_KEY = options['api_key']
-            self.SENDER = options['from']
+            if 'from' in options:
+                self.SENDER = options['from']
+
+    def send_message_lookup(self, message, template_id, **kwargs):
+        try:
+            api_url = f'https://api.kavenegar.com/v1/{self.API_KEY}/verify/lookup.json'
+            data = {
+                'receptor': self.RECEIVER,
+                'template': template_id,
+                'token': message.strip(),
+            }
+            if kwargs.get('token2'):
+                data['token2'] = kwargs.get('token2').strip()
+
+            if kwargs.get('token3'):
+                data['token3'] = kwargs.get('token3').strip()
+
+            if kwargs.get('token10'):
+                data['token10'] = kwargs.get('token10')
 
+            if kwargs.get('token20'):
+                data['token20'] = kwargs.get('token20')
+
+            response = requests.post(url=api_url, data=data)
+            return response
+            
+        except Exception as e:
+            print(str(e))
+            return False
 
     def send_message(self, message):
         try:
@@ -148,7 +175,8 @@ class KavenegarCom:
                         418   Your credit is not sufficient.
                         451   Excessive calls within a specific time period are restricted to IP addresses.
             """
-        except:
+        except Exception as e:
+            print(str(e))
             return False
 
 
@@ -213,7 +241,25 @@ def send_message(mobile_number, message_text, data=None, template_id=None):
     elif sms_service == 'KAVENEGAR_COM':
         service = KavenegarCom(mobile=mobile_number, options=options)
         try:
-            response = service.send_message(message=message_text)
+            if template_id or data.get('template_id'):
+                if not template_id:
+                    template_id = data.get('template_id')
+
+                _data = {}
+                if 'token2' in data:
+                    _data['token2'] = data.get('token2')
+                if 'token3' in data:
+                    _data['token3'] = data.get('token3')
+                if 'token10' in data:
+                    _data['token10'] = data.get('token10')
+                if 'token20' in data:
+                    _data['token20'] = data.get('token20')
+
+                response = service.send_message_lookup(message=message_text, template_id=template_id, **_data)
+            else:
+                response = service.send_message(message=message_text)
+                    
+            print(response.json())
             response_json = response.json()
             entries = response_json.get('entries', [])
             _return = response_json.get('return', {})

{django_chelseru-2.0.0 → django_chelseru-2.0.1}/drfchelseru/settings.py

@@ -187,11 +187,13 @@ def sms_init_check():
                                     options['api_key'] = api_key
 
                                 _from = getattr(settings, SERVICE_NAME).get('SMS').get('SETTINGS').get('KAVENEGAR_COM_FROM')
-                                if not _from:
-                                    raise ImproperlyConfigured(f'KAVENEGAR_COM_FROM must be defined in {SERVICE_NAME}: SMS: SETTINGS, To send an SMS, the sender`s number is required.')
-                                
-                                else:
+                                if _from:
                                     options['from'] = _from
+                                # if not _from:
+                                #     raise ImproperlyConfigured(f'KAVENEGAR_COM_FROM must be defined in {SERVICE_NAME}: SMS: SETTINGS, To send an SMS, the sender`s number is required.')
+                                
+                                # else:
+                                
 
         return {'SMS_SERVICE': sms_service, 'SETTINGS': options, 'TEMPLATES': templates}
     except ImproperlyConfigured as e:

{django_chelseru-2.0.0 → django_chelseru-2.0.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-chelseru',
-    version='2.0.0',
+    version='2.0.1',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[