cgcsdk 0.7.1__py3-none-any.whl → 0.8.0__py3-none-any.whl

cgc/.env

@@ -6,5 +6,5 @@ API_PORT=21919
 CONFIG_FILE_NAME = cfg.json
 TMP_DIR = .tmp
 RELEASE = 0
-MAJOR_VERSION = 7
-MINOR_VERSION = 1
+MAJOR_VERSION = 8
+MINOR_VERSION = 0

cgc/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.8.0
+
+Release on Apr 14, 2023.
+
+* cgc db - new commands for managing databases
+* cgc compute - refactor commands for compute template management
+* cgc resource - new command to control db and compute resources
+
 ## 0.7.1
 
 Released on Mar 23, 2023.

cgc/__init__.py

@@ -7,3 +7,10 @@ from cgc.utils.version_control import get_version
 __version__ = get_version()
 __author__ = "Adrian Jastrzębski <a.jastrzebski@quantdevlabs.com>, Przemysław Kowalski <przemyslaw.kowalski@comtegra.pl>, Jakub Zboina <jakub.zboina@comtegra.pl>"
 __credits__ = "Quantum Dev Labs"
+
+
+# from cgc.utils.asdasd import asdasdasd as asdasdasdasdasdMongo
+
+# import cgc
+
+# cgc.asdasdasdasdasdMongo()

cgc/cgc.py

@@ -2,6 +2,8 @@ import click
 from cgc.commands.volume.volume_cmd import volume_group
 from cgc.commands.compute.compute_cmd import compute_group
 from cgc.commands.billing.billing_cmd import billing_group
+from cgc.commands.db.db_cmd import db_group
+from cgc.commands.resource.resource_cmd import resource_group
 from cgc.commands.auth.auth_cmd import (
     api_keys_group,
     auth_register,
@@ -23,6 +25,8 @@ cli.add_command(auth_register)
 cli.add_command(api_keys_group)
 cli.add_command(volume_group)
 cli.add_command(compute_group)
+cli.add_command(db_group)
+cli.add_command(resource_group)
 cli.add_command(billing_group)
 cli.add_command(cgc_rm)
 cli.add_command(cgc_status)

cgc/commands/auth/auth_cmd.py

@@ -13,7 +13,6 @@ from cgc.utils.cryptography import rsa_crypto
 from cgc.utils.click_group import CustomCommand, CustomGroup
 from cgc.utils.requests_helper import call_api, EndpointTypes
 from cgc.utils.response_utils import retrieve_and_validate_response_send_metric
-from cgc.telemetry.basic import telemetry_permission_set
 
 
 @click.group("api-keys", cls=CustomGroup)

cgc/commands/billing/__init__.py

@@ -20,6 +20,6 @@ class NoVolumeStopEvents(BillingCommandException):
         super().__init__("No volume stop events to list.")
 
 
-class NoComputeStopEvents(BillingCommandException):
+class NoResourceStopEvents(BillingCommandException):
     def __init__(self) -> None:
-        super().__init__("No compute stop events to list.")
+        super().__init__("No resource stop events to list.")

cgc/commands/billing/billing_cmd.py

@@ -4,7 +4,7 @@ from cgc.commands.billing.billing_utils import verify_input_datetime
 from cgc.commands.billing.billing_responses import (
     billing_status_response,
     billing_invoice_response,
-    stop_events_compute_response,
+    stop_events_resource_response,
     stop_events_volume_response,
 )
 from cgc.utils.prepare_headers import get_api_url_and_prepare_headers
@@ -66,17 +66,17 @@ def stop_events_group():
     pass
 
 
-@stop_events_group.command("compute")
+@stop_events_group.command("resource")
 @click.option("--date_from", "-f", "date_from", prompt="Date from (DD-MM-YYYY)")
 @click.option("--date_to", "-t", "date_to", prompt="Date to (DD-MM-YYYY)")
-def stop_events_compute(date_from, date_to):
+def stop_events_resource(date_from, date_to):
     verify_input_datetime(date_from, date_to)
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/billing/list_compute_stop_events?time_from={date_from}&time_till={date_to}"
-    metric = "billing.stop_events.compute"
+    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_compute_response(
+        stop_events_resource_response(
             retrieve_and_validate_response_send_metric(__res, metric)
         )
     )

cgc/commands/billing/billing_responses.py

@@ -2,7 +2,7 @@ import calendar
 from cgc.commands.billing import (
     NoCostsFound,
     NoInvoiceFoundForSelectedMonth,
-    NoComputeStopEvents,
+    NoResourceStopEvents,
     NoVolumeStopEvents,
 )
 from cgc.commands.billing.billing_utils import (
@@ -40,10 +40,10 @@ def billing_invoice_response(year: int, month: int, data: dict) -> str:
 
 
 @key_error_decorator_for_helpers
-def stop_events_compute_response(data: dict) -> str:
+def stop_events_resource_response(data: dict) -> str:
     event_list = data["details"]["event_list"]
     if not event_list:
-        raise NoComputeStopEvents()
+        raise NoResourceStopEvents()
     return get_table_compute_stop_events_message(event_list)
 
 

cgc/commands/billing/billing_utils.py

@@ -35,7 +35,7 @@ def _get_costs_list_for_user(costs_list: list):
         resources = cost["resources"]
         name = resources["name"]
         rent_type = cost["type"]
-        if rent_type == "events_compute":
+        if rent_type == "events_resource":
             entity = resources["entity"]
         elif rent_type == "events_volume":
             entity = "volume"

cgc/commands/cgc_cmd.py

@@ -1,6 +1,6 @@
 import click
 from cgc.commands.cgc_cmd_responses import cgc_status_response
-from cgc.commands.compute.compute_cmd import compute_delete
+from cgc.commands.resource.resource_cmd import resource_delete
 from cgc.utils.requests_helper import call_api, EndpointTypes
 from cgc.utils.click_group import CustomCommand
 from cgc.utils.prepare_headers import get_api_url_and_prepare_headers
@@ -14,15 +14,15 @@ def cgc_rm(name: str):
     """
     Delete an app in user namespace
     """
-    compute_delete(name)
+    resource_delete(name)
 
 
 @click.command("status", cls=CustomCommand)
 def cgc_status():
     """Lists available and used resources"""
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/status"
-    metric = "compute.status"
+    url = f"{api_url}/v1/api/resource/status"
+    metric = "resource.status"
     __res = call_api(
         request=EndpointTypes.get,
         url=url,

cgc/commands/cgc_cmd_responses.py

@@ -21,12 +21,11 @@ def cgc_status_response(data: dict):
         "GPU",
         "-",
         "-",
-        "-",
+        # "-",
         "Volume",
         "Storage",
         "-",
         "-",
-        "-",
     ]
     types = [
         "",
@@ -37,9 +36,8 @@ def cgc_status_response(data: dict):
         # "V100",
         "Count",
         "",
-        "cpu-nvme",
-        "cpu-ssd",
-        "gpu-nvme",
+        "nvme",
+        "ssd",
     ]
     resource_keys = [
         "limits.cpu",
@@ -50,9 +48,8 @@ def cgc_status_response(data: dict):
         # "comtegra.cloud/v100",
         "persistentvolumeclaims",
         "requests.storage",
-        "compute-nvme-rwx.storageclass.storage.k8s.io/requests.storage",
-        "compute-ssd-rwx.storageclass.storage.k8s.io/requests.storage",
-        "gpu-nvme-rwx.storageclass.storage.k8s.io/requests.storage",
+        "nvme-rwx.storageclass.storage.k8s.io/requests.storage",
+        "ssd-rwx.storageclass.storage.k8s.io/requests.storage",
     ]
 
     resources_available_list = []
@@ -61,8 +58,8 @@ def cgc_status_response(data: dict):
         available = resources_available[key]
         limit = resources_limits[key]
         if "storage" in key or "memory" in key:
-            available = f"{available} GiB"
-            limit = f"{limit} GiB"
+            available = f"{available} Gb"
+            limit = f"{limit} Gb"
         else:
             available = int(available)
             limit = int(limit)

cgc/commands/compute/compute_cmd.py

@@ -5,20 +5,13 @@ from cgc.commands.compute.compute_models import EntityList, GPUsList
 from cgc.commands.compute.compute_responses import (
     compute_create_filebrowser_response,
     compute_create_response,
-    compute_delete_response,
-    compute_restart_response,
-    compute_list_response,
-    template_list_response,
-    template_get_start_path_response,
-)
-from cgc.commands.compute.compute_utills import (
-    compute_create_payload,
-    compute_delete_payload,
 )
+from cgc.commands.compute.compute_utills import compute_create_payload
 from cgc.utils.prepare_headers import get_api_url_and_prepare_headers
 from cgc.utils.response_utils import retrieve_and_validate_response_send_metric
 from cgc.utils.click_group import CustomGroup, CustomCommand
 from cgc.utils.requests_helper import call_api, EndpointTypes
+from cgc.commands.resource.resource_cmd import resource_delete
 
 
 @click.group(name="compute", cls=CustomGroup)
@@ -32,42 +25,6 @@ def compute_group(ctx, debug):
     ctx.obj["DEBUG"] = debug
 
 
-@click.group(name="template", cls=CustomGroup)
-def template_group():
-    """
-    Management of templates.
-    """
-
-
-@template_group.command("list", cls=CustomCommand)
-def template_list():
-    """Lists all available templates"""
-    api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/list_available_templates"
-    metric = "compute.template.list"
-    __res = call_api(request=EndpointTypes.get, url=url, headers=headers)
-    click.echo(
-        template_list_response(
-            retrieve_and_validate_response_send_metric(__res, metric)
-        )
-    )
-
-
-@template_group.command("get_start_path", cls=CustomCommand)
-@click.argument("template", type=click.Choice(EntityList.get_list()))
-def template_get_start_path(template: str):
-    """Displays start path of specified template"""
-    api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/get_template_start_path?template_name={template}"
-    metric = "compute.template.get_start_path"
-    __res = call_api(request=EndpointTypes.get, url=url, headers=headers)
-    click.echo(
-        template_get_start_path_response(
-            retrieve_and_validate_response_send_metric(__res, metric)
-        )
-    )
-
-
 @click.group(name="filebrowser", cls=CustomGroup)
 def filebrowser_group():
     """
@@ -79,7 +36,7 @@ def filebrowser_group():
 def compute_filebrowser_create():
     """Create a filebrowser service"""
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/filebrowser_create"
+    url = f"{api_url}/v1/api/resource/filebrowser_create"
     metric = "compute.create_filebrowser"
     __payload = {"puid": 0, "pgid": 0}
     __res = call_api(
@@ -98,7 +55,7 @@ def compute_filebrowser_create():
 @filebrowser_group.command("delete", cls=CustomCommand)
 def compute_filebrowser_delete():
     """Delete a filebrowser service"""
-    compute_delete("filebrowser")
+    resource_delete("filebrowser")
 
 
 @compute_group.command("create", cls=CustomCommand)
@@ -169,7 +126,7 @@ def compute_create(
     :type name: str
     """
     api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/create"
+    url = f"{api_url}/v1/api/resource/create"
     metric = "compute.create"
     __payload = compute_create_payload(
         name=name,
@@ -202,78 +159,7 @@ def compute_delete_cmd(name: str):
     :param name: name of app to delete
     :type name: str
     """
-    compute_delete(name)
-
-
-def compute_delete(name: str):
-    """
-    Delete an app using backend endpoint.
-    \f
-    :param name: name of app to delete
-    :type name: str
-    """
-    api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/delete"
-    metric = "compute.delete"
-    __payload = compute_delete_payload(name=name)
-    __res = call_api(
-        request=EndpointTypes.delete,
-        url=url,
-        headers=headers,
-        data=json.dumps(__payload),
-    )
-    click.echo(
-        compute_delete_response(
-            retrieve_and_validate_response_send_metric(__res, metric)
-        )
-    )
-
-
-@compute_group.command("list", cls=CustomCommand)
-@click.option(
-    "-d", "--detailed", "detailed", type=click.BOOL, is_flag=True, default=False
-)
-@click.pass_context
-def compute_list(ctx, detailed):
-    """
-    List all apps for user namespace.
-    """
-    api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/list"
-    metric = "compute.list"
-    __res = call_api(
-        request=EndpointTypes.get,
-        url=url,
-        headers=headers,
-    )
-    table = compute_list_response(
-        detailed,
-        retrieve_and_validate_response_send_metric(__res, metric),
-    )
-
-    click.echo(table)
-
-
-@compute_group.command("restart", cls=CustomCommand)
-@click.argument("name", type=click.STRING)
-def compute_restart(name: str):
-    """Restarts the specified app"""
-    api_url, headers = get_api_url_and_prepare_headers()
-    url = f"{api_url}/v1/api/compute/restart"
-    metric = "compute.restart"
-    __payload = {"name": name}
-    __res = call_api(
-        request=EndpointTypes.post,
-        url=url,
-        headers=headers,
-        data=json.dumps(__payload),
-    )
-    click.echo(
-        compute_restart_response(
-            retrieve_and_validate_response_send_metric(__res, metric)
-        )
-    )
+    resource_delete(name)
 
 
 compute_group.add_command(filebrowser_group)
-compute_group.add_command(template_group)

cgc/commands/compute/compute_models.py

@@ -1,7 +1,15 @@
 from enum import Enum
 
 
-class EntityList(Enum):
+class CGCEntityList(Enum):
+    """Base class for other lists"""
+
+    @classmethod
+    def get_list(cls) -> list[str]:
+        return [el.value for el in cls]
+
+
+class EntityList(CGCEntityList):
     """List of templates in cgc-server
 
     :param Enum: name of template
@@ -13,12 +21,20 @@ class EntityList(Enum):
     NVIDIA_PYTORCH = "nvidia-pytorch"
     NVIDIA_TRITON = "nvidia-triton"
 
-    @classmethod
-    def get_list(cls) -> list[str]:
-        return [el.value for el in cls]
 
+class DatabasesList(CGCEntityList):
+    """List of templates in cgc-server
+
+    :param Enum: name of template
+    :type Enum: str
+    """
+
+    MONGODB = "mongodb"
+    POSTGRESQL = "postgresql"
+    REDIS = "redis"
 
-class GPUsList(Enum):
+
+class GPUsList(CGCEntityList):
     """List of templates in cgc-server
 
     :param Enum: name of template
@@ -28,7 +44,3 @@ class GPUsList(Enum):
     A100 = "A100"
     # V100 = "V100"
     A5000 = "A5000"
-
-    @classmethod
-    def get_list(cls) -> list[str]:
-        return [el.value for el in cls]

cgc/commands/compute/compute_responses.py

@@ -89,13 +89,18 @@ def compute_create_response(data: dict) -> str:
         app_token = data["details"]["created_template"]["app_token"]
     except KeyError:
         app_token = None
-    app_url = data["details"]["created_template"]["pod_url"]
 
     message = f"{entity} app {name} creation started!\n"
     if volumes:
         message += f" Volumes to mount: {volumes}\n"
         message += f"Container will be Ready after volumes can be see mounted.\n"
-    message += f"Will be accessible at: {app_url}\nApp token: {app_token}\nTo monitor the startup status use command: cgc compute list"
+
+    app_url = data["details"]["created_template"]["pod_url"]
+    if app_url == "None":
+        message += f"Will be accessible at: {app_url}\n"
+    else:
+        message += "This app is not exposed via HTTPS\n"
+    message += f"App token: {app_token}\nTo monitor the startup status use command: cgc resource list"
 
     return message
 
@@ -126,3 +131,25 @@ def compute_restart_response(data: dict) -> str:
 
     name = data["details"]["template_name"]
     return f"App {name} has been successfully restarted."
+
+
+@key_error_decorator_for_helpers
+def compute_logs_response(data: dict) -> str:
+    """prepare logs to print
+
+    :param data: _description_
+    :type data: dict
+    :return: _description_
+    :rtype: str
+    """
+    # converting dict o list
+    logs_list = []
+    for event in data["details"]["pod_event_list"]:
+        row = []
+        for key, value in event.items():
+            row.append((key, value))
+        logs_list.append(row)
+    if len(logs_list) > 0:
+        return tabulate_a_response(logs_list)
+    else:
+        return "No events to list for this app"

cgc/commands/compute/compute_utills.py

@@ -76,7 +76,7 @@ def get_app_list(pod_list: list, detailed: bool) -> list:
 
 
 def compute_create_payload(
-    name, entity, cpu, memory, volumes: list, gpu: int, gpu_type: str
+    name, entity, cpu, memory, volumes: list, gpu: int = 0, gpu_type: str = None
 ):
     """
     Create payload for app creation.
@@ -90,8 +90,11 @@ def compute_create_payload(
         "memory": memory,
         "gpu_type": gpu_type,
     }
-    if len(volumes) != 0:
-        payload["pv_volume"] = volumes
+    try:
+        if len(volumes) != 0:
+            payload["pv_volume"] = volumes
+    except TypeError:
+        pass
     return payload
 
 

cgc/commands/db/db_cmd.py

@@ -0,0 +1,100 @@
+import json
+import click
+
+from cgc.commands.compute.compute_models import DatabasesList
+from cgc.commands.compute.compute_responses import compute_create_response
+from cgc.commands.compute.compute_utills import compute_create_payload
+from cgc.commands.resource.resource_cmd import resource_delete
+from cgc.utils.prepare_headers import get_api_url_and_prepare_headers
+from cgc.utils.response_utils import retrieve_and_validate_response_send_metric
+from cgc.utils.click_group import CustomGroup, CustomCommand
+from cgc.utils.requests_helper import call_api, EndpointTypes
+
+
+@click.group(name="db", cls=CustomGroup)
+def db_group():
+    """
+    Management of db resources.
+    """
+
+
+@db_group.command("create", cls=CustomCommand)
+@click.argument("entity", type=click.Choice(DatabasesList.get_list()))
+@click.option("-n", "--name", "name", type=click.STRING, required=True)
+@click.option(
+    "-c",
+    "--cpu",
+    "cpu",
+    type=click.INT,
+    default=1,
+    help="How much CPU cores app can use",
+)
+@click.option(
+    "-m",
+    "--memory",
+    "memory",
+    type=click.INT,
+    default=2,
+    help="How much Gi RAM app can use",
+)
+@click.option(
+    "-v",
+    "--volume",
+    "volumes",
+    multiple=False,
+    help="Volume name to be mounted with default mount path",
+)
+def db_create(
+    entity: str,
+    cpu: int,
+    memory: int,
+    volumes: list[str],
+    name: str,
+):
+    """
+    Create an app in user namespace.
+    \f
+    :param entity: name of entity to create
+    :type entity: str
+    :param cpu: number of cores to be used by app
+    :type cpu: int
+    :param memory: GB of memory to be used by app
+    :type memory: int
+    :param volumes: list of volumes to mount
+    :type volumes: list[str]
+    :param name: name of app
+    :type name: str
+    """
+    api_url, headers = get_api_url_and_prepare_headers()
+    url = f"{api_url}/v1/api/resource/create"
+    metric = "db.create"
+    __payload = compute_create_payload(
+        name=name,
+        entity=entity,
+        cpu=cpu,
+        memory=memory,
+        volumes=volumes,
+    )
+    __res = call_api(
+        request=EndpointTypes.post,
+        url=url,
+        headers=headers,
+        data=json.dumps(__payload),
+    )
+    click.echo(
+        compute_create_response(
+            retrieve_and_validate_response_send_metric(__res, metric)
+        )
+    )
+
+
+@db_group.command("delete", cls=CustomCommand)
+@click.argument("name", type=click.STRING)
+def db_delete_cmd(name: str):
+    """
+    Delete an app from user namespace.
+    \f
+    :param name: name of app to delete
+    :type name: str
+    """
+    resource_delete(name)

cgc/commands/debug/debug_cmd.py

@@ -5,7 +5,7 @@ from cgc.commands.auth.auth_utils import (
 from cgc.utils.click_group import CustomCommand, CustomGroup
 
 
-@click.group("debug", cls=CustomGroup)
+@click.group("debug", cls=CustomGroup, hidden=True)
 def debug_group():
     """
     Debug commands for testing.