ciocore 8.1.1rc3__py2.py3-none-any.whl → 8.2.0b2__py2.py3-none-any.whl

ciocore/VERSION

@@ -1 +1 @@
-8.1.1-rc.3
+8.2.0-beta.2

ciocore/api_client.py

@@ -445,7 +445,7 @@ def creds_same_domain(creds):
     if not token:
         return False
 
-    decoded = jwt.decode(creds["access_token"], verify=False, algorithms=['RS256'], options={"verify_signature": False})
+    decoded = jwt.decode(creds["access_token"], verify=False)
     audience_domain = decoded.get("aud")
     return (
         audience_domain
@@ -463,7 +463,7 @@ def account_id_from_jwt(token):
     Returns:
         str: The account id.
     """
-    payload = jwt.decode(token, verify=False, algorithms=['RS256'], options={"verify_signature": False})
+    payload = jwt.decode(token, verify=False)
     return payload.get("account")
 
 
@@ -500,7 +500,7 @@ def request_instance_types(as_dict=False):
     """
     api = ApiClient()
     response, response_code = api.make_request(
-        "api/v1/instance-types", use_api_key=True, raise_on_error=False
+        "api/v2/instance-types", use_api_key=True, raise_on_error=False
     )
     if response_code not in (200,):
         msg = "Failed to get instance types"

ciocore/docsite/apidoc/api_client/index.html

@@ -2227,7 +2227,7 @@ prompt the user to log in. </p>
     <span class="k">if</span> <span class="ow">not</span> <span class="n">token</span><span class="p">:</span>
         <span class="k">return</span> <span class="kc">False</span>
 
-    <span class="n">decoded</span> <span class="o">=</span> <span class="n">jwt</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="n">creds</span><span class="p">[</span><span class="s2">&quot;access_token&quot;</span><span class="p">],</span> <span class="n">verify</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">algorithms</span><span class="o">=</span><span class="p">[</span><span class="s1">&#39;RS256&#39;</span><span class="p">],</span> <span class="n">options</span><span class="o">=</span><span class="p">{</span><span class="s2">&quot;verify_signature&quot;</span><span class="p">:</span> <span class="kc">False</span><span class="p">})</span>
+    <span class="n">decoded</span> <span class="o">=</span> <span class="n">jwt</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="n">creds</span><span class="p">[</span><span class="s2">&quot;access_token&quot;</span><span class="p">],</span> <span class="n">verify</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
     <span class="n">audience_domain</span> <span class="o">=</span> <span class="n">decoded</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;aud&quot;</span><span class="p">)</span>
     <span class="k">return</span> <span class="p">(</span>
         <span class="n">audience_domain</span>
@@ -2301,7 +2301,7 @@ prompt the user to log in. </p>
 <span class="sd">    Returns:</span>
 <span class="sd">        str: The account id.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
-    <span class="n">payload</span> <span class="o">=</span> <span class="n">jwt</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="n">token</span><span class="p">,</span> <span class="n">verify</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">algorithms</span><span class="o">=</span><span class="p">[</span><span class="s1">&#39;RS256&#39;</span><span class="p">],</span> <span class="n">options</span><span class="o">=</span><span class="p">{</span><span class="s2">&quot;verify_signature&quot;</span><span class="p">:</span> <span class="kc">False</span><span class="p">})</span>
+    <span class="n">payload</span> <span class="o">=</span> <span class="n">jwt</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="n">token</span><span class="p">,</span> <span class="n">verify</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">payload</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;account&quot;</span><span class="p">)</span>
 </code></pre></div>
         </details>
@@ -2450,7 +2450,7 @@ prompt the user to log in. </p>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="n">api</span> <span class="o">=</span> <span class="n">ApiClient</span><span class="p">()</span>
     <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>
-        <span class="s2">&quot;api/v1/instance-types&quot;</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>
+        <span class="s2">&quot;api/v2/instance-types&quot;</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>
     <span class="p">)</span>
     <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>
         <span class="n">msg</span> <span class="o">=</span> <span class="s2">&quot;Failed to get instance types&quot;</span>

ciocore/docsite/apidoc/hardware_set/index.html

@@ -1366,19 +1366,21 @@ HardwareSet        </code>
         <span class="k">if</span> <span class="n">dual_platforms</span><span class="p">:</span>
             <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>
                 <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>
-                <span class="n">is_gpu</span> <span class="o">=</span> <span class="s2">&quot;gpu_count&quot;</span> <span class="ow">in</span> <span class="n">flat_dict</span>
-                <span class="k">if</span> <span class="n">is_gpu</span><span class="p">:</span>
-                    <span class="n">it</span><span class="p">[</span><span class="s2">&quot;description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">DESCRIPTION_TEMPLATE_OS</span><span class="p">[</span><span class="s2">&quot;gpu&quot;</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>
-                <span class="k">else</span><span class="p">:</span>
-                    <span class="n">it</span><span class="p">[</span><span class="s2">&quot;description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">DESCRIPTION_TEMPLATE_OS</span><span class="p">[</span><span class="s2">&quot;cpu&quot;</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>
+                <span class="n">template_key</span> <span class="o">=</span> <span class="s2">&quot;cpu&quot;</span>
+                <span class="k">if</span> <span class="n">it</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;best-fit&quot;</span><span class="p">):</span>
+                    <span class="n">template_key</span> <span class="o">=</span> <span class="s2">&quot;best-fit&quot;</span>
+                <span class="k">elif</span> <span class="s2">&quot;gpu_count&quot;</span> <span class="ow">in</span> <span class="n">flat_dict</span><span class="p">:</span>
+                    <span class="n">template_key</span> <span class="o">=</span> <span class="s2">&quot;gpu&quot;</span>
+                <span class="n">it</span><span class="p">[</span><span class="s2">&quot;description&quot;</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>
         <span class="k">else</span><span class="p">:</span>
             <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>
                 <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>
-                <span class="n">is_gpu</span> <span class="o">=</span> <span class="s2">&quot;gpu_count&quot;</span> <span class="ow">in</span> <span class="n">flat_dict</span>
-                <span class="k">if</span> <span class="n">is_gpu</span><span class="p">:</span>
-                    <span class="n">it</span><span class="p">[</span><span class="s2">&quot;description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">DESCRIPTION_TEMPLATE</span><span class="p">[</span><span class="s2">&quot;gpu&quot;</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>
-                <span class="k">else</span><span class="p">:</span>
-                    <span class="n">it</span><span class="p">[</span><span class="s2">&quot;description&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">DESCRIPTION_TEMPLATE</span><span class="p">[</span><span class="s2">&quot;cpu&quot;</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>
+                <span class="n">template_key</span> <span class="o">=</span> <span class="s2">&quot;cpu&quot;</span>
+                <span class="k">if</span> <span class="n">it</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;best-fit&quot;</span><span class="p">):</span>
+                    <span class="n">template_key</span> <span class="o">=</span> <span class="s2">&quot;best-fit&quot;</span>
+                <span class="k">elif</span> <span class="s2">&quot;gpu_count&quot;</span> <span class="ow">in</span> <span class="n">flat_dict</span><span class="p">:</span>
+                    <span class="n">template_key</span> <span class="o">=</span> <span class="s2">&quot;gpu&quot;</span>
+                <span class="n">it</span><span class="p">[</span><span class="s2">&quot;description&quot;</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>
 
         <span class="k">return</span> <span class="n">instance_types</span>