cgcsdk 1.1.0__py3-none-any.whl → 1.2.1__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 = 1
-MINOR_VERSION = 0
+MAJOR_VERSION = 2
+MINOR_VERSION = 1

cgc/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 1.2.1
+
+Release on Nov 26, 2024
+
+* `cgc register` now correctly saves api-keys into user configuration file
+
+## 1.2.0
+
+Release on Nov 20, 2024
+
+* `cgc job list` now process more information from the job payload data
+* processing resource labels in the `list` endpoints
+* `cgc api-keys create` allows managing API keys levels (CGC, LLM)
+* `cgc api-keys list` now shows more information about the API keys
+* support for one-off billing events
+* `gpu-label` and `gpu-count` retrieval from jobs
+* `cgc api-keys create` does not overwrite existing keys by default
+
 ## 1.1.0
 
 Release on Oct 02, 2024

cgc/commands/auth/auth_cmd.py

@@ -90,6 +90,21 @@ def auth_register(config_filename: str = "cfg.json"):
 
 
 @api_keys_group.command("create", cls=CustomCommand)
+@click.option(
+    "--level",
+    "-l",
+    "level",
+    type=click.STRING,
+    required=False,
+    help="Level of API key",
+)
+@click.option(
+    "--expires-in",
+    "-ei",
+    "expires_in",
+    type=click.INT,
+    required=False,
+)
 @click.option(
     "--user",
     "-u",
@@ -104,18 +119,47 @@ def auth_register(config_filename: str = "cfg.json"):
     type=click.STRING,
     required=False,
 )
-def api_keys_create(user_id: str, password: str):
+@click.option(
+    "--overwrite",
+    "-o",
+    "overwrite",
+    type=click.BOOL,
+    required=False,
+    default=False,
+    help="Overwrite existing API key locally",
+)
+@click.option(
+    "--comment",
+    "-c",
+    "comment",
+    type=click.STRING,
+    required=False,
+)
+def api_keys_create(
+    level: str, expires_in: int, user_id: str, password: str, overwrite: bool,
+    comment: str
+):
     """Login a user in system using user id and password, then creates new API key pair and overwrites existing.
     \f
-    :param user_id: user_id received in invite
+    :param level: level of API key
+    :type level: str
+    :param expires_in: expiration time of API key
+    :type expires_in: int
+    :param user_id: username
     :type user_id: str
-    :param password: password for the user
+    :param password: password
     :type password: str
+    :param overwrite: overwrite existing API key
+    :type overwrite: bool
     """
-    api_key, secret = auth_create_api_key_with_save(user_id, password)
+    api_key, secret = auth_create_api_key_with_save(
+        user_id, password, level, expires_in, overwrite, comment
+    )
     click.echo(login_successful_response())
     click.echo(f"API key: {api_key}")
     click.echo(f"API secret: {secret}")
+    if comment:
+        click.echo(f"Comment: {comment}")
 
 
 @api_keys_group.command("delete", cls=CustomCommand)

cgc/commands/auth/auth_logic.py

@@ -41,9 +41,25 @@ def auth_list_api_keys(user_id: str = None, password: str = None):
     return json_data["details"].get("api_keys")
 
 
-def auth_create_api_key_with_save(user_id: str = None, password: str = None):
+def auth_create_api_key_with_save(
+    user_id: str = None,
+    password: str = None,
+    level: str = None,
+    expires_in: int = None,
+    overwrite: bool = False,
+    comment: str = None,
+):
     """Function to create API key and API secret for user and save it to config file."""
     url = f"{get_headers_data.load_user_api_url()}/v1/api/user/create/api-key"
+    query_params = []
+    if level is not None:
+        query_params.append(f"level={level}")
+    if expires_in is not None:
+        query_params.append(f"expires_in={expires_in}")
+    if comment is not None:
+        query_params.append(f"comment={comment}")
+    if query_params:
+        url += "?" + "&".join(query_params)
     headers = prepare_headers.prepare_headers_api_key(user_id, password)
     metric = "auth.api-key"
     __res = call_api(
@@ -55,7 +71,8 @@ def auth_create_api_key_with_save(user_id: str = None, password: str = None):
     json_data = retrieve_and_validate_response_send_metric(__res, metric)
     api_key = json_data["details"].get("_id")
     secret = json_data["details"].get("secret")
-    save_to_config(api_key=api_key, api_secret=secret)
-    if user_id is not None and password is not None:
-        save_to_config(user_id=user_id, password=password)
+    if overwrite:
+        save_to_config(api_key=api_key, api_secret=secret)
+        if user_id is not None and password is not None:
+            save_to_config(user_id=user_id, password=password)
     return api_key, secret

cgc/commands/auth/auth_responses.py

@@ -31,7 +31,7 @@ def auth_register_response(
         cgc_api_url=cgc_api_url,
         cgc_secret=cgc_secret,
     )
-    auth_logic.auth_create_api_key_with_save()
+    auth_logic.auth_create_api_key_with_save(overwrite=True)
     shutil.rmtree(TMP_DIR_PATH)
     # cfg.json
     if config_filename == "cfg.json":

cgc/commands/compute/billing/billing_utils.py

@@ -28,22 +28,25 @@ def _get_costs_list_for_user(costs_list: list):
     user_costs_list_to_print = []
     total_user_cost = 0
     for cost in costs_list:
-        rent_start = cost["rent_start_cost"]
-        rent_end = cost["rent_end_cost"]
-        rent_time = f"{int(cost['rent_time_cost'])} s"
-        rent_cost = f"{float(cost['cost_total']):.2f} pln"
-        resources = cost["resources"]
-        name = resources["name"]
-        rent_type = cost["type"]
-        if rent_type == "events_resource":
-            entity = resources["entity"]
-        elif rent_type == "events_volume":
-            entity = "volume"
+        if cost["type"] == "events_resource":
+            resources = cost["resources"]
+            user_costs_list_to_print.append([resources["entity"],
+                resources["name"], cost["rent_start_cost"],
+                cost["rent_end_cost"], f"{int(cost['rent_time_cost'])} s",
+                f"{float(cost['cost_total']):.2f} pln"])
+        elif cost["type"] == "events_volume":
+            resources = cost["resources"]
+            user_costs_list_to_print.append(["volume", resources["name"],
+                cost["rent_start_cost"], cost["rent_end_cost"],
+                f"{int(cost['rent_time_cost'])} s",
+                f"{float(cost['cost_total']):.2f} pln"])
+        elif cost["type"] == "events_oneoff":
+            user_costs_list_to_print.append(["oneoff", cost["product"],
+                cost["date"], "-", cost["quantity"],
+                f"{float(cost['cost_total']):.8f} pln"])
         else:
-            entity = "ERROR"
+            user_costs_list_to_print.append(["ERROR", "", "", "", "", ""])
         total_user_cost += float(cost["cost_total"])
-        row_list = [entity, name, rent_start, rent_end, rent_time, rent_cost]
-        user_costs_list_to_print.append(row_list)
     if costs_list:
         user_costs_list_to_print.sort(key=lambda d: f"{d[0]} {d[2]}")
     return user_costs_list_to_print, total_user_cost
@@ -89,7 +92,7 @@ def _get_status_list_headers():
     :return: list of headers
     :rtype: list
     """
-    return ["entity", "name", "start", "end", "time", "cost"]
+    return ["entity", "name", "start", "end", "quantity", "cost"]
 
 
 # TODO: refactor to use: tabulate_a_response(data: list) -> str:

cgc/commands/compute/compute_utils.py

@@ -109,8 +109,17 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
             # getting rid of unwanted and used values
             if "pod-template-hash" in pod["labels"].keys():
                 pod["labels"].pop("pod-template-hash")
-            pod["labels"].pop("app-name")
-            pod["labels"].pop("entity")
+            # getting rid of unwanted and used values
+            unwanted_labels = [
+                "app-name",
+                "resource-type",
+                "pod-template-hash",
+                "entity",
+            ]
+            for unwanted_label in unwanted_labels:
+                if unwanted_label in pod["labels"].keys():
+                    pod["labels"].pop(unwanted_label, None)
+
             if detailed:
                 pod["labels"]["url"] = pod["labels"]["pod_url"]
                 if pod_data["type"] == "nvidia-pytorch":
@@ -118,8 +127,12 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
             else:
                 pod["labels"]["url"] = pod["labels"]["pod_url"]
                 pod["labels"].pop("app-token", None)
-            pod["labels"].pop("pod_url")
-            pod["labels"].pop("resource-type")
+            pod["labels"].pop(
+                "pod_url", None
+            )  # should be always present in the payload
+            pod["labels"].pop(
+                "resource-type", None
+            )  # should be always present in the payload
             pod["labels"].pop("api-key-id", None)
             pod["labels"].pop("user-id", None)
 

cgc/commands/jobs/job_utils.py

@@ -166,6 +166,8 @@ def get_job_json_data(job_list: list):
             limits = main_container.get("resources", {}).get("limits")
             cpu = limits.get("cpu") if limits is not None else 0
             ram = limits.get("memory") if limits is not None else "0Gi"
+            gpu_label = job.get("labels", {}).get("gpu-type", "N/A")
+            gpu_count = job.get("labels", {}).get("gpu-count", "N/A")
 
             job_data = {
                 "name": job.get("labels", {}).get("app-name"),
@@ -173,11 +175,20 @@ def get_job_json_data(job_list: list):
                 "volumes_mounted": volumes_mounted,
                 "cpu": cpu,
                 "ram": ram,
+                "gpu-label": gpu_label,
+                "gpu-count": gpu_count,
             }
             # getting rid of unwanted and used values
-            if "pod-template-hash" in job["labels"].keys():
-                job["labels"].pop("pod-template-hash")
-            job["labels"].pop("entity")
+            unwanted_labels = [
+                "app-name",
+                "api-key-id",
+                "resource-type",
+                "pod-template-hash",
+                "entity",
+            ]
+            for unwanted_label in unwanted_labels:
+                if unwanted_label in job["labels"].keys():
+                    job["labels"].pop(unwanted_label)
 
             # appending the rest of labels
             job_data.update(job["labels"])

{cgcsdk-1.1.0.dist-info → cgcsdk-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cgcsdk
-Version: 1.1.0
+Version: 1.2.1
 Summary: CGC Core REST API client
 Home-page: https://cgc.comtegra.cloud/
 Author: Comtegra AI Team
@@ -23,7 +23,7 @@ Requires-Dist: click
 Requires-Dist: python-dotenv
 Requires-Dist: tabulate
 Requires-Dist: pycryptodomex
-Requires-Dist: paramiko >=2.11
+Requires-Dist: paramiko>=2.11
 Requires-Dist: statsd
 Requires-Dist: requests
 Requires-Dist: setuptools

{cgcsdk-1.1.0.dist-info → cgcsdk-1.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-cgc/.env,sha256=U3C0HJQT97waXH8lYgrRl4JwcuH_0YpwS25TKm8U9xY,209
-cgc/CHANGELOG.md,sha256=A-OH4XghR7LI9eAVrdiphDuAEuhYVHi1k4HZ2fgFF-8,10253
+cgc/.env,sha256=gURax26_tsuDMuNv--5GXRS582fTfqeKIzfS_68MgHo,209
+cgc/CHANGELOG.md,sha256=zA7_E9mg39i9-lYf2c-BGdpvBkoPvnKISIFDAbDWIxQ,10815
 cgc/__init__.py,sha256=d03Xv8Pw4ktNyUHfmicP6XfxYPXnVYLaCZPyUlg_RNQ,326
 cgc/cgc.py,sha256=3I_Ef0ggX9caaJKJkhfGYSe8XwkHzSWxwGAClMHDnUs,1663
 cgc/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,26 +10,26 @@ cgc/commands/cgc_helpers.py,sha256=-RduMrEDknGx-bxLRUX413JY9nuqWxBIGcwbwWrnDb4,1
 cgc/commands/cgc_models.py,sha256=ThYrflL6gfiu3u3cWCbiisY7vfkKbo9JGqd5Jqr2jXc,352
 cgc/commands/exceptions.py,sha256=kVCWEdcqmkLO5QVIINdEXQw29_glyX2C11ZMFgT7b8E,155
 cgc/commands/auth/__init__.py,sha256=JnqNezSEUEVVPQIymya4llXr8LIug2vymQSAGBr4Ovg,397
-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_cmd.py,sha256=7sG1MWh1vbC9_lGFOLVRXGyXEnIbvF49mtA5EOehfJE,5082
+cgc/commands/auth/auth_logic.py,sha256=2XSVbPdxcHbWSQKUHgwz8JPw11_hiyDJFFTkYOAjIC4,2751
+cgc/commands/auth/auth_responses.py,sha256=OlhZnE5yvS1EPmkVfOeCg7wBq5ayW7o_fAzN0OCAfgY,2109
 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=X1ExOKDIxSFZbBRbWyfWSCeRAe3_cFGa3jOgq6CfjHw,6439
-cgc/commands/compute/compute_utils.py,sha256=KNP-FRIeK20rBRoeyPCO5zKc90nXKQHH0pJ4-lZdNwY,9191
+cgc/commands/compute/compute_utils.py,sha256=RrbswO8GKQjocAK4RiMz3YqckftTsqwR5uTvIt3kevo,9662
 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
-cgc/commands/compute/billing/billing_utils.py,sha256=zXLbBBcWeOgur-r0OKiIjaKeaxMNxASXWzCTeTsyC6o,4711
+cgc/commands/compute/billing/billing_utils.py,sha256=Tiaka_glvNcrBN_2AE2iDFMkAim8tZ5sMzbaHRXNV4A,5081
 cgc/commands/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/db/db_cmd.py,sha256=cUS5t91QL_VfLaXJITYUjBiszoE-P8PYnm3u8VkmHEQ,3750
 cgc/commands/db/db_models.py,sha256=zpMcrDBanLx7YQJ_-PWrQCbh3B-C0qWn1Pt5SnDwsh0,1351
 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=pvTVEDqBazt6617sXsCMmlttCD6wZPpGQIrcrOd0Hyw,6707
+cgc/commands/jobs/job_utils.py,sha256=-r5YNt0Wr_LRL2bOp9RJ3OKSej827UYew2ds4qFy5_U,7135
 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
@@ -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.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.2.1.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cgcsdk-1.2.1.dist-info/METADATA,sha256=b0Tli_BWBGVBNhq7WDZ7h97cZH_lt4sDG9Mtk-_GYH8,2985
+cgcsdk-1.2.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+cgcsdk-1.2.1.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
+cgcsdk-1.2.1.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
+cgcsdk-1.2.1.dist-info/RECORD,,

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

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