cgcsdk 1.0.16__tar.gz → 1.0.18__tar.gz

{cgcsdk-1.0.16/cgcsdk.egg-info → cgcsdk-1.0.18}/PKG-INFO

@@ -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 → cgcsdk-1.0.18}/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

{cgcsdk-1.0.16 → cgcsdk-1.0.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

{cgcsdk-1.0.16 → cgcsdk-1.0.18}/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.16 → cgcsdk-1.0.18}/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)

{cgcsdk-1.0.16 → cgcsdk-1.0.18}/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

{cgcsdk-1.0.16 → cgcsdk-1.0.18}/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.18/cgc/commands/user/keys_models.py

@@ -0,0 +1,31 @@
+from cgc.commands.cgc_models import CGCEntityList
+
+
+class SSHKeyTypes(CGCEntityList):
+    """List of supported SSH key types
+
+    :param Enum: name of SSH key type
+    :type Enum: str
+    """
+
+    RSA = "ssh-rsa"
+    DSS = "ssh-dss"
+    ECDSA_P256 = "ecdsa-sha2-nistp256"
+    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,
+        ]

{cgcsdk-1.0.16 → cgcsdk-1.0.18}/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 → cgcsdk-1.0.18/cgcsdk.egg-info}/PKG-INFO

@@ -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 → cgcsdk-1.0.18}/setup.py

@@ -15,18 +15,25 @@ VERSION_STRING = f"{RELEASE}.{MAJOR_VERSION}.{MINOR_VERSION}"
 setup(
     name="cgcsdk",
     version=VERSION_STRING,
-    description="Comtegra GPU Cloud REST API client",
+    description="CGC Core REST API client",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://git.comtegra.pl/",
+    url="https://cgc.comtegra.cloud/",
     project_urls={
         "Documentation": "https://docs.cgc.comtegra.cloud/",
-        "GitHub": "https://git.comtegra.pl/",
-        "Changelog": "https://git.comtegra.pl/foobar/foobar/blob/master/CHANGELOG.md",
+        "GitHub": "https://git.comtegra.pl/k8s/cgc-client-k8s-cloud",
+        "Changelog": "https://git.comtegra.pl/k8s/cgc-client-k8s-cloud/-/blob/main/cgc/CHANGELOG.md",
     },
     author="Comtegra AI Team",
     author_email="ai@comtegra.pl",
-    keywords=["cloud", "sdk", "orchestrator", "kubernetes", "jupyter-notebook"],
+    keywords=[
+        "cloud",
+        "sdk",
+        "orchestrator",
+        "kubernetes",
+        "jupyter-notebook",
+        "cgc-core",
+    ],
     license="BSD 2-clause",
     packages=find_packages(exclude=["cgc.tests.*, cgc.tests"]),
     package_data={"cgc": ["CHANGELOG.md", ".env", "tests/desired_responses/*"]},
@@ -49,14 +56,11 @@ setup(
         ],
     },
     classifiers=[
-        "Development Status :: 1 - Planning",
+        "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: BSD License",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
     ],

cgcsdk-1.0.16/cgc/commands/user/keys_models.py

@@ -1,16 +0,0 @@
-from cgc.commands.cgc_models import CGCEntityList
-
-
-class SSHKeyTypes(CGCEntityList):
-    """List of supported SSH key types
-
-    :param Enum: name of SSH key type
-    :type Enum: str
-    """
-
-    RSA = "ssh-rsa"
-    DSS = "ssh-dss"
-    ECDSA_P256 = "ecdsa-sha2-nistp256"
-    ECDSA_P384 = "ecdsa-sha2-nistp384"
-    ECDSA_P521 = "ecdsa-sha2-nistp521"
-    ED25519 = "ssh-ed25519"