accli 2.0.7__tar.gz → 2.0.12__tar.gz

{accli-2.0.7 → accli-2.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accli
-Version: 2.0.7
+Version: 2.0.12
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)

{accli-2.0.7 → accli-2.0.12}/accli/AcceleratorTaskDispatcher.py

@@ -4,6 +4,9 @@ import hashlib
 import shutil
 import tempfile
 import fnmatch
+import concurrent.futures
+import json
+from pathlib import Path
 from typing import Optional, Dict, List
 
 import requests
@@ -50,9 +53,13 @@ def get_file_sha1(file_path):
 
 
 def copy_tree(src, dst, include=None, exclude=None, root_src=None):
-    """Recursively copy from src to dst, excluding .git folders."""
+    """Recursively copy from src to dst, excluding .git folders. Includes override excludes."""
     if root_src is None:
         root_src = src
+        
+    excludes = [e.strip() for e in exclude.split(',') if e.strip()] if exclude else []
+    includes = [i.strip() for i in include.split(',') if i.strip()] if include else []
+        
     for item in os.listdir(src):
         src_path = os.path.join(src, item)
         dst_path = os.path.join(dst, item)
@@ -61,24 +68,54 @@ def copy_tree(src, dst, include=None, exclude=None, root_src=None):
         if os.path.isdir(src_path):
             if item == '.git':
                 continue
-            if exclude:
-                excludes = [e.strip() for e in exclude.split(',') if e.strip()]
-                if any(fnmatch.fnmatch(rel_path, p) or fnmatch.fnmatch(item, p) for p in excludes):
-                    continue
+            
+            is_excluded = any(fnmatch.fnmatch(rel_path, p) or fnmatch.fnmatch(item, p) for p in excludes)
+            # Traverse even if excluded as long as includes exist, to find exceptions
+            if is_excluded and not includes:
+                continue
+                
             os.makedirs(dst_path, exist_ok=True)
             copy_tree(src_path, dst_path, include, exclude, root_src)
         else:
-            if exclude:
-                excludes = [e.strip() for e in exclude.split(',') if e.strip()]
-                if any(fnmatch.fnmatch(rel_path, p) or fnmatch.fnmatch(item, p) for p in excludes):
-                    continue
-            if include:
-                includes = [i.strip() for i in include.split(',') if i.strip()]
-                if not any(fnmatch.fnmatch(rel_path, p) or fnmatch.fnmatch(item, p) for p in includes):
-                    continue
+            is_excluded = any(fnmatch.fnmatch(rel_path, p) or fnmatch.fnmatch(item, p) for p in excludes)
+            is_included = any(fnmatch.fnmatch(rel_path, p) or fnmatch.fnmatch(item, p) for p in includes)
+            
+            if is_included:
+                pass # Included files override exclude
+            elif is_excluded:
+                continue # Skipped by exclude
+            elif includes and not excludes:
+                continue # If ONLY includes list is provided, act as whitelist
+                
             shutil.copy2(src_path, dst_path)
 
 
+def _upload_cas_file_worker(args):
+    rel_path, file_path, term_cli_project_service, project_slug = args
+    file_hash = get_file_sha1(file_path)
+    blob_name = f"cas_{file_hash}.blob"
+    
+    print(f"Checking {rel_path} (hash: {file_hash[:8]})...")
+    presigned_push_url = term_cli_project_service.get_jobstore_push_url(
+        project_slug, blob_name
+    )
+    if presigned_push_url:
+        print(f"Uploading {rel_path}...")
+        with open(file_path, 'rb') as f:
+            res = requests.put(
+                presigned_push_url,
+                data=f,
+                verify=False,
+            )
+            res.raise_for_status()
+        print(f"Uploaded {rel_path}.")
+    else:
+        print(f"Skipped {rel_path} (already in jobstore).")
+    
+    mode = os.stat(file_path).st_mode
+    return {"path": rel_path, "hash": file_hash, "mode": mode}
+
+
 @lru_cache(maxsize=None)
 def push_folder_job(directory, include=None, exclude=None):
     server_url = get_server_url()
@@ -97,19 +134,32 @@ def push_folder_job(directory, include=None, exclude=None):
     if os.path.isfile(f'{repo_dir}/wkube.py'):
         os.remove(f'{repo_dir}/wkube.py')
 
-    temp_zip_path = f"{repo_dir}/temp.zip"
-    compress_folder(repo_dir, temp_zip_path)
-
-    sha256_hash = get_file_sha1(temp_zip_path)
-    final_zip_path = f"{repo_dir}/{sha256_hash}.zip"
-    os.rename(temp_zip_path, final_zip_path)
-
+    manifest = {"type": "cas_manifest", "files": []}
+    
+    upload_args = []
+    for root, dirs, files in os.walk(repo_dir):
+        for file in files:
+            file_path = os.path.join(root, file)
+            rel_path = Path(file_path).relative_to(repo_dir).as_posix()
+            upload_args.append((rel_path, file_path, term_cli_project_service, project_slug))
+            
+    with concurrent.futures.ThreadPoolExecutor(max_workers=30) as executor:
+        for result in executor.map(_upload_cas_file_worker, upload_args):
+            manifest["files"].append(result)
+            
+    manifest_path = os.path.join(repo_dir, "manifest.json")
+    with open(manifest_path, "w") as f:
+        json.dump(manifest, f)
+        
+    manifest_hash = get_file_sha1(manifest_path)
+    manifest_name = f"manifest_{manifest_hash}.json"
+    
     presigned_push_url = term_cli_project_service.get_jobstore_push_url(
-        project_slug, f"{sha256_hash}.zip"
+        project_slug, manifest_name
     )
-
+    
     if presigned_push_url:
-        with open(final_zip_path, 'rb') as f:
+        with open(manifest_path, 'rb') as f:
             res = requests.put(
                 presigned_push_url,
                 data=f,
@@ -118,7 +168,7 @@ def push_folder_job(directory, include=None, exclude=None):
             res.raise_for_status()
 
     shutil.rmtree(repo_dir)
-    return f"s3accjobstore://{sha256_hash}.zip", sha256_hash
+    return f"s3accjobstore://{manifest_name}", manifest_hash
 
 
 class JobDispatchModel(BaseModel):

{accli-2.0.7 → accli-2.0.12}/accli/_version.py

@@ -1,3 +1,3 @@
 # Please strictly put double quote to use this info for git tag 
 # Read a developer guide for git tag command with regex
-VERSION = "v2.0.7"
+VERSION = "v2.0.12"

{accli-2.0.7 → accli-2.0.12}/accli/gui.py

@@ -88,7 +88,11 @@ class AccliGuiApp(tk.Tk):
         
         # Checkboxes
         self.style.configure("TCheckbutton", background="#1e1e1e", foreground="#ffffff")
-        self.style.map("TCheckbutton", background=[("active", "#1e1e1e")])
+        self.style.map("TCheckbutton",
+            background=[("active", "#1e1e1e")],
+            indicatorbackground=[("selected", "#007acc"), ("!selected", "#2d2d2d")],
+            indicatorforeground=[("selected", "#ffffff"), ("!selected", "#2d2d2d")]
+        )
 
     def create_widgets(self):
         # Top banner
@@ -122,7 +126,7 @@ class AccliGuiApp(tk.Tk):
                 cmd = [sys.executable] + args
             else:
                 # Script mode
-                cmd = [sys.executable, "-m", "accli.cli"] + args
+                cmd = [sys.executable, "-m", "accli"] + args
 
             if elevate and platform.system() != "Windows":
                 import shutil
@@ -162,11 +166,14 @@ class AccliGuiApp(tk.Tk):
                 process.wait()
                 
                 if on_done:
-                    self.after(0, lambda: on_done(process.returncode, "".join(output_lines)))
+                    ret_code = process.returncode
+                    out_text = "".join(output_lines)
+                    self.after(0, lambda: on_done(ret_code, out_text))
             except Exception as e:
-                self.append_log(f"ERROR executing command: {e}\n")
+                err_text = str(e)
+                self.append_log(f"ERROR executing command: {err_text}\n")
                 if on_done:
-                    self.after(0, lambda: on_done(-1, str(e)))
+                    self.after(0, lambda: on_done(-1, err_text))
 
         threading.Thread(target=worker, daemon=True).start()
 
@@ -196,10 +203,26 @@ class AccliGuiApp(tk.Tk):
         self.login_btn = ttk.Button(card, text="Authenticate / Login", command=self.action_login)
         self.login_btn.grid(row=0, column=2, padx=10, pady=5)
         
+        self.debug_mode_val = tk.BooleanVar(value=bool(os.environ.get("ACCLI_DEBUG")))
+        self.debug_check = ttk.Checkbutton(
+            card,
+            text="Debug mode",
+            variable=self.debug_mode_val,
+            command=self.on_debug_toggle
+        )
+        self.debug_check.grid(row=1, column=0, columnspan=3, sticky=tk.W, pady=(5, 0))
+        
         # Connection status details
         self.conn_details_txt = tk.Text(auth_tab, height=12, bg="#2d2d2d", fg="#ffffff", insertbackground="white", font=("Courier New", 10), state=tk.DISABLED)
         self.conn_details_txt.pack(fill=tk.BOTH, expand=True, pady=10)
 
+    def on_debug_toggle(self):
+        if self.debug_mode_val.get():
+            os.environ["ACCLI_DEBUG"] = "1"
+        else:
+            os.environ.pop("ACCLI_DEBUG", None)
+        self.refresh_login_status()
+
     def refresh_login_status(self):
         from accli.token import get_db_path
         from tinydb import TinyDB
@@ -229,13 +252,16 @@ class AccliGuiApp(tk.Tk):
             self.server_entry.configure(state=tk.NORMAL)
             self.status_bar_val.set("Session Status: Disconnected")
             
-        def on_check_done(code, output):
-            self.conn_details_txt.configure(state=tk.NORMAL)
-            self.conn_details_txt.delete("1.0", tk.END)
-            self.conn_details_txt.insert(tk.END, output)
-            self.conn_details_txt.configure(state=tk.DISABLED)
-
-        self.run_cli_async(["status"], on_done=on_check_done, log_to_viewer=False)
+        details = [
+            f"Server URL:     {server_url}",
+            f"Session Status: {'Connected / Logged In' if logged_in else 'Not Logged In'}",
+            f"Token DB Path:  {db_path}",
+            f"Debug Mode:     {'Enabled ($env:ACCLI_DEBUG=\"1\")' if os.environ.get('ACCLI_DEBUG') else 'Disabled'}"
+        ]
+        self.conn_details_txt.configure(state=tk.NORMAL)
+        self.conn_details_txt.delete("1.0", tk.END)
+        self.conn_details_txt.insert(tk.END, "\n".join(details) + "\n")
+        self.conn_details_txt.configure(state=tk.DISABLED)
 
     def action_login(self):
         if hasattr(self, "is_logged_in_state") and self.is_logged_in_state:
@@ -288,7 +314,7 @@ class AccliGuiApp(tk.Tk):
                 response = requests.post(
                     token_endpoint,
                     json={"device_authorization_code": auth_code.strip()},
-                    verify=True
+                    verify=(not bool(os.environ.get("ACCLI_DEBUG")))
                 )
                 
                 if response.status_code == 400:
@@ -306,8 +332,9 @@ class AccliGuiApp(tk.Tk):
                 self.after(0, lambda: messagebox.showinfo("Success", "Successfully logged in!"))
                 self.after(0, self.refresh_login_status)
             except Exception as e:
-                self.append_log(f"Authentication Failed: {e}\n")
-                self.after(0, lambda: messagebox.showerror("Error", f"Authentication failed: {e}"))
+                err_text = str(e)
+                self.append_log(f"Authentication Failed: {err_text}\n")
+                self.after(0, lambda msg=err_text: messagebox.showerror("Error", f"Authentication failed: {msg}"))
                 self.after(0, self.refresh_login_status)
 
         threading.Thread(target=perform_auth, daemon=True).start()

{accli-2.0.7 → accli-2.0.12}/accli/token.py

@@ -3,6 +3,7 @@ import threading
 import time
 import requests
 import typer
+from rich import print
 from tinydb import TinyDB
 
 ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)

{accli-2.0.7 → accli-2.0.12}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accli
-Version: 2.0.7
+Version: 2.0.12
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)