From ee055bdb81eae6f9695080713fbf3012659fade2 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Wed, 12 Mar 2025 22:54:38 -0400
Subject: [PATCH] Improve loading efficiency of common.py
---
client-cli/pvc/lib/common.py | 57 ++++++++++++++++++------------------
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/client-cli/pvc/lib/common.py b/client-cli/pvc/lib/common.py
index 000dd28c..a918a1e7 100644
--- a/client-cli/pvc/lib/common.py
+++ b/client-cli/pvc/lib/common.py
@@ -19,12 +19,13 @@
#
###############################################################################
-import os
-import math
-import time
-import requests
-import click
from ast import literal_eval
+from click import echo, progressbar
+from math import ceil
+from os.path import getsize
+from requests import get, post, put, patch, delete, Response
+from requests.exceptions import ConnectionError
+from time import time
from urllib3 import disable_warnings
@@ -39,7 +40,7 @@ def format_bytes(size_bytes):
}
human_bytes = "0B"
for unit in sorted(byte_unit_matrix, key=byte_unit_matrix.get):
- formatted_bytes = int(math.ceil(size_bytes / byte_unit_matrix[unit]))
+ formatted_bytes = int(ceil(size_bytes / byte_unit_matrix[unit]))
if formatted_bytes < 10000:
human_bytes = "{}{}".format(formatted_bytes, unit)
break
@@ -57,7 +58,7 @@ def format_metric(integer):
}
human_integer = "0"
for unit in sorted(integer_unit_matrix, key=integer_unit_matrix.get):
- formatted_integer = int(math.ceil(integer / integer_unit_matrix[unit]))
+ formatted_integer = int(ceil(integer / integer_unit_matrix[unit]))
if formatted_integer < 10000:
human_integer = "{}{}".format(formatted_integer, unit)
break
@@ -97,12 +98,12 @@ def format_age(age_secs):
class UploadProgressBar(object):
def __init__(self, filename, end_message="", end_nl=True):
- file_size = os.path.getsize(filename)
+ file_size = getsize(filename)
file_size_human = format_bytes(file_size)
- click.echo("Uploading file (total size {})...".format(file_size_human))
+ echo("Uploading file (total size {})...".format(file_size_human))
self.length = file_size
- self.time_last = int(round(time.time() * 1000)) - 1000
+ self.time_last = int(round(time() * 1000)) - 1000
self.bytes_last = 0
self.bytes_diff = 0
self.is_end = False
@@ -114,7 +115,7 @@ class UploadProgressBar(object):
else:
self.end_suffix = ""
- self.bar = click.progressbar(length=self.length, width=20, show_eta=True)
+ self.bar = progressbar(length=self.length, width=20, show_eta=True)
def update(self, monitor):
bytes_cur = monitor.bytes_read
@@ -123,7 +124,7 @@ class UploadProgressBar(object):
self.is_end = True
self.bytes_last = bytes_cur
- time_cur = int(round(time.time() * 1000))
+ time_cur = int(round(time() * 1000))
if (time_cur - 1000) > self.time_last:
self.time_last = time_cur
self.bar.update(self.bytes_diff)
@@ -132,13 +133,13 @@ class UploadProgressBar(object):
if self.is_end:
self.bar.update(self.bytes_diff)
self.bytes_diff = 0
- click.echo()
- click.echo()
+ echo()
+ echo()
if self.end_message:
- click.echo(self.end_message + self.end_suffix, nl=self.end_nl)
+ echo(self.end_message + self.end_suffix, nl=self.end_nl)
-class ErrorResponse(requests.Response):
+class ErrorResponse(Response):
def __init__(self, json_data, status_code, headers):
self.json_data = json_data
self.status_code = status_code
@@ -178,7 +179,7 @@ def call_api(
for i in range(3):
failed = False
try:
- response = requests.get(
+ response = get(
uri,
timeout=timeout,
headers=headers,
@@ -190,16 +191,14 @@ def call_api(
failed = True
continue
break
- except requests.exceptions.ConnectionError:
+ except ConnectionError:
failed = True
continue
if failed:
error = f"Code {response.status_code}" if response else "Timeout"
- raise requests.exceptions.ConnectionError(
- f"Failed to connect after 3 tries ({error})"
- )
+ raise ConnectionError(f"Failed to connect after 3 tries ({error})")
if operation == "post":
- response = requests.post(
+ response = post(
uri,
timeout=timeout,
headers=headers,
@@ -209,7 +208,7 @@ def call_api(
verify=config["verify_ssl"],
)
if operation == "put":
- response = requests.put(
+ response = put(
uri,
timeout=timeout,
headers=headers,
@@ -219,7 +218,7 @@ def call_api(
verify=config["verify_ssl"],
)
if operation == "patch":
- response = requests.patch(
+ response = patch(
uri,
timeout=timeout,
headers=headers,
@@ -228,7 +227,7 @@ def call_api(
verify=config["verify_ssl"],
)
if operation == "delete":
- response = requests.delete(
+ response = patch, delete(
uri,
timeout=timeout,
headers=headers,
@@ -243,10 +242,10 @@ def call_api(
# Display debug output
if config["debug"]:
- click.echo("API endpoint: {}".format(uri), err=True)
- click.echo("Response code: {}".format(response.status_code), err=True)
- click.echo("Response headers: {}".format(response.headers), err=True)
- click.echo(err=True)
+ echo("API endpoint: {}".format(uri), err=True)
+ echo("Response code: {}".format(response.status_code), err=True)
+ echo("Response headers: {}".format(response.headers), err=True)
+ echo(err=True)
# Return the response object
return response