cgcsdk 1.0.17__tar.gz → 1.1.0__tar.gz

{cgcsdk-1.0.17/cgcsdk.egg-info → cgcsdk-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cgcsdk
-Version: 1.0.17
+Version: 1.1.0
 Summary: CGC Core REST API client
 Home-page: https://cgc.comtegra.cloud/
 Author: Comtegra AI Team

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/.env

@@ -5,5 +5,5 @@ API_SECURE_CONNECTION=yes
 CONFIG_FILE_NAME = cfg.json
 TMP_DIR = .tmp
 RELEASE = 1
-MAJOR_VERSION = 0
-MINOR_VERSION = 17
+MAJOR_VERSION = 1
+MINOR_VERSION = 0

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## 1.1.0
+
+Release on Oct 02, 2024
+
+* fix: not required `app-token` label for computes
+* update: grant_type for JWT authentication
+
+## 1.0.18
+
+Release on Aug 28, 2024
+
+* `cgc job list` now also uses information from the job status
+* `cgc compute port list` now shows full ingress path in the new column
+* `cgc status` now shows user defined quotas
+
 ## 1.0.17
 
 Release on Aug 19, 2024

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/commands/auth/auth_utils.py

@@ -37,7 +37,7 @@ def _get_jwt_from_server(user_id: str = None, password: str = None) -> str:
         "Content-Type": "application/x-www-form-urlencoded",
     }
     metric = "auth.jwt"
-    __payload = f"grant_type=&username={user_id}&password={password}"
+    __payload = f"grant_type=password&username={user_id}&password={password}"
     __res = call_api(
         request=EndpointTypes.post,
         url=url,

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/commands/cgc_cmd_responses.py

@@ -5,9 +5,9 @@ from cgc.utils.message_utils import key_error_decorator_for_helpers
 
 
 def _resource_match(resource: str) -> Union[str, None]:
-    if resource == "requests.cpu":
+    if resource == "limits.cpu":
         return "Total CPU"
-    elif resource == "requests.memory":
+    elif resource == "limits.memory":
         return "Total RAM"
     elif resource == "requests.nvidia.com/gpu":
         return "Total GPU"
@@ -21,6 +21,8 @@ def _resource_match(resource: str) -> Union[str, None]:
     elif resource.endswith(".storageclass.storage.k8s.io/requests.storage"):
         storage_class = resource.split(".")[0]
         return f"Storage ({storage_class})"
+    elif resource == "pods":
+        return "Pod Count"
     else:
         return None
 
@@ -32,13 +34,14 @@ class ResourceOrder(Enum):
     STORAGE = 4
     VOLUME = 5
     GPU_TYPE = 6
-    OTHER = 7
+    POD = 7
+    OTHER = 8
 
 
 def _resource_order(resource: str) -> ResourceOrder:
-    if resource == "requests.cpu":
+    if resource == "limits.cpu":
         return ResourceOrder.CPU
-    elif resource == "requests.memory":
+    elif resource == "limits.memory":
         return ResourceOrder.MEMORY
     elif resource == "requests.nvidia.com/gpu":
         return ResourceOrder.GPU
@@ -50,6 +53,8 @@ def _resource_order(resource: str) -> ResourceOrder:
         return ResourceOrder.STORAGE
     elif resource.endswith(".storageclass.storage.k8s.io/requests.storage"):
         return ResourceOrder.STORAGE
+    elif resource == "pods":
+        return ResourceOrder.POD
     else:
         return ResourceOrder.OTHER
 

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/commands/compute/compute_responses.py

@@ -14,10 +14,22 @@ from cgc.utils.response_utils import (
 @key_error_decorator_for_helpers
 def get_compute_port_list(data: dict) -> list:
     resource_ports_data = data["details"]["ports"]["ports"]
-    ingress_data = data["details"]["ingress"]
-    ingress_port_names = [port["port_name"] for port in ingress_data]
-    for port in resource_ports_data:
-        port["ingress"] = True if port["name"] in ingress_port_names else False
+    try:
+        ingress_data = data["details"]["ingress"]
+        ingress_port_names = [port["port_name"] for port in ingress_data]
+        for port in resource_ports_data:
+            port["ingress"] = True if port["name"] in ingress_port_names else False
+            port_data = next(
+                (
+                    ingress
+                    for ingress in ingress_data
+                    if ingress["port_name"] == port["name"]
+                ),
+                None,
+            )
+            port["ingress_url"] = port_data.get("url", "") if port_data else ""
+    except KeyError:
+        pass  # no ingress data, server outdated
     return resource_ports_data
 
 

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/commands/compute/compute_utils.py

@@ -113,11 +113,11 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
             pod["labels"].pop("entity")
             if detailed:
                 pod["labels"]["url"] = pod["labels"]["pod_url"]
-                if pod_data["type"] != "filebrowser":
+                if pod_data["type"] == "nvidia-pytorch":
                     pod["labels"]["url"] += f"""/?token={pod["labels"]['app-token']}"""
             else:
                 pod["labels"]["url"] = pod["labels"]["pod_url"]
-                pod["labels"].pop("app-token")
+                pod["labels"].pop("app-token", None)
             pod["labels"].pop("pod_url")
             pod["labels"].pop("resource-type")
             pod["labels"].pop("api-key-id", None)

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/commands/jobs/job_utils.py

@@ -122,7 +122,10 @@ def get_job_list(job_list: list, job_pod_list: list):
         for job_pod in job_pod_list:
             job_pod_labels: dict = job_pod.get("labels", {})
             if job_pod_labels.get("app-name", "") == job.get("name"):
-                job["status"] = job_pod["status"]
+                if job["status"] is not None and job["status"] == "Unknown":
+                    job["status"] = job_pod["status"]  # try to get status from pod
+                elif job["status"] is None:  # support older server versions
+                    job["status"] = job_pod["status"]
                 job["gpu-count"] = job_pod_labels.get("gpu-count", 0)
                 job["gpu-label"] = job_pod_labels.get("gpu-label", "N/A")
                 # job["status_reason"] = [
@@ -166,9 +169,7 @@ def get_job_json_data(job_list: list):
 
             job_data = {
                 "name": job.get("labels", {}).get("app-name"),
-                "status": job.get("status", {}).get(
-                    "phase", "Unknown"
-                ),  # only happen when Pod "disappeared" from the k8s - BUG
+                "status": job.get("status", {}).get("phase", "Unknown"),
                 "volumes_mounted": volumes_mounted,
                 "cpu": cpu,
                 "ram": ram,

{cgcsdk-1.0.17 → cgcsdk-1.1.0}/cgc/utils/version_control.py

@@ -66,8 +66,8 @@ def check_version():
         click.echo(prepare_error_message(OUTDATED_MAJOR))
         print_compare_versions(server_version, client_version)
         while True:
-            anwser = input("Update now? (Y/N): ").lower()
-            if anwser in ("y", "yes"):
+            answer = input("Update now? (Y/N): ").lower()
+            if answer in ("y", "yes"):
                 update_file_path = os.path.join(os.path.dirname(__file__), "update.py")
                 try:
                     subprocess.Popen([sys.executable, update_file_path])
@@ -78,7 +78,7 @@ def check_version():
                             "Could not initiate update, try again or install update manually with: pip install --upgrade cgcsdk"
                         )
                     )
-            if anwser in ("n", "no"):
+            if answer in ("n", "no"):
                 sys.exit()
             else:
                 click.echo(prepare_warning_message("wrong input, please try again."))

{cgcsdk-1.0.17 → cgcsdk-1.1.0/cgcsdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cgcsdk
-Version: 1.0.17
+Version: 1.1.0
 Summary: CGC Core REST API client
 Home-page: https://cgc.comtegra.cloud/
 Author: Comtegra AI Team