cgcsdk 1.0.17__py3-none-any.whl → 1.1.0__py3-none-any.whl

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

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

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,

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
 

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
 
 

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)

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,

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.dist-info → cgcsdk-1.1.0.dist-info}/METADATA

@@ -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.dist-info → cgcsdk-1.1.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-cgc/.env,sha256=Re91I-x2HkLXGiieZbGPUmTXuYxjYGiqkmM5QR5Xf7g,210
-cgc/CHANGELOG.md,sha256=tMdiR1vQVf5S3wuA0zGVHRgj_ng1lcVmfy3Gu-YN2ME,9905
+cgc/.env,sha256=U3C0HJQT97waXH8lYgrRl4JwcuH_0YpwS25TKm8U9xY,209
+cgc/CHANGELOG.md,sha256=A-OH4XghR7LI9eAVrdiphDuAEuhYVHi1k4HZ2fgFF-8,10253
 cgc/__init__.py,sha256=d03Xv8Pw4ktNyUHfmicP6XfxYPXnVYLaCZPyUlg_RNQ,326
 cgc/cgc.py,sha256=3I_Ef0ggX9caaJKJkhfGYSe8XwkHzSWxwGAClMHDnUs,1663
 cgc/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/cgc_cmd.py,sha256=xuRoMtO7VG0sZbOFrEGxPWRg94SBrgyRJDQif4el7UM,5031
-cgc/commands/cgc_cmd_responses.py,sha256=0bkRIxfd7EiVdShOubxhDiUSlGj6yEZQL_NOHtu334k,3525
+cgc/commands/cgc_cmd_responses.py,sha256=k8_rTAb9Ambnupg3NqCa7Te375D2YdeSVyhqz8xJg-Y,3647
 cgc/commands/cgc_helpers.py,sha256=-RduMrEDknGx-bxLRUX413JY9nuqWxBIGcwbwWrnDb4,1516
 cgc/commands/cgc_models.py,sha256=ThYrflL6gfiu3u3cWCbiisY7vfkKbo9JGqd5Jqr2jXc,352
 cgc/commands/exceptions.py,sha256=kVCWEdcqmkLO5QVIINdEXQw29_glyX2C11ZMFgT7b8E,155
@@ -13,12 +13,12 @@ cgc/commands/auth/__init__.py,sha256=JnqNezSEUEVVPQIymya4llXr8LIug2vymQSAGBr4Ovg
 cgc/commands/auth/auth_cmd.py,sha256=f8_2oIlFQ1k0zvJXGfrwkdVoK5EJBwWesNdOcjtY_uM,4220
 cgc/commands/auth/auth_logic.py,sha256=PzEyC6OBRSne_5dQT-cq69J0i8BqfGL0MIoXW-yM8qE,2281
 cgc/commands/auth/auth_responses.py,sha256=kIGyCbNqSQKhDsVpIIcbzR-1bFQHkC3ClbUPBNfKPwk,2095
-cgc/commands/auth/auth_utils.py,sha256=8NZQQuR0JDCxRkNOHy8nRLDpeT3W87iNyaBI1owj79c,3597
+cgc/commands/auth/auth_utils.py,sha256=3RSBAR_V5DANhJ_R0cN4poP2uCNdx2tU1VXxP17yXig,3605
 cgc/commands/compute/__init__.py,sha256=lCdLfZ0ECSHtXEUSwq5YRHH85yXHchSsz8ZJvmClPtI,239
 cgc/commands/compute/compute_cmd.py,sha256=YZYR0milioX8aShLUC5NSKWcJSimQx6d4WmweAgdCrw,16131
 cgc/commands/compute/compute_models.py,sha256=MNwxG94fFJfaQ3kGlVXSJh1H5qPHLSU_6BnoiuWS7UA,860
-cgc/commands/compute/compute_responses.py,sha256=vBZtb8ieHUi8wbRBozMn0wYGhjFTMGBbIxSPMD2hG1Q,6025
-cgc/commands/compute/compute_utils.py,sha256=Pj4xa-C8-MzXF-CCnnHNXn0sXjHy_t-N7c-eig-vF1Y,9182
+cgc/commands/compute/compute_responses.py,sha256=X1ExOKDIxSFZbBRbWyfWSCeRAe3_cFGa3jOgq6CfjHw,6439
+cgc/commands/compute/compute_utils.py,sha256=KNP-FRIeK20rBRoeyPCO5zKc90nXKQHH0pJ4-lZdNwY,9191
 cgc/commands/compute/billing/__init__.py,sha256=ccjz-AzBCROjuR11qZRM4_62slI9ErmLi27xPUoRPHM,752
 cgc/commands/compute/billing/billing_cmd.py,sha256=8lGf2GPyr09ZmqkRshmgfSPQgXa9o_IDSfwZgMfBE4k,4156
 cgc/commands/compute/billing/billing_responses.py,sha256=5vQSR_d41uizengzfXlHXL7XivO_73PpWdKmoUgqYNw,1965
@@ -29,7 +29,7 @@ cgc/commands/db/db_models.py,sha256=zpMcrDBanLx7YQJ_-PWrQCbh3B-C0qWn1Pt5SnDwsh0,
 cgc/commands/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/debug/debug_cmd.py,sha256=kuAuh5YOqzGFjoiYZwfM9FJ1z5OeSpC0JAIUEzS83lM,412
 cgc/commands/jobs/__init__.py,sha256=E-438wgIzlnGmXs5jgmWAhJ1KNV6UXF2gz8SXu3UxA0,231
-cgc/commands/jobs/job_utils.py,sha256=LlgMK11XQ-yjl_eOTFYwdJwOxyeiSCNkZQRZFpFW14A,6560
+cgc/commands/jobs/job_utils.py,sha256=pvTVEDqBazt6617sXsCMmlttCD6wZPpGQIrcrOd0Hyw,6707
 cgc/commands/jobs/jobs_cmd.py,sha256=4zHZtT2y_FoBrGNR5nfSJ0gi-MX1rUP68KwpvuZ8m0Q,6922
 cgc/commands/jobs/jobs_responses.py,sha256=QXFXA4zwQOo5Gvq5rEc7J_cxxsYqkdU19X9MCcZetUM,1771
 cgc/commands/resource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -77,7 +77,7 @@ cgc/utils/prepare_headers.py,sha256=Hi3WNqtqydW56tNTLZmpfMTpu4aKCoDrLx4OcCGH9_U,
 cgc/utils/requests_helper.py,sha256=Z89dTOTbSSi1xmtNPmAdJpduR9-DC12WEQsHYeuM9a0,2046
 cgc/utils/response_utils.py,sha256=9vJqAt2UFJ1n-oesFPe6CB_ooGoStjl-twY_31Jt4_I,7374
 cgc/utils/update.py,sha256=AsQwhcBqsjgNPKn6AN6ojt0Ew5otvJXyshys6bjr7DQ,413
-cgc/utils/version_control.py,sha256=MTXpwFC0zl0xKZsllFHZMOUm0VuihA0u3g4jVW70c7w,4163
+cgc/utils/version_control.py,sha256=rnHeo8_y-8HJfEKLqpiMM26QR8b-CAl3zfgcv0a3y8I,4163
 cgc/utils/consts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/utils/consts/env_consts.py,sha256=_yHjhXDBwYfLfUWfHOPlhGdzC0j9VFlkjKuSrvblBsU,1154
 cgc/utils/consts/message_consts.py,sha256=xSW7XaqPIAO_uJr-eK2fcjP2o7t0OJ0OP75otbUBnAg,1232
@@ -85,9 +85,9 @@ cgc/utils/cryptography/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 cgc/utils/cryptography/aes_crypto.py,sha256=S0rKg38oy7rM5lTrP6DDpjLA-XRxuZggAXyxMFHtyzY,3333
 cgc/utils/cryptography/encryption_module.py,sha256=rbblBBorHYPGl-iKblyZX3_NuPEvUTpnH1l_RgNGCbA,1958
 cgc/utils/cryptography/rsa_crypto.py,sha256=h3jU5qPpj9uVjP1rTqZJTdYB5yjhD9HZpr_nD439h9Q,4180
-cgcsdk-1.0.17.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cgcsdk-1.0.17.dist-info/METADATA,sha256=3cWZFg06Ft1oFBGe-AbyHYVrLeKn2NT8Mino5qnDmqA,2987
-cgcsdk-1.0.17.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-cgcsdk-1.0.17.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
-cgcsdk-1.0.17.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
-cgcsdk-1.0.17.dist-info/RECORD,,
+cgcsdk-1.1.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cgcsdk-1.1.0.dist-info/METADATA,sha256=OSfHEfaDvQhZ5y0tzORo9jwUKcOgsyf0FgyxyGVJAQc,2986
+cgcsdk-1.1.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+cgcsdk-1.1.0.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
+cgcsdk-1.1.0.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
+cgcsdk-1.1.0.dist-info/RECORD,,

{cgcsdk-1.0.17.dist-info → cgcsdk-1.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.2.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any