ciocore 8.0.1__py2.py3-none-any.whl → 8.1.0b3__py2.py3-none-any.whl

ciocore/package_tree.py

@@ -14,6 +14,7 @@ The only functions you should need from this module are:
 
 import copy
 import json
+import re
 
 WINDOWS = "windows"
 LINUX = "linux"
@@ -382,15 +383,11 @@ def _find_by_path(tree, path):
     finds a matching package, we use that package as the root of the tree for the next search. As we
     are searching for an exact path match, we limit the search to one level deep each time.
     """
-
-    if not path:
-        return None
-
-
     result = None
-    for name in [p for p in path.split("/") if p]:
-        tree = _find_by_name(tree, name, 1)
-        result = tree
+    if path:
+        for name in [p for p in re.split(r'[\/|]', path) if p]:
+            tree = _find_by_name(tree, name, 1)
+            result = tree
     return result
 
 

{ciocore-8.0.1.dist-info → ciocore-8.1.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.0.1
+Version: 8.1.0b3
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -9,7 +9,6 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
 Description-Content-Type: text/markdown
-Requires-Dist: requests[use_chardet_on_py3] ==2.28.1
 Requires-Dist: pyjwt ==1.7.1
 Requires-Dist: future >=0.18.2
 Requires-Dist: cioseq <1.0.0,>=0.4.1
@@ -51,6 +50,13 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Changelog
 
+## Unreleased: 
+
+*  8.1.0-beta.2 
+   *  Allow bar and fw slash as separators for package paths
+   *  Adds a get_account_data method to the Python API so we can provide account ID in requests
+   *  Remove chardet from requirements as it caused conflicts
+ 
 ## Version:8.0.1 -- 22 Apr 2024
 
 * The uploader now sends all error messages to the dashboard - not just the first error.

{ciocore-8.0.1.dist-info → ciocore-8.1.0b3.dist-info}/RECORD

@@ -1,20 +1,20 @@
-ciocore/VERSION,sha256=NUqt24vsbMosc7cU07CLlLBV2gAdKgs8roFBqy0xjlA,5
+ciocore/VERSION,sha256=2DRqOK9nMlSC11Nee86uSKsieXWZ1KvFlSNzs6gNdTs,12
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=TyHXGmK4uTmKV93O_IpAvttZhbexIIZTGP-IVn_WyWM,24599
+ciocore/api_client.py,sha256=LvxG1EfUte3NjLiuVqFUwP2iBRaUdaNSKt4wMu9Bajs,33508
 ciocore/cli.py,sha256=jZ1lOKQiUcrMhsVmD9SVmPMFwHtgDF4SaoAf2-PBS54,15449
 ciocore/client_db.py,sha256=tTz3bl2xeDPPcYSDS3g3QgV_xYihJMx0Kj6OeN2klK0,12978
 ciocore/common.py,sha256=mBIS6KiYoQsjWe6aIFUGRRvCMl8BIN2kmLZ4J8icap8,14982
 ciocore/compat.py,sha256=5uEXPSog_jxsDMaHBswAKEtfyXT25VgU6WNGIhz9PHU,256
 ciocore/conductor_submit.py,sha256=ONE0LsA5hGavTJIOXXYx8qzl8_vBPADwhd6Ytq_0E0c,9382
 ciocore/config.py,sha256=rCL7kaFn1tYgSglN8q9Wx6SwMpoXTq0BMQGwPRVwVIg,8973
-ciocore/data.py,sha256=Ji0qUk8nJXBNakoHSqBiVx8O58SbZXyt273SHlEDn3U,7027
+ciocore/data.py,sha256=_FD0sZLvLrJUXo03as3cb1RsHihL95jDCDz3MoyvNvQ,7315
 ciocore/exceptions.py,sha256=4Oq-WX-qiN6kPUdBCHvvd6mtSQ0nCkDbJxWt2CNtpv8,1504
 ciocore/file_utils.py,sha256=swA7th9WhDEloW69YViRTKB-oeC9UmNdEGegfH1r-Gw,17176
 ciocore/hardware_set.py,sha256=FlRQiGCLRcSW7Oko_gzgVK8ZqJ_J92eT8e_AleAbS2E,17047
 ciocore/loggeria.py,sha256=2xdQRFb9NyXynU2O_pSOszJWcpoHgPwTUWJvERg7ODY,15251
 ciocore/package_environment.py,sha256=MEHV7jfs3NJIEYCIaW8JfJdBmelvPHZMmBzPlXETiRo,7808
 ciocore/package_query.py,sha256=2m5EBXfu1lmqupZrFF8f8mfkX_PgijpdMxCtFI5e5s0,5574
-ciocore/package_tree.py,sha256=vkORKXxQ7dO8l0_96eFwm-5AUVL0rP9bhgWYhW_v3lo,15649
+ciocore/package_tree.py,sha256=r_UBxV5sVthdrFEGOkJlM-8ktKakkwsq_y9aBMz1ti4,15653
 ciocore/post_install.py,sha256=zu5Ctz2ANbKD-f5G2ODLIhKkWENBi4F3UKKu50OEWrg,1000
 ciocore/retry.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ciocore/validator.py,sha256=f_K7gxz122W_i5AxVx6dKhckOygl8TnmQiVj7tyX5zw,2344
@@ -24,13 +24,13 @@ ciocore/auth/server.py,sha256=8btX9-EokUl6q55V8muDmEV2tvvbTBD0BHeWFbwkzUc,3892
 ciocore/docsite/404.html,sha256=zUCnDe9r5yFZh8MXcTmzDaFyYBuRHz1gvuyJS2rYiTI,17207
 ciocore/docsite/index.html,sha256=xz215H_KHWBYI1HT7IRpAZ4d1ptUiO8Y4DlOmbEPgPk,20945
 ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
-ciocore/docsite/objects.inv,sha256=s2FKStLlVIQbfG7U2-nw-7rz4unvd1W0u00YtLBxAKo,758
+ciocore/docsite/objects.inv,sha256=la6BNz_7lZoDCr3Nin1oAB7Y7DvIy4ZOKUvR-9hfwko,785
 ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
-ciocore/docsite/sitemap.xml.gz,sha256=mBXMN84utPFOOhXBKJnq47kV3Zp6NvUz5Xxy7lDOxq8,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=0AdyUY-LmL5ZqUeqxIjjzmoZDbupNcImCWf7RFeO5-o,170218
+ciocore/docsite/sitemap.xml.gz,sha256=em4iu7zKmOkZgFbmMbI_E6t_BlR_viXFUAOuB44IrWY,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=qXLzKggMPnORGOzywLCYVD2Lre1M_3y3dli8fdj3ulo,193119
 ciocore/docsite/apidoc/apidoc/index.html,sha256=KGsHBY6GBF380w338GfOIMWnwAyyLvw2i1RQFORdwlE,26171
 ciocore/docsite/apidoc/config/index.html,sha256=n3koKPRUza5-uHUt8hK8H8XyH6HG_U2CsGobdaN4KfY,72559
-ciocore/docsite/apidoc/data/index.html,sha256=QhqiXUd_3qk_jGRYB5JiqlJTem8Jg7aKa5mPPDT1978,50850
+ciocore/docsite/apidoc/data/index.html,sha256=cXDztSoMYKeHP5cz370AoyMjKOH-gmF6oYCZk0psNGY,51962
 ciocore/docsite/apidoc/hardware_set/index.html,sha256=4GEBYy5uLVlJqvdG71RdyrN7sKKuxszxipgmRi_NCbM,123042
 ciocore/docsite/apidoc/package_environment/index.html,sha256=1d4hVlBXPy4bldkBH1GsRjVd-bxdYANmB-Mg7xIAC_4,69248
 ciocore/docsite/apidoc/package_tree/index.html,sha256=7GaOHXeM_oKH8Db25f2-h5kUI1R6pcp0bXxW1COCJxs,109393
@@ -81,7 +81,7 @@ ciocore/docsite/cmdline/downloader/index.html,sha256=917XE3waukGnIXI9qxl0zYEf3vH
 ciocore/docsite/cmdline/packages/index.html,sha256=Ssb2R7eSubBNR824oc3jjhJfrG3JKOPojA-uiAczgeQ,20923
 ciocore/docsite/cmdline/uploader/index.html,sha256=TtLbHNlu4ofZ4bQBqam87RelWdHnVDSL7_rw_YqBbC8,25123
 ciocore/docsite/how-to-guides/index.html,sha256=rF-DMyk4k_jGUJRF3dKtMMiOgXS8OvBqAn-zxWy3AGs,20100
-ciocore/docsite/search/search_index.json,sha256=ZMAbHLAlwOTujgA32XJTA7SHogRYh9i-ioPFOxjjJ0s,182633
+ciocore/docsite/search/search_index.json,sha256=PZRdMiiSfYE_yytH50tR7cYO1CRmlknnrbM2BFDl2Oc,190641
 ciocore/docsite/stylesheets/extra.css,sha256=_Cxe9Dhg1BBi6Kqaz_iZD9z9VyqxA9vtONRjP4PVic0,354
 ciocore/docsite/stylesheets/tables.css,sha256=LE_zwGRxGcdPIy-9QiVPecOzlEBSqZb_WP5vDkFE0ZM,3235
 ciocore/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +103,7 @@ tests/extra_env_fixtures.py,sha256=8qvU4d8SXGKzRVNR5whVqKCQOwOVMiFVfbKBAjxa2gE,1
 tests/instance_type_fixtures.py,sha256=uIzQduqKQVgjllMuyXaYnRC-pwqk5lnTx3NY2M5Nujo,4320
 tests/package_fixtures.py,sha256=CsJnhB7oYzIxJH7b1tCOPyvnnVSCqEbSPhtCnsHL-nA,5070
 tests/project_fixtures.py,sha256=iBm_th_JtAw76vlNu7Jjhh9tLH4oOaNi-MgtPzCV7yQ,138
-tests/test_api_client.py,sha256=tnYkIYvDILGJRatZM0nrtr83x8yBJstMP0Rt151U2gI,6757
+tests/test_api_client.py,sha256=qQATQRBBUYr0G2deZHeCflNvvPo36CJyn_5xS29YPUA,16244
 tests/test_base_downloader.py,sha256=SS7tWKv2ZZhpUDk4UCg1TkrNrpntjSewgzLl1mEubSE,3603
 tests/test_cli.py,sha256=_WTs2SWlEgd6wtg1hmOBlFnbWVdFLvqp0KqNhy-y2e8,5532
 tests/test_common.py,sha256=tY_-SY-JmJX09UehFs9RIDqZ785AmhfTl6eVKJeIUFY,763
@@ -120,8 +120,8 @@ tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
 tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
 tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
-ciocore-8.0.1.dist-info/METADATA,sha256=798KBccoox0YMHAcd09zV7pIzVkXN_GNoBWhckmK4D4,18440
-ciocore-8.0.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-ciocore-8.0.1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.0.1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.0.1.dist-info/RECORD,,
+ciocore-8.1.0b3.dist-info/METADATA,sha256=2xTpGaHNdwWS50Z-TLAAokcROv9uxcY2Y_DD4-YwPKM,18644
+ciocore-8.1.0b3.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+ciocore-8.1.0b3.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.1.0b3.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.1.0b3.dist-info/RECORD,,

tests/test_api_client.py

@@ -2,9 +2,11 @@
 
    isort:skip_file
 """
+import datetime
+import json
 import sys
 import unittest
-import json
+
 try:
     from unittest import mock
 except ImportError:
@@ -12,7 +14,11 @@ except ImportError:
 
 from ciocore import api_client
 
-from ciocore.api_client import request_extra_environment
+
+from ciocore.api_client import _get_compute_usage, get_compute_usage
+from ciocore.api_client import _get_storage_usage, get_storage_usage
+from ciocore.api_client import request_extra_environment, get_account_data
+ 
 
 class ApiClientTest(unittest.TestCase):
     @staticmethod
@@ -164,3 +170,212 @@ class TestRequestExtraEnvironment(unittest.TestCase):
 
         self.assertEqual("Error: Could not get account environment!", str(context.exception))
         mock_ApiClient.assert_called_once()
+
+class TestGetComputeUsage(unittest.TestCase):
+
+    def setUp(self):
+        
+        # Precison is rounded to 4 places to avoid FP issues.
+        self.compute_response_data = {
+            "data": [
+                {
+                    "cores": 0.5, 
+                    "instance_cost": 0.0200, 
+                    "license_cost": 0.0200, 
+                    "minutes": 6.9700, 
+                    "self_link": 0, 
+                    "start_time": "Tue, 09 Jan 2024 18:00:00 GMT"
+                }, 
+                {
+                    "cores": 0.4, 
+                    "instance_cost": 0.0200, 
+                    "license_cost": 0.0200, 
+                    "minutes": 6.9600, 
+                    "self_link": 1, 
+                    "start_time": "Tue, 09 Jan 2024 19:00:00 GMT"
+                }, 
+                {
+                    "cores": 0.9613, 
+                    "instance_cost": 0.0400, 
+                    "license_cost": 0.0800, 
+                    "minutes": 7.2100, 
+                    "self_link": 2, 
+                    "start_time": "Tue, 16 Jan 2024 17:00:00 GMT"
+                }, 
+            ]
+        }
+     
+        self.response_ok = mock.MagicMock(status_code=200, text=json.dumps(self.compute_response_data))
+        self.response_error = mock.MagicMock(status_code=500, text=json.dumps({"error": "Internal Server Error"}))
+
+    @mock.patch("ciocore.api_client.ApiClient")
+    @mock.patch("ciocore.api_client.read_conductor_credentials")
+    @mock.patch("ciocore.api_client.account_id_from_jwt")
+    def test_query_raw_compute_usage(self, mock_account_id_from_jwt, mock_read_conductor_credentials, mock_ApiClient):
+        # Set up mocks for successful execution
+        mock_read_conductor_credentials.return_value = "valid_token"
+        mock_account_id_from_jwt.return_value = "123"
+        mock_api_instance = mock_ApiClient.return_value
+        mock_api_instance.make_request.return_value = (self.response_ok.text, self.response_ok.status_code)
+
+        start_time = datetime.datetime(2024, 1, 1)
+        end_time = datetime.datetime(2024, 3, 20)
+
+        result = _get_compute_usage(start_time, end_time)
+
+        self.assertEqual(result, self.compute_response_data['data'])
+        
+    @mock.patch("ciocore.api_client.ApiClient")
+    @mock.patch("ciocore.api_client.read_conductor_credentials")
+    @mock.patch("ciocore.api_client.account_id_from_jwt")
+    def test_compute_usage(self, mock_account_id_from_jwt, mock_read_conductor_credentials, mock_ApiClient):
+        # Set up mocks for successful execution
+        mock_read_conductor_credentials.return_value = "valid_token"
+        mock_account_id_from_jwt.return_value = "123"
+        mock_api_instance = mock_ApiClient.return_value
+        mock_api_instance.make_request.return_value = (self.response_ok.text, self.response_ok.status_code)
+
+        start_time = datetime.datetime(2024, 1, 1)
+        end_time = datetime.datetime(2024, 3, 20)
+
+        result = get_compute_usage(start_time=start_time, end_time=end_time)
+
+        self.assertEqual(result, {  '2024-01-09': {'cost': 0.08,
+                                                 'corehours': 0.9, 
+                                                 'walltime': 13.93},
+                                    '2024-01-16': { 'cost': 0.12,
+                                                    'corehours': 0.9613, 
+                                                    'walltime': 7.21}})
+        
+    @mock.patch("ciocore.api_client.ApiClient")
+    def test_get_compute_usage_api_failure(self, mock_ApiClient):
+        # Set up mock for API failure
+        mock_api_instance = mock_ApiClient.return_value
+        mock_api_instance.make_request.return_value = (self.response_error.text, self.response_error.status_code)
+
+        start_time = datetime.datetime(2024, 1, 1)
+        end_time = datetime.datetime(2024, 3, 20)
+        
+        # Assert exception raised when the API call fails
+        with self.assertRaises(Exception) as context:
+            get_compute_usage(start_time, end_time)
+
+        self.assertIn('Failed to query compute usage', str(context.exception))
+        mock_ApiClient.assert_called_once()    
+class TestGetStorageUsage(unittest.TestCase):
+
+    def setUp(self):
+               
+        self.storage_response_data = {
+            "data": [
+                {
+                "cost": "28.96", 
+                "cost_per_day": [
+                    4.022,
+                    4.502, 
+                    4.502, 
+                    5.102, 
+                    5.102, 
+                    5.732
+                ], 
+                "currency": "USD", 
+                "daily_price": "0.006", 
+                "end_date": "2024-01-07", 
+                "gibs_per_day": [
+                    679.714,
+                    750.34, 
+                    750.34, 
+                    850.36, 
+                    850.35, 
+                    955.32
+                ], 
+                "gibs_used": "806.07", 
+                "monthly_price": "0.18", 
+                "start_date": "2024-01-01", 
+                "storage_unit": "GiB"
+                }
+            ]
+            }
+        
+        self.response_ok = mock.MagicMock(status_code=200, text=json.dumps(self.storage_response_data))
+        self.response_error = mock.MagicMock(status_code=500, text=json.dumps({"error": "Internal Server Error"}))
+        
+    @mock.patch("ciocore.api_client.ApiClient")
+    @mock.patch("ciocore.api_client.read_conductor_credentials")
+    @mock.patch("ciocore.api_client.account_id_from_jwt")
+    def test_query_raw_storage_usage(self, mock_account_id_from_jwt, mock_read_conductor_credentials, mock_ApiClient):
+        # Set up mocks for successful execution
+        mock_read_conductor_credentials.return_value = "valid_token"
+        mock_account_id_from_jwt.return_value = "123"
+        mock_api_instance = mock_ApiClient.return_value
+        mock_api_instance.make_request.return_value = (self.response_ok.text, self.response_ok.status_code)
+
+        start_time = datetime.datetime(2024, 5, 1)
+        end_time = datetime.datetime(2024, 5, 17)
+
+        result = _get_storage_usage(start_time, end_time)
+
+        self.assertEqual(result, self.storage_response_data['data'][0])
+
+    @mock.patch("ciocore.api_client.ApiClient")
+    @mock.patch("ciocore.api_client.read_conductor_credentials")
+    @mock.patch("ciocore.api_client.account_id_from_jwt")
+    def test_storage_usage(self, mock_account_id_from_jwt, mock_read_conductor_credentials, mock_ApiClient):
+        # Set up mocks for successful execution
+        mock_read_conductor_credentials.return_value = "valid_token"
+        mock_account_id_from_jwt.return_value = "123"
+        mock_api_instance = mock_ApiClient.return_value
+        mock_api_instance.make_request.return_value = (self.response_ok.text, self.response_ok.status_code)
+
+        start_time = datetime.datetime(2024, 1, 1)
+        end_time = datetime.datetime(2024, 1, 7)
+
+        result = get_storage_usage(start_time=start_time, end_time=end_time)
+        
+        self.assertEqual(result, {  '2024-01-01': {'cost': 4.022, 'GiB': 679.714},
+                                    '2024-01-02': {'cost': 4.502, 'GiB': 750.34},
+                                    '2024-01-03': {'cost': 4.502, 'GiB': 750.34},
+                                    '2024-01-04': {'cost': 5.102, 'GiB': 850.36},
+                                    '2024-01-05': {'cost': 5.102, 'GiB': 850.35},
+                                    '2024-01-06': {'cost': 5.732, 'GiB': 955.32}
+                                  })
+
+class TestGetAccountData(unittest.TestCase):
+
+    @mock.patch('ciocore.api_client.read_conductor_credentials')
+    @mock.patch('ciocore.api_client.jwt.decode')
+    def test_get_account_data_success(self, mock_decode, mock_read_credentials):
+        # Setup the mocks
+        mock_token = 'mocked_token'
+        mock_read_credentials.return_value = mock_token
+        mock_payload = {
+            "email": "user@example.com",
+            "aud": "com.domain",
+            "account": "123456",
+            "id": "user_id",
+            "role": 0,
+            "iat": 1609459200,  # 2021-01-01 00:00:00 UTC
+            "exp": 1612137600,  # 2021-02-01 00:00:00 UTC
+        }
+        mock_decode.return_value = mock_payload
+
+        account_data = get_account_data()
+
+        # Assertions
+        self.assertIsNotNone(account_data)
+        self.assertEqual(account_data['email'], mock_payload['email'])
+        self.assertEqual(account_data['domain'], 'domain')
+        self.assertEqual(account_data['account_id'], mock_payload['account'])
+        self.assertEqual(account_data['user_id'], mock_payload['id'])
+        self.assertEqual(account_data['role'], mock_payload['role'])
+        self.assertEqual(account_data['issued'], datetime.datetime.fromtimestamp(mock_payload['iat']))
+        self.assertEqual(account_data['expiry'], datetime.datetime.fromtimestamp(mock_payload['exp']))
+        self.assertEqual(account_data['token'], mock_token)
+
+    @mock.patch('ciocore.api_client.read_conductor_credentials')
+    def test_get_account_data_no_token(self, mock_read_credentials):
+        mock_read_credentials.return_value = None
+
+        # Call it
+        account_data = get_account_data()
+        self.assertIsNone(account_data)