ciocore 8.2.0b2__py2.py3-none-any.whl → 8.3.0b1__py2.py3-none-any.whl

ciocore/hardware_set.py

@@ -30,12 +30,10 @@ logger = logging.getLogger(__name__)
 
 
 DESCRIPTION_TEMPLATE_OS = {
-    "best-fit": "{operating_system} {description}",
     "cpu": "{operating_system} {cores} core {memory}GB Mem",
     "gpu": "{operating_system} {cores} core {memory}GB Mem ({gpu_count} {gpu_model} GPUs {gpu_memory}GB Mem)",
 }
 DESCRIPTION_TEMPLATE = {
-    "best-fit": "{description}",
     "cpu": "{cores} core {memory}GB Mem",
     "gpu": "{cores} core {memory}GB Mem ({gpu_count} {gpu_model} GPUs {gpu_memory}GB Mem)",
 }
@@ -391,21 +389,19 @@ class HardwareSet(object):
         if dual_platforms:
             for it in instance_types:
                 flat_dict = flatten_dict(it)
-                template_key = "cpu"
-                if it["name"].startswith("best-fit"):
-                    template_key = "best-fit"
-                elif "gpu_count" in flat_dict:
-                    template_key = "gpu"
-                it["description"] = DESCRIPTION_TEMPLATE_OS[template_key].format(**flat_dict)
+                is_gpu = "gpu_count" in flat_dict
+                if is_gpu:
+                    it["description"] = DESCRIPTION_TEMPLATE_OS["gpu"].format(**flat_dict)
+                else:
+                    it["description"] = DESCRIPTION_TEMPLATE_OS["cpu"].format(**flat_dict)
         else:
             for it in instance_types:
                 flat_dict = flatten_dict(it)
-                template_key = "cpu"
-                if it["name"].startswith("best-fit"):
-                    template_key = "best-fit"
-                elif "gpu_count" in flat_dict:
-                    template_key = "gpu"
-                it["description"] = DESCRIPTION_TEMPLATE[template_key].format(**flat_dict)
+                is_gpu = "gpu_count" in flat_dict
+                if is_gpu:
+                    it["description"] = DESCRIPTION_TEMPLATE["gpu"].format(**flat_dict)
+                else:
+                    it["description"] = DESCRIPTION_TEMPLATE["cpu"].format(**flat_dict)
 
         return instance_types
 

{ciocore-8.2.0b2.dist-info → ciocore-8.3.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.2.0b2
+Version: 8.3.0b1
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -53,7 +53,8 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Unreleased: 
 
-* Adds support and updates library tests for the new best fit instance types.
+* 8.3.0-beta.1
+  * Fixes a bug where the uploader would hang if there were no uploads.
 
 ## Version:8.1.0 -- 10 Jun 2024
 

{ciocore-8.2.0b2.dist-info → ciocore-8.3.0b1.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ciocore/VERSION,sha256=2uATqhJYU656qUDoxpBQq7mei0G78f6nBzHrY9j6odk,12
+ciocore/VERSION,sha256=3mUYLmyGL0374GNF_GDf_gUk_KtaMp0-KqahsFaemM0,12
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=GRhnyerDQ90b_qCiBd2zTwtNj7pBAzfOrG8HduJf-Ww,32810
+ciocore/api_client.py,sha256=SBxEwAiwn2XtH7T_ipefUbWhczXjoNdNbQBur1RV-Bw,32810
 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/conductor_submit.py,sha256=bxvzdyNzscAOOOsqTvAYh5DQsTWyCQJNb16Mf-n_F0M,9702
 ciocore/config.py,sha256=rCL7kaFn1tYgSglN8q9Wx6SwMpoXTq0BMQGwPRVwVIg,8973
 ciocore/data.py,sha256=Ji0qUk8nJXBNakoHSqBiVx8O58SbZXyt273SHlEDn3U,7027
 ciocore/exceptions.py,sha256=4Oq-WX-qiN6kPUdBCHvvd6mtSQ0nCkDbJxWt2CNtpv8,1504
 ciocore/file_utils.py,sha256=swA7th9WhDEloW69YViRTKB-oeC9UmNdEGegfH1r-Gw,17176
-ciocore/hardware_set.py,sha256=-Cc8PIShvb5Us8EC5JvRWbaX7NS8CtcjtfbGhGbv9Fk,17211
+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
@@ -26,12 +26,12 @@ ciocore/docsite/index.html,sha256=xz215H_KHWBYI1HT7IRpAZ4d1ptUiO8Y4DlOmbEPgPk,20
 ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
 ciocore/docsite/objects.inv,sha256=XwmLactPEWWC4fAWqHNPBXGsluRxLLTrwDLQqq51ONY,775
 ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
-ciocore/docsite/sitemap.xml.gz,sha256=N659m56MWx060JteLPoWwfaR2O0g178ZdQ-BU87i30E,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=SPB3ox5ht9HPjoTIzIWxa9wKYpmPaQNazDAeAI2Jw-w,188372
+ciocore/docsite/sitemap.xml.gz,sha256=UoThZxwc5AswRffOCwmnivnuvsBJrVhPkT3MoZqOlMg,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=mh9VwU1J3Ks6MWvo5a-PcUt5GYdm8s7KsIVDWfnOeXY,188372
 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/hardware_set/index.html,sha256=t5BOOiE_nSUogdseP2koC1XhxNr8MPi47RFaW1eERrE,123119
+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
 ciocore/docsite/assets/_mkdocstrings.css,sha256=K3bqYEmxlOHQ3-M11JNbBWHCBDBLarkFRm8HuEYrAG4,341
@@ -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=FaOyC5mABlY1sG1h2HKwMQye7SeXmbh560KwHlmd_7k,189181
+ciocore/docsite/search/search_index.json,sha256=vBLU-rkC0pxOPX0O3MNKXRKGfgsaS1-91KsV17Gf9SY,189092
 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
@@ -115,13 +115,13 @@ tests/test_imports_2and3.py,sha256=ehqpRYPVY7djBcb8OT_cnh86iCJJ9wuMWnfSR9RHxmY,5
 tests/test_job_downloader.py,sha256=_dZqyLZhc2Bq2n7-skERfodHx1JgFyHw8TamHp6ID9I,7025
 tests/test_package_environment.py,sha256=CdiC2PDVSnbcwTb4fsDTWqGYSzs1n5ca2KMoyISckGA,5893
 tests/test_package_tree.py,sha256=xCwNwYUmJrfmgCP2FGoHRFG-L0JPy8s4-66icxAls4o,6780
-tests/test_submit.py,sha256=-ORI75pWzFGKUCkqHuPzaMxkK7qGh1zuAOMcTQ6Q1Hk,4940
+tests/test_submit.py,sha256=ppijBcpLXeHUZh7UXyClxLalSV6cTfKb6Ygw5zXQPKo,5836
 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.2.0b2.dist-info/METADATA,sha256=L6jwFYYGCnJE3D-_PCOZ2wAQNpd3au0ojAMwOYgW1d0,18662
-ciocore-8.2.0b2.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-ciocore-8.2.0b2.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.2.0b2.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.2.0b2.dist-info/RECORD,,
+ciocore-8.3.0b1.dist-info/METADATA,sha256=ytQ5OLjvyM5Snxcz3tmIvYfTVVPuY57tEraxPW83n7g,18671
+ciocore-8.3.0b1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+ciocore-8.3.0b1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.3.0b1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.3.0b1.dist-info/RECORD,,

tests/test_submit.py

@@ -9,7 +9,6 @@ try:
     from unittest.mock import MagicMock, patch
 except ImportError:
     from mock import MagicMock, patch
-    
 
 
 def get_required_args():
@@ -28,7 +27,9 @@ class InitTest(unittest.TestCase):
         self.kSubmit = Submit
         self.required_args = get_required_args()
 
-        getuser_patcher = patch("getpass.getuser", return_value="joe.bloggs@example.com")
+        getuser_patcher = patch(
+            "getpass.getuser", return_value="joe.bloggs@example.com"
+        )
         self.mock_getuser = getuser_patcher.start()
         self.addCleanup(getuser_patcher.stop)
 
@@ -70,42 +71,48 @@ class SendTest(unittest.TestCase):
         self.kSubmit = Submit
         self.required_args = get_required_args()
 
-        getuser_patcher = patch("getpass.getuser", return_value="joe.bloggs@example.com")
+        getuser_patcher = patch(
+            "getpass.getuser", return_value="joe.bloggs@example.com"
+        )
         self.mock_getuser = getuser_patcher.start()
         self.addCleanup(getuser_patcher.stop)
 
         file_utils_process_patcher = patch(
-            "ciocore.file_utils.process_upload_filepaths", 
-            return_value=[]
+            "ciocore.file_utils.process_upload_filepaths", return_value=[]
         )
         self.mock_file_utils_process = file_utils_process_patcher.start()
         self.addCleanup(file_utils_process_patcher.stop)
 
         make_request_patcher = patch(
             "ciocore.api_client.ApiClient.make_request",
-            return_value=('{}', 201),
+            return_value=("{}", 201),
         )
         self.mock_make_request = make_request_patcher.start()
         self.addCleanup(make_request_patcher.stop)
 
-
-    def test_send_calls_handle_local_upload_by_default(self):
+    def test_send_calls_handle_local_upload_by_default_when_upload_paths_present(self):
         args = self.required_args
+        args["upload_paths"] = ["/a/b"]
+
         submission = self.kSubmit(args)
         submission._handle_local_upload = MagicMock()
         submission.main()
         submission._handle_local_upload.assert_called_with({})
 
-
-    def test_send_calls_enforce_md5s_if_local_upload_off_and_enforced_md5s(self):
-        args = {"local_upload": False, "enforced_md5s": {"a":"1"}}
+    def test_send_calls_enforce_md5s_if_local_upload_off_and_enforced_md5s_when_upload_paths_present(
+        self,
+    ):
+        args = {"local_upload": False, "enforced_md5s": {"a": "1"}}
+        args["upload_paths"] = ["/a/b"]
         args.update(self.required_args)
         submission = self.kSubmit(args)
         submission._enforce_md5s = MagicMock()
         submission.main()
         submission._enforce_md5s.assert_called_with({})
 
-    def test_send_doesnt_call_enforce_md5s_if_local_upload_off_and_no_enforced_md5s(self):
+    def test_send_doesnt_call_enforce_md5s_if_local_upload_off_and_no_enforced_md5s(
+        self,
+    ):
         args = {"local_upload": False}
         args.update(self.required_args)
         submission = self.kSubmit(args)
@@ -113,14 +120,30 @@ class SendTest(unittest.TestCase):
         submission.main()
         self.assertEqual(submission._enforce_md5s.call_count, 0)
 
+    def test_send_doesnt_call_any_upload_methods_if_no_upload_paths(self):
+        args = self.required_args
+        submission = self.kSubmit(args)
+        submission._handle_local_upload = MagicMock()
+        submission._enforce_md5s = MagicMock()
+        submission.main()
+        self.assertEqual(submission._handle_local_upload.call_count, 0)
+        self.assertEqual(submission._enforce_md5s.call_count, 0)
+
+    def test_send_switches_local_upload_true_if_no_upload_paths_and_local_upload_false(
+        self,
+    ):
+        args = {"local_upload": False}
+        args.update(self.required_args)
+        submission = self.kSubmit(args)
+        self.assertEqual(submission.payload["local_upload"], True)
 
     def test_send_raise_if_bad_response_code(self):
         make_request_patcher = patch(
             "ciocore.api_client.ApiClient.make_request",
-            return_value=('{}', 404),
+            return_value=("{}", 404),
         )
         self.mock_make_request = make_request_patcher.start()
- 
+
         with self.assertRaises(Exception):
             submission = self.kSubmit(self.required_args)
             submission._handle_daemon_upload = MagicMock()
@@ -129,11 +152,12 @@ class SendTest(unittest.TestCase):
         make_request_patcher.stop()
 
 
-class uploaderTest():
+class uploaderTest:
 
     def test_smoke(self):
 
         from ciocore import uploader
+
         uploader_args = {
             "location": "here",
             "database_filepath": "/path/to/db",
@@ -142,5 +166,5 @@ class uploaderTest():
         }
         up = uploader.Uploader(uploader_args)
         manager = up.create_manager("some_project")
-        filemap = {"/a/b1": None,"/a/b2": None}
+        filemap = {"/a/b1": None, "/a/b2": None}
         # self.assertEqual(uploader_args["thread_count"], 4)