anatools 5.1.28__py3-none-any.whl → 6.0.0__py3-none-any.whl

anatools/__init__.py

@@ -16,4 +16,4 @@ View the `Introduction to Rendered.ai Documentation`_ to learn more.
 from .anaclient.anaclient import client
 from .annotations.annotations import annotations
 
-__version__ = '5.1.28'
+__version__ = '6.0.0'

anatools/anaclient/anaclient.py

@@ -93,7 +93,7 @@ class client:
         if self.__bearer_token:
             initial_headers = {'Authorization': f'Bearer {self.__bearer_token}'}
 
-        self.ana_api = api(self.__url, self.__status_url, initial_headers, self.verbose)
+        self.ana_api = api(self.__url, self.__status_url, initial_headers, self.verbose, self.interactive)
 
         # initialize client variables
         self.__logout = False
@@ -188,15 +188,15 @@ class client:
                 if self.interactive: print_color(f'Failed to login to {self.__environment} with email {self.__email}.', 'ff0000')
                 self.user = None
             except requests.exceptions.ConnectionError as e:
-                print_color(f'Could not connect to API to login. Try again or contact support@rendered.ai for assistance.', 'ff0000')
+                if self.interactive: print_color(f'Could not connect to API to login. Try again or contact support@rendered.ai for assistance.', 'ff0000')
                 raise AuthFailedError()
             except requests.exceptions.JSONDecodeError as e:
-                print_color(f'Failed to login with email {self.__email} and endpoint {self.__url}. Please confirm this is the correct email and endpoint, contact support@rendered.ai for assistance.', 'ff0000')
+                if self.interactive: print_color(f'Failed to login with email {self.__email} and endpoint {self.__url}. Please confirm this is the correct email and endpoint, contact support@rendered.ai for assistance.', 'ff0000')
                 raise AuthFailedError()
-            self.ana_api = api(self.__url, self.__status_url, {'uid':self.user['uid'], 'Authorization': f'Bearer {self.user["idtoken"]}'}, self.verbose)
+            self.ana_api = api(self.__url, self.__status_url, {'uid':self.user['uid'], 'Authorization': f'Bearer {self.user["idtoken"]}'}, self.verbose, self.interactive)
             try:
                 response = self.ana_api.getSDKCompatibility()
-                if response['version'] != anatools.__version__: print_color(response['message'], 'ff0000')
+                if self.interactive and response['version'] != anatools.__version__: print_color(response['message'], 'ff0000')
             except:
                 if self.verbose: print_color("Failed to check SDK compatibility.", 'ff0000')
             # ask to create an api key if using email/password
@@ -301,20 +301,20 @@ class client:
         import requests
 
         try:
-            self.ana_api = api(self.__url, self.__status_url, {'apikey': self.__APIKey}, self.verbose)
+            self.ana_api = api(self.__url, self.__status_url, {'apikey': self.__APIKey}, self.verbose, self.interactive)
             apikeydata = self.ana_api.getAPIKeyContext(apiKey=self.__APIKey)
             if not apikeydata:
-                print_color("Invalid API Key", 'ff0000')
+                if self.interactive: print_color("Invalid API Key", 'ff0000')
                 raise AuthFailedError()
             if apikeydata.get('expiresAt'):
                 apikey_date = datetime.strptime(apikeydata['expiresAt'], "%Y-%m-%dT%H:%M:%S.%fZ")
                 current_date = datetime.now()
                 if apikey_date < current_date:
-                    print_color(f"API Key expired at {apikey_date}", 'ff0000')
+                    if self.interactive: print_color(f"API Key expired at {apikey_date}", 'ff0000')
                     raise AuthFailedError()
             try:
                 response = self.ana_api.getSDKCompatibility()
-                if response['version'] != anatools.__version__: print_color(response['message'], 'ff0000')
+                if self.interactive and response['version'] != anatools.__version__: print_color(response['message'], 'ff0000')
             except:
                 if self.verbose: print_color("Failed to check SDK compatibility.", 'ff0000')
         except requests.exceptions.ConnectionError as e:
@@ -383,15 +383,15 @@ class client:
         if self.user:
             if int(time.time()) > int(self.user['expiresAt']):
                 self.user = self.ana_api.login(self.__email, self.__password)
-                self.ana_api = api(self.__url, self.__status_url, {'uid': self.user['uid'], 'Authorization': f'Bearer {self.user["idtoken"]}'}, self.verbose)
+                self.ana_api = api(self.__url, self.__status_url, {'uid': self.user['uid'], 'Authorization': f'Bearer {self.user["idtoken"]}'}, self.verbose, self.interactive)
                 try:
                     notification = self.ana_api.getSystemNotifications()
                     self.__notificationId = notification['notificationId']
                     if notification and notification['notificationId'] != self.__notificationId:
                         self.__notificationId = notification['notificationId']
-                        print_color(notification['message'], 'ffff00')
+                        if self.interactive: print_color(notification['message'], 'ffff00')
                 except requests.exceptions.ConnectionError as e:
-                        print_color(f"Could not get notifications: {e}", 'ffff00')
+                        if self.interactive: print_color(f"Could not get notifications: {e}", 'ffff00')
 
 
     def check_logout(self):
@@ -462,8 +462,9 @@ class client:
                     f"code_challenge={code_challenge}&"
                     f"code_challenge_method=S256")
 
-        print_color("No other authentication methods found, attempting to login via your browser.", 'ffff00')
-        print_color(f"If your browser does not open automatically, please open this URL in your browser: \n{auth_url}", "91e600")
+        if self.interactive:
+            print_color("No other authentication methods found, attempting to login via your browser.", 'ffff00')
+            print_color(f"If your browser does not open automatically, please open this URL in your browser: \n{auth_url}", "91e600")
         webbrowser.open(auth_url)
 
         auth_code = [None]
@@ -561,7 +562,7 @@ class client:
         """
         from anatools.lib.print import print_color
         services = self.ana_api.getSystemStatus(serviceId)
-        if services and display:
+        if services and display and self.interactive:
             spacing = max([len(service['serviceName']) for service in services])+4
             print('Service Name'.ljust(spacing, ' ')+'Status')
             for service in services:

anatools/anaclient/api/api.py

@@ -2,12 +2,13 @@
 
 class api:
 
-    def __init__(self, url, status_url, headers, verbose=False):
+    def __init__(self, url, status_url, headers, verbose=False, interactive=True):
         import requests
         self.url = url
         self.status_url = status_url
         self.headers = headers or {}
         self.verbose = verbose
+        self.interactive = interactive
         self.types = None
         self.fields = {}
         self.session = requests.Session()

anatools/anaclient/api/handlers.py

@@ -21,7 +21,7 @@ def errorhandler(self, response, call):
                    'token is invalid' in lower_error_message or \
                    'token expired' in lower_error_message or \
                    'authentication failed' in lower_error_message:
-                    print_color("Authentication failed. The provided token may be invalid, expired, or you do not have permission for this operation.", 'ff0000')
+                    if self.interactive: print_color("Authentication failed. The provided token may be invalid, expired, or you do not have permission for this operation.", 'ff0000')
                     # Optionally, raise a more specific AuthFailedError if it exists and is appropriate here
             raise Exception(error_message)
         else: raise Exception(f'There was an issue with the {call} API call.')

anatools/anaclient/channels.py

@@ -182,15 +182,40 @@ def build_channel(self, channelfile, ignore=['data/', 'output/'], verify=False):
         disk_usage = shutil.disk_usage('/')
         gb_free = disk_usage.free / (1024**3)  # Convert bytes to GB
         if self.verbose == 'debug': print(f"Disk space left: {gb_free:.3f}GB")
-        if gb_free < 20: print_color(f'\nWarning: Low disk space detected! Only {gb_free:.1f}GB available.', 'ffff00')
+        if gb_free < 20 and self.interactive: print_color(f'\nWarning: Low disk space detected! Only {gb_free:.1f}GB available.', 'ffff00')
         docker_space_cmd = "docker system df --format json"
         result = subprocess.run(docker_space_cmd, shell=True, capture_output=True, text=True)
         if result.returncode == 0:
-            docker_stats = json.loads(result.stdout)
-            total_docker_size = sum(item.get('Size', 0) for item in docker_stats if 'Size' in item)
-            docker_gb = total_docker_size / (1024**3)  # Convert bytes to GB
+            # Parse Docker output which may be NDJSON (newline-delimited) or concatenated JSON objects
+            # Use JSONDecoder.raw_decode() to handle both formats robustly
+            import re
+            def parse_docker_json(data):
+                results = []
+                decoder = json.JSONDecoder()
+                idx = 0
+                data = data.strip()
+                while idx < len(data):
+                    obj, end_idx = decoder.raw_decode(data, idx)
+                    results.append(obj)
+                    idx = end_idx
+                    # Skip any whitespace between objects
+                    while idx < len(data) and data[idx].isspace():
+                        idx += 1
+                return results
+            docker_stats = parse_docker_json(result.stdout)
+            # Parse human-readable size strings (e.g., "85.19GB", "2.087MB", "0B") to GB
+            def parse_size_to_gb(size_str):
+                if not size_str or size_str == '0B':
+                    return 0.0
+                match = re.match(r'^([\d.]+)([KMGT]?B)$', size_str)
+                if not match:
+                    return 0.0
+                value, unit = float(match.group(1)), match.group(2)
+                multipliers = {'B': 1/(1024**3), 'KB': 1/(1024**2), 'MB': 1/1024, 'GB': 1, 'TB': 1024}
+                return value * multipliers.get(unit, 0)
+            docker_gb = sum(parse_size_to_gb(item.get('Size', '0B')) for item in docker_stats)
             if self.verbose == 'debug': print(f"Docker space used: {docker_gb:.3f}GB")
-            if docker_gb > 20:
+            if docker_gb > 20 and self.interactive:
                 print_color(f'\nWarning: Docker is using {docker_gb:.1f}GB of disk space!', 'ffff00')
                 print_color('Consider running "docker system prune -a" to free up space.', 'ffff00')
                 print_color('This will remove:', 'ffff00')
@@ -199,11 +224,11 @@ def build_channel(self, channelfile, ignore=['data/', 'output/'], verify=False):
                 print_color('  - All dangling images', 'ffff00')
                 print_color('  - All dangling build cache', 'ffff00')
     except Exception as e:
-        print(e)
+        if self.verbose == 'debug': print(f"Docker space check failed: {e}")
         pass
 
     # build dockerfile
-    print('Building Channel Image...', end='', flush=True)    
+    if self.interactive: print('Building Channel Image...', end='', flush=True)    
     if not os.path.isfile(channelfile): raise Exception(f'No channel file {channelfile} found.')
     channeldir, channelfile = os.path.split(channelfile)
     if channeldir == "": channeldir = "./"   
@@ -249,10 +274,10 @@ RUN sudo /home/$USERNAME/miniconda3/envs/anatools/bin/pip install -r /ana/requir
                     if 'error' in output: print_color(f'{output["error"]}', 'ff0000')
                 if 'stream' in output: logfile.write(output['stream'])
                 if 'error' in output: logfile.write(output["error"])
-                print(f'\rBuilding Channel Image...  [{time.time()-start:.3f}s]', end='', flush=True)
+                if self.interactive: print(f'\rBuilding Channel Image...  [{time.time()-start:.3f}s]', end='', flush=True)
             except StopIteration as e:
                 time.sleep(5)
-                print(f"\rBuilding Channel Image...done.  [{time.time()-start:.3f}s]", flush=True)
+                if self.interactive: print(f"\rBuilding Channel Image...done.  [{time.time()-start:.3f}s]", flush=True)
                 try:
                     dockerclient = docker.from_env()
                     dockerclient.images.get(channelfile.split('.')[0])
@@ -267,26 +292,26 @@ RUN sudo /home/$USERNAME/miniconda3/envs/anatools/bin/pip install -r /ana/requir
     # if verify, check that image is valid by running anautils command
     if verify:
         try:
-            print(f'Verifying Channel Image...', end='', flush=True)
+            if self.interactive: print(f'Verifying Channel Image...', end='', flush=True)
             start = time.time()
 
             # Run anautils command in the Docker container to verify schema
             container_name = f"verify_{channelfile.split('.')[0]}_{int(time.time())}"
             cmd = [
-                "docker", "run", "--name", container_name, 
-                channelfile.split('.')[0], 
+                "docker", "run", "--name", container_name,
+                channelfile.split('.')[0],
                 "anautils", "--mode=schema", "--output=/tmp"
             ]
-            
+
             result = subprocess.run(cmd,  capture_output=True, text=True, check=False)
             subprocess.run(["docker", "rm", container_name], capture_output=True)
             if result.returncode != 0:
-                print_color(f"\n\n{result.stderr}\n", "ff0000")
+                if self.interactive: print_color(f"\n\n{result.stderr}\n", "ff0000")
                 raise Exception(f'Error encountered while verifying Docker image with the anautils command.')
-            
-            print(f"\rVerifying Channel Image...done. [{time.time()-start:.3f}s]")
+
+            if self.interactive: print(f"\rVerifying Channel Image...done. [{time.time()-start:.3f}s]")
             status = True
-                
+
         except Exception as e:
             raise Exception(f'Error encountered while verifying Docker image. Please check that you can generate the schema using the anautils command.')
 
@@ -339,7 +364,7 @@ def deploy_channel(self, channelId=None, channelfile=None, image=None):
     except: raise Exception('Error connecting to Docker.')
 
     # get repository info
-    print(f"Pushing Channel Image...", end='', flush=True)
+    if self.interactive: print(f"Pushing Channel Image...", end='', flush=True)
     dockerinfo = self.ana_api.deployChannel(channelId, image)
     deploymentId = dockerinfo['deploymentId']
     reponame = dockerinfo['ecrEndpoint']
@@ -363,11 +388,11 @@ def deploy_channel(self, channelId=None, channelfile=None, image=None):
                 progressDetail = line['progressDetail']
                 if progressDetail['total'] >= largest:
                     largest = progressDetail['total']
-                    print(f"\rPushing Channel Image...  [{time.time()-start:.3f}s, {min(100,round((progressDetail['current']/progressDetail['total']) * 100))}%]", end='', flush=True)
+                    if self.interactive: print(f"\rPushing Channel Image...  [{time.time()-start:.3f}s, {min(100,round((progressDetail['current']/progressDetail['total']) * 100))}%]", end='', flush=True)
         logfile.write(str(line) + '\n')
     logfile.close()
     if self.verbose != 'debug': os.remove(os.path.join(channeldir, 'dockerpush.log'))
-    print(f"\rPushing Channel Image...done.  [{time.time()-start:.3f}s]     ", flush=True)
+    if self.interactive: print(f"\rPushing Channel Image...done.  [{time.time()-start:.3f}s]     ", flush=True)
     
     # cleanup docker and update channels
     dockerclient.images.remove(reponame)
@@ -396,13 +421,13 @@ def get_deployment_status(self, deploymentId, stream=False):
     if deploymentId is None: raise Exception('DeploymentId must be specified.')
     if stream:
         data = self.ana_api.getChannelDeployment(deploymentId=deploymentId)
-        print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
+        if self.interactive: print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
         while (data['status']['state'] not in ['Channel Deployment Complete','Channel Deployment Failed']):
             time.sleep(10)
-            print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
+            if self.interactive: print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
             if self.check_logout(): return
             data = self.ana_api.getChannelDeployment(deploymentId=deploymentId)
-        print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", flush=True)
+        if self.interactive: print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", flush=True)
         return data
     else: return self.ana_api.getChannelDeployment(deploymentId=deploymentId)
 
@@ -457,8 +482,8 @@ def upload_channel_documentation(self, channelId, mdfile):
             "X-Amz-Signature":      fileinfo['fields']['signature'],
         }
         response = requests.post(fileinfo['url'], data=data, files=files)
-        if response.status_code != 204: 
-            print(response.status_code)
+        if response.status_code != 204:
+            if self.verbose: print(response.status_code)
             raise Exception('Failed to upload channel documentation file.')
     return True
 

anatools/anaclient/datasets.py

@@ -170,28 +170,55 @@ def delete_dataset(self, datasetId, workspaceId=None):
 
 def download_dataset(self, datasetId, workspaceId=None, localDir=None):
     """Download a dataset.
-    
+
     Parameters
     ----------
     datasetId : str
         Dataset ID of dataset to download.
     workspaceId : str
-        Workspace ID that the dataset is in. If none is provided, the default workspace will get used. 
+        Workspace ID that the dataset is in. If none is provided, the default workspace will get used.
     localDir : str
         Path for where to download the dataset. If none is provided, current working directory will be used.
-        
+
     Returns
     -------
     str
         Returns the path the dataset was downloaded to.
+
+    Raises
+    ------
+    ValueError
+        If datasetId is not provided.
+    Exception
+        If the dataset cannot be downloaded (e.g., still running, failed, or not found).
     """
     from anatools.lib.download import download_file
 
     self.check_logout()
     if datasetId is None: raise ValueError("The datasetId parameter is required!")
-    if workspaceId is None: workspaceId = self.workspace    
-    url = self.ana_api.downloadDataset(workspaceId=workspaceId, datasetId=datasetId)        
-    fname = self.ana_api.getDatasets(workspaceId=workspaceId, datasetId=datasetId)[0]['name'] + '.zip'
+    if workspaceId is None: workspaceId = self.workspace
+
+    # Get dataset info to provide better error messages
+    datasets = self.ana_api.getDatasets(workspaceId=workspaceId, datasetId=datasetId)
+    if not datasets:
+        raise Exception(f"Dataset with ID '{datasetId}' not found in workspace.")
+
+    dataset = datasets[0]
+    dataset_name = dataset.get('name', datasetId)
+    dataset_status = dataset.get('status', 'unknown')
+
+    url = self.ana_api.downloadDataset(workspaceId=workspaceId, datasetId=datasetId)
+
+    if url is None:
+        # Provide a helpful error message based on the dataset status
+        if dataset_status.lower() in ['running', 'pending', 'queued']:
+            raise Exception(f"Dataset '{dataset_name}' is still {dataset_status}. Please wait for the dataset to complete before downloading.")
+        elif dataset_status.lower() in ['failed', 'error', 'cancelled']:
+            raise Exception(f"Dataset '{dataset_name}' has status '{dataset_status}' and cannot be downloaded.")
+        else:
+            raise Exception(f"Dataset '{dataset_name}' is not available for download (status: {dataset_status}). The dataset may still be processing or may have failed.")
+
+    fname = dataset_name + '.zip'
     return download_file(url=url, fname=fname, localDir=localDir) 
 
 

anatools/anaclient/helpers.py

@@ -16,10 +16,10 @@ def generate_etag(file_path, chunk_size=128 * hashlib.md5().block_size):
         raise IOError(f"Error reading file {file_path}: {e}")
 
 
-def upload_part(i, file_path, url, part_size, total_parts, progress_tracker, prefix_message, max_retries=3):
+def upload_part(i, file_path, url, part_size, total_parts, progress_tracker, prefix_message, max_retries=3, interactive=True):
     """Uploads a single part, creating a new session for each request, updating progress with retry and delay."""
     percent_complete = (progress_tracker["completed_parts"] / total_parts) * 100
-    print(f"\x1b[1K\r{prefix_message}: {percent_complete:.2f}% complete", end="", flush=True)
+    if interactive: print(f"\x1b[1K\r{prefix_message}: {percent_complete:.2f}% complete", end="", flush=True)
     retries = 0
 
     while retries <= max_retries:
@@ -36,21 +36,22 @@ def upload_part(i, file_path, url, part_size, total_parts, progress_tracker, pre
             e_tag = response.headers["ETag"]
             progress_tracker["completed_parts"] += 1
             percent_complete = (progress_tracker["completed_parts"] / total_parts) * 100
-            print(f"\x1b[1K\r{prefix_message}: {percent_complete:.2f}% complete", end="", flush=True)
+            if interactive: print(f"\x1b[1K\r{prefix_message}: {percent_complete:.2f}% complete", end="", flush=True)
             return {"partNumber": i + 1, "eTag": e_tag}
 
         except requests.RequestException as e:
             if retries == max_retries:
                 raise Exception(f"Failed to upload part {i+1} after {retries} attempts. Error: {e}")
 
-            print(f"\n\033[91m{prefix_message}: Attempt {retries + 1} failed with error", flush=True)
-            print(f"{e}. ", flush=True)
-            print("Retrying in 30 seconds...\033[0m", flush=True)
+            if interactive:
+                print(f"\n\033[91m{prefix_message}: Attempt {retries + 1} failed with error", flush=True)
+                print(f"{e}. ", flush=True)
+                print("Retrying in 30 seconds...\033[0m", flush=True)
             time.sleep(30)  # Wait 30 seconds before retrying
             retries += 1
 
 
-def multipart_upload_file(file_path, part_size, urls, prefix_message):
+def multipart_upload_file(file_path, part_size, urls, prefix_message, interactive=True):
     if len(urls) > 0:
         parts = []
         total_parts = len(urls)
@@ -61,14 +62,14 @@ def multipart_upload_file(file_path, part_size, urls, prefix_message):
             for i, url in enumerate(urls):
                 futures.append(
                     executor.submit(
-                        upload_part, i, file_path, url, part_size, total_parts, progress_tracker, prefix_message
+                        upload_part, i, file_path, url, part_size, total_parts, progress_tracker, prefix_message, interactive=interactive
                     )
                 )
 
             for future in as_completed(futures):
                 parts.append(future.result())
 
-        print(f"\x1b[1K\r{prefix_message}: upload complete.", end="", flush=True)
+        if interactive: print(f"\x1b[1K\r{prefix_message}: upload complete.", end="", flush=True)
         return parts
     else:
         with open(file_path, "rb") as filebytes:
@@ -77,5 +78,5 @@ def multipart_upload_file(file_path, part_size, urls, prefix_message):
             response = requests.put(url, files=files)
             if response.status_code != 204:
                 raise Exception(f"Failed to upload, with status code: {response.status_code}")
-        print(f"\x1b[1K\r{prefix_message}: upload complete.", end="", flush=True)
+        if interactive: print(f"\x1b[1K\r{prefix_message}: upload complete.", end="", flush=True)
         return []

anatools/anaclient/services.py

@@ -174,15 +174,40 @@ def build_service(self, servicefile):
         disk_usage = shutil.disk_usage('/')
         gb_free = disk_usage.free / (1024**3)  # Convert bytes to GB
         if self.verbose == 'debug': print(f"Disk space left: {gb_free:.3f}GB")
-        if gb_free < 20: print_color(f'\nWarning: Low disk space detected! Only {gb_free:.1f}GB available.', 'ffff00')
+        if gb_free < 20 and self.interactive: print_color(f'\nWarning: Low disk space detected! Only {gb_free:.1f}GB available.', 'ffff00')
         docker_space_cmd = "docker system df --format json"
         result = subprocess.run(docker_space_cmd, shell=True, capture_output=True, text=True)
         if result.returncode == 0:
-            docker_stats = json.loads(result.stdout)
-            total_docker_size = sum(item.get('Size', 0) for item in docker_stats if 'Size' in item)
-            docker_gb = total_docker_size / (1024**3)  # Convert bytes to GB
+            # Parse Docker output which may be NDJSON (newline-delimited) or concatenated JSON objects
+            # Use JSONDecoder.raw_decode() to handle both formats robustly
+            import re
+            def parse_docker_json(data):
+                results = []
+                decoder = json.JSONDecoder()
+                idx = 0
+                data = data.strip()
+                while idx < len(data):
+                    obj, end_idx = decoder.raw_decode(data, idx)
+                    results.append(obj)
+                    idx = end_idx
+                    # Skip any whitespace between objects
+                    while idx < len(data) and data[idx].isspace():
+                        idx += 1
+                return results
+            docker_stats = parse_docker_json(result.stdout)
+            # Parse human-readable size strings (e.g., "85.19GB", "2.087MB", "0B") to GB
+            def parse_size_to_gb(size_str):
+                if not size_str or size_str == '0B':
+                    return 0.0
+                match = re.match(r'^([\d.]+)([KMGT]?B)$', size_str)
+                if not match:
+                    return 0.0
+                value, unit = float(match.group(1)), match.group(2)
+                multipliers = {'B': 1/(1024**3), 'KB': 1/(1024**2), 'MB': 1/1024, 'GB': 1, 'TB': 1024}
+                return value * multipliers.get(unit, 0)
+            docker_gb = sum(parse_size_to_gb(item.get('Size', '0B')) for item in docker_stats)
             if self.verbose == 'debug': print(f"Docker space used: {docker_gb:.3f}GB")
-            if docker_gb > 20:
+            if docker_gb > 20 and self.interactive:
                 print_color(f'\nWarning: Docker is using {docker_gb:.1f}GB of disk space!', 'ffff00')
                 print_color('Consider running "docker system prune -a" to free up space.', 'ffff00')
                 print_color('This will remove:', 'ffff00')
@@ -191,10 +216,11 @@ def build_service(self, servicefile):
                 print_color('  - All dangling images', 'ffff00')
                 print_color('  - All dangling build cache', 'ffff00')
     except Exception as e:
+        if self.verbose == 'debug': print(f"Docker space check failed: {e}")
         pass
 
     # check for service Dockerfile
-    print('Building Service Image...', end='', flush=True)    
+    if self.interactive: print('Building Service Image...', end='', flush=True)    
     if not os.path.isfile(servicefile): raise Exception(f'No service file {servicefile} found.')
     servicedir, servicefile = os.path.split(servicefile)
     imgtime = int(time.time())
@@ -207,12 +233,12 @@ def build_service(self, servicefile):
     try:
         start = time.time()
         streamer = dockerclient.build(
-            path=servicedir, 
-            dockerfile=os.path.join(servicedir, '.devcontainer/Dockerfile'), 
-            tag=image, 
-            rm=True, 
-            decode=True, 
-            platform='linux/amd64', 
+            path=servicedir,
+            dockerfile=os.path.join(servicedir, '.devcontainer/Dockerfile'),
+            tag=image,
+            rm=True,
+            decode=True,
+            platform='linux/amd64',
             nocache=False,
             pull=False)
         logfilepath = os.path.join(tempfile.gettempdir(), 'dockerbuild.log')
@@ -225,7 +251,7 @@ def build_service(self, servicefile):
                     if 'error' in output: print_color(f'{output["error"]}', 'ff0000')
                 if 'stream' in output: logfile.write(output['stream'])
                 if 'error' in output: logfile.write(output["error"])
-                print(f'\rBuilding Service Image...  [{time.time()-start:.3f}s]', end='', flush=True)
+                if self.interactive: print(f'\rBuilding Service Image...  [{time.time()-start:.3f}s]', end='', flush=True)
             except StopIteration:
                 time.sleep(1)
                 try:
@@ -238,7 +264,7 @@ def build_service(self, servicefile):
         logfile.close()
         raise Exception(f'Error encountered while building Docker image. Please check logfile {logfilepath}.')
     if self.verbose != 'debug' and os.path.exists(logfilepath): os.remove(logfilepath)
-    print(f"\rBuilding Service Image...done.  [{time.time()-start:.3f}s]", flush=True)
+    if self.interactive: print(f"\rBuilding Service Image...done.  [{time.time()-start:.3f}s]", flush=True)
     return image
 
 
@@ -296,13 +322,13 @@ def deploy_service(self, serviceId=None, servicefile=None):
                 progressDetail = line['progressDetail']
                 if progressDetail['total'] >= largest:
                     largest = progressDetail['total']
-                    print(f"\rPushing Service Image...  [{time.time()-start:.3f}s, {min(100,round((progressDetail['current']/progressDetail['total']) * 100))}%]", end='', flush=True)
-        if 'error' in line: 
+                    if self.interactive: print(f"\rPushing Service Image...  [{time.time()-start:.3f}s, {min(100,round((progressDetail['current']/progressDetail['total']) * 100))}%]", end='', flush=True)
+        if 'error' in line:
             if 'HTTP 403' in line['error']: raise Exception('You do not have permission to push to this repository.')
             else: raise Exception(line['error'])
     logfile.close()
     if self.verbose != 'debug' and os.path.exists(logfilepath): os.remove(logfilepath)
-    print(f"\rPushing Service Image...done.  [{time.time()-start:.3f}s]     ", flush=True)
+    if self.interactive: print(f"\rPushing Service Image...done.  [{time.time()-start:.3f}s]     ", flush=True)
     
     # cleanup docker and update services
     dockerclient.images.remove(reponame)
@@ -331,13 +357,13 @@ def get_service_deployment(self, deploymentId, stream=False):
     if deploymentId is None: raise Exception('DeploymentId must be specified.')
     if stream:
         data = self.ana_api.getServiceDeployment(deploymentId=deploymentId)
-        print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
+        if self.interactive: print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
         while (data['status']['state'] not in ['Service Deployment Complete','Service Deployment Failed']):
             time.sleep(10)
-            print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
+            if self.interactive: print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", end='', flush=True)
             if self.check_logout(): return
             data = self.ana_api.getServiceDeployment(deploymentId=deploymentId)
-        print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", flush=True)
+        if self.interactive: print(f"\r\tStep {data['status']['step']} - {data['status']['message']}", flush=True)
         return data
     else: return self.ana_api.getServiceDeployment(deploymentId=deploymentId)
 

anatools/anaclient/volumes.py

@@ -274,8 +274,8 @@ def download_volume_data(self, volumeId, files=[], localDir=None, recursive=True
                 if self.interactive: 
                     print(f"\x1b[1K\rdownload: {response[index]['key']} to {filename}", flush=True)
             except:
-                traceback.print_exc()
-                print(f"\x1b[1K\rdownload: failed to download {response[index]['key']}", flush=True)
+                if self.verbose: traceback.print_exc()
+                if self.interactive: print(f"\x1b[1K\rdownload: failed to download {response[index]['key']}", flush=True)
     return
 
 
@@ -330,7 +330,8 @@ def upload_volume_data(self, volumeId, files=None, localDir=None, destinationDir
                 if sync == True:
                     file_hash = generate_etag(filepath)
                     source_hashes.append(file + file_hash)
-            else: print(f"Could not find {filepath}.")
+            else:
+                if self.interactive: print(f"Could not find {filepath}.")
     else:
         for root, dirs, files in os.walk(localDir):
             for file in files:
@@ -371,37 +372,37 @@ def upload_volume_data(self, volumeId, files=None, localDir=None, destinationDir
                 delete_files.append(destination_file)  
 
         if (len(delete_files)):
-            print(f"The following files will be deleted:", end='\n', flush=True)
-            for file in delete_files:
-                print(f"   {file}", end='\n', flush=True)
-            answer = input("Delete these files [Y/n]: ")
-            if answer.lower() == "y":
-                self.refresh_token()
-                self.ana_api.deleteVolumeData(volumeId=volumeId, keys=delete_files)
+            if self.interactive:
+                print(f"The following files will be deleted:", end='\n', flush=True)
+                for file in delete_files:
+                    print(f"   {file}", end='\n', flush=True)
+                answer = input("Delete these files [Y/n]: ")
+                if answer.lower() == "y":
+                    self.refresh_token()
+                    self.ana_api.deleteVolumeData(volumeId=volumeId, keys=delete_files)
 
     for index, file in enumerate(source_files):
         destination_key = (destinationDir or '') + file
-        print(f"\x1b[1K\rUploading {file} to the volume [{index+1} / {len(source_files)}]", end='\n' if self.verbose else '', flush=True)
+        if self.interactive: print(f"\x1b[1K\rUploading {file} to the volume [{index+1} / {len(source_files)}]", end='\n' if self.verbose else '', flush=True)
         if (sync == True and (source_hashes[index] in destination_hashes)):
-            print(f"\x1b[1K\rsync: {file}'s hash exists", end='\n' if self.verbose else '', flush=True)
+            if self.interactive: print(f"\x1b[1K\rsync: {file}'s hash exists", end='\n' if self.verbose else '', flush=True)
         elif sync == False or (source_hashes[index] not in destination_hashes):
             try:
                 self.refresh_token()
                 filepath = os.path.join(localDir, file)
                 filesize = os.path.getsize(filepath)
                 fileinfo = self.ana_api.uploadVolumeData(volumeId=volumeId, key=destination_key, size=filesize)
-                # print(f"\x1b[1K\rupload: {file} to the volume. [{index+1} / {len(source_files)}]", end='\n' if self.verbose else '', flush=True)
-                parts = multipart_upload_file(filepath, int(fileinfo["partSize"]), fileinfo["urls"], f"Uploading {file} to the volume [{index+1} / {len(source_files)}]")
+                parts = multipart_upload_file(filepath, int(fileinfo["partSize"]), fileinfo["urls"], f"Uploading {file} to the volume [{index+1} / {len(source_files)}]", interactive=self.interactive)
                 self.refresh_token()
                 finalize_success = self.ana_api.uploadVolumeDataFinalizer(uploadId=fileinfo['uploadId'], key=fileinfo['key'], parts=parts)
                 if not finalize_success:
                     faileduploads.append(file)
             except:
-                traceback.print_exc()
+                if self.verbose: traceback.print_exc()
                 faileduploads.append(file)
-                print(f"\x1b[1K\rupload: {file} failed", end='\n' if self.verbose else '', flush=True)
-    print("\x1b[1K\rUploading files completed.", flush=True)
-    if len(faileduploads): print('The following files failed to upload:', faileduploads, flush=True)
+                if self.interactive: print(f"\x1b[1K\rupload: {file} failed", end='\n' if self.verbose else '', flush=True)
+    if self.interactive: print("\x1b[1K\rUploading files completed.", flush=True)
+    if len(faileduploads) and self.interactive: print('The following files failed to upload:', faileduploads, flush=True)
     return