optimuslib 0.0.38__py3-none-any.whl → 0.0.39__py3-none-any.whl

optimuslib/optimuslib.py

@@ -101,7 +101,7 @@ def checkOS():
     osVersion = platform.platform()
     oshostname = platform.node()
     # log.info('osType: %s, osVersion: %s, oshostname: %s', osType, osVersion, oshostname)
-    print('osType: '+osType+', osVersion: '+osVersion+', oshostname: '+oshostname)
+    print(f'osType: {osType}, osVersion: {osVersion}, oshostname: {oshostname}')
     return osType, osVersion, oshostname
 
 
@@ -149,12 +149,12 @@ osType, osVersion, oshostname = checkOS()
 if osType == 'Windows':
     proxyhost = 'http://127.0.0.1:8080'
     proxyhost = None
-    # log.setLevel(logging.INFO)    
-    # file.setLevel(logging.INFO)
-    # stream.setLevel(logging.INFO)
-    log.setLevel(logging.DEBUG)
-    file.setLevel(logging.DEBUG)
-    stream.setLevel(logging.DEBUG)
+    log.setLevel(logging.INFO)    
+    file.setLevel(logging.INFO)
+    stream.setLevel(logging.INFO)
+    # log.setLevel(logging.DEBUG)
+    # file.setLevel(logging.DEBUG)
+    # stream.setLevel(logging.DEBUG)
 else:
     proxyhost = None
     # log.setLevel(logging.INFO)    
@@ -253,7 +253,7 @@ def traverse(path):
 ############## REQUESTS LIBRARY ###################
 import time, sys, requests
 # import sys
-# import requests
+import requests
 requests.packages.urllib3.disable_warnings()
 
 # For Futures - Parallel Processing of Requests
@@ -343,7 +343,7 @@ def sendRequest(method, requestUrl, cookies=None, headers=None, data=None, json=
     totalRequestsSent += 1
     
     # log.info('[%d/%d] Sending Request: %s',totalRequestsSent,len(requestUrl),requestUrl)
-    log.debug('\t[%d] Sending Request: %s',totalRequestsSent,requestUrl)
+    log.debug(f'\t[{totalRequestsSent}] Sending Request: {requestUrl}')
     # log.info('\t[%d] Sending Request: %s',totalRequestsSent,requestUrl)
 
     # log.debug('Sending request - \n\t Request URL: %s %s\n\tRequest Headers: %s\n\t Request Data: %s\n\tRequest Json Data: %s', method, requestUrl, headers, data, json)
@@ -358,19 +358,25 @@ def sendRequest(method, requestUrl, cookies=None, headers=None, data=None, json=
             response=s.delete(requestUrl, cookies=cookies, headers=headers, data=data, json=json, params=params, files=files, timeout=timeout, allow_redirects=allow_redirects, verify=verify)
         if method=='put' or method=='PUT':
             response=s.put(requestUrl, cookies=cookies, headers=headers, data=data, json=json, params=params, files=files, timeout=timeout, allow_redirects=allow_redirects, verify=verify)
-        # log.debug('Recieved Response - Response Status Code: %d\n\tResponse Headers: %s\n\tResponse Data: %s', response.result().status_code, str(response.result().headers), str(response.result().text))
-        log.debug('Recieved Response - Response Status Code: %d\n\tResponse Data: %s', response.result().status_code, str(response.result().text))
+        # # log.debug('Recieved Response - Response Status Code: %d\n\tResponse Headers: %s\n\tResponse Data: %s', response.result().status_code, str(response.result().headers), str(response.result().text))
+        log.debug(f'Recieved Response - Response Status Code: {response.result().status_code}\n\tResponse Data: {str(response.result().text)}')
         return response
     # except requests.exceptions.ConnectionError as e:
     # except (MalformedRequest, InternalError, StatusUnknown, ConnectionError, ConnectionResetError, http.client.RemoteDisconnected, RemoteDisconnected, ProtocolError, HTTPException, socket.gaierror) as e:
-    except (ConnectionError, ConnectionResetError) as e:
-        # log.error('ConnectionError occured - %s', e)
-        log.error('Exception occured - %s', e)
+    except requests.exceptions.ConnectionError as e:
+        log.error(f'ConnectionError occured - {e}')
+        print('Sleeping for 60 secods before next request')
+        time.sleep(60)
+        sendRequest(method, requestUrl, cookies, headers, data, json, params, files, timeout, proxyhost, validResponseCodes, allow_redirects, verify)
+        # sys.exit()
+    except requests.exceptions.ConnectionResetError as e:
+        log.error(f'Exception occured - {e}')
         log.error('Is your internet connection Stable?')
-        # sendRequest(requestUrl, cookies=cookies, headers=headers, data=data, json=json, params=params, files=files, timeout=timeout, proxyhost=None, validResponseCodes=False,allow_redirects=allow_redirects, verify=False)
         sys.exit()
+    except requests.exceptions.RequestException as e:
+        print(f"Request failed: {e}")
     except ConnectionRefusedError as e:
-        log.error('Exception occured - %s', e)
+        log.error(f'Exception occured - {e}')
         log.error('Is proxy set and server not running?')
         sys.exit()
 
@@ -406,7 +412,7 @@ def sendBulkRequests(method, requestUrlList, cookies=None, headers=None, data=No
     for requestUrl in requestUrlList:
         totalBulkRequestsSent+=1
         # log.info('Sending Bulk Request...[%d/%d]', totalBulkRequestsSent, totalRequestUrl)
-        log.debug('Sending Bulk Request...[%d/%d]', totalBulkRequestsSent, totalRequestUrl)
+        log.debug(f'Sending Bulk Request...[{totalBulkRequestsSent}/{totalRequestUrl}]')
         futureResponse = sendRequest(method, requestUrl, cookies=cookies, headers=headers, data=data, json=json, timeout=timeout, allow_redirects=allow_redirects, proxyhost=proxyhost)
         futureResponseList.append(futureResponse)
     return futureResponseList
@@ -1256,10 +1262,7 @@ def formatCurrrencyIndian(number):
 def getDiscordBotUpdates(botToken, channelId, messageCount=1):
     log.info('Checking new messages...')
     url = 'https://discord.com/api/v10/channels/'+channelId+'/messages?limit='+str(messageCount)
-    headers = {
-        'Authorization': 'Bot ' + botToken,
-        'Content-Type': 'application/json'
-    }
+    headers = {'Authorization': 'Bot ' + botToken}
     response = sendRequest('get', url, headers=headers, proxyhost=proxyhost)
     # response = sendRequest('get', url, proxyhost=proxyhost)
     # try:
@@ -1334,7 +1337,7 @@ def fetchOTPDiscord(botToken, otpFetchWaitTime, otpChannelId):
 
 # function to validate if length is > 4096
 def sendDiscordBotNotification(botToken,channelId,message, parse_mode=''):
-    msgs = [message[i:i + 4096] for i in range(0, len(message), 4096)]
+    msgs = [message[i:i + 2000] for i in range(0, len(message), 4096)]
     for text in msgs:
          sendDiscordBotNotificationMain(botToken,channelId,text, parse_mode)
             
@@ -1350,7 +1353,10 @@ def sendDiscordBotNotificationMain(botToken,channelId,message, parse_mode=''):
         return True
     else:
         responseJson = response.result().json()
-        log.info('Discord Bot Message Send Failure Error Description: %s', responseJson['description'])
+        try:
+            log.info(f'Discord Bot Message Send Failure Error Description: {responseJson['errors']['content']['_errors'][0]['code']} - {responseJson['errors']['content']['_errors'][0]['message']}')
+        except:
+            log.info(f'Discord Bot Message Send Failure Error Description: {responseJson['message']}')
         getVarInfo('responseJson',responseJson)
         return False
         

{optimuslib-0.0.38.dist-info → optimuslib-0.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: optimuslib
-Version: 0.0.38
+Version: 0.0.39
 Summary: Function Library for mostly used codes
 Author: Shomi Nanwani
 Requires-Python: >=3.9,<4.0

optimuslib-0.0.39.dist-info/RECORD

@@ -0,0 +1,5 @@
+optimuslib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+optimuslib/optimuslib.py,sha256=LfDWhxtOT8pyP1PlB62Drkp3Of0maBCOVlEVUr_r_yw,55211
+optimuslib-0.0.39.dist-info/METADATA,sha256=IwPhbKGK-wwxbKD_23BqyDzj-yVjPk-iKaBRPPSLiGY,611
+optimuslib-0.0.39.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+optimuslib-0.0.39.dist-info/RECORD,,

optimuslib-0.0.38.dist-info/RECORD

@@ -1,5 +0,0 @@
-optimuslib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-optimuslib/optimuslib.py,sha256=R6ieYVgNW5ct2zljAnor9B282OiYgeXgyfMC2Xmu7JE,54874
-optimuslib-0.0.38.dist-info/METADATA,sha256=b6tNhLogjkX7gb7KrEhrb0QdMLB4kt3QEP3ECX_m3zo,611
-optimuslib-0.0.38.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-optimuslib-0.0.38.dist-info/RECORD,,