cgcsdk 1.0.16__py3-none-any.whl → 1.0.18__py3-none-any.whl

cgc/.env

@@ -6,4 +6,4 @@ CONFIG_FILE_NAME = cfg.json
 TMP_DIR = .tmp
 RELEASE = 1
 MAJOR_VERSION = 0
-MINOR_VERSION = 16
+MINOR_VERSION = 18

cgc/CHANGELOG.md

@@ -1,8 +1,25 @@
 # Change Log
 
+## 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 port list` now shows which ports are ingress (`cgc resource ingress app_name`)
+* fix bug for the `cgc keys ssh create` command
+* `cgc context list` now shows which context is active
+* `cgc context list` now shows context server address
+
 ## 1.0.16
 
-Release on Aug XX, 2024
+Release on Aug 02, 2024
 
 * dynamic storage classes for volumes
 * dynamic templates available for compute

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/cgc_helpers.py

@@ -1,12 +1,18 @@
 from typing import List
 from cgc.utils import quick_sort
-from cgc.utils.config_utils import read_from_cfg
+from cgc.utils.config_utils import get_config_file_name, read_from_cfg
 from tabulate import tabulate
 
 
+def _is_main_context_file(file: str) -> bool:
+    if get_config_file_name() == file:
+        return True
+    return None
+
+
 def table_of_user_context_files(config_files: List[str]):
     # print tabulate of: [context NR | namespace | user_id]
-    headers = ["Context No.", "Namespace", "User ID"]
+    headers = ["Context No.", "Namespace", "User ID", "URL", "Is active"]
     contexts = []
     contexts_nrs = []
     for file in config_files:
@@ -16,13 +22,17 @@ def table_of_user_context_files(config_files: List[str]):
         )  # should never throw exception with good config_file list
         contexts_nrs.append(file_context[0])
         file_data = read_from_cfg(None, file)
-        values_to_read = ["namespace", "user_id"]
+        values_to_read = ["namespace", "user_id", "cgc_api_url"]
         for k in values_to_read:
             try:
                 value = file_data[k]
             except KeyError:
                 value = None
+                if k == "cgc_api_url":
+                    value = "https://cgc-api.comtegra.cloud:443"
             file_context.append(value)
+
+        file_context.append(_is_main_context_file(file))
         contexts.append(file_context)
 
     contexts_nrs_sorted = quick_sort(contexts_nrs)

cgc/commands/compute/compute_responses.py

@@ -9,12 +9,28 @@ from cgc.utils.response_utils import (
     tabulate_a_response,
     fill_missing_values_in_a_response,
 )
-from cgc.utils.message_utils import prepare_warning_message
 
 
 @key_error_decorator_for_helpers
 def get_compute_port_list(data: dict) -> list:
-    return data["details"]["ports"]["ports"]
+    resource_ports_data = data["details"]["ports"]["ports"]
+    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
 
 
 @key_error_decorator_for_helpers

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/commands/user/keys_models.py

@@ -14,3 +14,18 @@ class SSHKeyTypes(CGCEntityList):
     ECDSA_P384 = "ecdsa-sha2-nistp384"
     ECDSA_P521 = "ecdsa-sha2-nistp521"
     ED25519 = "ssh-ed25519"
+
+    def load_data() -> list:
+        """Return list of supported SSH key types
+
+        :return: list of supported SSH key types
+        :rtype: list
+        """
+        return [
+            SSHKeyTypes.RSA,
+            SSHKeyTypes.DSS,
+            SSHKeyTypes.ECDSA_P256,
+            SSHKeyTypes.ECDSA_P384,
+            SSHKeyTypes.ECDSA_P521,
+            SSHKeyTypes.ED25519,
+        ]

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

@@ -1,23 +1,20 @@
 Metadata-Version: 2.1
 Name: cgcsdk
-Version: 1.0.16
-Summary: Comtegra GPU Cloud REST API client
-Home-page: https://git.comtegra.pl/
+Version: 1.0.18
+Summary: CGC Core REST API client
+Home-page: https://cgc.comtegra.cloud/
 Author: Comtegra AI Team
 Author-email: ai@comtegra.pl
 License: BSD 2-clause
 Project-URL: Documentation, https://docs.cgc.comtegra.cloud/
-Project-URL: GitHub, https://git.comtegra.pl/
-Project-URL: Changelog, https://git.comtegra.pl/foobar/foobar/blob/master/CHANGELOG.md
-Keywords: cloud,sdk,orchestrator,kubernetes,jupyter-notebook
-Classifier: Development Status :: 1 - Planning
+Project-URL: GitHub, https://git.comtegra.pl/k8s/cgc-client-k8s-cloud
+Project-URL: Changelog, https://git.comtegra.pl/k8s/cgc-client-k8s-cloud/-/blob/main/cgc/CHANGELOG.md
+Keywords: cloud,sdk,orchestrator,kubernetes,jupyter-notebook,cgc-core
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown

{cgcsdk-1.0.16.dist-info → cgcsdk-1.0.18.dist-info}/RECORD

@@ -1,12 +1,12 @@
-cgc/.env,sha256=VMwTqev7-Fa9XaP3Ofy8Th-Dl2GurIWONmQgSLCUl2A,210
-cgc/CHANGELOG.md,sha256=gbcedsO6U2gjiefnjcOYV4czqaG0-QmtsSnykXZ_iL4,9625
+cgc/.env,sha256=KTykewq9LWgx0m2GHM2FXfmPnd4v_qyo_DYZHZk-EHc,210
+cgc/CHANGELOG.md,sha256=drq-88Bv02cAPKZ3A7YUoN9MBmq0lXEftYBzTKSqGug,10122
 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_helpers.py,sha256=ngArFjVw-8P_2g7J8k3b9xgDxfJw7JeaOtkhTySMSGU,1174
+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
 cgc/commands/auth/__init__.py,sha256=JnqNezSEUEVVPQIymya4llXr8LIug2vymQSAGBr4Ovg,397
@@ -17,7 +17,7 @@ cgc/commands/auth/auth_utils.py,sha256=8NZQQuR0JDCxRkNOHy8nRLDpeT3W87iNyaBI1owj7
 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=DnRIZC_F1ZE887fMOXXYGYuYmB9n5x63sf8Ga_TL4Ww,5806
+cgc/commands/compute/compute_responses.py,sha256=X1ExOKDIxSFZbBRbWyfWSCeRAe3_cFGa3jOgq6CfjHw,6439
 cgc/commands/compute/compute_utils.py,sha256=Pj4xa-C8-MzXF-CCnnHNXn0sXjHy_t-N7c-eig-vF1Y,9182
 cgc/commands/compute/billing/__init__.py,sha256=ccjz-AzBCROjuR11qZRM4_62slI9ErmLi27xPUoRPHM,752
 cgc/commands/compute/billing/billing_cmd.py,sha256=8lGf2GPyr09ZmqkRshmgfSPQgXa9o_IDSfwZgMfBE4k,4156
@@ -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
@@ -37,7 +37,7 @@ cgc/commands/resource/resource_cmd.py,sha256=y2R6ZF0jFhTppD9JUpwLIcEdFRXg82Xw_5y
 cgc/commands/resource/resource_responses.py,sha256=sES7mAi_Cv5B6Z3I_6eUOqVwOr2HgMO45cz8MiNZetQ,197
 cgc/commands/user/__init__.py,sha256=Rhaa2SDXQsJVJnTX0oFyZ90tAuiAUBeRy3Bd415S4os,382
 cgc/commands/user/keys_cmd.py,sha256=dfHnhHmEwRH1xl_wRNQcpCT-THJTBYPHMTJSI2AsDXE,4509
-cgc/commands/user/keys_models.py,sha256=IYojnAu3aTGJ7qHIYvZy-0YFzXRmueZNplS4RqdfJfw,378
+cgc/commands/user/keys_models.py,sha256=FhpVZ--AUQf-Q8cvnSD2Gysrh38awqXSc-jT3yKnk2s,767
 cgc/commands/user/keys_responses.py,sha256=TBHFWAVN1kEgP6sudbMwfpiZOcfTr0a0SD-f-Wn-ed8,1389
 cgc/commands/user/keys_utils.py,sha256=w1TcMTlKJNxXjnj-XsiUU8N__-l1TsWqfPPjGpRqtI0,2285
 cgc/commands/user/secret_cmd.py,sha256=_b9ewJlEE4gMCrgdyycpO5MOdJvibeHObAiPE-mWIgA,4165
@@ -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.16.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cgcsdk-1.0.16.dist-info/METADATA,sha256=omC-JocyzpOolm58Rv7yP2lYEqvBDwAfl8EPP_OsGSw,3091
-cgcsdk-1.0.16.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-cgcsdk-1.0.16.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
-cgcsdk-1.0.16.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
-cgcsdk-1.0.16.dist-info/RECORD,,
+cgcsdk-1.0.18.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cgcsdk-1.0.18.dist-info/METADATA,sha256=VTXLNnbKhUMb3xRdPkwr7cxYMUD-tcm86wkHH6TLHfo,2987
+cgcsdk-1.0.18.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+cgcsdk-1.0.18.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
+cgcsdk-1.0.18.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
+cgcsdk-1.0.18.dist-info/RECORD,,

{cgcsdk-1.0.16.dist-info → cgcsdk-1.0.18.dist-info}/WHEEL

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