Added Chapter 16, updates to ch14 & 15

Author: alandmoore

Chapter14/ABQ_Data_Entry/abq_data_entry/application.py

@@ -35,7 +35,9 @@ def __init__(self, *args, **kwargs):
       return
 
     # show the window
-    self.deiconify()
+    # chapter14:  use after() here to eliminate the small window
+    # that flashes up breifly
+    self.after(250, self.deiconify)
 
    # Create model
    # remove for ch12
@@ -176,7 +178,7 @@ def _simple_login(username, password):
 
   # new ch12
   def _database_login(self, username, password):
-    """Try to login to the database and create self.data_model"""
+    """Try to login to the database and create self.model"""
     db_host = self.settings['db_host'].get()
     db_name = self.settings['db_name'].get()
     try:

Chapter14/ABQ_Data_Entry/abq_data_entry/mainmenu.py

@@ -67,25 +67,18 @@ def _add_weather_download(self, menu):
     menu.add_command(
       label="Update Weather Data",
       command=self._event('<<UpdateWeatherData>>'),
-      accelerator=self.accelerators.get('weather'),
-      image=self.icons.get('weather'),
-      compound=tk.LEFT
     )
 
   def _add_rest_upload(self, menu):
     menu.add_command(
       label="Upload CSV to corporate REST",
       command=self._event('<<UploadToCorporateREST>>'),
-      image=self.icons.get('upload_rest'),
-      compound=tk.LEFT
     )
 
-  def _add_ftp_upload(self, menu):
+  def _add_sftp_upload(self, menu):
     menu.add_command(
-      label="Upload CSV to corporate FTP",
-      command=self._event('<<UploadToCorporateFTP>>'),
-      image=self.icons.get('upload_ftp'),
-      compound=tk.LEFT
+      label="Upload CSV to corporate SFTP",
+      command=self._event('<<UploadToCorporateSFTP>>'),
     )
 
   def _add_autofill_date(self, menu):
@@ -157,7 +150,7 @@ def _build_menu(self):
     self._menus['Tools'] = tk.Menu(self, tearoff=False, **self.styles)
     self._add_weather_download(self._menus['Tools'])
     self._add_rest_upload(self._menus['Tools'])
-    self._add_ftp_upload(self._menus['Tools'])
+    self._add_sftp_upload(self._menus['Tools'])
 
     # The options menu
     self._menus['Options'] = tk.Menu(self, tearoff=False, **self.styles)
@@ -265,7 +258,7 @@ def _build_menu(self):
     self._add_themes_menu(self._menus['Tools'])
     self._add_weather_download(self._menus['Tools'])
     self._add_rest_upload(self._menus['Tools'])
-    self._add_ftp_upload(self._menus['Tools'])
+    self._add_sftp_upload(self._menus['Tools'])
 
     # The help menu
     self._menus['Help'] = tk.Menu(self, tearoff=False)
@@ -310,7 +303,7 @@ def _build_menu(self):
     self._menus['Tools'] = tk.Menu(self, tearoff=False, **self.styles)
     self._add_weather_download(self._menus['Tools'])
     self._add_rest_upload(self._menus['Tools'])
-    self._add_ftp_upload(self._menus['Tools'])
+    self._add_sftp_upload(self._menus['Tools'])
 
     # The View menu
     self._menus['View'] = tk.Menu(self, tearoff=False, **self.styles)
@@ -379,7 +372,7 @@ def _build_menu(self):
     self._menus['Tools'] = tk.Menu(self, tearoff=False)
     self._add_weather_download(self._menus['Tools'])
     self._add_rest_upload(self._menus['Tools'])
-    self._add_ftp_upload(self._menus['Tools'])
+    self._add_sftp_upload(self._menus['Tools'])
 
     # View menu
     self._menus['View'] = tk.Menu(self, tearoff=False)

Chapter14/ABQ_Data_Entry/abq_data_entry/models.py

@@ -88,21 +88,16 @@ def __init__(self, host, database, user, password):
     self.connection = pg.connect(host=host, database=database,
       user=user, password=password, cursor_factory=DictCursor)
 
-    techs = self.query("SELECT * FROM lab_techs ORDER BY name")
+    techs = self.query("SELECT name FROM lab_techs ORDER BY name")
     labs = self.query("SELECT id FROM labs ORDER BY id")
     plots = self.query("SELECT DISTINCT plot FROM plots ORDER BY plot")
     self.fields['Technician']['values'] = [x['name'] for x in techs]
     self.fields['Lab']['values'] = [x['id'] for x in labs]
     self.fields['Plot']['values'] = [str(x['plot']) for x in plots]
 
   def query(self, query, parameters=None):
-    cursor = self.connection.cursor()
-    try:
+    with self.connection.cursor() as cursor:
       cursor.execute(query, parameters)
-    except (pg.Error) as e:
-      self.connection.rollback()
-      raise e
-    else:
       self.connection.commit()
       # cursor.description is None when
       # no rows are returned
@@ -134,7 +129,7 @@ def get_record(self, rowkey):
       query,
       {"date": date, "time": time, "lab": lab, "plot": plot}
     )
-    return result[0] if result else {}
+    return result[0] if result else dict()
 
   def save_record(self, record, rowkey):
     """Save a record to the database
@@ -175,7 +170,7 @@ def get_lab_check(self, date, time, lab):
       'lab_id = %(lab)s AND date = %(date)s AND time = %(time)s')
     results = self.query(
       query, {'date': date, 'time': time, 'lab': lab})
-    return results[0] if results else {}
+    return results[0] if results else dict()
 
   def get_current_seed_sample(self, lab, plot):
     """Get the seed sample currently planted in the given lab and plot"""

Chapter15/ABQ_Data_Entry/abq_data_entry/application.py

@@ -6,6 +6,7 @@
 from tkinter import filedialog
 from tkinter import font
 import platform
+from queue import Queue
 
 from . import views as v
 from . import models as m
@@ -65,7 +66,7 @@ def __init__(self, *args, **kwargs):
       '<<NewRecord>>': self._new_record,
       '<<UpdateWeatherData>>': self._update_weather_data,
       '<<UploadToCorporateREST>>': self._upload_to_corporate_rest,
-      '<<UploadToCorporateFTP>>': self._upload_to_corporate_ftp,
+      '<<UploadToCorporateSFTP>>': self._upload_to_corporate_sftp,
       '<<ShowGrowthChart>>': self.show_growth_chart,
       '<<ShowYieldChart>>': self.show_yield_chart
      }
@@ -99,9 +100,8 @@ def __init__(self, *args, **kwargs):
 
     # The data record list
     self.recordlist_icon = tk.PhotoImage(file=images.LIST_ICON)
-    self.recordlist = v.RecordList(
-      self, self.inserted_rows, self.updated_rows
-    )
+    self.recordlist = v.RecordList(self)
+
     self.notebook.insert(
         0, self.recordlist, text='Records',
         image=self.recordlist_icon, compound=tk.LEFT
@@ -288,12 +288,13 @@ def _set_font(self, *_):
       tk_font.config(size=font_size, family=font_family)
 
   # new chapter 13
-  def _update_weather_data(self):
+  def _update_weather_data(self, *_):
     """Initiate retrieval and storage of weather data"""
+    weather_data_model = m.WeatherDataModel(
+      self.settings['weather_station'].get()
+    )
     try:
-      weather_data = n.get_local_weather(
-        self.settings['weather_station'].get()
-      )
+      weather_data = weather_data_model.get_weather_data()
     except Exception as e:
       messagebox.showerror(
         title='Error',
@@ -306,58 +307,186 @@ def _update_weather_data(self):
       time = weather_data['observation_time_rfc822']
       self.status.set(f"Weather data recorded for {time}")
 
-  def _upload_to_corporate_ftp(self, *_):
+  def _create_csv_extract(self):
+    csvmodel = m.CSVModel()
+    records = self.model.get_all_records()
+    if not records:
+      raise Exception('No records were found to build a CSV file.')
+    for record in records:
+      csvmodel.save_record(record)
+    return csvmodel.file
 
-    csvfile = self._create_csv_extract()
-    d = v.LoginDialog(self, 'Login to ABQ Corporate FTP')
-    if d.result is not None:
-      username, password = d.result
-      try:
-        n.upload_to_corporate_ftp(
-          csvfile,
-          self.settings['abq_ftp_host'].get(),
-          self.settings['abq_ftp_port'].get(),
-          username, password
-        )
-      except n.ftp.all_errors as e:
-        messagebox.showerror('Error connecting to ftp', str(e))
-      else:
-        messagebox.showinfo(
-          'Success', f'{csvfile} successfully uploaded to FTP'
+
+  def _upload_to_corporate_sftp(self, *_):
+
+    # create csv file
+    try:
+      csvfile = self._create_csv_extract()
+    except Exception as e:
+      messagebox.showwarning(
+        title='Error', message=str(e)
+      )
+      return
+
+    # authenticate
+    d = v.LoginDialog(self, 'Login to ABQ Corporate SFTP')
+    if d.result is None:
+      return
+    username, password = d.result
+
+    # create model
+    host = self.settings['abq_sftp_host'].get()
+    port = self.settings['abq_sftp_port'].get()
+    sftp_model = m.SFTPModel(host, port)
+    try:
+      sftp_model.authenticate(username, password)
+    except Exception as e:
+      messagebox.showerror('Error Authenticating', str(e))
+      return
+
+    # check destination file
+    destination_dir = self.settings['abq_sftp_path'].get()
+    destination_path = f'{destination_dir}/{csvfile.name}'
+
+    try:
+      exists = sftp_model.check_file(destination_path)
+    except Exception as e:
+      messagebox.showerror(
+        f'Error checking file {destination_path}',
+        str(e)
+      )
+      return
+    if exists:
+      # ask if we should overwrite
+      overwrite = messagebox.askyesno(
+        'File exists',
+        f'The file {destination_path} already exists on the server, '
+        'do you want to overwrite it?'
+      )
+      if not overwrite:
+        # ask if we should download it
+        download = messagebox.askyesno(
+          'Download file',
+          'Do you want to download the file to inspect it?'
         )
+        if download:
+          # get a destination filename and save
+          filename = filedialog.asksaveasfilename()
+          if not filename:
+            return
+          try:
+            sftp_model.get_file(destination_path, filename)
+          except Exception as e:
+            messagebox.showerror('Error downloading', str(e))
+            return
+          messagebox.showinfo(
+            'Download Complete', 'Download Complete.'
+            )
+        return
+    # if we haven't returned, the user wants to upload
+    try:
+      sftp_model.upload_file(csvfile, destination_path)
+    except Exception as e:
+      messagebox.showerror('Error uploading', str(e))
+    else:
+      messagebox.showinfo(
+        'Success',
+        f'{csvfile} successfully uploaded to SFTP server.'
+      )
 
-  def _upload_to_corporate_rest(self):
-    csvfile = self._create_csv_extract()
-    if csvfile is None:
+  def _upload_to_corporate_rest(self, *_):
+
+    # create csv file
+    try:
+      csvfile = self._create_csv_extract()
+    except Exception as e:
       messagebox.showwarning(
-        title='No records',
-        message='There are no records to upload'
+        title='Error', message=str(e)
       )
       return
+
+    # Authenticate to the rest server
     d = v.LoginDialog(
       self, 'Login to ABQ Corporate REST API'
     )
     if d.result is not None:
       username, password = d.result
     else:
       return
+
+    # create REST model
+    rest_model = m.CorporateRestModel(
+        self.settings['abq_rest_url'].get()
+    )
     try:
-      n.upload_to_corporate_rest(
-        csvfile,
-        self.settings['abq_upload_url'].get(),
-        self.settings['abq_auth_url'].get(),
-        username,
-        password
-      )
-    except n.requests.ConnectionError as e:
-      messagebox.showerror('Error connecting', str(e))
+      rest_model.authenticate(username, password)
     except Exception as e:
-      messagebox.showerror('General Exception', str(e))
-    else:
-      messagebox.showinfo(
-        'Success',
-        f'{csvfile} successfully uploaded to REST API.'
+      messagebox.showerror('Error authenticating', str(e))
+      return
+
+    # Check if the file exists
+    try:
+      exists = rest_model.check_file(csvfile.name)
+    except Exception as e:
+      messagebox.showerror('Error checking for file', str(e))
+      return
+
+    if exists:
+      # ask if we should overwrite
+      overwrite = messagebox.askyesno(
+        'File exists',
+        f'The file {csvfile.name} already exists on the server, '
+        'do you want to overwrite it?'
       )
+      if not overwrite:
+        # ask if we should download it
+        download = messagebox.askyesno(
+          'Download file',
+          'Do you want to download the file to inspect it?'
+        )
+        if download:
+          # get a destination filename and save
+          filename = filedialog.asksaveasfilename()
+          if not filename:
+            return
+          try:
+            data = rest_model.get_file(csvfile.name)
+          except Exception as e:
+            messagebox.showerror('Error downloading', str(e))
+            return
+          with open(filename, 'w', encoding='utf-8') as fh:
+            fh.write(data)
+          messagebox.showinfo(
+            'Download Complete', 'Download Complete.'
+            )
+        return
+    # if we haven't returned, the user wants to upload
+    rest_model.upload_file(csvfile)
+    self._check_queue(rest_model.queue)
+
+
+  def _check_queue(self, queue):
+    while not queue.empty():
+      item = queue.get()
+      if item.status == 'done':
+        messagebox.showinfo(
+          item.status,
+          message=item.subject,
+          detail=item.body
+        )
+        self.status.set(item.subject)
+        return
+      elif item.status == 'error':
+        messagebox.showerror(
+          item.status,
+          message=item.subject,
+          detail=item.body
+        )
+        self.status.set(item.subject)
+        return
+      else:
+        self.status.set(f'{item.subject}: {item.body}')
+    self.after(100, self._check_queue, queue)
 
   #New for ch15
   def show_growth_chart(self, *_):