change in yaml file and file structure

.env

@@ -11,6 +11,7 @@ URL_WITHOUT_ATTACH=https://cloud.ilens.io/sms-util/api/v1/eim/email/send
 AUTHORIZATION=Basic QWxsR29vZE5hbWVzUkdvbmU6Y29tQlJBTlNlQU50YW1hc0ViSUNhUGVD
 FROM_ADDRESS=no-reply@ilens.io
 MONGO_COLLECTION_EMAIL=email_ids
+GATEWAY=priority
 # SMTP_HOST=
 # SMTP_PORT=
 # SMTP_USERNAME=

Dockerfile

@@ -14,4 +14,4 @@ RUN pip install -r requirements.txt
 # EXPOSE <port_number>
 
 # Define the command to run your application
-CMD ["python", "../app.py"]
+CMD ["python", "app.py"]
\ No newline at end of file

app.py

 import logging
-from utils.create_report_sample import DailyReportGenerator
+from scripts.create_report import DailyReportGenerator
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')

config.yml

-template_file: D:\vision_utilities\vision_utilities\report_generator\templates\daily_report_jk_template.xlsx
+template_file: D:\vision_utilities\vision_utilities\report_generator\templates\daily_report_jk_template - Copy.xlsx
 # logo_image: path/to/logo.png
 
 cameras:
   - camera_name: jk
-    packer_name: Packer 1
-  - camera_name: camera_42
-    packer_name: Packer 2
-  - camera_name: camera_44
-    packer_name: Packer 4
-  - camera_name: camera_45
-    packer_name: Packer 5
-  - camera_name: camera_46
-    packer_name: Packer 6
-  - camera_name: camera_47
-    packer_name: Packer 7
-
-subject: Daily Report
-
-body: |
-  Dear recipient,
-  
-  Please find attached the daily report for your review.
-  
-  Thank you.
+    packer_name: Packer - 1
+  - camera_name: Packer 2
+    packer_name: Packer - 2
+  - camera_name: Packer 4
+    packer_name: Packer - 4
+  - camera_name: Packer 5
+    packer_name: Packer - 5
+  - camera_name: Packer 6
+    packer_name: Packer - 6
+  - camera_name: Packer 7
+    packer_name: Packer - 7
+
+# subject: Daily Report
+
+# # body: |
+  
+# #   Dear Sir,
+  
+# #   Please find attached the daily report for your review for yesterday's consignment.
+
\ No newline at end of file
+
+# #   Thanks and Regards.
+
+email:
+
+  subject: Daily Report
+  
+  body: |
+    Dear Sir,
+    
+    Please find attached the daily report for your review for yesterday's consignment.
+    
+    Thanks and Regards.

utils/create_report.py → reports_samples/create_report_v5.py

@@ -76,7 +76,7 @@ class DailyReportGenerator:
         # Calculate the previous day's date
         previous_day = current_time - timedelta(days=1)
         report_date = previous_day.strftime("%Y-%m-%d")
-        #report_file = f"daily_report_{report_date}.xlsx"
+        report_file = f"daily_report_{report_date}.xlsx"
 
         wb = load_workbook(self.template_file)
         sheet = wb.active

requirements.txt

@@ -3,3 +3,4 @@ pymongo==3.11.4
 PyYAML==6.0
 openpyxl==3.1.2
 requests==2.29.0
+python-dotenv==1.0.0
\ No newline at end of file

utils/create_report_sample.py → scripts/create_report.py

@@ -158,25 +158,23 @@ class DailyReportGenerator:
 
 
 
-    def send_email_from_ut(self,filename="daily_report", filepath=None):
+    def send_email_from_ut(self,filename="daily_report.xlsx", filepath=None):
         
         logging.info("Sending email to {}".format(self.get_receiver_emails()))
         payload = dict()
         payload['from_name'] = os.environ["FROM_ADDRESS"]
         payload['receiver_list'] = self.get_receiver_emails()
-        payload['subject'] = self.config['subject']
-        payload['content'] = self.config['body']
+        payload['subject'] = self.config['email']['subject']
+        payload['content'] = self.config['email']['body']
+        payload['gateway_id'] = os.environ["GATEWAY"]
         headers = {'authorization': os.environ["AUTHORIZATION"]}
         count = 0
         while count < 3:
             try:
                 if filename and filepath:
-                    files = [('attachments', (filename, open(filepath, 'rb'), 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'))]
-                    # print(payload)
-                    # print(os.environ["URL_WITH_ATTACH"])
+                    files = [('attachments', (filename, open(filepath, 'rb'), 'application/html'))]
                     response = requests.request("POST", os.environ["URL_WITH_ATTACH"], data=payload, 
                                                 headers=headers, files=files, timeout=10)
-                    print(response.text)
                     logging.info(f"Response status code for request is: {response.status_code}")
                     if response.status_code == 200:
                         return True