ciocore 8.2.0b1__py2.py3-none-any.whl → 8.2.0b2__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of ciocore might be problematic. Click here for more details.
- ciocore/VERSION +1 -1
- ciocore/api_client.py +1 -1
- ciocore/docsite/apidoc/api_client/index.html +1 -1
- ciocore/docsite/apidoc/hardware_set/index.html +12 -18
- ciocore/docsite/search/search_index.json +1 -1
- ciocore/docsite/sitemap.xml.gz +0 -0
- ciocore/hardware_set.py +14 -18
- {ciocore-8.2.0b1.dist-info → ciocore-8.2.0b2.dist-info}/METADATA +2 -2
- {ciocore-8.2.0b1.dist-info → ciocore-8.2.0b2.dist-info}/RECORD +13 -13
- tests/test_hardware_set.py +19 -28
- {ciocore-8.2.0b1.dist-info → ciocore-8.2.0b2.dist-info}/WHEEL +0 -0
- {ciocore-8.2.0b1.dist-info → ciocore-8.2.0b2.dist-info}/entry_points.txt +0 -0
- {ciocore-8.2.0b1.dist-info → ciocore-8.2.0b2.dist-info}/top_level.txt +0 -0
ciocore/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.2.0-beta.
|
|
1
|
+
8.2.0-beta.2
|
ciocore/api_client.py
CHANGED
|
@@ -500,7 +500,7 @@ def request_instance_types(as_dict=False):
|
|
|
500
500
|
"""
|
|
501
501
|
api = ApiClient()
|
|
502
502
|
response, response_code = api.make_request(
|
|
503
|
-
"api/
|
|
503
|
+
"api/v2/instance-types", use_api_key=True, raise_on_error=False
|
|
504
504
|
)
|
|
505
505
|
if response_code not in (200,):
|
|
506
506
|
msg = "Failed to get instance types"
|
|
@@ -2450,7 +2450,7 @@ prompt the user to log in. </p>
|
|
|
2450
2450
|
<span class="sd"> """</span>
|
|
2451
2451
|
<span class="n">api</span> <span class="o">=</span> <span class="n">ApiClient</span><span class="p">()</span>
|
|
2452
2452
|
<span class="n">response</span><span class="p">,</span> <span class="n">response_code</span> <span class="o">=</span> <span class="n">api</span><span class="o">.</span><span class="n">make_request</span><span class="p">(</span>
|
|
2453
|
-
<span class="s2">"api/
|
|
2453
|
+
<span class="s2">"api/v2/instance-types"</span><span class="p">,</span> <span class="n">use_api_key</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">raise_on_error</span><span class="o">=</span><span class="kc">False</span>
|
|
2454
2454
|
<span class="p">)</span>
|
|
2455
2455
|
<span class="k">if</span> <span class="n">response_code</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">(</span><span class="mi">200</span><span class="p">,):</span>
|
|
2456
2456
|
<span class="n">msg</span> <span class="o">=</span> <span class="s2">"Failed to get instance types"</span>
|
|
@@ -1339,14 +1339,6 @@ HardwareSet </code>
|
|
|
1339
1339
|
<span class="k">else</span> <span class="p">[{</span><span class="s2">"label"</span><span class="p">:</span> <span class="s2">"CPU"</span><span class="p">,</span> <span class="s2">"order"</span><span class="p">:</span> <span class="mi">1</span><span class="p">}]</span>
|
|
1340
1340
|
<span class="p">)</span>
|
|
1341
1341
|
<span class="n">result</span><span class="p">[</span><span class="n">it</span><span class="p">[</span><span class="s2">"name"</span><span class="p">]]</span> <span class="o">=</span> <span class="n">it</span>
|
|
1342
|
-
<span class="n">result</span><span class="p">[</span><span class="s2">"best_fit"</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="s2">"name"</span><span class="p">:</span><span class="s2">"automatic_instance_type"</span><span class="p">,</span>
|
|
1343
|
-
<span class="s2">"description"</span><span class="p">:</span> <span class="s2">"Conductor will choose."</span><span class="p">,</span>
|
|
1344
|
-
<span class="s2">"categories"</span><span class="p">:</span> <span class="p">[{</span><span class="s2">"label"</span><span class="p">:</span> <span class="s2">"auto"</span><span class="p">,</span> <span class="s2">"order"</span><span class="p">:</span> <span class="mi">0</span><span class="p">}],</span>
|
|
1345
|
-
<span class="s2">"gpu"</span><span class="p">:</span> <span class="kc">None</span><span class="p">,</span>
|
|
1346
|
-
<span class="s2">"cores"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
|
|
1347
|
-
<span class="s2">"memory"</span><span class="p">:</span> <span class="mi">0</span>
|
|
1348
|
-
<span class="p">}</span>
|
|
1349
|
-
|
|
1350
1342
|
|
|
1351
1343
|
<span class="k">return</span> <span class="n">result</span>
|
|
1352
1344
|
|
|
@@ -1374,19 +1366,21 @@ HardwareSet </code>
|
|
|
1374
1366
|
<span class="k">if</span> <span class="n">dual_platforms</span><span class="p">:</span>
|
|
1375
1367
|
<span class="k">for</span> <span class="n">it</span> <span class="ow">in</span> <span class="n">instance_types</span><span class="p">:</span>
|
|
1376
1368
|
<span class="n">flat_dict</span> <span class="o">=</span> <span class="n">flatten_dict</span><span class="p">(</span><span class="n">it</span><span class="p">)</span>
|
|
1377
|
-
<span class="n">
|
|
1378
|
-
<span class="k">if</span> <span class="n">
|
|
1379
|
-
<span class="n">
|
|
1380
|
-
<span class="k">
|
|
1381
|
-
<span class="n">
|
|
1369
|
+
<span class="n">template_key</span> <span class="o">=</span> <span class="s2">"cpu"</span>
|
|
1370
|
+
<span class="k">if</span> <span class="n">it</span><span class="p">[</span><span class="s2">"name"</span><span class="p">]</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">"best-fit"</span><span class="p">):</span>
|
|
1371
|
+
<span class="n">template_key</span> <span class="o">=</span> <span class="s2">"best-fit"</span>
|
|
1372
|
+
<span class="k">elif</span> <span class="s2">"gpu_count"</span> <span class="ow">in</span> <span class="n">flat_dict</span><span class="p">:</span>
|
|
1373
|
+
<span class="n">template_key</span> <span class="o">=</span> <span class="s2">"gpu"</span>
|
|
1374
|
+
<span class="n">it</span><span class="p">[</span><span class="s2">"description"</span><span class="p">]</span> <span class="o">=</span> <span class="n">DESCRIPTION_TEMPLATE_OS</span><span class="p">[</span><span class="n">template_key</span><span class="p">]</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="o">**</span><span class="n">flat_dict</span><span class="p">)</span>
|
|
1382
1375
|
<span class="k">else</span><span class="p">:</span>
|
|
1383
1376
|
<span class="k">for</span> <span class="n">it</span> <span class="ow">in</span> <span class="n">instance_types</span><span class="p">:</span>
|
|
1384
1377
|
<span class="n">flat_dict</span> <span class="o">=</span> <span class="n">flatten_dict</span><span class="p">(</span><span class="n">it</span><span class="p">)</span>
|
|
1385
|
-
<span class="n">
|
|
1386
|
-
<span class="k">if</span> <span class="n">
|
|
1387
|
-
<span class="n">
|
|
1388
|
-
<span class="k">
|
|
1389
|
-
<span class="n">
|
|
1378
|
+
<span class="n">template_key</span> <span class="o">=</span> <span class="s2">"cpu"</span>
|
|
1379
|
+
<span class="k">if</span> <span class="n">it</span><span class="p">[</span><span class="s2">"name"</span><span class="p">]</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">"best-fit"</span><span class="p">):</span>
|
|
1380
|
+
<span class="n">template_key</span> <span class="o">=</span> <span class="s2">"best-fit"</span>
|
|
1381
|
+
<span class="k">elif</span> <span class="s2">"gpu_count"</span> <span class="ow">in</span> <span class="n">flat_dict</span><span class="p">:</span>
|
|
1382
|
+
<span class="n">template_key</span> <span class="o">=</span> <span class="s2">"gpu"</span>
|
|
1383
|
+
<span class="n">it</span><span class="p">[</span><span class="s2">"description"</span><span class="p">]</span> <span class="o">=</span> <span class="n">DESCRIPTION_TEMPLATE</span><span class="p">[</span><span class="n">template_key</span><span class="p">]</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="o">**</span><span class="n">flat_dict</span><span class="p">)</span>
|
|
1390
1384
|
|
|
1391
1385
|
<span class="k">return</span> <span class="n">instance_types</span>
|
|
1392
1386
|
|