Compatibility fixes for the new themis login (#6)

Author: confestim

temmies_cli/commands/init.py

@@ -14,9 +14,12 @@ def init_assignment(year_course_assignment, path, search, test_folder, file_fold
     """
     Initialize a new assignment or course.
     """
+    
+    # ask for user
+    user = input("Enter your s-number (s12354): ")
+    
     # Authenticate the user
-    user = input("Enter your Themis username: ")
-    themis = Themis(user)
+    themis = Themis(user=user)
 
     if search:
         click.echo(f"Searching for assignment: {search}")
@@ -50,11 +53,11 @@ def init_assignment(year_course_assignment, path, search, test_folder, file_fold
     if is_course:
         root_path = os.path.join(path, course.title.lower().replace(" ", "_"))
         click.echo(f"Initializing entire course '{course.title}'...")
-        create_assignment_files(course, root_path, user, test_folder, file_folder)
+        create_assignment_files(themis, course, root_path, user, test_folder, file_folder)
     else:
         root_path = os.path.join(path, assignment.title.lower().replace(" ", "_"))
         click.echo(f"Initializing assignment '{assignment.title}'...")
-        create_assignment_files(assignment, root_path, user, test_folder, file_folder)
+        create_assignment_files(themis, assignment, root_path, user, test_folder, file_folder)
 
     click.echo(f"Initialized at '{root_path}'.")
 

temmies_cli/commands/utils.py

@@ -13,7 +13,7 @@
 from temmies.exercise_group import ExerciseGroup
 import click
 from tqdm import tqdm
-
+import json
 
 def parse_path(themis, path_str):
     """
@@ -108,19 +108,20 @@ def download_assignment_files(assignment, path, test_folder, file_folder):
         click.echo(str(e))
 
 
-def create_metadata_file(root_path, user, assignment_path):
+def create_metadata_file(instance:Themis, root_path, user, assignment_path):
     """
     Create the .temmies metadata file.
     """
     metadata_path = os.path.join(root_path, '.temmies')
     with open(metadata_path, 'w', encoding='utf-8') as f:
         f.write(f"username={user}\n")
         f.write(f"assignment_path={assignment_path}\n")
+        f.write(f"session_cookies={instance.get_session_cookies()}\n")
     os.chmod(metadata_path, 0o600)
     click.echo(f"Created .temmies metadata file in '{root_path}'.")
 
 
-def load_metadata():
+def load_metadata() -> Themis:
     """
     Load assignment metadata from the .temmies file.
     """
@@ -137,13 +138,23 @@ def load_metadata():
     username = metadata.get('username')
     assignment_path = metadata.get('assignment_path')
 
+    # Create a Themis instance and set the session cookies
+    session_cookies = json.loads(metadata.get('session_cookies'))
+    
+    instance = Themis(session_cookies)
+    
+    # Handle session expiration
+    if instance.get_session_cookies() != session_cookies:
+        create_metadata_file(instance, os.getcwd(), username, assignment_path)
+    
     if not username or not assignment_path:
         click.echo("Missing assignment metadata in .temmies file.", err=True)
         return None
-    return metadata
+    
+    return instance, assignment_path
 
 
-def create_assignment_files(group, root_path, user, test_folder, file_folder):
+def create_assignment_files(instance:Themis, group, root_path, user, test_folder, file_folder):
     """
     Download files and test cases for a group (folder or assignment) recursively.
     """
@@ -152,15 +163,16 @@ def create_assignment_files(group, root_path, user, test_folder, file_folder):
 
     if group.submitable:
         # It's an assignment
-        create_metadata_file(root_path, user, group.path)
+        create_metadata_file(instance, root_path, user, group.path)
     else:
         # It's a folder or course
         items = group.get_items()
         for item in items:
             item_path = os.path.join(
                 root_path, item.title.lower().replace(" ", "_"))
             create_assignment_files(
-                item, item_path, user, test_folder, file_folder)
+                instance, item, item_path, user, test_folder, file_folder
+                )
 
 def get_current_assignment():
     """
@@ -170,14 +182,10 @@ def get_current_assignment():
     Raises:
         ValueError: If metadata is missing or incomplete.
     """
-    metadata = load_metadata()
-    if not metadata:
-        raise ValueError("No assignment metadata found. Run 'temmies init' first.")
-
-    username = metadata.get('username')
-    assignment_path = metadata.get('assignment_path')
-
-    themis = Themis(username)
+    themis, assignment_path = load_metadata()
+    if not themis:
+        raise ValueError("Failed to load metadata. Make sure to run 'temmies init' first.")
+    
     return ExerciseGroup(
         themis.session,
         assignment_path,