accli 0.7.9__tar.gz → 0.7.11__tar.gz

{accli-0.7.9 → accli-0.7.11}/PKG-INFO

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

{accli-0.7.9 → accli-0.7.11}/accli/AcceleratorJobProjectService.py

@@ -12,6 +12,8 @@ from typing import List, Tuple
 
 from accli.common import todict
 
+ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)
+
 class AccAPIError(Exception):
     pass
 
@@ -38,7 +40,7 @@ class AcceleratorJobProjectService:
             self,
             user_token, 
             server_url='http://accelerator-api.iiasa.ac.at',
-            verify_cert=True
+            verify_cert=(not ACCLI_DEBUG)
         ):
         
         self.user_token = user_token
@@ -739,7 +741,7 @@ class Fs:
         accelerator_job_service = AcceleratorJobProjectService(
             user_token, 
             server_url=server_url,
-            verify_cert=True
+            verify_cert=(not ACCLI_DEBUG)
         )
 
         accelerator_job_service.add_filestream_as_job_output(
@@ -763,7 +765,7 @@ class Fs:
         accelerator_job_service = AcceleratorJobProjectService(
             user_token, 
             server_url=server_url,
-            verify_cert=True
+            verify_cert=(not ACCLI_DEBUG)
         )
 
         return accelerator_job_service.get_file_url_from_repo(
@@ -805,7 +807,7 @@ class Fs:
         accelerator_job_service = AcceleratorJobProjectService(
             user_token, 
             server_url=server_url,
-            verify_cert=True
+            verify_cert=(not ACCLI_DEBUG)
         )
 
         return accelerator_job_service.enumerate_files_by_prefix(

{accli-0.7.9 → accli-0.7.11}/accli/AcceleratorTaskDispatcher.py

@@ -5,6 +5,7 @@ import hashlib
 import shutil
 import tempfile
 import requests
+from functools import lru_cache
 from typing import Optional, List, Dict
 from pydantic.v1 import BaseModel, root_validator
 from accli.AcceleratorTerminalCliProjectService import AcceleratorTerminalCliProjectService
@@ -14,6 +15,8 @@ from accli.token import (
     get_project_slug
 )
 
+ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)
+
 FOLDER_JOB_REPO_URL = 'https://github.com/IIASA-Accelerator/wkube-job.git'
 
 
@@ -60,6 +63,7 @@ def copy_tree(src, dst):
         else:
             shutil.copy2(src_path, dst_path)
 
+@lru_cache(maxsize=None)
 def push_folder_job(dir):
 
     access_token = get_token()
@@ -71,7 +75,7 @@ def push_folder_job(dir):
     term_cli_project_service = AcceleratorTerminalCliProjectService(
         user_token=access_token,
         server_url=server_url,
-        verify_cert=False
+        verify_cert=(not ACCLI_DEBUG)
     )
 
     repo_dir = tempfile.mkdtemp()
@@ -204,7 +208,9 @@ class WKubeTaskKwargs(BaseModel):
             job_folder = values.get('job_folder', './')
 
             if not (values.get('repo_url') and values.get('repo_branch')):
-                    remote_url, branch_name = push_folder_job(job_folder)
+                    remote_url, branch_name = push_folder_job(
+                        os.path.abspath(job_folder)
+                    )
                     values['repo_url'] = remote_url
                     values['repo_branch'] = branch_name
             else:

{accli-0.7.9 → accli-0.7.11}/accli/AcceleratorTerminalCliProjectService.py

@@ -9,6 +9,8 @@ from rich.progress import Progress
 
 from accli.common import todict
 
+ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)
+
 class AccAPIError(Exception):
 
     def __init__(self, message, response, status_code):            
@@ -33,7 +35,7 @@ class AcceleratorTerminalCliProjectService:
             self,
             user_token, 
             server_url,
-            verify_cert=True
+            verify_cert=(not ACCLI_DEBUG)
         ):
         
         self.user_token = user_token

{accli-0.7.9 → accli-0.7.11}/accli/_version.py

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

{accli-0.7.9 → accli-0.7.11}/accli/cli.py

@@ -20,6 +20,8 @@ from rich.progress import Progress, SpinnerColumn, TextColumn, ProgressColumn, B
 
 warnings.filterwarnings('ignore')
 
+ACCLI_DEBUG = os.environ.get('ACCLI_DEBUG', False)
+
 app = typer.Typer(
     add_completion=False, 
     pretty_exceptions_show_locals=False, 
@@ -61,7 +63,8 @@ def login(
 
     token_response = requests.post(
         f"{server}/v1/oauth/device/token/", 
-        json={"device_authorization_code": device_authorization_code}
+        json={"device_authorization_code": device_authorization_code},
+        verify=(not ACCLI_DEBUG)
     )
 
     print("")
@@ -83,7 +86,7 @@ def upload_file(project_slug, accelerator_filename, local_filepath, progress, ta
     term_cli_project_service = AcceleratorTerminalCliProjectService(
         user_token=access_token,
         server_url=server_url,
-        verify_cert=False
+        verify_cert=(not ACCLI_DEBUG)
     )
 
     stat = term_cli_project_service.get_file_stat(project_slug, f"{folder_name}/{accelerator_filename}")
@@ -161,7 +164,7 @@ def validate(
     term_cli_project_service = AcceleratorTerminalCliProjectService(
         user_token="",
         server_url=server,
-        verify_cert=False
+        verify_cert=(not ACCLI_DEBUG)
     )
 
     validate = CsvRegionalTimeseriesValidator(
@@ -187,7 +190,7 @@ def dispatch(
     term_cli_project_service = AcceleratorTerminalCliProjectService(
         user_token=access_token,
         server_url=server_url,
-        verify_cert=False
+        verify_cert=(not ACCLI_DEBUG)
     )
 
     base_dir = os.getcwd()

{accli-0.7.9 → accli-0.7.11}/accli.egg-info/PKG-INFO

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