Minor email send changes

Author: frikky

email/1.3.0/src/app.py

@@ -95,6 +95,12 @@ def send_email_smtp(self, smtp_host, recipient, subject, body, smtp_port, attach
             except ValueError:
                 return "SMTP port needs to be a number (Current: %s)" % smtp_port
 
+        if "office365.com" in smtp_host:
+            return {
+                "success": False,
+                "reason": "Office 365 does not easily support SMTP anymore, and recommends the Graph API. Please use the Outlook Office365 app in Shuffle with the 'send email' action."
+            }
+
         self.logger.info("Pre SMTP setup")
         try:
             s = smtplib.SMTP(host=smtp_host, port=smtp_port)

microsoft-excel/1.0.0/api.yaml

@@ -31,7 +31,7 @@ authentication:
         type: string
 actions:
   - name: get_excel_file_data 
-    description: Gets data from all cells in an excel file as a list. If CSV, returns it as a CSV list
+    description: Gets data from all cells in an excel file as a list. If CSV, returns it as a CSV list. Max 25.000 lines in total due to timeouts.
     auth_not_required: true
     parameters:
       - name: file_id
@@ -40,6 +40,27 @@ actions:
         required: true
         schema:
           type: string
+      - name: to_list 
+        description: Whether the output should be a list or not
+        multiline: false
+        required: false 
+        options:
+          - true
+          - false
+        schema:
+          type: string
+      - name: sheets 
+        description: The sheets to use. Comma separated.
+        multiline: false
+        required: false 
+        schema:
+          type: string
+      - name: max_rows 
+        description: The maximum number of rows to return
+        multiline: false
+        required: false 
+        schema:
+          type: string
     returns:
       schema:
         type: string 

microsoft-excel/1.0.0/src/app.py

@@ -127,9 +127,8 @@ def convert_to_csv(self, tenant_id, client_id, client_secret, file_id, sheet="Sh
             sheet = "Sheet1"
 
         #wb = Workbook(basename)
-        wb = load_workbook(basename)
-        print("Sheets: %s" % wb.sheetnames)
-    
+        wb = load_workbook(basename, read_only=True)
+
         # grab the active worksheet
         ws = wb.active
         #for item in ws.iter_rows():
@@ -149,19 +148,25 @@ def convert_to_csv(self, tenant_id, client_id, client_secret, file_id, sheet="Sh
             csvdata = csvdata[:-1]+"\n"
         csvdata = csvdata[:-1]
 
-        print()
-        print("Data length:\n(%s)\n" % len(csvdata))
+        print("Data length: (%s)" % len(csvdata))
 
         return csvdata
 
-    def get_excel_file_data(self, file_id):
+    def get_excel_file_data(self, file_id, to_list=True, sheets="", max_rows=100000, skip_rows=0):
         filedata = self.get_file(file_id)
         if filedata["success"] != True:
-            print(f"Bad info from file: {filedata}") 
+            print(f"[ERROR] Bad info from file: {filedata}") 
             return filedata
 
+        if not sheets:
+            sheets = ""
+
+        sheets = sheets.lower()
+        max_rows = int(max_rows)
+        skip_rows = int(skip_rows)
+
         try:
-            print("Filename: %s" % filedata["filename"])
+            #print("Filename: %s" % filedata["filename"])
             if "csv" in filedata["filename"]:
                 try:
                     filedata["data"] = filedata["data"].decode("utf-8")
@@ -183,23 +188,41 @@ def get_excel_file_data(self, file_id):
 
         #wb = Workbook(basename)
         try:
-            wb = load_workbook(basename)
+            wb = load_workbook(basename, read_only=True)
         except Exception as e:
             return {
                 "success": False,
                 "reason": "The file is invalid. Are you sure it's a valid excel file? CSV files are not supported.",
                 "exception": "Error: %s" % e,
             }
-
-        print("Sheets: %s" % wb.sheetnames)
 
+        # Default
+        #max_count = 25000
+        #if os.getenv("SHUFFLE_APP_SDK_TIMEOUT") > 240:
+        # Limits are ~no longer relevant if to_list=True
+
+        cnt = 0
+        skipped_cnt = 0 
         output_data = []
         for ws in wb.worksheets:
-            print(f"Title: {ws.title}")
+            if ws.title.lower() not in sheets and sheets != "":
+                continue
 
             # grab the active worksheet
             csvdata = ""
+            if cnt-skipped_cnt > skip_rows:
+                break
+
+            list_data = []
             for row in ws.values:
+                cnt += 1
+                if cnt < skip_rows:
+                    skipped_cnt += 1
+                    continue
+
+                if cnt-skipped_cnt > max_rows:
+                    break
+
                 for value in row:
                     #print(value)
                     if value == None:
@@ -209,15 +232,30 @@ def get_excel_file_data(self, file_id):
                     else:
                         csvdata += str(value)+","
 
-                csvdata = csvdata[:-1]+"\n"
-            csvdata = csvdata[:-1]
-    
-            print()
-            print("Data:\n%s\n" % csvdata)
-            output_data.append({
+                list_data.append(csvdata)
+                if to_list == False:
+                    csvdata = csvdata[:-1]+"\n"
+                else:
+                    csvdata = ""
+
+            #csvdata = csvdata[:-1]
+
+            output = {
                 "sheet": ws.title,
                 "data": csvdata,
-            })
+            }
+
+            if to_list == False:
+                print("Data len (%s): %d" % (ws.title, len(csvdata)))
+                output_data.append(output)
+            else:
+                print("Data len (%s): %d" % (ws.title, len(list_data)))
+                output_data.append({
+                    "sheet": ws.title,
+                    "data": list_data,
+                })
+
+        print("Done! Returning data of length: %d" % len(output_data))
 
         return output_data