Update server.py

server.py

@@ -62,17 +62,8 @@ def ping():
     return {"message": "pong"}
 
     
-def zip_if_needed(src_dir, zip_path):
-    if os.path.exists(zip_path):
-        return  # already zipped
-    print(f"📦 Zipping {src_dir} → {zip_path}")
-    with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zf:
-        for root, _, files in os.walk(src_dir):
-            for file in files:
-                full_path = os.path.join(root, file)
-                rel_path = os.path.relpath(full_path, src_dir)
-                zf.write(full_path, arcname=rel_path)
-    print(f"✅ Created zip: {zip_path}")
+
+
 
 def extract_zip_if_needed(zip_path, dest_dir):
     if os.path.exists(dest_dir):
@@ -94,9 +85,9 @@ def print_directory_tree(path):
             printstr += indent
             printstr += f
     return printstr
+ 
 
-
-def copy_zip_extract_and_report():
+def copy_extract_and_report():
     src_base = "./hf_cache"
     dst_base = "/data/hf_cache"
 
@@ -110,23 +101,27 @@ def copy_zip_extract_and_report():
         os.makedirs(dst_dir, exist_ok=True)
 
         for name in os.listdir(src_dir):
-            full_path = os.path.join(src_dir, name)
-            if not os.path.isdir(full_path):
+            if not name.endswith(".zip"):
                 continue
 
-            zip_name = f"{name}.zip"
-            local_zip = os.path.join(src_dir, zip_name)
-            dst_zip = os.path.join(dst_dir, zip_name)
-            extract_path = os.path.join(dst_dir, name)
+            src_zip = os.path.join(src_dir, name)
+            dst_zip = os.path.join(dst_dir, name)
 
-            zip_if_needed(full_path, local_zip)
-
-            # Copy zip to /data
+            # Copy zip to /data if not already present
             if not os.path.exists(dst_zip):
-                shutil.copy(local_zip, dst_zip)
+                shutil.copy(src_zip, dst_zip)
                 print(f"📤 Copied zip to: {dst_zip}")
 
-            extract_zip_if_needed(dst_zip, extract_path)
+            # Determine the extract folder name (strip ".zip" from the filename)
+            extract_folder = os.path.splitext(name)[0]
+            extract_path = os.path.join(dst_dir, extract_folder)
+
+            # Extract if not already extracted
+            if not os.path.exists(extract_path):
+                os.makedirs(extract_path, exist_ok=True)
+                with zipfile.ZipFile(dst_zip, 'r') as zip_ref:
+                    zip_ref.extractall(extract_path)
+                print(f"📦 Extracted zip to: {extract_path}")
 
     print("\n📦 Local hf_cache structure:")
     printstr1 = print_directory_tree("./hf_cache")
@@ -139,10 +134,8 @@ def copy_zip_extract_and_report():
 
 @app.get("/copy_and_extract")
 def copy_and_extract():
-    import io
-    from contextlib import redirect_stdout
 
-    printstr = copy_zip_extract_and_report()
+    printstr = copy_extract_and_report()
     
     return {"message": "done", "log": printstr}