cgcsdk 1.2.5__py3-none-any.whl → 1.3.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 = 2
-MINOR_VERSION = 5
+MAJOR_VERSION = 3
+MINOR_VERSION = 0

cgc/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 1.3.0
+
+Release on July 08, 2025
+
+* stop events are not longer supported
+* billing endpoints v1 are not longer supported
+* added support for v2 billing endpoints
+* added `cgc billing pricing` command
+* error messages are now more descriptive
+
+## 1.2.6
+
+Release on Apr 30, 2025
+
+* `cgc resource scale up` scales up the resource replicas, with the given name
+* `cgc resource scale down` scales down the resource replicas, with the given name
+* modified error message displayed - uses custom_exceptions
+* listing of `TurnedOff` resources is now available
+* `TurnedOn` available if the resource is not running, but it is scaled up
+
 ## 1.2.5
 
 Release on Apr 16, 2025

cgc/commands/compute/billing/billing_cmd.py

@@ -2,12 +2,10 @@ import click
 
 from datetime import datetime
 
-from cgc.commands.compute.billing.billing_utils import verify_input_datetime
 from cgc.commands.compute.billing.billing_responses import (
+    billing_pricing_response,
     billing_status_response,
     billing_invoice_response,
-    stop_events_resource_response,
-    stop_events_volume_response,
 )
 from cgc.utils.prepare_headers import get_api_url_and_prepare_headers
 from cgc.utils.response_utils import retrieve_and_validate_response_send_metric
@@ -24,12 +22,22 @@ def billing_group():
 
 
 @billing_group.command("status", cls=CustomCommand)
-def billing_status():
+@click.option(
+    "--detailed",
+    "-d",
+    "detailed",
+    prompt=True,
+    type=bool,
+    default=False,
+    help="If true, returns detailed invoice information",
+    is_flag=True,
+)
+def billing_status(detailed: bool):
     """
     Shows billing status for user namespace
     """
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/billing/status"
+    url = f"{api_url}/v2/api/billing/status?details={detailed}"
     metric = "billing.status"
     __res = call_api(request=EndpointTypes.get, url=url, headers=headers)
     click.echo(
@@ -64,12 +72,24 @@ def _get_previous_year_if_required():
     type=click.IntRange(1, 12),
     default=_get_previous_month(),
 )
-def billing_invoice(year: int, month: int):
+@click.option(
+    "--detailed",
+    "-d",
+    "detailed",
+    prompt=True,
+    type=bool,
+    default=False,
+    help="If true, returns detailed invoice information",
+    is_flag=True,
+)
+def billing_invoice(year: int, month: int, detailed: bool):
     """
     Opens invoice from given year and month
     """
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/billing/invoice?year={year}&month={month}"
+    url = (
+        f"{api_url}/v2/api/billing/invoice?year={year}&month={month}&details={detailed}"
+    )
     metric = "billing.invoice"
     __res = call_api(request=EndpointTypes.get, url=url, headers=headers)
 
@@ -82,78 +102,17 @@ def billing_invoice(year: int, month: int):
     )
 
 
-@click.group("stop_events", cls=CustomGroup)
-def stop_events_group():
-    """
-    List stop events information.
-    """
-    pass
-
-
-@stop_events_group.command("resource")
-@click.option(
-    "--date_from",
-    "-f",
-    "date_from",
-    prompt="Date from (DD-MM-YYYY)",
-    default=datetime.now().replace(day=1).strftime("%d-%m-%Y"),
-    help="Start date for filtering stop events",
-)
-@click.option(
-    "--date_to",
-    "-t",
-    "date_to",
-    prompt="Date to (DD-MM-YYYY)",
-    default=datetime.now().strftime("%d-%m-%Y"),
-    help="End date for filtering stop events",
-)
-def stop_events_resource(date_from, date_to):
-    """
-    List resource stop events information for a given time period
-    """
-    verify_input_datetime(date_from, date_to)
-    api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/billing/list_resource_stop_events?time_from={date_from}&time_till={date_to}"
-    metric = "billing.stop_events.resource"
-    __res = call_api(request=EndpointTypes.get, url=url, headers=headers)
-    click.echo(
-        stop_events_resource_response(
-            retrieve_and_validate_response_send_metric(__res, metric)
-        )
-    )
-
-
-@stop_events_group.command("volume")
-@click.option(
-    "--date_from",
-    "-f",
-    "date_from",
-    prompt="Date from (DD-MM-YYYY)",
-    default=datetime.now().replace(day=1).strftime("%d-%m-%Y"),
-    help="Start date for filtering stop events",
-)
-@click.option(
-    "--date_to",
-    "-t",
-    "date_to",
-    prompt="Date to (DD-MM-YYYY)",
-    default=datetime.now().strftime("%d-%m-%Y"),
-    help="End date for filtering stop events",
-)
-def stop_events_volume(date_from, date_to):
+@billing_group.command("pricing", cls=CustomCommand)
+def billing_pricing():
     """
-    List volume stop events information for a given time period
+    Shows billing pricing information for user
     """
-    verify_input_datetime(date_from, date_to)
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/billing/list_storage_stop_events?time_from={date_from}&time_till={date_to}"
-    metric = "billing.stop_events.volume"
+    url = f"{api_url}/v2/api/billing/user_pricing"
+    metric = "billing.pricing"
     __res = call_api(request=EndpointTypes.get, url=url, headers=headers)
     click.echo(
-        stop_events_volume_response(
+        billing_pricing_response(
             retrieve_and_validate_response_send_metric(__res, metric)
         )
     )
-
-
-billing_group.add_command(stop_events_group)

cgc/commands/compute/billing/billing_responses.py

@@ -1,15 +1,12 @@
 import calendar
+import click
+from decimal import Decimal
+from tabulate import tabulate
 from cgc.commands.compute.billing import (
     NoCostsFound,
     NoInvoiceFoundForSelectedMonth,
-    NoResourceStopEvents,
-    NoVolumeStopEvents,
-)
-from cgc.commands.compute.billing.billing_utils import (
-    get_billing_status_message,
-    get_table_compute_stop_events_message,
-    get_table_volume_stop_events_message,
 )
+from cgc.commands.compute.billing.billing_utils import get_billing_status_message
 from cgc.utils.message_utils import key_error_decorator_for_helpers
 
 
@@ -17,10 +14,11 @@ from cgc.utils.message_utils import key_error_decorator_for_helpers
 def billing_status_response(data: dict) -> str:
     total_cost = data["details"]["cost_total"]
     namespace = data["details"]["namespace"]
-    user_list = data["details"]["details"]
-    if not user_list:
+    billing_records = data["details"]["billing_records"]
+    details = data["details"].get("details", [])
+    if not billing_records:
         raise NoCostsFound()
-    message = get_billing_status_message(user_list)
+    message = get_billing_status_message(billing_records, details)
     message += f"Total cost for namespace {namespace}: {total_cost:.2f} pln"
     return message
 
@@ -29,27 +27,39 @@ def billing_status_response(data: dict) -> str:
 def billing_invoice_response(year: int, month: int, data: dict) -> str:
     total_cost = float(data["details"]["cost_total"])
     namespace = data["details"]["namespace"]
-    users_invoices_list = data["details"]["invoice"]
+    billing_records = data["details"]["billing_records"]
+    details = data["details"].get("details", [])
     if (
-        not users_invoices_list or total_cost == 0
+        not billing_records or total_cost == 0
     ):  # TODO: total_cost == 0 is it correct thinking?
         raise NoInvoiceFoundForSelectedMonth(year, month)
-    message = get_billing_status_message(users_invoices_list)
+    message = get_billing_status_message(billing_records, details)
     message += f"Total cost for namespace {namespace} in {calendar.month_name[month]} {year}: {total_cost:.2f} pln"
     return message
 
 
 @key_error_decorator_for_helpers
-def stop_events_resource_response(data: dict) -> str:
-    event_list = data["details"]["event_list"]
-    if not event_list:
-        raise NoResourceStopEvents()
-    return get_table_compute_stop_events_message(event_list)
+def billing_pricing_response(data: dict) -> str:
+    """Create response string for billing pricing command.
 
+    :return: Response string.
+    :rtype: str
+    """
+    pricing_details = data["details"]["pricing_details"]
+    if not pricing_details:
+        return "No pricing details available."
+    if pricing_details.get("tier"):
+        tier = pricing_details["tier"] or "DEFAULT"
+        click.echo(f"Current pricing tier: {tier}")
+    if not pricing_details.get("resources"):
+        return "No resources costs available."
+    headers = ["Resource", "Price per unit (pln) / (second OR token)"]
+    pricing_data = [
+        (resource, f"{Decimal(str(price)):.7f}")
+        for resource, price in pricing_details.get("resources").items()
+    ]
+    click.echo(
+        "Pricing values displayed are approximated due to float representation. For exact values, refer to the billing system dashboard."
+    )
 
-@key_error_decorator_for_helpers
-def stop_events_volume_response(data: dict) -> str:
-    event_list = data["details"]["event_list"]
-    if not event_list:
-        raise NoVolumeStopEvents()
-    return get_table_volume_stop_events_message(event_list)
+    return tabulate(pricing_data, headers=headers)

cgc/commands/compute/billing/billing_utils.py

@@ -17,7 +17,7 @@ def verify_input_datetime(*args):
 
 
 def _get_costs_list_for_user(costs_list: list):
-    """Method to format data in costs list to be displayed in a table and calculate user cost
+    """Format data in costs list to be displayed in a table and calculate user cost
 
     :param costs_list: list of costs for user
     :type costs_list: list
@@ -25,83 +25,142 @@ def _get_costs_list_for_user(costs_list: list):
     :rtype: user_costs_list_to_print: list, total_user_cost: float
     """
     user_costs_list_to_print = []
-    oneoff_aggregated = {}
     total_user_cost = 0
 
     for cost in costs_list:
-        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":
-            product = cost["product"]
-            if product not in oneoff_aggregated:
-                oneoff_aggregated[product] = {
-                    "quantity": 0,
-                    "cost_total": 0
-                }
-            oneoff_aggregated[product]["quantity"] += cost["quantity"]
-            oneoff_aggregated[product]["cost_total"] += cost["cost_total"]
+        if "resource_cost" in cost:
+            if cost.get("type", "") == "oneoff":
+                for resource, value in cost["resource_cost"].items():
+                    user_costs_list_to_print.append(
+                        [
+                            cost.get("type", ""),
+                            cost.get("namespace", ""),
+                            f"{resource}: {float(value):.2f} pln",
+                            "-",
+                            "-",
+                            "<<-",
+                        ]
+                    )
+                    total_user_cost += float(cost.get("cost_total", 0))
+            else:
+                resource_cost_str = ", ".join(
+                    f"{k}: {float(v):.2f}" for k, v in cost["resource_cost"].items()
+                )
+                start, end = "-", "-"
+                if "datetime_range" in cost and len(cost["datetime_range"]) == 2:
+                    start, end = cost["datetime_range"]
+                user_costs_list_to_print.append(
+                    [
+                        cost.get("type", ""),
+                        cost.get("namespace", ""),
+                        resource_cost_str,
+                        start,
+                        end,
+                        f"{float(cost.get('cost_total', 0)):.2f} pln",
+                    ]
+                )
+                total_user_cost += float(cost.get("cost_total", 0))
+
+    if costs_list:
+        user_costs_list_to_print.sort(key=lambda d: f"{d[0]} {d[1]}")
+    return user_costs_list_to_print, total_user_cost
+
+
+def _get_costs_list_for_user_with_details(costs_list: list):
+    """Format data in costs list to be displayed in a table and calculate user cost with details
+
+    :param costs_list: list of costs for user
+    :type costs_list: list
+    :return: formatted list of costs and total cost for user
+    :rtype: user_costs_list_to_print: list, total_user_cost: float
+    """
+    user_costs_list_to_print = []
+    total_user_cost = 0
+
+    for cost in costs_list:
+        # Support both old and new structure
+        record = cost.get("record", {})
+        name = record.get("name", cost.get("name", ""))
+        # id_ = record.get("id", cost.get("id", ""))
+        user_id = record.get("user_id", cost.get("user_id", ""))
+        namespace = record.get("namespace", cost.get("namespace", ""))
+        type_ = record.get("type", cost.get("type", ""))
+        resource_cost = cost.get("resource_cost", {})
+        if type_ == "oneoff":
+            for resource, value in resource_cost.items():
+                user_costs_list_to_print.append(
+                    [
+                        name,
+                        user_id,
+                        namespace,
+                        type_,
+                        f"{resource}: {float(value):.2f} pln",
+                        "-",
+                        "-",
+                        "<<-",
+                    ]
+                )
+                total_user_cost += float(cost.get("cost_total", 0))
         else:
-            user_costs_list_to_print.append(["ERROR", "", "", "", "", ""])
-        total_user_cost += cost["cost_total"]
-
-    for product, data in oneoff_aggregated.items():
-        user_costs_list_to_print.append([
-            "oneoff",
-            product,
-            "-",
-            "-",
-            f"{data['quantity']:d}",
-            f"{data['cost_total']:.8f} pln"
-        ])
+            resource_cost_str = ", ".join(
+                f"{k}: {float(v):.2f}" for k, v in resource_cost.items()
+            )
+            start = cost.get("calculation_start_time", "-")
+            end = cost.get("calculation_end_time", "-")
+            cost_total = cost.get("cost_total", 0)
+
+            user_costs_list_to_print.append(
+                [
+                    name,
+                    # id_,
+                    user_id,
+                    namespace,
+                    type_,
+                    resource_cost_str,
+                    start,
+                    end,
+                    f"{float(cost_total):.2f} pln",
+                ]
+            )
+        total_user_cost += float(cost_total)
 
     if costs_list:
-        user_costs_list_to_print.sort(key=lambda d: f"{d[0]} {d[2]}")
+        user_costs_list_to_print.sort(key=lambda d: f"{d[0]} {d[1]}")
     return user_costs_list_to_print, total_user_cost
 
 
-def get_billing_status_message(user_list: list):
+def get_billing_status_message(billing_records: list, details: list = []):
     """Prints billing status for all users in a pretty table
 
     :param user_list: list of users with costs
     :type user_list: list
     """
     message = ""
-    for user in user_list:
-        user_id = user["user_id"]
-        costs_list = user["details"]
-        costs_list_to_print, _user_cost = _get_costs_list_for_user(costs_list)
+    users = set(
+        record.get("user_id", "") for record in billing_records
+    )  # Get unique user IDs
+    if not users:
+        return "No billing records found."
+    for user in users:
+        user_records = [
+            record for record in billing_records if record["user_id"] == user
+        ]
+        costs_list_to_print, _user_cost = _get_costs_list_for_user(user_records)
         list_headers = _get_status_list_headers()
-        message += f"Billing status for user: {user_id}\n"
+        message += f"Billing status for user: {user}\n"
         message += tabulate(costs_list_to_print, headers=list_headers)
         message += f"\n\nSummary user cost: {float(_user_cost):.2f} pln\n\n"
+    if details:
+        message += "Detailed billing records:\n"
+        costs_list_to_print, _ = _get_costs_list_for_user_with_details(details)
+        if not costs_list_to_print:
+            message += "No detailed billing records found.\n"
+        else:
+            list_headers = _get_billing_details_list_headers()
+            message += tabulate(costs_list_to_print, headers=list_headers)
+            message += "\n\n"
     return message
 
-    # "status": "Success",
-    # "reason": "BILLING_INVOICE",
-    # "details": {
-    #     "namespace": "pytest",
-    #     "cost_total": 0,
-    #     "invoice": [
-    #         {
-    #             "user_id": "e57c8668-6bc3-47c7-85de-903bfc3772b7",
-    #             "month": 11,
-    #             "year": 2022,
-    #             "cost_total": 0,
-    #             "details": [],
-    #         }
-    #     ],
-    #     "date_requested": {"year": 2022, "month": 11},
-
 
 def _get_status_list_headers():
     """Generates headers for billing status command
@@ -109,7 +168,26 @@ def _get_status_list_headers():
     :return: list of headers
     :rtype: list
     """
-    return ["entity", "name", "start", "end", "quantity", "cost"]
+    return ["type", "namespace", "resource breakdown", "start", "end", "cost"]
+
+
+def _get_billing_details_list_headers():
+    """Generates headers for billing details command
+
+    :return: list of headers
+    :rtype: list
+    """
+    return [
+        "name",
+        # "id",
+        "user_id",
+        "namespace",
+        "type",
+        "resource breakdown",
+        "start",
+        "end",
+        "cost_total",
+    ]
 
 
 # TODO: refactor to use: tabulate_a_response(data: list) -> str:

cgc/commands/compute/compute_responses.py

@@ -62,6 +62,10 @@ def compute_list_response(detailed: bool, data: dict) -> str:
     pod_list = data["details"]["pods_list"]
     setup_gauge(f"{get_namespace()}.compute.count", len(pod_list))
 
+    # disabled resources pod list
+    other_pods_list = data["details"].get("other_pods_list", [])
+    pod_list.extend(other_pods_list)
+
     if not pod_list:
         raise NoAppsToList()
 
@@ -156,6 +160,20 @@ def compute_delete_response(data: dict) -> str:
     return f"App {name} and its service successfully deleted."
 
 
+@key_error_decorator_for_helpers
+def compute_scale_response(data: dict) -> str:
+    """Create response string for compute scale command.
+
+    :param response: dict object from API response.
+    :type response: requests.Response
+    :return: Response string.
+    :rtype: str
+    """
+    name = data["details"]["template_name"]
+    replicas = data["details"]["replicas"]
+    return f"App {name} has been successfully scaled to {replicas} replicas."
+
+
 @key_error_decorator_for_helpers
 def compute_restart_response(data: dict) -> str:
     """Create response string for compute restart command.

cgc/commands/compute/compute_utils.py

@@ -83,6 +83,13 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
     """
     output_data = []
 
+    def update_output_data_count(pod_name):
+        for pod in output_data:
+            if pod["name"] == pod_name:
+                pod["count"] += 1
+                return True
+        return False
+
     for pod in pod_list:
         try:
             main_container_name = pod["labels"]["entity"]
@@ -94,7 +101,7 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
                 raise Exception(
                     "Parser was unable to find main container in server output in container list"
                 )
-            volumes_mounted = list_get_mounted_volumes(main_container["mounts"])
+            volumes_mounted = list_get_mounted_volumes(main_container.get("mounts", []))
             limits = main_container["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"
@@ -106,6 +113,7 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
                 "volumes_mounted": volumes_mounted,
                 "cpu": cpu,
                 "ram": ram,
+                "count": pod.get("replicas", 1), # first in the list are always pods
             }
             # getting rid of unwanted and used values
             if "pod-template-hash" in pod["labels"].keys():
@@ -139,7 +147,9 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
 
             # appending the rest of labels
             pod_data.update(pod["labels"])
-            output_data.append(pod_data)
+
+            if not update_output_data_count(pod_data["name"]):
+                output_data.append(pod_data)
         except KeyError:
             pass
 

cgc/commands/debug/debug_cmd.py

@@ -1,18 +1,18 @@
-import click
-from cgc.commands.auth.auth_utils import (
-    _get_jwt_from_server,
-)
-from cgc.utils.click_group import CustomCommand, CustomGroup
-
-
-@click.group("debug", cls=CustomGroup, hidden=True)
-def debug_group():
-    """
-    Debug commands for testing.
-    """
-    pass
-
-
-@debug_group.command("get-jwt", cls=CustomCommand)
-def get_jwt_from_server():
-    click.echo(_get_jwt_from_server())
+import click
+from cgc.commands.auth.auth_utils import (
+    _get_jwt_from_server,
+)
+from cgc.utils.click_group import CustomCommand, CustomGroup
+
+
+@click.group("debug", cls=CustomGroup, hidden=True)
+def debug_group():
+    """
+    Debug commands for testing.
+    """
+    pass
+
+
+@debug_group.command("get-jwt", cls=CustomCommand)
+def get_jwt_from_server():
+    click.echo(_get_jwt_from_server())

cgc/commands/resource/resource_cmd.py

@@ -4,6 +4,7 @@ import json
 from cgc.commands.db.db_models import DatabasesList
 from cgc.commands.compute.compute_models import ComputesList
 from cgc.commands.compute.compute_responses import (
+    compute_scale_response,
     template_list_response,
     template_get_start_path_response,
     compute_restart_response,
@@ -82,6 +83,63 @@ def compute_restart(name: str):
     )
 
 
+@resource_group.group(name="scale", cls=CustomGroup, hidden=False)
+def scale_group():
+    """
+    Management of scaling resources replicas.
+    """
+
+
+@scale_group.command("up", cls=CustomCommand)
+@click.argument("name", type=click.STRING)
+# @click.option(
+#     "-s",
+#     "--scale",
+#     "replicas",
+#     type=NonNegativeInteger(),
+#     required=True,
+#     help="Scale factor - number of replicas (must be 0 or greater)",
+# )
+def compute_scale_up(name: str):
+    """Scales the specified app up"""
+    api_url, headers = get_api_url_and_prepare_headers()
+    url = f"{api_url}/v1/api/resource/scale?replicas=1"
+    metric = "resource.scale"
+    __payload = {"name": name}
+    __res = call_api(
+        request=EndpointTypes.post,
+        url=url,
+        headers=headers,
+        data=json.dumps(__payload).encode("utf-8"),
+    )
+    click.echo(
+        compute_scale_response(
+            retrieve_and_validate_response_send_metric(__res, metric)
+        )
+    )
+
+
+@scale_group.command("down", cls=CustomCommand)
+@click.argument("name", type=click.STRING)
+def compute_scale_down(name: str):
+    """Scales the specified app down"""
+    api_url, headers = get_api_url_and_prepare_headers()
+    url = f"{api_url}/v1/api/resource/scale?replicas=0"
+    metric = "resource.scale"
+    __payload = {"name": name}
+    __res = call_api(
+        request=EndpointTypes.post,
+        url=url,
+        headers=headers,
+        data=json.dumps(__payload).encode("utf-8"),
+    )
+    click.echo(
+        compute_scale_response(
+            retrieve_and_validate_response_send_metric(__res, metric)
+        )
+    )
+
+
 @resource_group.command("ingress", cls=CustomCommand)
 @click.argument("name", type=click.STRING)
 def get_resource_ingress(name: str):

cgc/commands/volume/volume_responses.py

@@ -41,7 +41,7 @@ def volume_storage_class_details_response(data: dict) -> str:
     :rtype: str
     """
     # ["details"]["storage_class"] -> storage class name
-    # ["details"]["storage_class_info"] -> billing_cost, storage_type, reclaim_policy, volume_binding_mode
+    # ["details"]["storage_class_info"] -> storage_type, reclaim_policy, volume_binding_mode
 
     storage_class_headers = [
         "name",

cgc/tests/test.py

@@ -0,0 +1,110 @@
+def list_get_mounted_volumes(volume_list: list) -> str:
+    """Formats and returns list of PVC volumes mounted to an app.
+
+    :param volume_list: list of all volumes mounted to an app
+    :type volume_list: list
+    :return: list of PVC volumes
+    :rtype: str
+    """
+    volume_name_list = []
+    for volume in volume_list:
+        volume_type = volume.get("type")
+        if volume_type == "PVC":
+            volume_name = volume.get("name")
+            volume_name_list.append(volume_name)
+    volumes_mounted = (
+        ", ".join(volume_name_list) if len(volume_name_list) != 0 else None
+    )
+    return volumes_mounted
+
+
+def get_job_json_data(job_list: list):
+    """Formats and returns list of jobs to print.
+
+    :param job_list: list of jobs
+    :type job_list: list
+    :return: formatted list of jobs
+    :rtype: list
+    """
+    output_data = []
+
+    for job in job_list:
+        try:
+            main_container_name = "custom-job"
+            try:
+                main_container = [
+                    x
+                    for x in job.get("containers", [])
+                    if x.get("name") == main_container_name
+                ][0]
+            except IndexError:
+                raise Exception(
+                    "Parser was unable to find main container in server output in container list"
+                )
+            volumes_mounted = list_get_mounted_volumes(main_container.get("mounts", []))
+            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"
+
+            job_data = {
+                "name": job.get("labels", {}).get("app-name"),
+                "status": job.get("status", {}).get("phase", "Unknown"),
+                "volumes_mounted": volumes_mounted,
+                "cpu": cpu,
+                "ram": ram,
+            }
+            # 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")
+
+            # appending the rest of labels
+            job_data.update(job["labels"])
+            output_data.append(job_data)
+        except KeyError:
+            pass
+
+    return output_data
+
+
+def get_job_list(job_list: list, job_pod_list: list):
+    list_of_json_job_data = get_job_json_data(job_list)
+
+    for i, job_data in enumerate(job_list):
+        list_of_json_job_data[i]["name"] = job_data.get("name", "")
+        list_of_json_job_data[i]["ttl"] = job_data.get(
+            "ttl_seconds_after_finished", "N/A"
+        )
+        list_of_json_job_data[i]["ads"] = job_data.get("active_deadline_seconds", "N/A")
+    for job in list_of_json_job_data:
+        for job_pod in job_pod_list:
+            job_pod_labels: dict = job_pod.get("labels", {})
+            print(job_pod.get("labels"))
+            if job_pod_labels.get("app-name", "") == job.get("name"):
+                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")
+                break
+
+    return list_of_json_job_data
+
+
+def main():
+    import json
+
+    with open("test.json") as f:
+        response_data = json.load(f)
+
+    job_list = response_data.get("details", {}).get("job_list", [])
+    job_pod_list = response_data.get("details", {}).get("job_pod_list", [])
+
+    _list_of_json_job_data = get_job_list(job_list, job_pod_list)
+
+    # print(list_of_json_job_data)
+
+
+if __name__ == "__main__":
+    main()

cgc/utils/click_group.py

@@ -17,3 +17,16 @@ class CustomCommand(click.Command):
         pieces = self.collect_usage_pieces(ctx)
         cmd_path = ctx.command_path.removeprefix("python -m ")
         formatter.write_usage(cmd_path, " ".join(pieces))
+
+
+class NonNegativeInteger(click.types.IntParamType):
+    """A parameter that only accepts non-negative integers."""
+
+    name = "non-negative-integer"
+
+    def convert(self, value, param, ctx):
+        # First convert using the parent class method
+        result = super().convert(value, param, ctx)
+        if result < 0:
+            self.fail(f"{value} is not a non-negative integer", param, ctx)
+        return result

cgc/utils/custom_exceptions.py

@@ -3,29 +3,33 @@
 # every warning has its message that will be returned to print
 CUSTOM_EXCEPTIONS = {
     500: {
-        "UNDEFINED": "undefined exception",
-        "USER_KEY_CREATE_ERROR": "Error while creating key",
+        "UNDEFINED": "Undefined exception.",
+        "USER_KEY_CREATE_ERROR": "Error while creating key.",
+        "RESOURCE_SCALE_TEMPLATE_ERROR": "Error while scaling resource - resource not fully compatible with CGC.",
     },
     413: {
-        "PVC_CREATE_STORAGE_LIMIT_EXCEEDED": "This request exceeds your storage limits",
-        "PVC_CREATE_NOT_ENOUGH_STORAGE_IN_CLUSTER": "No more storage available",
-        "REQUEST_RESOURCE_LIMIT_EXCEEDED": "This request exceeds your resources limit",
-        "RESOURCES_NOT_AVAILABLE_IN_CLUSTER": "Requested resources not available",
+        "PVC_CREATE_STORAGE_LIMIT_EXCEEDED": "This request exceeds your storage limits.",
+        "PVC_CREATE_NOT_ENOUGH_STORAGE_IN_CLUSTER": "No more storage available.",
+        "REQUEST_RESOURCE_LIMIT_EXCEEDED": "This request exceeds your resource limits.",
+        "RESOURCES_NOT_AVAILABLE_IN_CLUSTER": "Requested resources are not available.",
+        "RESOURCE_SCALE_RESOURCES_LIMIT_EXCEEDED": "This request exceeds your resource limits.",
+        "PVC_CREATE_STORAGE_LIMIT_EXCEEDED": "Storage limit exceeded.",
     },
     409: {
-        "PVC_NAME_ALREADY_EXISTS": "Volume with this name already exists.",
-        "PVC_DELETE_EXCEPTION": "Can't delete mounted volume, try with force",
-        "RESOURCE_PORTS_ALREADY_EXISTS": "Port with this name already exists.",
-        "RESOURCE_TEMPLATE_NAME_ALREADY_EXISTS": "Resource with this name already exists.",
-        "JOB_CREATE_ALREADY_EXISTS": "Job with this name already exists.",
-        "USER_KEY_ALREADY_EXISTS": "Key with these data already exists.",
+        "PVC_NAME_ALREADY_EXISTS": "A volume with this name already exists.",
+        "PVC_DELETE_EXCEPTION": "Can't delete mounted volume. Try with force.",
+        "RESOURCE_PORTS_ALREADY_EXISTS": "A port with this name already exists.",
+        "RESOURCE_TEMPLATE_NAME_ALREADY_EXISTS": "A resource with this name already exists.",
+        "JOB_CREATE_ALREADY_EXISTS": "A job with this name already exists.",
+        "USER_KEY_ALREADY_EXISTS": "A key with this data already exists.",
+        "AlreadyExists": "An object with this name already exists.",
     },
     404: {
-        "PVC_CREATE_NO_SC": "Selected disk type and access mode unavailable",
+        "PVC_CREATE_NO_SC": "Selected disk type and access mode are unavailable.",
         "BILLING_STATUS_NO_DATA": "No data to print.",
         "NOT_DELETED_ANYTHING_IN_COMPUTE_DELETE": "No app with this name to delete.",
-        "API_KEY_DELETE_ERROR": "No api key with this id to delete",
-        "PVC_MOUNT_NOT_FOUND_TEMPLATE": "No app with this name to mount.",
+        "API_KEY_DELETE_ERROR": "No API key with this ID to delete.",
+        "PVC_MOUNT_NOT_FOUND_TEMPLATE": "App resource with this name not found.",
         "PVC_UNMOUNT_NOT_MOUNTED": "Volume with this name is not mounted.",
         "PVC_NOT_FOUND": "Volume with this name not found.",
         "PVC_DELETE_NOT_FOUND": "App with this name not found.",
@@ -35,13 +39,21 @@ CUSTOM_EXCEPTIONS = {
         "COMPUTE_RESOURCE_QUOTA_NOT_FOUND": "You do not have enforced limits on your namespace.",
         "JOB_NOT_FOUND": "Job with this name not found.",
         "RESOURCE_NOT_FOUND": "Resource with this name not found.",
-        "USER_KEY_NOT_FOUND": "Key with this id not found.",
+        "USER_KEY_NOT_FOUND": "Key with this ID not found.",
+        "RESOURCE_SCALE_TEMPLATE_NOT_FOUND": "No app with this name.",
+        "NotFound": "Resource not found.",
+        "USER_SECRET_UPDATE_NOT_FOUND": "Secret not found.",
+        "USER_SECRET_DELETE_NOT_FOUND": "Secret not found.",
+        "PVC_SC_NOT_FOUND": "Storage class with this name is not defined.",
+        "RESOURCE_RESTART_TEMPLATE_NOT_FOUND": "Resource with this name not found.",
+        "NOT_DELETED_ANYTHING_IN_RESOURCE_DELETE": "There is nothing to delete with this name.",
     },
     400: {
         "WRONG_DATE_FORMAT": "Wrong date format.",
         "ENTITY_NOT_ALLOWED": "You can't create this entity.",
         "PVC_MOUNT_ALREADY_MOUNTED": "This volume is already mounted.",
-        "TEMPLATE_NAME_SYSTEM_RESERVED": "You can't create app with this name.",
-        "JOB_LACKS_REQUIRED_PARAMETER": "Job requires container image parameter.",
+        "TEMPLATE_NAME_SYSTEM_RESERVED": "You can't create an app with this name.",
+        "JOB_LACKS_REQUIRED_PARAMETER": "Job requires a container image parameter.",
+        "RESOURCE_PORTS_EXCEPTION": "Resource with this name not found.",
     },
 }

cgc/utils/message_utils.py

@@ -63,5 +63,9 @@ def key_error_decorator_for_helpers(func):
             return prepare_error_message(UNKNOWN_ERROR)
         except (ResponseException, click.ClickException) as err:
             return prepare_warning_message(err)
+        except KeyboardInterrupt:
+            increment_metric(metric="client.interrupted", is_error=True)
+            # silently exit
+            exit(0)
 
     return wrapper

cgc/utils/prepare_headers.py

@@ -20,7 +20,7 @@ def get_api_url_and_prepare_headers():
     }
     return get_headers_data.load_user_api_url(), headers
 
-
+@key_error_decorator_for_helpers
 def get_url_and_prepare_headers_register(
     user_id: str, access_key: str, url: str = None, secret: str = None
 ):
@@ -39,7 +39,7 @@ def get_url_and_prepare_headers_register(
     }
     return url, headers
 
-
+@key_error_decorator_for_helpers
 def get_url_and_headers_jwt_token():
     url = f"{get_headers_data.load_user_api_url()}/v1/api/user/create/token"
     headers = {
@@ -63,7 +63,7 @@ def prepare_headers_api_key(user_id: str = None, password: str = None):
     }
     return headers
 
-
+@key_error_decorator_for_helpers
 def get_api_url_and_prepare_headers_version_control():
     """Prepares headers for version control request.
 

cgc/utils/requests_helper.py

@@ -59,6 +59,10 @@ def call_api(request: EndpointTypes, **kwargs):
     except OSError:
         increment_metric(metric="client.certificate", is_error=True)
         click.echo(prepare_error_message(CERTIFICATE_ERROR))
+    except KeyboardInterrupt:
+        increment_metric(metric="client.interrupted", is_error=True)
+        # silently exit
+        sys.exit()
     except:
         increment_metric(metric="client.unhandled", is_error=True)
         click.echo(prepare_error_message(UNKNOWN_ERROR))

cgc/utils/response_utils.py

@@ -118,9 +118,12 @@ def retrieve_and_validate_response_send_metric(
         else:
             try:
                 response_json = response.json()
-                if "details" in response_json:
-                    click.echo(prepare_error_message(response_json["details"]))
-                else:
+                status_code = response.status_code
+                reason = response_json.get("reason", "")
+                if (
+                    status_code in CUSTOM_EXCEPTIONS
+                    and reason in CUSTOM_EXCEPTIONS[status_code]
+                ):
                     click.echo(
                         prepare_error_message(
                             CUSTOM_EXCEPTIONS[response.status_code][
@@ -128,6 +131,10 @@ def retrieve_and_validate_response_send_metric(
                             ]
                         )
                     )
+                elif "details" in response_json:
+                    click.echo(prepare_error_message(response_json["details"]))
+                else:
+                    raise KeyError("No specific error message or details field found.")
             except KeyError:
                 error_message = _get_response_json_error_message(response_json)
                 if isinstance(error_message, str):

cgc/utils/version_control.py

@@ -38,7 +38,7 @@ def get_server_version():
 
 
 def print_compare_versions(server_version: str, client_version: str):
-    click.echo(f"Available version: {server_version}")
+    click.echo(f"Server version: {server_version}")
     click.echo(f"Installed version: {client_version}")
 
 

{cgcsdk-1.2.5.dist-info → cgcsdk-1.3.0.dist-info}/METADATA

@@ -1,76 +1,76 @@
-Metadata-Version: 2.4
-Name: cgcsdk
-Version: 1.2.5
-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/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.11
-Classifier: Programming Language :: Python :: 3.12
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: click
-Requires-Dist: python-dotenv
-Requires-Dist: tabulate
-Requires-Dist: pycryptodomex
-Requires-Dist: paramiko>=2.11
-Requires-Dist: statsd
-Requires-Dist: requests
-Requires-Dist: setuptools
-Requires-Dist: colorama
-Requires-Dist: psycopg2-binary
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: summary
-
-# Comtegra GPU Cloud CLI Client
-
-## Basic info
-
-CGC Clinet is complete solution to create and manage your compute resources through CLI interface and python code. It incorporates CLI and SDK in one package.
-
-CGC CLI is a command line interface for Comtegra GPU Cloud. CGC CLI enables management of your Comtegra GPU Cloud resources. Current version of the app provides support for compute, storage and network resurces to be created, listed and deleted. Every compute resource is given to you as an URL, which is accessible from open Internet.
-
-To enable better access to your storage resources, every account has the ability to spawn free of charge filebrowser which is local implementation of dropbox. Remember to mount newely created volumes to it.
-
-For now, we provide the ability to spawn compute resources like:
-
-1. [Jupyter notebook](https://jupyter.org/) with tensorflow or pytorch installed as default
-2. [Triton inferencing server](https://docs.nvidia.com/deeplearning/triton-inference-server/) for large scale inferencing
-3. [Label studio](https://labelstud.io/) for easy management of your data annotation tasks with variety of modes
-4. [Rapids](https://rapids.ai/) suite of accelerated libraries for data processing
-
-Notebooks are equiped with all CUDA libraries and GPU drivers which enables the usage of GPU for accelerated computations.
-Apart from compute resources, we provide the database engines accessible from within your namespace:
-
-1. [PostgreSQL](https://www.postgresql.org/)
-2. [Weaviate](https://weaviate.io/)
-
-More are coming!
-Please follow instructions to get started.
-
-## More info
-
-If you'd like to know more visit:
-
-- [Comtegra GPU Website](https://cgc.comtegra.cloud)
-- [Docs](https://docs.cgc.comtegra.cloud)
+Metadata-Version: 2.4
+Name: cgcsdk
+Version: 1.3.0
+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/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.11
+Classifier: Programming Language :: Python :: 3.12
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: click
+Requires-Dist: python-dotenv
+Requires-Dist: tabulate
+Requires-Dist: pycryptodomex
+Requires-Dist: paramiko>=2.11
+Requires-Dist: statsd
+Requires-Dist: requests
+Requires-Dist: setuptools
+Requires-Dist: colorama
+Requires-Dist: psycopg2-binary
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
+
+# Comtegra GPU Cloud CLI Client
+
+## Basic info
+
+CGC Clinet is complete solution to create and manage your compute resources through CLI interface and python code. It incorporates CLI and SDK in one package.
+
+CGC CLI is a command line interface for Comtegra GPU Cloud. CGC CLI enables management of your Comtegra GPU Cloud resources. Current version of the app provides support for compute, storage and network resurces to be created, listed and deleted. Every compute resource is given to you as an URL, which is accessible from open Internet.
+
+To enable better access to your storage resources, every account has the ability to spawn free of charge filebrowser which is local implementation of dropbox. Remember to mount newely created volumes to it.
+
+For now, we provide the ability to spawn compute resources like:
+
+1. [Jupyter notebook](https://jupyter.org/) with tensorflow or pytorch installed as default
+2. [Triton inferencing server](https://docs.nvidia.com/deeplearning/triton-inference-server/) for large scale inferencing
+3. [Label studio](https://labelstud.io/) for easy management of your data annotation tasks with variety of modes
+4. [Rapids](https://rapids.ai/) suite of accelerated libraries for data processing
+
+Notebooks are equiped with all CUDA libraries and GPU drivers which enables the usage of GPU for accelerated computations.
+Apart from compute resources, we provide the database engines accessible from within your namespace:
+
+1. [PostgreSQL](https://www.postgresql.org/)
+2. [Weaviate](https://weaviate.io/)
+
+More are coming!
+Please follow instructions to get started.
+
+## More info
+
+If you'd like to know more visit:
+
+- [Comtegra GPU Website](https://cgc.comtegra.cloud)
+- [Docs](https://docs.cgc.comtegra.cloud)

{cgcsdk-1.2.5.dist-info → cgcsdk-1.3.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-cgc/.env,sha256=__9LESwdxS-0FzmB6h-HdVRL8IND1O4rCf7Gt3RKhyk,209
-cgc/CHANGELOG.md,sha256=ioh9EniDUXJD71PbXHcQQaVM4-9iwl24gXKNRGfUDCk,11489
+cgc/.env,sha256=HL_aZZeVlSqO2b4XjXFvcFow-X89HtNK4yfZn3bFQeg,209
+cgc/CHANGELOG.md,sha256=DtPZAzR5ZNARX9TRnasZVbY7Tk9ddn913KQw3_smdlo,12119
 cgc/__init__.py,sha256=d03Xv8Pw4ktNyUHfmicP6XfxYPXnVYLaCZPyUlg_RNQ,326
 cgc/cgc.py,sha256=3I_Ef0ggX9caaJKJkhfGYSe8XwkHzSWxwGAClMHDnUs,1663
 cgc/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,23 +17,23 @@ cgc/commands/auth/auth_utils.py,sha256=3RSBAR_V5DANhJ_R0cN4poP2uCNdx2tU1VXxP17yX
 cgc/commands/compute/__init__.py,sha256=lCdLfZ0ECSHtXEUSwq5YRHH85yXHchSsz8ZJvmClPtI,239
 cgc/commands/compute/compute_cmd.py,sha256=1i4B_tXjSBtRNDnimgilz4a6BacZTHjFnMsf9EUodOU,16433
 cgc/commands/compute/compute_models.py,sha256=5do3kSrzoZSDX1ElSZMmmW3AI9A1oeOGtrjQYePf4O0,884
-cgc/commands/compute/compute_responses.py,sha256=X1ExOKDIxSFZbBRbWyfWSCeRAe3_cFGa3jOgq6CfjHw,6439
-cgc/commands/compute/compute_utils.py,sha256=wtSgzaoqvvwfR2dHvt8Eup0LH8Fm8pec4Hf52rU_TvI,9734
+cgc/commands/compute/compute_responses.py,sha256=R_BcEPxh57JEK_Er83qN22RpuYCDNctlKY6m-5aPx-c,7025
+cgc/commands/compute/compute_utils.py,sha256=VneJYv8OUiDLYH7u-Gea1vBIx4Tayv3_SRzqfI_i1Sg,10095
 cgc/commands/compute/billing/__init__.py,sha256=ccjz-AzBCROjuR11qZRM4_62slI9ErmLi27xPUoRPHM,752
-cgc/commands/compute/billing/billing_cmd.py,sha256=cUOPQyf5d-vfUVMoetdBxoJx1dqxeQfyke5v-QP88wM,4508
-cgc/commands/compute/billing/billing_responses.py,sha256=5vQSR_d41uizengzfXlHXL7XivO_73PpWdKmoUgqYNw,1965
-cgc/commands/compute/billing/billing_utils.py,sha256=wIiDm7n4bOuKLO4-kLy0AnpPk9G_T14Y5DiFcXOtNrI,5553
+cgc/commands/compute/billing/billing_cmd.py,sha256=d6TzvpbLEetEZCLOz3epk29leIJSofRCeCQ0hCW8jvM,3096
+cgc/commands/compute/billing/billing_responses.py,sha256=R_FQXcU2YhPP80Q0euBsZUc4iVUurJxXY6hLLwazfKY,2514
+cgc/commands/compute/billing/billing_utils.py,sha256=VQTgZd6pSjwROHb_BpwaATo8LowPyUPdrdbdLbI802Y,8313
 cgc/commands/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/db/db_cmd.py,sha256=iXwJzWu4xiaUIfyKSixpnK7-GtoplvfbUN8HHly1YAY,3981
 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/debug/debug_cmd.py,sha256=HU6d1kSRhLVJUxw5Np2wrOREM1GWXQY0WIvFOe9brEo,394
 cgc/commands/jobs/__init__.py,sha256=E-438wgIzlnGmXs5jgmWAhJ1KNV6UXF2gz8SXu3UxA0,231
 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
-cgc/commands/resource/resource_cmd.py,sha256=y2R6ZF0jFhTppD9JUpwLIcEdFRXg82Xw_5yrNIfG4mI,4089
+cgc/commands/resource/resource_cmd.py,sha256=UfhaNoiNvqLfYmcBskKD7QHzfY_LPvU0a4zlPdvzxQk,5722
 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
@@ -48,7 +48,7 @@ cgc/commands/volume/__init__.py,sha256=Ou3kyb72aaXkrVCfQCVdniA65R2xHsRFgebooG1gf
 cgc/commands/volume/data_model.py,sha256=lLHuKRMe-5mgHL3i48QJn8_S3tJHFMCwu8cJAxXe-PU,1267
 cgc/commands/volume/volume_cmd.py,sha256=Eylo_V8Tex8OF5IQcAlpo6ggC4FXYfnQunGtat6WwSs,8279
 cgc/commands/volume/volume_models.py,sha256=eKHYLcAUezoJ1X2ENE-GE2CgE8lynlfT3Hs2PI8zAnY,779
-cgc/commands/volume/volume_responses.py,sha256=lO6NiUFJkNTTKLerFihe3CeQwdo56WyUN5bk01dtfMs,4027
+cgc/commands/volume/volume_responses.py,sha256=tuFws-4yMWj3fcjxwclc7FaJbvGK5n3WzK1SwPNGx7Q,4013
 cgc/commands/volume/volume_utils.py,sha256=6IuDCNT-KAvUUF_EDg5cL9JewTGsbBsZlYd_zKHowCU,1973
 cgc/sdk/__init__.py,sha256=m8uAD2e_ADbHC4_kaOpLrUk_bHy7wC56rPjhcttclCs,177
 cgc/sdk/exceptions.py,sha256=99XIzDO6LYKjex715troH-MkGUN7hi2Bit4KHfSHDis,214
@@ -59,6 +59,7 @@ cgc/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/telemetry/basic.py,sha256=h0f2yAanaflkEnetLjQvs_IR43KL0JmhJ30yrl6tOas,3174
 cgc/tests/__init__.py,sha256=8aI3MVpkzaj0_UX02kZCtY5vmGO0rnq0mw2H04-OHf8,102743
 cgc/tests/responses_tests.py,sha256=9vLOaUICeUXoDObeFwuu0FBTmC-hnJNZfzvolT96dGM,9188
+cgc/tests/test.py,sha256=pFPo8SkE17Si2UhbyLaDhlBxcUMk445M3ZxLlVfhqR8,3877
 cgc/tests/desired_responses/test_billing_invoice.txt,sha256=KR5m2gamn_bgfBdBmWDH2sPRJIPOw1u8kdH-gYE8jow,1579
 cgc/tests/desired_responses/test_billing_status.txt,sha256=2KSUixFOrhXI5ON6qtsIUmzFye5LBZB1xneY8ST0MqE,2381
 cgc/tests/desired_responses/test_billing_stop_events_compute.txt,sha256=nHdixgLhAXDMeoDvjk9Mwv6b0JIAsW8j7Z6SS5scjSs,234
@@ -68,16 +69,16 @@ cgc/tests/desired_responses/test_compute_list_no_labels.txt,sha256=-OeQIaEHHsHZ8
 cgc/tests/desired_responses/test_tabulate_response.txt,sha256=beNyCTS9fwrHn4ueEOVk2BpOeSYZWumIa3H5EUGnW1I,789
 cgc/tests/desired_responses/test_volume_list.txt,sha256=vYB1p50BBHD801q7LUdDc_aca4ezQ8CFLWw7I-b4Uao,309
 cgc/utils/__init__.py,sha256=JOvbqyGdFtswXE1TntOqM7XuIg5-t042WzAzvmX7Xtk,3661
-cgc/utils/click_group.py,sha256=Scfw8eMIyt2dE1ezUq2JuiI-E_LklqXQXJEr7L-EG6A,633
+cgc/utils/click_group.py,sha256=57jEtLJV6944p6gIfuCWmAd_kXfY3rneRngoglYZ9u8,1055
 cgc/utils/config_utils.py,sha256=rbiA2ZNP2SslJ7zA-my7SB0ZLILBMxGjnzP1JhhGc2g,7525
-cgc/utils/custom_exceptions.py,sha256=qvHdzaunZswZgN96iOHZIfLjehlJ79mcjqoMoW-tqEM,2628
+cgc/utils/custom_exceptions.py,sha256=lNpt6Oacd4RqxOQicExUHprLd_a_VtfWS0qVGS3TYtI,3587
 cgc/utils/get_headers_data.py,sha256=JdEg5vrAHcWfsSJ7poYk3sNIY10OxX7YGVcmua-37lY,413
-cgc/utils/message_utils.py,sha256=Lg9G86MRKhQyl1Ito38clGBK-REfgp5fT5aeMqSfhW4,1961
-cgc/utils/prepare_headers.py,sha256=Hi3WNqtqydW56tNTLZmpfMTpu4aKCoDrLx4OcCGH9_U,2656
-cgc/utils/requests_helper.py,sha256=Z89dTOTbSSi1xmtNPmAdJpduR9-DC12WEQsHYeuM9a0,2046
-cgc/utils/response_utils.py,sha256=C0we250lDVxpadtMlx7vUQj0u_gff0zieuVqeuqS2x8,7378
+cgc/utils/message_utils.py,sha256=ebU-omCBTEx3Vvq4kF3vG3x0MPv2fotnvxAFX4mR03c,2116
+cgc/utils/prepare_headers.py,sha256=crjwBvyejtgEQGaL9kJxU4v8Hk6tLn9zaLbMzNIGR6s,2752
+cgc/utils/requests_helper.py,sha256=L0h_u5PkgSJvNY4Q8eraRebhdLghtDtSeBveCWFzNFQ,2188
+cgc/utils/response_utils.py,sha256=LCuUFBmkBHmLX5sQ9-WlPShe_yLPXzs8tDS4RUNYJTk,7734
 cgc/utils/update.py,sha256=AsQwhcBqsjgNPKn6AN6ojt0Ew5otvJXyshys6bjr7DQ,413
-cgc/utils/version_control.py,sha256=rnHeo8_y-8HJfEKLqpiMM26QR8b-CAl3zfgcv0a3y8I,4163
+cgc/utils/version_control.py,sha256=Ssd01sYYp79Y8Bl7_N4BDZLvfrmJ23YoWIBRs4VxHCM,4160
 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=KMajQ5yGxQ45ZPTWVLQj9ajy1KbMeCkHvSW-871A1rs,1355
@@ -85,9 +86,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.2.5.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cgcsdk-1.2.5.dist-info/METADATA,sha256=wMQvJPI6XdJ5Qgy88ukNP1cd6GkGaT6xfqNlYZwDMPw,3247
-cgcsdk-1.2.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cgcsdk-1.2.5.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
-cgcsdk-1.2.5.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
-cgcsdk-1.2.5.dist-info/RECORD,,
+cgcsdk-1.3.0.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cgcsdk-1.3.0.dist-info/METADATA,sha256=ShijHWs9C9oy1NabyeD32sZ8B61dyLrCDANHfIkRYXk,3171
+cgcsdk-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cgcsdk-1.3.0.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
+cgcsdk-1.3.0.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
+cgcsdk-1.3.0.dist-info/RECORD,,

{cgcsdk-1.2.5.dist-info → cgcsdk-1.3.0.dist-info}/WHEEL

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