django-chelseru 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

{django_chelseru-2.0.0.dist-info → django_chelseru-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 2.0.0
+Version: 2.0.2
 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.dist-info → django_chelseru-2.0.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_chelseru-2.0.0.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
+django_chelseru-2.0.2.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
 drfchelseru/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 drfchelseru/admin.py,sha256=uamcWPCCw9_dD00XL8Brp8A1NvfhB5FtUfF9DWQCK9c,1022
 drfchelseru/apps.py,sha256=hOTTzFGLXiTPZeN8p_LLcSECLtsR2Q0SUo8zJzgM-qQ,211
@@ -7,8 +7,8 @@ drfchelseru/middlewares.py,sha256=Ej_9GTlVPzfzYAUqxUn7VHJRdlywQmrbSIW43yK5q5U,38
 drfchelseru/models.py,sha256=jQ5IbS5q4GufZC9W_zgX1Qg8YU_f8V-Jusbh5hQYPhQ,11214
 drfchelseru/routing.py,sha256=shAlgzcIwVuVPlvKeWBLCqr6PuBTHyIrWNgHEfnqrxg,165
 drfchelseru/serializers.py,sha256=I3kS2NhzIprY8-WWhjQPShAom6R7epg7do7RnDkpnys,1421
-drfchelseru/services.py,sha256=9sHlY-_Prd1Wl1WTddT-e1nE7rYKlDjFaYl6FGjwvTA,27142
-drfchelseru/settings.py,sha256=zzOKwaciRMOhf5tQM4jAT4_80nggTwl_HqCby7TCUaE,11385
+drfchelseru/services.py,sha256=K-VzisPliuKv0BL6Z3U6Tz0ewiVwhUkxt7yn08pemCk,29024
+drfchelseru/settings.py,sha256=LhdRLmUJnNlET0JYnHqRdFzmBD_nEX18qU1C1j0qN0E,11466
 drfchelseru/signals.py,sha256=CI1mZR5RrdOddXBnPC1eMdt9iQkYFDypfgogtfTc2eQ,2714
 drfchelseru/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 drfchelseru/urls.py,sha256=qD3As2gSCEaNDxgU0ejIADLUt9t2EvoaTmqeiV1LRSA,898
@@ -37,7 +37,7 @@ drfchelseru/migrations/0020_payment_paid_at.py,sha256=H6cr-tfjJVjN3tCsCD8ecg9JGJ
 drfchelseru/migrations/0021_alter_payment_message.py,sha256=g5qIvQ-wecdXGcMf7ZhyfL2u85QpgMUOADHE7t4QHog,397
 drfchelseru/migrations/0022_payment_pay_mode_wallet.py,sha256=241lZITO1jQHqXkJKYm8DKUh7w9rmROh65LzNifP3BA,1521
 drfchelseru/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_chelseru-2.0.0.dist-info/METADATA,sha256=EObLgGe6BtL_uteht0I9gkfDai8YPHmlsTKDhm4ea2Y,18242
-django_chelseru-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_chelseru-2.0.0.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
-django_chelseru-2.0.0.dist-info/RECORD,,
+django_chelseru-2.0.2.dist-info/METADATA,sha256=XpDHKGThjY6g1xxY19GijeYm8hZTWBjjp1yMEM5F3g4,18242
+django_chelseru-2.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_chelseru-2.0.2.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
+django_chelseru-2.0.2.dist-info/RECORD,,

drfchelseru/services.py

@@ -116,10 +116,38 @@ 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'
+            message = ''.join(list(map(lambda x: x if x != ' ' else '-', message.strip())))
+            data = {
+                'receptor': self.RECEIVER,
+                'template': template_id,
+                'token': message,
+            }
+            if kwargs.get('token2'):
+                data['token2'] = ''.join(list(map(lambda x: x if x != ' ' else '-', kwargs.get('token2').strip())))
+
+            if kwargs.get('token3'):
+                data['token3'] = ''.join(list(map(lambda x: x if x != ' ' else '-', kwargs.get('token3').strip())))
+
+            if kwargs.get('token10'):
+                data['token10'] = kwargs.get('token10').strip()
 
+            if kwargs.get('token20'):
+                data['token20'] = kwargs.get('token20').strip()
+
+            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 +176,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 +242,24 @@ 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)
+                    
             response_json = response.json()
             entries = response_json.get('entries', [])
             _return = response_json.get('return', {})

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: