cgcsdk 1.0.11__py3-none-any.whl → 1.0.13__py3-none-any.whl

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

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

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

cgc/commands/{billing → 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):

cgc/commands/{billing → 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,

cgc/commands/{billing → 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,

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(

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)

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
 

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,

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

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
 

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

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.dist-info → cgcsdk-1.0.13.dist-info}/METADATA

@@ -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.dist-info → cgcsdk-1.0.13.dist-info}/RECORD

@@ -1,7 +1,7 @@
-cgc/.env,sha256=GAb-EBVNtzC-cmDEt71iK-qpPKlXSIBqT5k7X5B5Z10,210
-cgc/CHANGELOG.md,sha256=bw-rz1Rg1uhYUqYVW1Oi2ztI5FPCv0ETJVH8rUAuKDQ,8626
+cgc/.env,sha256=qjUqdM59LavIOj9PI4Yp6IY-GenzQ-GjKMoSsbzSbAY,210
+cgc/CHANGELOG.md,sha256=EGVriqZcu86Vjgk7htQNlJybvKrs5mf-dtjFerLcqWk,8880
 cgc/__init__.py,sha256=d03Xv8Pw4ktNyUHfmicP6XfxYPXnVYLaCZPyUlg_RNQ,326
-cgc/cgc.py,sha256=SaZIGvZpA25OBx2KnQlZVjWNY2ejCyPU5KEkwqh7sh0,1655
+cgc/cgc.py,sha256=3I_Ef0ggX9caaJKJkhfGYSe8XwkHzSWxwGAClMHDnUs,1663
 cgc/config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/cgc_cmd.py,sha256=QwqjZl9FmAMOvuUQMJm-wOV88OxbdwK5UIS0zkg-mAo,4956
@@ -13,15 +13,15 @@ cgc/commands/auth/__init__.py,sha256=JnqNezSEUEVVPQIymya4llXr8LIug2vymQSAGBr4Ovg
 cgc/commands/auth/auth_cmd.py,sha256=FiRM16RGtP1zoJ9InbFAa-3W-EkJQbzBDxF0AmZa1JA,4196
 cgc/commands/auth/auth_responses.py,sha256=oZ1aC7tyrT43imF2iMaL0u1jTJzuGLEmCN8RBeMxpf4,1959
 cgc/commands/auth/auth_utils.py,sha256=-diCsKuF5UcQZoq962RuLktrG6sRmipJrDkm9Sf3wbg,5507
-cgc/commands/billing/__init__.py,sha256=0arQm0R3Ouw7tXPooJsvWd_pGeHhzaVwQCbWMKQPT9A,753
-cgc/commands/billing/billing_cmd.py,sha256=T1E5WW5Z-RlzddaotimTuvLvIbGihNpStIBETnlUznM,4140
-cgc/commands/billing/billing_responses.py,sha256=HAD5N-Odx3Jz1OmhO4v66rHoXpTYIOGlXDsrs0da9dk,1949
-cgc/commands/billing/billing_utils.py,sha256=zXLbBBcWeOgur-r0OKiIjaKeaxMNxASXWzCTeTsyC6o,4711
 cgc/commands/compute/__init__.py,sha256=lCdLfZ0ECSHtXEUSwq5YRHH85yXHchSsz8ZJvmClPtI,239
 cgc/commands/compute/compute_cmd.py,sha256=eXKeoOV3DsOypuxzKMa3MpITOKKbF2cZjy30iofHHG8,15489
 cgc/commands/compute/compute_models.py,sha256=yse6mCEhhE2RdWIO7EHx4r5Y-350gWWy4UWFsdltNNg,778
 cgc/commands/compute/compute_responses.py,sha256=DnRIZC_F1ZE887fMOXXYGYuYmB9n5x63sf8Ga_TL4Ww,5806
 cgc/commands/compute/compute_utils.py,sha256=XXnd_EuF9vCmW14r0ThlN98ScKSx3KAeqFbWy2g2mlk,8812
+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/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/commands/db/db_cmd.py,sha256=4iamsHTy68YjrKztyRGz2PqQgo54Q_rURgm2zpp_hL8,3512
 cgc/commands/db/db_models.py,sha256=oJUAF23nb_r8fSyhLHMJrRbRzLY_vpJQu6Vy4WRa0cg,1036
@@ -45,9 +45,9 @@ cgc/commands/user/secret_responses.py,sha256=sg7HP5a0LnUvlo9w8oOcYASwI2cPeRnecjT
 cgc/commands/user/secret_utils.py,sha256=70dn937rzecQ0eE-8zb9fLnBDWtjWjdQY1LJvHv3NzM,1623
 cgc/commands/volume/__init__.py,sha256=Ou3kyb72aaXkrVCfQCVdniA65R2xHsRFgebooG1gflA,384
 cgc/commands/volume/data_model.py,sha256=meprXdaXLo3mMTZta1ks1-BJ7G0rO16qi_ycH-sXJpY,1295
-cgc/commands/volume/volume_cmd.py,sha256=5bd0vq5--Y7IfniO33tGBYH0Z67Le2s_AMTiwJcPBA4,7673
-cgc/commands/volume/volume_responses.py,sha256=WefUohXxXZ9Znfc6P2XjoAM2RlA19hMKcVaW-xG9HWs,3199
-cgc/commands/volume/volume_utils.py,sha256=n6s0FgpsYyxFMp_JdMRCzRi5Ar3_Svg9JDvWSdX4lhk,1919
+cgc/commands/volume/volume_cmd.py,sha256=swT-U7zUGjXsItK-Esl7XUKtvOCHulLykJR0w15StJc,7673
+cgc/commands/volume/volume_responses.py,sha256=PqYe5HVbClkCMIuXWn_FDvPUNxsJW8M_hFIB0lf40bo,3213
+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
 cgc/sdk/job.py,sha256=q9Vsarc3rKzurM4AOmbQDsQUVdyRqx0UzJVe_uO8xCU,5318
@@ -56,7 +56,7 @@ cgc/sdk/resource.py,sha256=w8SVRqrx0Mj1FS91Bt0oaMAfC4CDEcomgqzFCNgGaPc,13537
 cgc/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/telemetry/basic.py,sha256=XagCcyH4QSEPmfiQ1WCjqXslnJO6IaJCY0AMPySd5rc,3175
 cgc/tests/__init__.py,sha256=8aI3MVpkzaj0_UX02kZCtY5vmGO0rnq0mw2H04-OHf8,102743
-cgc/tests/responses_tests.py,sha256=TtTwMZFo-nqJ-gHRmObYZsVKFdaEpT0JovMynmcxxfQ,9180
+cgc/tests/responses_tests.py,sha256=9vLOaUICeUXoDObeFwuu0FBTmC-hnJNZfzvolT96dGM,9188
 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
@@ -65,16 +65,16 @@ cgc/tests/desired_responses/test_compute_list.txt,sha256=3CDAuILJdwBmX6-GLj3zDbn
 cgc/tests/desired_responses/test_compute_list_no_labels.txt,sha256=-OeQIaEHHsHZ81tCOI5j6VQYUMlj8VYcyyOU_DhPOpU,155
 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=o3YYCh02WiAvmHw-8Hy3FJA4LjGWwPkaLTur6tEvsbE,3669
+cgc/utils/__init__.py,sha256=JOvbqyGdFtswXE1TntOqM7XuIg5-t042WzAzvmX7Xtk,3661
 cgc/utils/click_group.py,sha256=Scfw8eMIyt2dE1ezUq2JuiI-E_LklqXQXJEr7L-EG6A,633
-cgc/utils/config_utils.py,sha256=p1zVOsjRzci8xHOd5NHk8SrEFVHS2prkdqwvTdM73hk,3083
+cgc/utils/config_utils.py,sha256=-DkUBncq_nTUIbxnF9vTiibZHgJ6Beomzk7fg7zQJVA,3465
 cgc/utils/custom_exceptions.py,sha256=qvHdzaunZswZgN96iOHZIfLjehlJ79mcjqoMoW-tqEM,2628
 cgc/utils/message_utils.py,sha256=FAiUC-0zJiMhfPQAQC0ki1ZUs1vI_QqHwLmfoCDbLeU,1790
 cgc/utils/prepare_headers.py,sha256=67YMPogNoGbKnHQmGFc3iJCbsDZbRVjAIe3kBY-Dq98,2838
-cgc/utils/requests_helper.py,sha256=qhSTfOb0o-luHLAeIuiHTOl0R_ykkdQldQZz3D6Sr6s,2062
+cgc/utils/requests_helper.py,sha256=vM1b3sBF56HhiowrRFo6piEZ8lFbFSD9ZUF93OMFaYE,2104
 cgc/utils/response_utils.py,sha256=9vJqAt2UFJ1n-oesFPe6CB_ooGoStjl-twY_31Jt4_I,7374
 cgc/utils/update.py,sha256=AsQwhcBqsjgNPKn6AN6ojt0Ew5otvJXyshys6bjr7DQ,413
-cgc/utils/version_control.py,sha256=VsqNzNYWDvU3VsoPuYIaZV7Img-K2_DmEOHd7rZlRxk,3267
+cgc/utils/version_control.py,sha256=PeoLhA3045dZofFh5yvcqGt1NAVnRaZ_AK-e-HpGd7o,3468
 cgc/utils/consts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cgc/utils/consts/env_consts.py,sha256=8huPDBkbNEXoPHskFhYwiRi6TTw0_e9ylClpgh1NF2E,1290
 cgc/utils/consts/message_consts.py,sha256=8CIe3N_HL6Pj-gSArkPkpegsvm-QMWxqqnSgtzG08Qw,1218
@@ -82,9 +82,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.0.11.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cgcsdk-1.0.11.dist-info/METADATA,sha256=eHHp9OBhlNmUQN5v0I2IaqkkrDV5Y0X9GwCiLEim92s,3058
-cgcsdk-1.0.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cgcsdk-1.0.11.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
-cgcsdk-1.0.11.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
-cgcsdk-1.0.11.dist-info/RECORD,,
+cgcsdk-1.0.13.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cgcsdk-1.0.13.dist-info/METADATA,sha256=xxo5AMMCHkob54TrssRPxCEaHHZW2C-J9qBqgTDwBtk,3091
+cgcsdk-1.0.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cgcsdk-1.0.13.dist-info/entry_points.txt,sha256=bdfIHeJ6Y-BBr5yupCVoK7SUrJj1yNdew8OtIOg_3No,36
+cgcsdk-1.0.13.dist-info/top_level.txt,sha256=nqW9tqcIcCXFigQT69AuOk7XHKc4pCuv4HGJQGXb6iA,12
+cgcsdk-1.0.13.dist-info/RECORD,,