accli 2.0.0rc4__tar.gz → 2.0.1__tar.gz

{accli-2.0.0rc4 → accli-2.0.1}/PKG-INFO

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

{accli-2.0.0rc4 → accli-2.0.1}/accli/AcceleratorTaskDispatcher.py

@@ -11,7 +11,7 @@ from pydantic import BaseModel, model_validator
 from accli.AcceleratorTerminalCliProjectService import AcceleratorTerminalCliProjectService
 from accli.token import (
     get_token, get_server_url,
-    get_project_slug
+    get_project_slug, exchange_refresh_token
 )
 
 ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)
@@ -65,9 +65,9 @@ def copy_tree(src, dst):
 
 @lru_cache(maxsize=None)
 def push_folder_job(directory):
-    access_token = get_token()
     server_url = get_server_url()
     project_slug = get_project_slug()
+    _, access_token, _ = exchange_refresh_token(project_slug)
 
     term_cli_project_service = AcceleratorTerminalCliProjectService(
         user_token=access_token,

{accli-2.0.0rc4 → accli-2.0.1}/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.0-c4"
+VERSION = "v2.0.1"

{accli-2.0.0rc4 → accli-2.0.1}/accli/cli.py

@@ -15,7 +15,7 @@ from typing import List
 
 from accli.AcceleratorTerminalCliProjectService import AcceleratorTerminalCliProjectService
 from accli.CsvRegionalTimeseriesValidator import CsvRegionalTimeseriesValidator
-from accli.token import save_token_details, get_token, get_server_url, set_project_slug, get_project_slug, get_db_path
+from accli.token import save_token_details, get_token, get_server_url, set_project_slug, get_project_slug, get_db_path, exchange_refresh_token
 from rich import print
 from rich.progress import Progress, TextColumn, BarColumn, TaskProgressColumn, TimeElapsedColumn
 from typing_extensions import Annotated
@@ -182,84 +182,7 @@ def compute_sha256(filepath: str) -> str:
             h.update(chunk)
     return h.hexdigest()
 
-import threading
 
-_token_lock = threading.Lock()
-_cached_cas_token = None
-_cached_expires_at = 0
-_cached_access_token = None
-
-
-def exchange_refresh_token(project_slug: str) -> tuple[str, str, int]:
-    """
-    Exchanges the stored refresh token for a short-lived access token
-    and a new rotated refresh token. Updates the local TinyDB token cache.
-    Returns (cas_token, access_token, expires_at).
-    """
-    import time
-    from tinydb import TinyDB
-    from accli.token import get_db_path, save_token_details
-    
-    global _cached_cas_token, _cached_expires_at, _cached_access_token
-    
-    # 1. Fast-path check: Reuse valid in-memory cache if still fresh (> 5 mins remaining)
-    # and matches the requested project slug prefix.
-    now = int(time.time())
-    if _cached_cas_token and _cached_access_token and (_cached_expires_at - now > 300):
-        expected_prefix = f"xet_session_prj_{project_slug}_"
-        if _cached_cas_token.startswith(expected_prefix):
-            return _cached_cas_token, _cached_access_token, _cached_expires_at
-            
-    # 2. Block/lock to serialize requests and avoid rotation race conditions (RTR invalidation)
-    with _token_lock:
-        # Re-check cache inside the lock (double-checked locking pattern)
-        now = int(time.time())
-        if _cached_cas_token and _cached_access_token and (_cached_expires_at - now > 300):
-            expected_prefix = f"xet_session_prj_{project_slug}_"
-            if _cached_cas_token.startswith(expected_prefix):
-                return _cached_cas_token, _cached_access_token, _cached_expires_at
-                
-        db_path = get_db_path()
-        db = TinyDB(db_path)
-        item = next(iter(db), {})
-        refresh_token = item.get('token')
-        server_url = item.get('server_url', "https://accelerator.iiasa.ac.at")
-        webcli_url = item.get('webcli_url', "https://accelerator.iiasa.ac.at")
-        
-        if not refresh_token:
-            print("[bold red]ERROR: No token found. Please run 'accli login' first.[/bold red]")
-            raise typer.Exit(1)
-            
-        refresh_endpoint = f"{server_url.rstrip('/')}/api/v1/oauth/device/access-token/"
-        
-        try:
-            response = requests.post(
-                refresh_endpoint,
-                json={"refresh_token": refresh_token},
-                verify=(not ACCLI_DEBUG)
-            )
-            response.raise_for_status()
-            data = response.json()
-            
-            access_token = data["access_token"]
-            new_refresh_token = data["refresh_token"]
-            
-            # Save rotated refresh token back to local TinyDB
-            save_token_details(new_refresh_token, server_url, webcli_url)
-            
-            cas_token = f"xet_session_prj_{project_slug}_{access_token}"
-            # Expire slightly before the 1-hour limit (e.g. 50 minutes)
-            expires_at = int(time.time()) + 3000
-            
-            # Populate in-memory cache
-            _cached_cas_token = cas_token
-            _cached_access_token = access_token
-            _cached_expires_at = expires_at
-            
-            return cas_token, access_token, expires_at
-        except Exception as e:
-            print(f"[bold red]ERROR: Failed to authenticate/exchange refresh token: {e}[/bold red]")
-            raise typer.Exit(1)
 
 
 @app.command()
@@ -409,12 +332,16 @@ def copy(
         refresh_url = f"{server_url.rstrip('/')}/api/v1/oauth/device/cas-token/"
         refresh_headers = {"Authorization": f"Bearer {cas_token}"}
         
-        with Progress(
+        import sys
+        columns = [
             TextColumn("[progress.description]{task.description}"),
-            BarColumn(),
             TaskProgressColumn(),
             TimeElapsedColumn(),
-        ) as progress:
+        ]
+        if sys.stdout.isatty():
+            columns.insert(1, BarColumn())
+            
+        with Progress(*columns) as progress:
             total_size = sum(item[2] for item in files_to_download)
             overall_task = progress.add_task("[green]Total Download Progress...", total=total_size)
             
@@ -548,12 +475,16 @@ def copy(
         refresh_url = f"{server_url.rstrip('/')}/api/v1/oauth/device/cas-token/"
         refresh_headers = {"Authorization": f"Bearer {cas_token}"}
         
-        with Progress(
+        import sys
+        columns = [
             TextColumn("[progress.description]{task.description}"),
-            BarColumn(),
             TaskProgressColumn(),
             TimeElapsedColumn(),
-        ) as progress:
+        ]
+        if sys.stdout.isatty():
+            columns.insert(1, BarColumn())
+            
+        with Progress(*columns) as progress:
             total_size = sum(p.stat().st_size for p in local_paths)
             overall_task = progress.add_task("[green]Total Upload Progress...", total=total_size)
             

{accli-2.0.0rc4 → accli-2.0.1}/accli/setup-nfs.ps1

@@ -35,6 +35,17 @@ if (-not $NfsAlreadyEnabled) {
     Write-Host "[OK] Client for NFS features already enabled." -ForegroundColor Green
 }
 
+# 1.5 Configure Client for NFS (NfsClnt) service startup type to Manual
+# This prevents NFS Client from starting automatically on Windows boot, avoiding startup delays/hangs.
+# The service will be started on-demand when accli mounts a drive.
+Write-Host "Configuring Client for NFS (NfsClnt) service startup type to Manual..." -ForegroundColor Cyan
+if (Get-Service -Name "NfsClnt" -ErrorAction SilentlyContinue) {
+    Set-Service -Name "NfsClnt" -StartupType Manual -ErrorAction SilentlyContinue
+    Write-Host "[OK] NfsClnt service startup type configured to Manual." -ForegroundColor Green
+} else {
+    Write-Warning "Client for NFS service (NfsClnt) not found. Could not configure startup type."
+}
+
 # 2. Add Registry value for Linked Connections
 # Allows mapped network drives to be shared between elevated and standard sessions under the same user log-in.
 if (-not $RegAlreadyEnabled) {
@@ -108,6 +119,13 @@ if ($cfg.skip_auto_mount) {
     $env:HF_MOUNT_SKIP_AUTO_MOUNT = "1"
 }
 
+# Ensure NfsClnt service is started before attempting mount
+try {
+    if ((Get-Service -Name "NfsClnt" -ErrorAction SilentlyContinue).Status -ne 'Running') {
+        Start-Service -Name "NfsClnt" -ErrorAction SilentlyContinue
+    }
+} catch {}
+
 # Construct arguments
 $mountArgs = @(
     "--token-file", $cfg.db_path,

accli-2.0.1/accli/token.py

@@ -0,0 +1,194 @@
+import os
+import threading
+import time
+import requests
+import typer
+from tinydb import TinyDB
+
+ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)
+
+_token_lock = threading.Lock()
+_cached_cas_token = None
+_cached_expires_at = 0
+_cached_access_token = None
+
+
+def get_db_path():
+    sudo_user = os.environ.get("SUDO_USER")
+    pkexec_uid = os.environ.get("PKEXEC_UID")
+
+    if (sudo_user or pkexec_uid) and os.name != "nt":
+        try:
+            import pwd
+            if pkexec_uid:
+                home = pwd.getpwuid(int(pkexec_uid)).pw_dir
+            else:
+                home = pwd.getpwnam(sudo_user).pw_dir
+        except Exception:
+            home = os.path.expanduser("~")
+    else:
+        home = os.path.expanduser("~")
+
+    token_directory = f"{home}/.accli"
+
+    if not os.path.exists(token_directory):
+        os.makedirs(token_directory)
+
+    return f"{token_directory}/data.json"
+
+
+def save_token_details(token, server_url, webcli_url):
+    db_path = get_db_path()
+
+    try:
+        os.remove(db_path)
+    except OSError:
+        pass
+
+    db = TinyDB(db_path)
+    db.insert({
+        'token': token,
+        'server_url': server_url,
+        'webcli_url': webcli_url
+    })
+
+
+def get_token():
+    db_path = get_db_path()
+
+    db = TinyDB(db_path)
+
+    for item in db:
+        token = item.get('token')
+        if token:
+            break
+
+    if not token:
+        print("Token does not exists. Please login.")
+    return token
+
+
+def exchange_refresh_token(project_slug: str) -> tuple[str, str, int]:
+    """
+    Exchanges the stored refresh token for a short-lived access token
+    and a new rotated refresh token. Updates the local TinyDB token cache.
+    Returns (cas_token, access_token, expires_at).
+    """
+    global _cached_cas_token, _cached_expires_at, _cached_access_token
+
+    # 1. Fast-path check: Reuse valid in-memory cache if still fresh (> 5 mins remaining)
+    # and matches the requested project slug prefix.
+    now = int(time.time())
+    if _cached_cas_token and _cached_access_token and (_cached_expires_at - now > 300):
+        expected_prefix = f"xet_session_prj_{project_slug}_"
+        if _cached_cas_token.startswith(expected_prefix):
+            return _cached_cas_token, _cached_access_token, _cached_expires_at
+
+    # 2. Block/lock to serialize requests and avoid rotation race conditions (RTR invalidation)
+    with _token_lock:
+        # Re-check cache inside the lock (double-checked locking pattern)
+        now = int(time.time())
+        if _cached_cas_token and _cached_access_token and (_cached_expires_at - now > 300):
+            expected_prefix = f"xet_session_prj_{project_slug}_"
+            if _cached_cas_token.startswith(expected_prefix):
+                return _cached_cas_token, _cached_access_token, _cached_expires_at
+
+        db_path = get_db_path()
+        db = TinyDB(db_path)
+        item = next(iter(db), {})
+        refresh_token = item.get('token')
+        server_url = item.get('server_url', "https://accelerator.iiasa.ac.at")
+        webcli_url = item.get('webcli_url', "https://accelerator.iiasa.ac.at")
+
+        if not refresh_token:
+            print("[bold red]ERROR: No token found. Please run 'accli login' first.[/bold red]")
+            raise typer.Exit(1)
+
+        refresh_endpoint = f"{server_url.rstrip('/')}/api/v1/oauth/device/access-token/"
+
+        try:
+            response = requests.post(
+                refresh_endpoint,
+                json={"refresh_token": refresh_token},
+                verify=(not ACCLI_DEBUG)
+            )
+            response.raise_for_status()
+            data = response.json()
+
+            access_token = data["access_token"]
+            new_refresh_token = data["refresh_token"]
+
+            # Save rotated refresh token back to local TinyDB
+            save_token_details(new_refresh_token, server_url, webcli_url)
+
+            cas_token = f"xet_session_prj_{project_slug}_{access_token}"
+            # Expire slightly before the 1-hour limit (e.g. 50 minutes)
+            expires_at = int(time.time()) + 3000
+
+            # Populate in-memory cache
+            _cached_cas_token = cas_token
+            _cached_access_token = access_token
+            _cached_expires_at = expires_at
+
+            return cas_token, access_token, expires_at
+        except Exception as e:
+            print(f"[bold red]ERROR: Failed to authenticate/exchange refresh token: {e}[/bold red]")
+            raise typer.Exit(1)
+
+
+def get_github_app_token():
+    db_path = get_db_path()
+
+    db = TinyDB(db_path)
+
+    for item in db:
+        token = item.get('github_app_token')
+        if token:
+            break
+
+    if not token:
+        print("Github app token does not exists.")
+    return token
+
+
+def set_github_app_token(github_app_token):
+    db_path = get_db_path()
+    db = TinyDB(db_path)
+    db.update({'github_app_token': github_app_token}, doc_ids=[1])
+
+
+def set_project_slug(project_slug):
+    db_path = get_db_path()
+    db = TinyDB(db_path)
+    db.update({'project_slug': project_slug}, doc_ids=[1])
+
+
+def get_project_slug():
+    db_path = get_db_path()
+
+    db = TinyDB(db_path)
+
+    for item in db:
+        project_slug = item.get('project_slug')
+        if project_slug:
+            break
+
+    if not project_slug:
+        print("project slug was not set.")
+    return project_slug
+
+
+def get_server_url():
+    db_path = get_db_path()
+
+    db = TinyDB(db_path)
+
+    for item in db:
+        server_url = item.get('server_url')
+        if server_url:
+            break
+
+    if not server_url:
+        print("Server url does not exists. Please login.")
+    return server_url
+

{accli-2.0.0rc4 → accli-2.0.1}/accli.egg-info/PKG-INFO

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

accli-2.0.0rc4/accli/token.py

@@ -1,115 +0,0 @@
-import os
-
-from tinydb import TinyDB
-
-
-def get_db_path():
-    sudo_user = os.environ.get("SUDO_USER")
-    pkexec_uid = os.environ.get("PKEXEC_UID")
-
-    if (sudo_user or pkexec_uid) and os.name != "nt":
-        try:
-            import pwd
-            if pkexec_uid:
-                home = pwd.getpwuid(int(pkexec_uid)).pw_dir
-            else:
-                home = pwd.getpwnam(sudo_user).pw_dir
-        except Exception:
-            home = os.path.expanduser("~")
-    else:
-        home = os.path.expanduser("~")
-
-    token_directory = f"{home}/.accli"
-
-    if not os.path.exists(token_directory):
-        os.makedirs(token_directory)
-
-    return f"{token_directory}/data.json"
-
-
-def save_token_details(token, server_url, webcli_url):
-    db_path = get_db_path()
-
-    try:
-        os.remove(db_path)
-    except OSError:
-        pass
-
-    db = TinyDB(db_path)
-    db.insert({
-        'token': token,
-        'server_url': server_url,
-        'webcli_url': webcli_url
-    })
-
-
-def get_token():
-    db_path = get_db_path()
-
-    db = TinyDB(db_path)
-
-    for item in db:
-        token = item.get('token')
-        if token:
-            break
-
-    if not token:
-        print("Token does not exists. Please login.")
-    return token
-
-
-def get_github_app_token():
-    db_path = get_db_path()
-
-    db = TinyDB(db_path)
-
-    for item in db:
-        token = item.get('github_app_token')
-        if token:
-            break
-
-    if not token:
-        print("Github app token does not exists.")
-    return token
-
-
-def set_github_app_token(github_app_token):
-    db_path = get_db_path()
-    db = TinyDB(db_path)
-    db.update({'github_app_token': github_app_token}, doc_ids=[1])
-
-
-def set_project_slug(project_slug):
-    db_path = get_db_path()
-    db = TinyDB(db_path)
-    db.update({'project_slug': project_slug}, doc_ids=[1])
-
-
-def get_project_slug():
-    db_path = get_db_path()
-
-    db = TinyDB(db_path)
-
-    for item in db:
-        project_slug = item.get('project_slug')
-        if project_slug:
-            break
-
-    if not project_slug:
-        print("project slug was not set.")
-    return project_slug
-
-
-def get_server_url():
-    db_path = get_db_path()
-
-    db = TinyDB(db_path)
-
-    for item in db:
-        server_url = item.get('server_url')
-        if server_url:
-            break
-
-    if not server_url:
-        print("Server url does not exists. Please login.")
-    return server_url