cgcsdk 1.0.11__tar.gz → 1.0.13__tar.gz

{cgcsdk-1.0.11/cgcsdk.egg-info → cgcsdk-1.0.13}/PKG-INFO

@@ -1,24 +1,25 @@
 Metadata-Version: 2.1
 Name: cgcsdk
-Version: 1.0.11
+Version: 1.0.13
 Summary: Comtegra GPU Cloud REST API client
+Home-page: https://git.comtegra.pl/
 Author: Comtegra AI Team
 Author-email: ai@comtegra.pl
 License: BSD 2-clause
-Project-URL: Documentation, https://example.com/documentation/
-Project-URL: GitHub, https://github.com/foobar/foobar/
-Project-URL: Changelog, https://github.com/foobar/foobar/blob/master/CHANGELOG.md
+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
 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.4
-Classifier: Programming Language :: Python :: 3.5
 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
 License-File: LICENSE
 Requires-Dist: click

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/.env

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

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 1.0.13
+
+Release on June 05, 2024
+
+* increase volume create size to 4 TB (4096 GB)
+* cgc volume list now shows which disk type is used for the volume
+
+## 1.0.12
+
+Release on May 09, 2024
+
+* hotfix: allow secret upper cased, during registration process
+
 ## 1.0.11
 
 Release on April 25, 2024

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/cgc.py

@@ -1,7 +1,7 @@
 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.compute.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.jobs.jobs_cmd import job_group

{cgcsdk-1.0.11/cgc/commands → cgcsdk-1.0.13/cgc/commands/compute}/billing/__init__.py

@@ -7,7 +7,7 @@ class BillingCommandException(ResponseException):
 
 class NoCostsFound(BillingCommandException):
     def __init__(self) -> None:
-        super().__init__(f"No costs found in your namespace for current month.")
+        super().__init__("No costs found in your namespace for current month.")
 
 
 class NoInvoiceFoundForSelectedMonth(BillingCommandException):

{cgcsdk-1.0.11/cgc/commands → cgcsdk-1.0.13/cgc/commands/compute}/billing/billing_cmd.py

@@ -2,8 +2,8 @@ import click
 
 from datetime import datetime
 
-from cgc.commands.billing.billing_utils import verify_input_datetime
-from cgc.commands.billing.billing_responses import (
+from cgc.commands.compute.billing.billing_utils import verify_input_datetime
+from cgc.commands.compute.billing.billing_responses import (
     billing_status_response,
     billing_invoice_response,
     stop_events_resource_response,

{cgcsdk-1.0.11/cgc/commands → cgcsdk-1.0.13/cgc/commands/compute}/billing/billing_responses.py

@@ -1,11 +1,11 @@
 import calendar
-from cgc.commands.billing import (
+from cgc.commands.compute.billing import (
     NoCostsFound,
     NoInvoiceFoundForSelectedMonth,
     NoResourceStopEvents,
     NoVolumeStopEvents,
 )
-from cgc.commands.billing.billing_utils import (
+from cgc.commands.compute.billing.billing_utils import (
     get_billing_status_message,
     get_table_compute_stop_events_message,
     get_table_volume_stop_events_message,

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/commands/volume/volume_cmd.py

@@ -54,7 +54,7 @@ def volume_list():
     "--size",
     "size",
     help="Volume size in GiB",
-    type=click.IntRange(1, 1000),
+    type=click.IntRange(1, 4000),
     required=True,
 )
 @click.option(

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/commands/volume/volume_responses.py

@@ -26,7 +26,7 @@ def volume_list_response(data: dict) -> str:
     volume_list_to_print, total_size = get_formatted_volume_list_and_total_size(
         list_of_volumes
     )
-    list_headers = ["name", "used", "size", "type", "mounted to"]
+    list_headers = ["name", "used", "size", "type", "disks type", "mounted to"]
 
     setup_gauge(f"{get_namespace()}.volume.count", len(list_of_volumes))
     setup_gauge(f"{get_namespace()}.volume.totalSizeAccumulated", total_size)

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/commands/volume/volume_utils.py

@@ -12,12 +12,13 @@ def get_formatted_volume_list_and_total_size(list_of_volumes: list):
         name = volume["name"]
         used = volume["used"]
         size = volume["size"]
+        disks_type = volume["disks_type"]
         access_types = ", ".join(volume["access_types"])
         mounts = volume["mounted_to"]
         mounts[:] = [s.rsplit("-", 2)[0] for s in mounts]
         all_mounted_to = ", ".join(mounts)
         total_size += int("".join(filter(str.isdigit, size)))
-        row_list = [name, used, size, access_types, all_mounted_to]
+        row_list = [name, used, size, access_types, disks_type, all_mounted_to]
         list_to_print.append(row_list)
     return list_to_print, total_size
 

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/tests/responses_tests.py

@@ -17,7 +17,7 @@ from cgc.commands.compute.compute_responses import (
     template_list_response,
     template_get_start_path_response,
 )
-from cgc.commands.billing.billing_responses import (
+from cgc.commands.compute.billing.billing_responses import (
     billing_status_response,
     billing_invoice_response,
     stop_events_resource_response,

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/utils/__init__.py

@@ -22,7 +22,7 @@ def require_confirm_loop(message: str):
 
 def require_answer_loop(message: str, default: str):
     while True:
-        answer = input(f"{message}: [{default}]").lower()
+        answer = input(f"{message}: [{default}]")
         if answer == "":
             return default
         return answer

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/utils/config_utils.py

@@ -55,6 +55,21 @@ def save_to_config(**kwargs):
         json.dump(final_cfg, f)
 
 
+def is_config_file_present():
+    """Function to check if the config file is present
+
+    :return: True if the config file is present, False otherwise
+    :rtype: bool
+    """
+    try:
+        with open(
+            os.path.join(config_path, get_config_file_name()), "r", encoding="UTF-8"
+        ) as _:
+            return True
+    except FileNotFoundError:
+        return False
+
+
 def read_from_cfg(key: str, filename=None):
     """Function to read a single value from config
 

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/utils/requests_helper.py

@@ -32,12 +32,12 @@ def _process_endpoint_kwargs(**kwargs):
     return kwargs
 
 
-def _call_rest_endpoint(request: EndpointTypes, **kwargs):
+def _call_rest_endpoint(request: EndpointTypes, **kwargs) -> requests.Response:
     kwargs = _process_endpoint_kwargs(**kwargs)
     return request(**kwargs)
 
 
-def _call_rest_ssl_endpoint(request: EndpointTypes, **kwargs):
+def _call_rest_ssl_endpoint(request: EndpointTypes, **kwargs) -> requests.Response:
     kwargs = _process_endpoint_kwargs(**kwargs)
     return request(
         **kwargs, verify=False

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgc/utils/version_control.py

@@ -2,6 +2,7 @@ import os
 import subprocess
 import sys
 import click
+from cgc.utils.config_utils import is_config_file_present
 from cgc.utils.prepare_headers import get_api_url_and_prepare_headers_version_control
 from cgc.utils.message_utils import (
     prepare_error_message,
@@ -15,7 +16,6 @@ from cgc.utils.consts.message_consts import (
 )
 
 from cgc.utils.requests_helper import call_api, EndpointTypes
-from cgc.utils.response_utils import retrieve_and_validate_response_send_metric
 
 
 def get_server_version():
@@ -26,7 +26,14 @@ def get_server_version():
     """
     api_url, headers = get_api_url_and_prepare_headers_version_control()
     __res = call_api(request=EndpointTypes.get, url=api_url, headers=headers)
-    return retrieve_and_validate_response_send_metric(__res, None)
+    try:
+        __res.raise_for_status()
+    except Exception:
+        click.echo(
+            "Your current context server is not available, cannot check server version.",
+            color="yellow",
+        )
+    return __res.json()
 
 
 def print_compare_versions(server_version: str, client_version: str):
@@ -37,6 +44,8 @@ def print_compare_versions(server_version: str, client_version: str):
 @key_error_decorator_for_helpers
 def check_version():
     """Checks if Client version is up to date with Server version."""
+    if not is_config_file_present():
+        return
     data = get_server_version()
     server_release, server_major, server_minor = (
         data["server_version"]["release"],
@@ -48,7 +57,7 @@ def check_version():
     ]  # braking change - 0.9.0, will not work with lower server version
     server_version = f"{server_release}.{server_major}.{server_minor}"
     client_version = f"{RELEASE}.{MAJOR_VERSION}.{MINOR_VERSION}"
-    if server_major > MAJOR_VERSION or server_release > RELEASE:
+    if server_major >= MAJOR_VERSION and server_release > RELEASE:
         click.echo(prepare_error_message(OUTDATED_MAJOR))
         print_compare_versions(server_version, client_version)
         while True:

{cgcsdk-1.0.11 → cgcsdk-1.0.13/cgcsdk.egg-info}/PKG-INFO

@@ -1,24 +1,25 @@
 Metadata-Version: 2.1
 Name: cgcsdk
-Version: 1.0.11
+Version: 1.0.13
 Summary: Comtegra GPU Cloud REST API client
+Home-page: https://git.comtegra.pl/
 Author: Comtegra AI Team
 Author-email: ai@comtegra.pl
 License: BSD 2-clause
-Project-URL: Documentation, https://example.com/documentation/
-Project-URL: GitHub, https://github.com/foobar/foobar/
-Project-URL: Changelog, https://github.com/foobar/foobar/blob/master/CHANGELOG.md
+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
 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.4
-Classifier: Programming Language :: Python :: 3.5
 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
 License-File: LICENSE
 Requires-Dist: click

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/cgcsdk.egg-info/SOURCES.txt

@@ -19,15 +19,15 @@ cgc/commands/auth/__init__.py
 cgc/commands/auth/auth_cmd.py
 cgc/commands/auth/auth_responses.py
 cgc/commands/auth/auth_utils.py
-cgc/commands/billing/__init__.py
-cgc/commands/billing/billing_cmd.py
-cgc/commands/billing/billing_responses.py
-cgc/commands/billing/billing_utils.py
 cgc/commands/compute/__init__.py
 cgc/commands/compute/compute_cmd.py
 cgc/commands/compute/compute_models.py
 cgc/commands/compute/compute_responses.py
 cgc/commands/compute/compute_utils.py
+cgc/commands/compute/billing/__init__.py
+cgc/commands/compute/billing/billing_cmd.py
+cgc/commands/compute/billing/billing_responses.py
+cgc/commands/compute/billing/billing_utils.py
 cgc/commands/db/__init__.py
 cgc/commands/db/db_cmd.py
 cgc/commands/db/db_models.py

{cgcsdk-1.0.11 → cgcsdk-1.0.13}/setup.py

@@ -18,11 +18,11 @@ setup(
     description="Comtegra GPU Cloud REST API client",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    # url="https://github.com/",
+    url="https://git.comtegra.pl/",
     project_urls={
-        "Documentation": "https://example.com/documentation/",
-        "GitHub": "https://github.com/foobar/foobar/",
-        "Changelog": "https://github.com/foobar/foobar/blob/master/CHANGELOG.md",
+        "Documentation": "https://docs.cgc.comtegra.cloud/",
+        "GitHub": "https://git.comtegra.pl/",
+        "Changelog": "https://git.comtegra.pl/foobar/foobar/blob/master/CHANGELOG.md",
     },
     author="Comtegra AI Team",
     author_email="ai@comtegra.pl",
@@ -54,10 +54,10 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "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",
     ],
 )