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

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
             
 

{anatools-5.1.27.data → anatools-6.0.0.data}/scripts/anadeploy

@@ -332,6 +332,7 @@ try:
                         while resp not in [str(i) for i in range(len(channels)+1)]:
                             resp = input(f'Invalid input, please enter a number between 0 and {len(channels)}: ')
                         remotechannel = channels[int(resp)-1]
+                        print_color(f"Selected channel: {remotechannel['name']}", color='brand')
                         if volumes != remotechannel['volumes']:
                             client.edit_channel(channelId=remotechannel['channelId'], volumes=volumes)
                             remotechannel = client.get_channels(channelId=remotechannel['channelId'])[0]
@@ -493,6 +494,7 @@ try:
                         while resp not in [str(i) for i in range(len(services)+1)]:
                             resp = input(f'Invalid input, please enter a number between 0 and {len(services)}: ')
                         remoteservice = services[int(resp)-1]
+                        print_color(f"Selected service: {remoteservice['name']}", color='brand')
                         if volumes != remoteservice['volumes']:
                             client.edit_service(serviceId=remoteservice['serviceId'], volumes=volumes)
                             remoteservice = client.get_services(serviceId=remoteservice['serviceId'])[0]