Fix formatting and tests

Author: Mark-Powers

chi/container.py

@@ -17,7 +17,7 @@
 import os
 import tarfile
 import time
-from typing import Dictionary, List, Optional, Tuple
+from typing import Dict, List, Optional, Tuple
 
 from IPython.display import HTML, display
 from packaging.version import Version
@@ -62,7 +62,7 @@ class Container:
         id (str): The ID of the container.
         created_at (str): The timestamp when the container was created.
         status (str): The current status of the container.
-        environment (Dictionary[str, str]): A dictionary of environment variables for the container.
+        environment (Dict[str, str]): A dictionary of environment variables for the container.
         device_profiles (List[str]): A list of device profiles to be configured on the container.
     """
 
@@ -77,7 +77,7 @@ def __init__(
         runtime: str = None,
         command: List[str] = None,
         workdir: str = None,
-        environment: Dictionary[str, str] = {},
+        environment: Dict[str, str] = {},
         device_profiles: List[str] = [],
     ):
         self.name = name

chi/context.py

@@ -442,12 +442,13 @@ def on_change(change):
     else:
         print("Choose site feature is only available in an ipynb environment.")
 
+
 def use_lease_id(lease_id: str) -> None:
     """
     Sets the current lease ID to use in the global context.
 
     This configures the lease so it can be stored for ease
-    of restoring suspended sessions. Further lease validation, 
+    of restoring suspended sessions. Further lease validation,
     visualizations, and selectors are available in the lease module.
 
     Args:
@@ -456,12 +457,15 @@ def use_lease_id(lease_id: str) -> None:
     global _lease_id
 
     if not re.fullmatch(r"[A-Za-z0-9\-]+", lease_id):
-        raise CHIValueError(f'Lease ID "{lease_id}" is invalid. It must contain only letters, numbers, and hyphens with no spaces or special characters.')
+        raise CHIValueError(
+            f'Lease ID "{lease_id}" is invalid. It must contain only letters, numbers, and hyphens with no spaces or special characters.'
+        )
 
     _lease_id = lease_id
 
     print(f"Now using lease with ID {lease_id}.")
 
+
 def get_lease_id():
     """
     Returns the currently active lease ID, if one has been set.
@@ -473,6 +477,7 @@ def get_lease_id():
         print("No lease ID has been set. Use `use_lease_id()` to select one.")
     return _lease_id
 
+
 def get_project_name(project_id: Optional[str] = None) -> str:
     """
     Returns the name of a project by ID, or the current project name if no ID is given.

chi/lease.py

@@ -1210,17 +1210,25 @@ def list_leases() -> List[Lease]:
 
     return leases
 
+
 def _status_color(cell):
-    return "#a2d9fe" if cell.value == "2-ACTIVE" else (
-           "#ffe599" if cell.value == "1-PENDING" else (
-           "#f69084" if cell.value == "3-TERMINATED" else "#e0e0e0"))
-    
+    return (
+        "#a2d9fe"
+        if cell.value == "2-ACTIVE"
+        else (
+            "#ffe599"
+            if cell.value == "1-PENDING"
+            else ("#f69084" if cell.value == "3-TERMINATED" else "#e0e0e0")
+        )
+    )
+
+
 def show_leases() -> DataGrid:
     """
     Displays a table of the user's leases in an interactive, sortable format.
 
     Uses an ipydatagrid to present key lease attributes such as ID, name, status,
-    duration, and reservation counts. The grid supports sorting, filtering, and 
+    duration, and reservation counts. The grid supports sorting, filtering, and
     scrolling for easy exploration of lease state.
 
     Returns:
@@ -1233,95 +1241,106 @@ def estimate_column_width(df, column, char_px=7, padding=0):
         max_chars = df[column].astype(str).map(len).max()
         return max(max_chars * char_px + padding, 80)
 
-
     leases = list_leases()
 
     rows = []
     for lease in leases:
-
         try:
             project_name = get_project_name(lease.project_id)
         except ResourceError:
             project_name = lease.project_id[:8] if lease.project_id else "Unknown"
-    
+
         if lease.user_id == connection().current_user_id:
             user_label = os.getenv("OS_USERNAME")
         else:
             user_label = lease.user_id if lease.user_id else "Unknown"
-    
+
         if lease.start_date and lease.end_date:
-            duration_hrs = round((lease.end_date - lease.start_date).total_seconds() / 3600, 1)
+            duration_hrs = round(
+                (lease.end_date - lease.start_date).total_seconds() / 3600, 1
+            )
         else:
             duration_hrs = "N/A"
-    
+
         # Inside your row-building loop:
         if lease.end_date and lease.end_date > datetime.now():
             remaining_td = lease.end_date - datetime.now()
-            remaining_str = f"{remaining_td.days:02d}d {(remaining_td.seconds // 3600):02d}h"
+            remaining_str = (
+                f"{remaining_td.days:02d}d {(remaining_td.seconds // 3600):02d}h"
+            )
         elif lease.end_date and lease.end_date <= datetime.now():
             remaining_str = "Expired"
         else:
             remaining_str = "N/A"
 
-
         # prepending status with numeric makes it possible to character sort
         # since ipydatagrid does not allow custom sort functions
         status_order = {
             "PENDING": "1-PENDING",
             "ACTIVE": "2-ACTIVE",
-            "TERMINATED": "3-TERMINATED"
+            "TERMINATED": "3-TERMINATED",
         }
-        
-        rows.append({
-            "Name": lease.name,
-            "Status": status_order.get(lease.status, f"4-{lease.status}"),
-            "User": user_label,
-            "Project": project_name,
-            "Start": lease.start_date.strftime("%Y-%m-%d %H:%M") if lease.start_date else "",
-            "End": lease.end_date.strftime("%Y-%m-%d %H:%M") if lease.end_date else "",
-            "Remaining": remaining_str,
-            "Total Hours": duration_hrs,
-            "# Nodes": len(lease.node_reservations),
-            "# FIPs": len(lease.fip_reservations),
-            "Created": lease.created_at.strftime("%Y-%m-%d %H:%M") if lease.created_at else "",
-            "Lease ID": lease.id,
-            "_is_user_lease": 0 if lease.user_id == connection().current_user_id else 1
-        })
-    
+
+        rows.append(
+            {
+                "Name": lease.name,
+                "Status": status_order.get(lease.status, f"4-{lease.status}"),
+                "User": user_label,
+                "Project": project_name,
+                "Start": lease.start_date.strftime("%Y-%m-%d %H:%M")
+                if lease.start_date
+                else "",
+                "End": lease.end_date.strftime("%Y-%m-%d %H:%M")
+                if lease.end_date
+                else "",
+                "Remaining": remaining_str,
+                "Total Hours": duration_hrs,
+                "# Nodes": len(lease.node_reservations),
+                "# FIPs": len(lease.fip_reservations),
+                "Created": lease.created_at.strftime("%Y-%m-%d %H:%M")
+                if lease.created_at
+                else "",
+                "Lease ID": lease.id,
+                "_is_user_lease": 0
+                if lease.user_id == connection().current_user_id
+                else 1,
+            }
+        )
+
     df = pandas.DataFrame(rows)
     df = pandas.DataFrame(rows)
     df = df.sort_values(by=["_is_user_lease", "Status", "Created"])
     df = df.drop(columns=["_is_user_lease"])
 
     renderers = {
-    "Status": TextRenderer(
-        background_color=Expr(_status_color),
-        text_color="black",
-    ),
-        
+        "Status": TextRenderer(
+            background_color=Expr(_status_color),
+            text_color="black",
+        ),
     }
 
-    display(DataGrid(
-        df, 
-        layout={"height": "400px", "width": "100%"},
-        column_widths={
-            "key": 30,
-            "Name": int(estimate_column_width(df, "Name")),
-            "Status": 120, 
-            "Remaining": 80,
-            "Total Hours": 50,
-            "# Nodes": 30,
-            "# FIPs": 30,
-            "Project": 100,
-            "User": 75,
-            "Start": 95,
-            "End": 95,
-            "Created": 95,
-            "Lease ID": 30, 
-
-        },
-        renderers=renderers
-    ))
+    display(
+        DataGrid(
+            df,
+            layout={"height": "400px", "width": "100%"},
+            column_widths={
+                "key": 30,
+                "Name": int(estimate_column_width(df, "Name")),
+                "Status": 120,
+                "Remaining": 80,
+                "Total Hours": 50,
+                "# Nodes": 30,
+                "# FIPs": 30,
+                "Project": 100,
+                "User": 75,
+                "Start": 95,
+                "End": 95,
+                "Created": 95,
+                "Lease ID": 30,
+            },
+            renderers=renderers,
+        )
+    )
 
 
 def _get_lease_from_blazar(ref: str):