ciocore 8.1.0b3__py2.py3-none-any.whl → 8.1.1rc2__py2.py3-none-any.whl

ciocore/VERSION

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

ciocore/api_client.py

@@ -12,7 +12,6 @@ import jwt
 import logging
 import os
 import platform
-import datetime
 import requests
 import socket
 import time
@@ -446,7 +445,7 @@ def creds_same_domain(creds):
     if not token:
         return False
 
-    decoded = jwt.decode(creds["access_token"], verify=False)
+    decoded = jwt.decode(creds["access_token"], verify=False, algorithms=['RS256'], options={"verify_signature": False})
     audience_domain = decoded.get("aud")
     return (
         audience_domain
@@ -464,7 +463,7 @@ def account_id_from_jwt(token):
     Returns:
         str: The account id.
     """
-    payload = jwt.decode(token, verify=False)
+    payload = jwt.decode(token, verify=False, algorithms=['RS256'], options={"verify_signature": False})
     return payload.get("account")
 
 
@@ -489,30 +488,6 @@ def account_name_from_jwt(token):
     return None
 
 
-def get_account_data():
-    """
-    Get the authenticated account's data.
-    
-    Returns:
-        dict: The account data.
-    """
-    token = read_conductor_credentials(True)
-    if not token:
-        return None
-    
-    payload = jwt.decode(token, verify=False)
-    return {
-        "email": payload.get("email"),
-        "domain": ".".join(payload.get("aud").split(".")[1:]),
-        "account_id" : payload.get("account"),
-        "user_id" : payload.get("id"),
-        "role": payload.get("role"),
-        "issued": datetime.datetime.fromtimestamp(payload.get("iat")),
-        "expiry": datetime.datetime.fromtimestamp(payload.get("exp")),
-        "token": token,
-    }
-    
-
 def request_instance_types(as_dict=False):
     """
     Get the list of available instances types.

ciocore/data.py

@@ -53,7 +53,7 @@ def init(*products, **kwargs):
 
 def data(force=False):
     """
-    Provide projects, instance types, software package, and account data.
+    Provide projects, instance types, and software package data.
 
     Keyword Args:
         force: (bool) If `True`, then force the system to fetch fresh data -- Defaults to `False`.
@@ -62,10 +62,10 @@ def data(force=False):
         ValueError:  Module was not initialized with [init()](/data/#ciocore.data.init).
 
     Returns:
-        dict: Keys are `projects`, `instance_types`, `software`, `account`.
+        dict: Keys are `projects`, `instance_types`, `software`.
 
     When you access the data, if it has already been fetched, it will be returned. Otherwise,
-    requests will be made to fetch fresh data. You may need to authenticate in order to access the
+    requests will be made to fetch the data. You may need to authenticate in order to access the
     data.
 
     The set of instance types and software can be pruned to match the available platforms
@@ -84,8 +84,7 @@ def data(force=False):
 
     * **software** is a PackageTree object containing either all
     the software available at Conductor, or a subset based on specified products.
-    
-    * **account** is a dictionary containing account information gained from the JWT token.
+
 
     Examples:
         >>> from ciocore import data as coredata
@@ -99,10 +98,6 @@ def data(force=False):
 
         >>> coredata.data()["instance_types"]
         <ciocore.hardware_set.HardwareSet object at 0x0000028941CD9DC0>
-        
-        >>> coredata.data()["account"]["account_id"]
-        123456789012
-        
     """
 
     global __data__
@@ -134,9 +129,6 @@ def data(force=False):
         except Exception:
             pass   
         __data__["extra_environment"] = extra_env_vars
-        
-        __data__["account"] = api_client.get_account_data()
-        
 
         # PLATFORMS
         it_platforms = set([it["operating_system"] for it in instance_types])

ciocore/docsite/apidoc/api_client/index.html

@@ -653,13 +653,6 @@
     account_name_from_jwt()
   </a>
   
-</li>
-      
-        <li class="md-nav__item">
-  <a href="#ciocore.api_client.get_account_data" class="md-nav__link">
-    get_account_data()
-  </a>
-  
 </li>
       
         <li class="md-nav__item">
@@ -988,13 +981,6 @@
     account_name_from_jwt()
   </a>
   
-</li>
-      
-        <li class="md-nav__item">
-  <a href="#ciocore.api_client.get_account_data" class="md-nav__link">
-    get_account_data()
-  </a>
-  
 </li>
       
         <li class="md-nav__item">
@@ -2241,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">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">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>
@@ -2315,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">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="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>
@@ -2406,67 +2392,6 @@ prompt the user to log in. </p>
 
 
 
-<h2 id="ciocore.api_client.get_account_data" class="doc doc-heading">
-<code class="highlight language-python"><span class="n">get_account_data</span><span class="p">()</span></code>
-
-
-</h2>
-
-    <div class="doc doc-contents ">
-
-      <p>Get the authenticated account's data.</p>
-
-<p><strong>Returns:</strong></p>
-<table>
-  <thead>
-    <tr>
-      <th>Type</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><code>dict</code></td>
-      <td><p>The account data.</p></td>
-    </tr>
-  </tbody>
-</table>
-        <details class="quote">
-          <summary>Source code in <code>ciocore/api_client.py</code></summary>
-          <div class="highlight"><pre><span></span><code><span class="k">def</span> <span class="nf">get_account_data</span><span class="p">():</span>
-<span class="w">    </span><span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">    Get the authenticated account&#39;s data.</span>
-
-<span class="sd">    Returns:</span>
-<span class="sd">        dict: The account data.</span>
-<span class="sd">    &quot;&quot;&quot;</span>
-    <span class="n">token</span> <span class="o">=</span> <span class="n">read_conductor_credentials</span><span class="p">(</span><span class="kc">True</span><span class="p">)</span>
-    <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">None</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="p">{</span>
-        <span class="s2">&quot;email&quot;</span><span class="p">:</span> <span class="n">payload</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;email&quot;</span><span class="p">),</span>
-        <span class="s2">&quot;domain&quot;</span><span class="p">:</span> <span class="s2">&quot;.&quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">payload</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="o">.</span><span class="n">split</span><span class="p">(</span><span class="s2">&quot;.&quot;</span><span class="p">)[</span><span class="mi">1</span><span class="p">:]),</span>
-        <span class="s2">&quot;account_id&quot;</span> <span class="p">:</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>
-        <span class="s2">&quot;user_id&quot;</span> <span class="p">:</span> <span class="n">payload</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;id&quot;</span><span class="p">),</span>
-        <span class="s2">&quot;role&quot;</span><span class="p">:</span> <span class="n">payload</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;role&quot;</span><span class="p">),</span>
-        <span class="s2">&quot;issued&quot;</span><span class="p">:</span> <span class="n">datetime</span><span class="o">.</span><span class="n">datetime</span><span class="o">.</span><span class="n">fromtimestamp</span><span class="p">(</span><span class="n">payload</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;iat&quot;</span><span class="p">)),</span>
-        <span class="s2">&quot;expiry&quot;</span><span class="p">:</span> <span class="n">datetime</span><span class="o">.</span><span class="n">datetime</span><span class="o">.</span><span class="n">fromtimestamp</span><span class="p">(</span><span class="n">payload</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;exp&quot;</span><span class="p">)),</span>
-        <span class="s2">&quot;token&quot;</span><span class="p">:</span> <span class="n">token</span><span class="p">,</span>
-    <span class="p">}</span>
-</code></pre></div>
-        </details>
-    </div>
-
-  </div>
-
-
-
-  <div class="doc doc-object doc-function">
-
-
-
 <h2 id="ciocore.api_client.request_instance_types" class="doc doc-heading">
 <code class="highlight language-python"><span class="n">request_instance_types</span><span class="p">(</span><span class="n">as_dict</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span></code>
 

ciocore/docsite/apidoc/data/index.html

@@ -991,7 +991,7 @@
 
     <div class="doc doc-contents ">
 
-      <p>Provide projects, instance types, software package, and account data.</p>
+      <p>Provide projects, instance types, and software package data.</p>
 
 <p><strong>Keyword arguments:</strong></p>
 <table>
@@ -1036,11 +1036,11 @@
   <tbody>
     <tr>
       <td><code>dict</code></td>
-      <td><p>Keys are <code>projects</code>, <code>instance_types</code>, <code>software</code>, <code>account</code>.</p></td>
+      <td><p>Keys are <code>projects</code>, <code>instance_types</code>, <code>software</code>.</p></td>
     </tr>
   </tbody>
 </table>      <p>When you access the data, if it has already been fetched, it will be returned. Otherwise,
-requests will be made to fetch fresh data. You may need to authenticate in order to access the
+requests will be made to fetch the data. You may need to authenticate in order to access the
 data.</p>
 <p>The set of instance types and software can be pruned to match the available platforms
 represented by each other. For example, if the instance types come from an orchestrator that
@@ -1061,9 +1061,6 @@ available machines configurations.</p>
 <p><strong>software</strong> is a PackageTree object containing either all
 the software available at Conductor, or a subset based on specified products.</p>
 </li>
-<li>
-<p><strong>account</strong> is a dictionary containing account information gained from the JWT token.</p>
-</li>
 </ul>
 
 <p><strong>Examples:</strong></p>
@@ -1078,16 +1075,13 @@ the software available at Conductor, or a subset based on specified products.</p
 </code></pre></div>
     <div class="highlight"><pre><span></span><code><span class="o">&gt;&gt;&gt;</span> <span class="n">coredata</span><span class="o">.</span><span class="n">data</span><span class="p">()[</span><span class="s2">&quot;instance_types&quot;</span><span class="p">]</span>
 <span class="o">&lt;</span><span class="n">ciocore</span><span class="o">.</span><span class="n">hardware_set</span><span class="o">.</span><span class="n">HardwareSet</span> <span class="nb">object</span> <span class="n">at</span> <span class="mh">0x0000028941CD9DC0</span><span class="o">&gt;</span>
-</code></pre></div>
-    <div class="highlight"><pre><span></span><code><span class="o">&gt;&gt;&gt;</span> <span class="n">coredata</span><span class="o">.</span><span class="n">data</span><span class="p">()[</span><span class="s2">&quot;account&quot;</span><span class="p">][</span><span class="s2">&quot;account_id&quot;</span><span class="p">]</span>
-<span class="mi">123456789012</span>
 </code></pre></div>
 
         <details class="quote">
           <summary>Source code in <code>ciocore/data.py</code></summary>
           <div class="highlight"><pre><span></span><code><span class="k">def</span> <span class="nf">data</span><span class="p">(</span><span class="n">force</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">    Provide projects, instance types, software package, and account data.</span>
+<span class="sd">    Provide projects, instance types, and software package data.</span>
 
 <span class="sd">    Keyword Args:</span>
 <span class="sd">        force: (bool) If `True`, then force the system to fetch fresh data -- Defaults to `False`.</span>
@@ -1096,10 +1090,10 @@ the software available at Conductor, or a subset based on specified products.</p
 <span class="sd">        ValueError:  Module was not initialized with [init()](/data/#ciocore.data.init).</span>
 
 <span class="sd">    Returns:</span>
-<span class="sd">        dict: Keys are `projects`, `instance_types`, `software`, `account`.</span>
+<span class="sd">        dict: Keys are `projects`, `instance_types`, `software`.</span>
 
 <span class="sd">    When you access the data, if it has already been fetched, it will be returned. Otherwise,</span>
-<span class="sd">    requests will be made to fetch fresh data. You may need to authenticate in order to access the</span>
+<span class="sd">    requests will be made to fetch the data. You may need to authenticate in order to access the</span>
 <span class="sd">    data.</span>
 
 <span class="sd">    The set of instance types and software can be pruned to match the available platforms</span>
@@ -1119,7 +1113,6 @@ the software available at Conductor, or a subset based on specified products.</p
 <span class="sd">    * **software** is a PackageTree object containing either all</span>
 <span class="sd">    the software available at Conductor, or a subset based on specified products.</span>
 
-<span class="sd">    * **account** is a dictionary containing account information gained from the JWT token.</span>
 
 <span class="sd">    Examples:</span>
 <span class="sd">        &gt;&gt;&gt; from ciocore import data as coredata</span>
@@ -1133,10 +1126,6 @@ the software available at Conductor, or a subset based on specified products.</p
 
 <span class="sd">        &gt;&gt;&gt; coredata.data()[&quot;instance_types&quot;]</span>
 <span class="sd">        &lt;ciocore.hardware_set.HardwareSet object at 0x0000028941CD9DC0&gt;</span>
-
-<span class="sd">        &gt;&gt;&gt; coredata.data()[&quot;account&quot;][&quot;account_id&quot;]</span>
-<span class="sd">        123456789012</span>
-
 <span class="sd">    &quot;&quot;&quot;</span>
 
     <span class="k">global</span> <span class="n">__data__</span>
@@ -1169,9 +1158,6 @@ the software available at Conductor, or a subset based on specified products.</p
             <span class="k">pass</span>   
         <span class="n">__data__</span><span class="p">[</span><span class="s2">&quot;extra_environment&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">extra_env_vars</span>
 
-        <span class="n">__data__</span><span class="p">[</span><span class="s2">&quot;account&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">api_client</span><span class="o">.</span><span class="n">get_account_data</span><span class="p">()</span>
-
-
         <span class="c1"># PLATFORMS</span>
         <span class="n">it_platforms</span> <span class="o">=</span> <span class="nb">set</span><span class="p">([</span><span class="n">it</span><span class="p">[</span><span class="s2">&quot;operating_system&quot;</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">valid_platforms</span> <span class="o">=</span> <span class="n">it_platforms</span><span class="o">.</span><span class="n">intersection</span><span class="p">(</span><span class="n">__platforms__</span><span class="p">)</span>