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

ciocore/hardware_set.py

@@ -30,10 +30,12 @@ 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)",
 }
@@ -362,14 +364,6 @@ class HardwareSet(object):
                     else [{"label": "CPU", "order": 1}]
                 )
             result[it["name"]] = it
-        result["best_fit"] = {"name":"automatic_instance_type", 
-                            "description": "Conductor will choose.",
-                            "categories": [{"label": "auto", "order": 0}],
-                            "gpu": None,
-                            "cores": 0,
-                            "memory": 0
-                            }
-            
 
         return result
 
@@ -397,19 +391,21 @@ class HardwareSet(object):
         if dual_platforms:
             for it in instance_types:
                 flat_dict = flatten_dict(it)
-                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)
+                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)
         else:
             for it in instance_types:
                 flat_dict = flatten_dict(it)
-                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)
+                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)
 
         return instance_types
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.2.0b1
+Version: 8.2.0b2
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -53,7 +53,7 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Unreleased: 
 
-* Adds support and updates library tests for instance type auto-selection option.
+* Adds support and updates library tests for the new best fit instance types.
 
 ## Version:8.1.0 -- 10 Jun 2024
 

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

@@ -1,6 +1,6 @@
-ciocore/VERSION,sha256=8GsYj-WuwuLZceRVqkJ--37Gpie719_Xudc2O7lFoKo,12
+ciocore/VERSION,sha256=2uATqhJYU656qUDoxpBQq7mei0G78f6nBzHrY9j6odk,12
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=SBxEwAiwn2XtH7T_ipefUbWhczXjoNdNbQBur1RV-Bw,32810
+ciocore/api_client.py,sha256=GRhnyerDQ90b_qCiBd2zTwtNj7pBAzfOrG8HduJf-Ww,32810
 ciocore/cli.py,sha256=jZ1lOKQiUcrMhsVmD9SVmPMFwHtgDF4SaoAf2-PBS54,15449
 ciocore/client_db.py,sha256=tTz3bl2xeDPPcYSDS3g3QgV_xYihJMx0Kj6OeN2klK0,12978
 ciocore/common.py,sha256=mBIS6KiYoQsjWe6aIFUGRRvCMl8BIN2kmLZ4J8icap8,14982
@@ -10,7 +10,7 @@ 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=kzLbKP0YP2DBaRQbzLW5VHkmcNmVR7rXVj7PUj2zgp4,17420
+ciocore/hardware_set.py,sha256=-Cc8PIShvb5Us8EC5JvRWbaX7NS8CtcjtfbGhGbv9Fk,17211
 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=3Jlsa-36ZfMjbHYn936cxyK6OG-kL6cMIuXvnjApovY,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=mh9VwU1J3Ks6MWvo5a-PcUt5GYdm8s7KsIVDWfnOeXY,188372
+ciocore/docsite/sitemap.xml.gz,sha256=N659m56MWx060JteLPoWwfaR2O0g178ZdQ-BU87i30E,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=SPB3ox5ht9HPjoTIzIWxa9wKYpmPaQNazDAeAI2Jw-w,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=FJLjrN3pzotVeYsF6aUa0RCYZzorPBMH_p5anZzI35U,124390
+ciocore/docsite/apidoc/hardware_set/index.html,sha256=t5BOOiE_nSUogdseP2koC1XhxNr8MPi47RFaW1eERrE,123119
 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=9GkGlvXOx8zMaOAMa-OFsXBO-tWRZmnOBOzKYCZVm0c,189485
+ciocore/docsite/search/search_index.json,sha256=FaOyC5mABlY1sG1h2HKwMQye7SeXmbh560KwHlmd_7k,189181
 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
@@ -110,7 +110,7 @@ tests/test_common.py,sha256=tY_-SY-JmJX09UehFs9RIDqZ785AmhfTl6eVKJeIUFY,763
 tests/test_config.py,sha256=-_G682Ss3Zr1FmcMkjla1zAZprX2tQKpKc5_wD28rII,13340
 tests/test_data.py,sha256=NIBXpCjG3Os3vpc1CkiVONrebro8D_jqQyJ0N3kbucU,5433
 tests/test_downloader.py,sha256=hceljsjnuvk5Vk5X4mHgavIEcpbv8ylPwpz7rTwJ-aE,4721
-tests/test_hardware_set.py,sha256=E-jNduU1sp-IQa3L4oKGCTn-Tsn8tGUKPrcK4syFJbY,4862
+tests/test_hardware_set.py,sha256=hW7A_suyYdU7WkB7qoHSBPLxaAP2CKqI0i_ULfO5GeY,4408
 tests/test_imports_2and3.py,sha256=ehqpRYPVY7djBcb8OT_cnh86iCJJ9wuMWnfSR9RHxmY,507
 tests/test_job_downloader.py,sha256=_dZqyLZhc2Bq2n7-skERfodHx1JgFyHw8TamHp6ID9I,7025
 tests/test_package_environment.py,sha256=CdiC2PDVSnbcwTb4fsDTWqGYSzs1n5ca2KMoyISckGA,5893
@@ -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.2.0b1.dist-info/METADATA,sha256=z73W0b6QgA8z0RvXf5ZMyWfeDEqYk5aog-voihjWTPY,18666
-ciocore-8.2.0b1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-ciocore-8.2.0b1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.2.0b1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.2.0b1.dist-info/RECORD,,
+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,,

tests/test_hardware_set.py

@@ -28,31 +28,25 @@ class TestCategorizedInstanceTypes(unittest.TestCase):
         self.hs = HardwareSet(CW_INSTANCE_TYPES)
 
     def test_number_of_categories(self):
-        self.assertEqual(self.hs.number_of_categories(), 5)
+        self.assertEqual(self.hs.number_of_categories(), 4)
 
     def test_categories_sorted_on_order(self):
         labels = [i["label"] for i in self.hs.get_model()]
-        self.assertEqual(labels, ["auto", "low", "mid", "high", "extra"])
+        self.assertEqual(labels, ["low", "mid", "high", "extra"])
 
     def test_content_count(self):
         low_category_values = [c["value"] for c in self.hs.get_model()[0]["content"]]
-        if len(low_category_values) == 1:
-            self.assertEqual(low_category_values, ['automatic_instance_type'])
-        else:
-            self.assertEqual(low_category_values, ["cw-a-4-16", "cw-b-8-16"])
+        self.assertEqual(low_category_values, ["cw-a-4-16", "cw-b-8-16"])
 
     def test_in_several_categories(self):
         low_category_values = [c["value"] for c in self.hs.get_model()[0]["content"]]
         extra_category_values = [c["value"] for c in self.hs.get_model()[3]["content"]]
-        if len(low_category_values) == 1:
-            self.assertEqual(low_category_values, ['automatic_instance_type'])
-        else:
-            self.assertIn("cw-a-4-16", low_category_values)
-            self.assertIn("cw-a-4-16", extra_category_values)
+        self.assertIn("cw-a-4-16", low_category_values)
+        self.assertIn("cw-a-4-16", extra_category_values)
 
     def test_category_names(self):
         names = self.hs.labels()
-        self.assertEqual(names, ["auto", "low", "mid", "high", "extra"])
+        self.assertEqual(names, ["low", "mid", "high", "extra"])
 
 
 class TestRecategorizeInstanceTypes(unittest.TestCase):
@@ -112,26 +106,23 @@ class TestUncategorizedInstanceTypes(unittest.TestCase):
         self.hs = HardwareSet(ALL_INSTANCE_TYPES)
 
     def test_number_of_categories_uncategorized(self):
-        self.assertEqual(self.hs.number_of_categories(), 2)
+        self.assertEqual(self.hs.number_of_categories(), 1)
 
     def test_model_sorted_on_cores_mem(self):
         content = self.hs.get_model()[0]["content"]
         result = [c["label"] for c in content]
-        if len(result) == 1:
-            self.assertEqual(result, ['Conductor will choose.'])
-        else:
-            self.assertEqual(
-                result,
-                [
-                    "windows 4 core 26.0GB Mem",
-                    "linux 4 core 27.0GB Mem",
-                    "linux 8 core 30.0GB Mem",
-                    "windows 32 core 208.0GB Mem",
-                    "linux 32 core 208.0GB Mem",
-                    "windows 64 core 416.0GB Mem",
-                    "linux 64 core 416.0GB Mem",
-                ],
-            )
+        self.assertEqual(
+            result,
+            [
+                "windows 4 core 26.0GB Mem",
+                "linux 4 core 27.0GB Mem",
+                "linux 8 core 30.0GB Mem",
+                "windows 32 core 208.0GB Mem",
+                "linux 32 core 208.0GB Mem",
+                "windows 64 core 416.0GB Mem",
+                "linux 64 core 416.0GB Mem",
+            ],
+        )
 
 
 class TestProvider(unittest.TestCase):