ciocore 8.0.0b28__py2.py3-none-any.whl → 8.0.0b30__py2.py3-none-any.whl

ciocore/VERSION

@@ -1 +1 @@
-8.0.0-beta.28
+8.0.0-beta.30

ciocore/api_client.py

@@ -572,6 +572,38 @@ def request_software_packages():
     software = [sw for sw in software if not ("3dsmax" in sw["product"] and sw["platform"] == "linux")]
     return software
 
+def request_extra_environment():
+    """
+    Query Conductor for extra environment.
+    """
+    api = ApiClient()
+
+    uri = "api/v1/integrations/env-vars-configs"
+    response, response_code = api.make_request(
+        uri_path=uri, verb="GET", raise_on_error=False, use_api_key=True
+    )
+
+    if response_code not in [200]:
+        msg = "Failed to get extra environment"
+        msg += "\nError %s ...\n%s" % (response_code, response)
+        raise Exception(msg)
+
+    all_accounts = json.loads(response).get("data", [])
+
+    token = read_conductor_credentials(True)
+    if not token:
+        raise Exception("Error: Could not get conductor credentials!")
+    account_id =  str(account_id_from_jwt(token))
+
+    if not account_id:
+        raise Exception("Error: Could not get account id from jwt!")
+    account_env = next((account for account in all_accounts if account["account_id"] == account_id), None)
+    if not account_env:
+        raise Exception("Error: Could not get account environment!")
+    return account_env.get("env", [])
+
+
+
 
 def get_jobs(first_jid, last_jid=None):
     """

ciocore/cli.py

@@ -213,7 +213,7 @@ def upload(
     type=click.Choice(choices=PACKAGES_FORMAT_OPTIONS, case_sensitive=False),
 )
 def packages(fmt):
-    """List the softweare packages available on the render nodes in the cloud."""
+    """List the software packages available on the render nodes in the cloud."""
     package_query.pq(format=fmt)
 
 

ciocore/data.py

@@ -122,6 +122,14 @@ def data(force=False):
         # SOFTWARE
         software = api_client.request_software_packages()
 
+        # EXTRA ENV VARS
+        extra_env_vars = []
+        try:
+            extra_env_vars = api_client.request_extra_environment()
+        except Exception:
+            pass   
+        __data__["extra_environment"] = extra_env_vars
+
         # PLATFORMS
         it_platforms = set([it["operating_system"] for it in instance_types])
         valid_platforms = it_platforms.intersection(__platforms__)

ciocore/docsite/apidoc/api_client/index.html

@@ -674,6 +674,13 @@
     request_software_packages()
   </a>
   
+</li>
+      
+        <li class="md-nav__item">
+  <a href="#ciocore.api_client.request_extra_environment" class="md-nav__link">
+    request_extra_environment()
+  </a>
+  
 </li>
       
         <li class="md-nav__item">
@@ -981,6 +988,13 @@
     request_software_packages()
   </a>
   
+</li>
+      
+        <li class="md-nav__item">
+  <a href="#ciocore.api_client.request_extra_environment" class="md-nav__link">
+    request_extra_environment()
+  </a>
+  
 </li>
       
         <li class="md-nav__item">
@@ -2586,6 +2600,59 @@ prompt the user to log in. </p>
 
 
 
+<h2 id="ciocore.api_client.request_extra_environment" class="doc doc-heading">
+<code class="highlight language-python"><span class="n">request_extra_environment</span><span class="p">()</span></code>
+
+
+</h2>
+
+    <div class="doc doc-contents ">
+
+      <p>Query Conductor for extra environment.</p>
+
+        <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">request_extra_environment</span><span class="p">():</span>
+<span class="w">    </span><span class="sd">&quot;&quot;&quot;</span>
+<span class="sd">    Query Conductor for extra environment.</span>
+<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">uri</span> <span class="o">=</span> <span class="s2">&quot;api/v1/integrations/env-vars-configs&quot;</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="n">uri_path</span><span class="o">=</span><span class="n">uri</span><span class="p">,</span> <span class="n">verb</span><span class="o">=</span><span class="s2">&quot;GET&quot;</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="n">use_api_key</span><span class="o">=</span><span class="kc">True</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 extra environment&quot;</span>
+        <span class="n">msg</span> <span class="o">+=</span> <span class="s2">&quot;</span><span class="se">\n</span><span class="s2">Error </span><span class="si">%s</span><span class="s2"> ...</span><span class="se">\n</span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">response_code</span><span class="p">,</span> <span class="n">response</span><span class="p">)</span>
+        <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
+
+    <span class="n">all_accounts</span> <span class="o">=</span> <span class="n">json</span><span class="o">.</span><span class="n">loads</span><span class="p">(</span><span class="n">response</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;data&quot;</span><span class="p">,</span> <span class="p">[])</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">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s2">&quot;Error: Could not get conductor credentials!&quot;</span><span class="p">)</span>
+    <span class="n">account_id</span> <span class="o">=</span>  <span class="nb">str</span><span class="p">(</span><span class="n">account_id_from_jwt</span><span class="p">(</span><span class="n">token</span><span class="p">))</span>
+
+    <span class="k">if</span> <span class="ow">not</span> <span class="n">account_id</span><span class="p">:</span>
+        <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s2">&quot;Error: Could not get account id from jwt!&quot;</span><span class="p">)</span>
+    <span class="n">account_env</span> <span class="o">=</span> <span class="nb">next</span><span class="p">((</span><span class="n">account</span> <span class="k">for</span> <span class="n">account</span> <span class="ow">in</span> <span class="n">all_accounts</span> <span class="k">if</span> <span class="n">account</span><span class="p">[</span><span class="s2">&quot;account_id&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="n">account_id</span><span class="p">),</span> <span class="kc">None</span><span class="p">)</span>
+    <span class="k">if</span> <span class="ow">not</span> <span class="n">account_env</span><span class="p">:</span>
+        <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s2">&quot;Error: Could not get account environment!&quot;</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">account_env</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;env&quot;</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.get_jobs" class="doc doc-heading">
 <code class="highlight language-python"><span class="n">get_jobs</span><span class="p">(</span><span class="n">first_jid</span><span class="p">,</span> <span class="n">last_jid</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span></code>
 

ciocore/docsite/apidoc/data/index.html

@@ -1150,6 +1150,14 @@ the software available at Conductor, or a subset based on specified products.</p
         <span class="c1"># SOFTWARE</span>
         <span class="n">software</span> <span class="o">=</span> <span class="n">api_client</span><span class="o">.</span><span class="n">request_software_packages</span><span class="p">()</span>
 
+        <span class="c1"># EXTRA ENV VARS</span>
+        <span class="n">extra_env_vars</span> <span class="o">=</span> <span class="p">[]</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">extra_env_vars</span> <span class="o">=</span> <span class="n">api_client</span><span class="o">.</span><span class="n">request_extra_environment</span><span class="p">()</span>
+        <span class="k">except</span> <span class="ne">Exception</span><span class="p">:</span>
+            <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="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>

ciocore/docsite/apidoc/package_environment/index.html

@@ -900,9 +900,9 @@ PackageEnvironment        </code>
 
 <span class="sd">        The first time data is added to a PackageEnvironment, the platform is set in stone. Subsequent `adds` that try to change the platform are considered an error.</span>
 
-<span class="sd">        Each variable to be added specifies a merge_policy: `append` or `exclusive`. Once an individual variable has been initialized with a merge policy, it can&#39;t be changed. This means:</span>
+<span class="sd">        Each variable to be added specifies a merge_policy: `append`, `prepend`, or `exclusive` `append` and `prepend` can be thought of as lists= types. Once an individual variable has been initialized as a list, it can&#39;t be changed to `exclusive`. This means:</span>
 
-<span class="sd">        1. It&#39;s not possible to overwrite variables that have been set as append.</span>
+<span class="sd">        1. It&#39;s not possible to overwrite variables that have been added as `append` or `prepend`.</span>
 <span class="sd">        2. Exclusive variables are always overwritten by subsequent adds.</span>
 
 <span class="sd">        Raises:</span>
@@ -960,11 +960,13 @@ PackageEnvironment        </code>
             <span class="n">name</span> <span class="o">=</span> <span class="n">var</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span>
             <span class="n">value</span> <span class="o">=</span> <span class="n">var</span><span class="p">[</span><span class="s2">&quot;value&quot;</span><span class="p">]</span>
             <span class="n">policy</span> <span class="o">=</span> <span class="n">var</span><span class="p">[</span><span class="s2">&quot;merge_policy&quot;</span><span class="p">]</span>
-            <span class="k">if</span> <span class="n">policy</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">[</span><span class="s2">&quot;append&quot;</span><span class="p">,</span> <span class="s2">&quot;exclusive&quot;</span><span class="p">]:</span>
+            <span class="k">if</span> <span class="n">policy</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">[</span><span class="s2">&quot;append&quot;</span><span class="p">,</span> <span class="s2">&quot;prepend&quot;</span><span class="p">,</span> <span class="s2">&quot;exclusive&quot;</span><span class="p">]:</span>
                 <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unexpected merge policy: </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">policy</span><span class="p">)</span>
 
             <span class="k">if</span> <span class="n">policy</span> <span class="o">==</span> <span class="s2">&quot;append&quot;</span><span class="p">:</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">_append</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
+            <span class="k">elif</span> <span class="n">policy</span> <span class="o">==</span> <span class="s2">&quot;prepend&quot;</span><span class="p">:</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">_prepend</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
             <span class="k">else</span><span class="p">:</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">_set</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
 
@@ -998,6 +1000,22 @@ PackageEnvironment        </code>
             <span class="bp">self</span><span class="o">.</span><span class="n">_env</span><span class="p">[</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="p">[]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_env</span><span class="p">[</span><span class="n">name</span><span class="p">]</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">value</span><span class="p">)</span>
 
+    <span class="k">def</span> <span class="nf">_prepend</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">):</span>
+<span class="w">        </span><span class="sd">&quot;&quot;&quot;Set the value of an append/prepend variable.</span>
+
+<span class="sd">        Can be appended to with subsequent adds.</span>
+
+<span class="sd">        It is an error if the variable has already been declared with policy=exclusive.</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_env</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">name</span><span class="p">):</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_env</span><span class="p">[</span><span class="n">name</span><span class="p">],</span> <span class="nb">list</span><span class="p">):</span>
+                <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span>
+                    <span class="s2">&quot;Can&#39;t change merge policy for &#39;</span><span class="si">{}</span><span class="s2">&#39; from &#39;exclusive&#39; to &#39;prepend&#39;.&quot;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">name</span><span class="p">)</span>
+                <span class="p">)</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_env</span><span class="p">[</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="p">[]</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_env</span><span class="p">[</span><span class="n">name</span><span class="p">]</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
+
     <span class="k">def</span> <span class="fm">__iter__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Cast the object as a dict.&quot;&quot;&quot;</span>
         <span class="n">sep</span> <span class="o">=</span> <span class="s2">&quot;;&quot;</span> <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">platform</span> <span class="o">==</span> <span class="s2">&quot;windows&quot;</span> <span class="k">else</span> <span class="s2">&quot;:&quot;</span>
@@ -1142,9 +1160,9 @@ PackageEnvironment        </code>
       </tr>
   </tbody>
 </table>      <p>The first time data is added to a PackageEnvironment, the platform is set in stone. Subsequent <code>adds</code> that try to change the platform are considered an error.</p>
-<p>Each variable to be added specifies a merge_policy: <code>append</code> or <code>exclusive</code>. Once an individual variable has been initialized with a merge policy, it can't be changed. This means:</p>
+<p>Each variable to be added specifies a merge_policy: <code>append</code>, <code>prepend</code>, or <code>exclusive</code> <code>append</code> and <code>prepend</code> can be thought of as lists= types. Once an individual variable has been initialized as a list, it can't be changed to <code>exclusive</code>. This means:</p>
 <ol>
-<li>It's not possible to overwrite variables that have been set as append.</li>
+<li>It's not possible to overwrite variables that have been added as <code>append</code> or <code>prepend</code>.</li>
 <li>Exclusive variables are always overwritten by subsequent adds.</li>
 </ol>
 
@@ -1209,9 +1227,9 @@ PackageEnvironment        </code>
 
 <span class="sd">    The first time data is added to a PackageEnvironment, the platform is set in stone. Subsequent `adds` that try to change the platform are considered an error.</span>
 
-<span class="sd">    Each variable to be added specifies a merge_policy: `append` or `exclusive`. Once an individual variable has been initialized with a merge policy, it can&#39;t be changed. This means:</span>
+<span class="sd">    Each variable to be added specifies a merge_policy: `append`, `prepend`, or `exclusive` `append` and `prepend` can be thought of as lists= types. Once an individual variable has been initialized as a list, it can&#39;t be changed to `exclusive`. This means:</span>
 
-<span class="sd">    1. It&#39;s not possible to overwrite variables that have been set as append.</span>
+<span class="sd">    1. It&#39;s not possible to overwrite variables that have been added as `append` or `prepend`.</span>
 <span class="sd">    2. Exclusive variables are always overwritten by subsequent adds.</span>
 
 <span class="sd">    Raises:</span>
@@ -1269,11 +1287,13 @@ PackageEnvironment        </code>
         <span class="n">name</span> <span class="o">=</span> <span class="n">var</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span>
         <span class="n">value</span> <span class="o">=</span> <span class="n">var</span><span class="p">[</span><span class="s2">&quot;value&quot;</span><span class="p">]</span>
         <span class="n">policy</span> <span class="o">=</span> <span class="n">var</span><span class="p">[</span><span class="s2">&quot;merge_policy&quot;</span><span class="p">]</span>
-        <span class="k">if</span> <span class="n">policy</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">[</span><span class="s2">&quot;append&quot;</span><span class="p">,</span> <span class="s2">&quot;exclusive&quot;</span><span class="p">]:</span>
+        <span class="k">if</span> <span class="n">policy</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">[</span><span class="s2">&quot;append&quot;</span><span class="p">,</span> <span class="s2">&quot;prepend&quot;</span><span class="p">,</span> <span class="s2">&quot;exclusive&quot;</span><span class="p">]:</span>
             <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Unexpected merge policy: </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">policy</span><span class="p">)</span>
 
         <span class="k">if</span> <span class="n">policy</span> <span class="o">==</span> <span class="s2">&quot;append&quot;</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">_append</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
+        <span class="k">elif</span> <span class="n">policy</span> <span class="o">==</span> <span class="s2">&quot;prepend&quot;</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_prepend</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">_set</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span>
 </code></pre></div>