deploy: 6cb9f57

Author: jmsmkn

_modules/grandchallenge/components/models.html

@@ -1613,13 +1613,13 @@ <h1>Source code for grandchallenge.components.models</h1><div class="highlight">
 <div class="viewcode-block" id="ComponentJobManager.retrieve_existing_civs">
 <a class="viewcode-back" href="../../../components.html#grandchallenge.components.models.ComponentJobManager.retrieve_existing_civs">[docs]</a>
     <span class="nd">@staticmethod</span>
-    <span class="k">def</span><span class="w"> </span><span class="nf">retrieve_existing_civs</span><span class="p">(</span><span class="o">*</span><span class="p">,</span> <span class="n">civ_data</span><span class="p">):</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">retrieve_existing_civs</span><span class="p">(</span><span class="o">*</span><span class="p">,</span> <span class="n">civ_data_objects</span><span class="p">):</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">        Checks if there are existing CIVs for the provided data and returns those.</span>
+<span class="sd">        Check if there are existing CIVs for the provided data and returns those.</span>
 
 <span class="sd">        Parameters</span>
 <span class="sd">        ----------</span>
-<span class="sd">        civ_data</span>
+<span class="sd">        civ_data_objects</span>
 <span class="sd">            A list of CIVData objects.</span>
 
 <span class="sd">        Returns</span>
@@ -1628,29 +1628,31 @@ <h1>Source code for grandchallenge.components.models</h1><div class="highlight">
 
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="n">existing_civs</span> <span class="o">=</span> <span class="p">[]</span>
-        <span class="k">for</span> <span class="n">civ</span> <span class="ow">in</span> <span class="n">civ_data</span><span class="p">:</span>
+        <span class="k">for</span> <span class="n">civ_data</span> <span class="ow">in</span> <span class="n">civ_data_objects</span><span class="p">:</span>
             <span class="k">if</span> <span class="p">(</span>
-                <span class="n">civ</span><span class="o">.</span><span class="n">user_upload</span>
-                <span class="ow">or</span> <span class="n">civ</span><span class="o">.</span><span class="n">upload_session</span>
-                <span class="ow">or</span> <span class="n">civ</span><span class="o">.</span><span class="n">user_upload_queryset</span>
+                <span class="n">civ_data</span><span class="o">.</span><span class="n">user_upload</span>
+                <span class="ow">or</span> <span class="n">civ_data</span><span class="o">.</span><span class="n">upload_session</span>
+                <span class="ow">or</span> <span class="n">civ_data</span><span class="o">.</span><span class="n">user_upload_queryset</span>
             <span class="p">):</span>
                 <span class="c1"># uploads will create new CIVs, so ignore these</span>
                 <span class="k">continue</span>
-            <span class="k">elif</span> <span class="n">civ</span><span class="o">.</span><span class="n">image</span><span class="p">:</span>
+            <span class="k">elif</span> <span class="n">civ_data</span><span class="o">.</span><span class="n">image</span><span class="p">:</span>
                 <span class="k">try</span><span class="p">:</span>
                     <span class="n">civs</span> <span class="o">=</span> <span class="n">ComponentInterfaceValue</span><span class="o">.</span><span class="n">objects</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span>
-                        <span class="n">interface__slug</span><span class="o">=</span><span class="n">civ</span><span class="o">.</span><span class="n">interface_slug</span><span class="p">,</span> <span class="n">image</span><span class="o">=</span><span class="n">civ</span><span class="o">.</span><span class="n">image</span>
+                        <span class="n">interface__slug</span><span class="o">=</span><span class="n">civ_data</span><span class="o">.</span><span class="n">interface_slug</span><span class="p">,</span>
+                        <span class="n">image</span><span class="o">=</span><span class="n">civ_data</span><span class="o">.</span><span class="n">image</span><span class="p">,</span>
                     <span class="p">)</span><span class="o">.</span><span class="n">all</span><span class="p">()</span>
                     <span class="n">existing_civs</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">civs</span><span class="p">)</span>
                 <span class="k">except</span> <span class="n">ObjectDoesNotExist</span><span class="p">:</span>
                     <span class="k">continue</span>
-            <span class="k">elif</span> <span class="n">civ</span><span class="o">.</span><span class="n">file_civ</span><span class="p">:</span>
-                <span class="n">existing_civs</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">civ</span><span class="o">.</span><span class="n">file_civ</span><span class="p">)</span>
+            <span class="k">elif</span> <span class="n">civ_data</span><span class="o">.</span><span class="n">file_civ</span><span class="p">:</span>
+                <span class="n">existing_civs</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">civ_data</span><span class="o">.</span><span class="n">file_civ</span><span class="p">)</span>
             <span class="k">else</span><span class="p">:</span>
                 <span class="c1"># values can be of different types, including None and False</span>
                 <span class="k">try</span><span class="p">:</span>
                     <span class="n">civs</span> <span class="o">=</span> <span class="n">ComponentInterfaceValue</span><span class="o">.</span><span class="n">objects</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span>
-                        <span class="n">interface__slug</span><span class="o">=</span><span class="n">civ</span><span class="o">.</span><span class="n">interface_slug</span><span class="p">,</span> <span class="n">value</span><span class="o">=</span><span class="n">civ</span><span class="o">.</span><span class="n">value</span>
+                        <span class="n">interface__slug</span><span class="o">=</span><span class="n">civ_data</span><span class="o">.</span><span class="n">interface_slug</span><span class="p">,</span>
+                        <span class="n">value</span><span class="o">=</span><span class="n">civ_data</span><span class="o">.</span><span class="n">value</span><span class="p">,</span>
                     <span class="p">)</span><span class="o">.</span><span class="n">all</span><span class="p">()</span>
                     <span class="n">existing_civs</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">civs</span><span class="p">)</span>
                 <span class="k">except</span> <span class="n">ObjectDoesNotExist</span><span class="p">:</span>
@@ -2507,10 +2509,10 @@ <h1>Source code for grandchallenge.components.models</h1><div class="highlight">
         <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">is_editable</span><span class="p">:</span>
             <span class="k">raise</span> <span class="n">CIVNotEditableException</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="si">}</span><span class="s2"> is not editable.&quot;</span><span class="p">)</span>
 
-    <span class="k">def</span><span class="w"> </span><span class="nf">validate_values_and_execute_linked_task</span><span class="p">(</span>
-        <span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="p">,</span> <span class="n">values</span><span class="p">,</span> <span class="n">user</span><span class="p">,</span> <span class="n">linked_task</span><span class="o">=</span><span class="kc">None</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">validate_civ_data_objects_and_execute_linked_task</span><span class="p">(</span>
+        <span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="p">,</span> <span class="n">civ_data_objects</span><span class="p">,</span> <span class="n">user</span><span class="p">,</span> <span class="n">linked_task</span><span class="o">=</span><span class="kc">None</span>
     <span class="p">):</span>
-        <span class="k">for</span> <span class="n">civ_data</span> <span class="ow">in</span> <span class="n">values</span><span class="p">:</span>
+        <span class="k">for</span> <span class="n">civ_data</span> <span class="ow">in</span> <span class="n">civ_data_objects</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">create_civ</span><span class="p">(</span>
                 <span class="n">civ_data</span><span class="o">=</span><span class="n">civ_data</span><span class="p">,</span>
                 <span class="n">user</span><span class="o">=</span><span class="n">user</span><span class="p">,</span>

_modules/grandchallenge/evaluation/models.html

@@ -1730,9 +1730,8 @@ <h1>Source code for grandchallenge.evaluation.models</h1><div class="highlight">
                 <span class="p">)</span>
 
         <span class="k">if</span> <span class="n">additional_inputs</span><span class="p">:</span>
-            <span class="n">evaluation</span><span class="o">.</span><span class="n">validate_values_and_execute_linked_task</span><span class="p">(</span>
-                <span class="n">values</span><span class="o">=</span><span class="n">additional_inputs</span><span class="p">,</span>
-                <span class="n">user</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">creator</span><span class="p">,</span>
+            <span class="n">evaluation</span><span class="o">.</span><span class="n">validate_civ_data_objects_and_execute_linked_task</span><span class="p">(</span>
+                <span class="n">civ_data_objects</span><span class="o">=</span><span class="n">additional_inputs</span><span class="p">,</span> <span class="n">user</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">creator</span>
             <span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">e</span> <span class="o">=</span> <span class="n">check_prerequisites_for_evaluation_execution</span><span class="o">.</span><span class="n">signature</span><span class="p">(</span>
@@ -1895,7 +1894,7 @@ <h1>Source code for grandchallenge.evaluation.models</h1><div class="highlight">
         <span class="n">requires_gpu_type</span><span class="p">,</span>
         <span class="n">requires_memory_gb</span><span class="p">,</span>
     <span class="p">):</span>
-        <span class="n">existing_civs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">retrieve_existing_civs</span><span class="p">(</span><span class="n">civ_data</span><span class="o">=</span><span class="n">inputs</span><span class="p">)</span>
+        <span class="n">existing_civs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">retrieve_existing_civs</span><span class="p">(</span><span class="n">civ_data_objects</span><span class="o">=</span><span class="n">inputs</span><span class="p">)</span>
         <span class="n">unique_kwargs</span> <span class="o">=</span> <span class="p">{</span>
             <span class="s2">&quot;submission&quot;</span><span class="p">:</span> <span class="n">submission</span><span class="p">,</span>
             <span class="s2">&quot;method&quot;</span><span class="p">:</span> <span class="n">method</span><span class="p">,</span>
@@ -2156,8 +2155,8 @@ <h1>Source code for grandchallenge.evaluation.models</h1><div class="highlight">
     <span class="k">def</span><span class="w"> </span><span class="nf">get_civ_for_interface</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">interface</span><span class="p">):</span>
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">inputs</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">interface</span><span class="o">=</span><span class="n">interface</span><span class="p">)</span>
 
-    <span class="k">def</span><span class="w"> </span><span class="nf">validate_values_and_execute_linked_task</span><span class="p">(</span>
-        <span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="p">,</span> <span class="n">values</span><span class="p">,</span> <span class="n">user</span><span class="p">,</span> <span class="n">linked_task</span><span class="o">=</span><span class="kc">None</span>
+    <span class="k">def</span><span class="w"> </span><span class="nf">validate_civ_data_objects_and_execute_linked_task</span><span class="p">(</span>
+        <span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="p">,</span> <span class="n">civ_data_objects</span><span class="p">,</span> <span class="n">user</span><span class="p">,</span> <span class="n">linked_task</span><span class="o">=</span><span class="kc">None</span>
     <span class="p">):</span>
         <span class="kn">from</span><span class="w"> </span><span class="nn">grandchallenge.evaluation.tasks</span><span class="w"> </span><span class="kn">import</span> <span class="p">(</span>
             <span class="n">check_prerequisites_for_evaluation_execution</span><span class="p">,</span>
@@ -2169,8 +2168,10 @@ <h1>Source code for grandchallenge.evaluation.models</h1><div class="highlight">
             <span class="p">},</span>
             <span class="n">immutable</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
         <span class="p">)</span>
-        <span class="k">return</span> <span class="nb">super</span><span class="p">()</span><span class="o">.</span><span class="n">validate_values_and_execute_linked_task</span><span class="p">(</span>
-            <span class="n">values</span><span class="o">=</span><span class="n">values</span><span class="p">,</span> <span class="n">user</span><span class="o">=</span><span class="n">user</span><span class="p">,</span> <span class="n">linked_task</span><span class="o">=</span><span class="n">linked_task</span>
+        <span class="k">return</span> <span class="nb">super</span><span class="p">()</span><span class="o">.</span><span class="n">validate_civ_data_objects_and_execute_linked_task</span><span class="p">(</span>
+            <span class="n">civ_data_objects</span><span class="o">=</span><span class="n">civ_data_objects</span><span class="p">,</span>
+            <span class="n">user</span><span class="o">=</span><span class="n">user</span><span class="p">,</span>
+            <span class="n">linked_task</span><span class="o">=</span><span class="n">linked_task</span><span class="p">,</span>
         <span class="p">)</span>
 
     <span class="nd">@property</span>

components.html

@@ -398,11 +398,11 @@ <h3>Navigation</h3>
 
 <dl class="py method">
 <dt class="sig sig-object py" id="grandchallenge.components.models.ComponentJobManager.retrieve_existing_civs">
-<em class="property"><span class="k"><span class="pre">static</span></span><span class="w"> </span></em><span class="sig-name descname"><span class="pre">retrieve_existing_civs</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="keyword-only-separator o"><abbr title="Keyword-only parameters separator (PEP 3102)"><span class="pre">*</span></abbr></span></em>, <em class="sig-param"><span class="n"><span class="pre">civ_data</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="_modules/grandchallenge/components/models.html#ComponentJobManager.retrieve_existing_civs"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#grandchallenge.components.models.ComponentJobManager.retrieve_existing_civs" title="Link to this definition">¶</a></dt>
-<dd><p>Checks if there are existing CIVs for the provided data and returns those.</p>
+<em class="property"><span class="k"><span class="pre">static</span></span><span class="w"> </span></em><span class="sig-name descname"><span class="pre">retrieve_existing_civs</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="keyword-only-separator o"><abbr title="Keyword-only parameters separator (PEP 3102)"><span class="pre">*</span></abbr></span></em>, <em class="sig-param"><span class="n"><span class="pre">civ_data_objects</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="_modules/grandchallenge/components/models.html#ComponentJobManager.retrieve_existing_civs"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#grandchallenge.components.models.ComponentJobManager.retrieve_existing_civs" title="Link to this definition">¶</a></dt>
+<dd><p>Check if there are existing CIVs for the provided data and returns those.</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters<span class="colon">:</span></dt>
-<dd class="field-odd"><p><strong>civ_data</strong> – A list of CIVData objects.</p>
+<dd class="field-odd"><p><strong>civ_data_objects</strong> – A list of CIVData objects.</p>
 </dd>
 <dt class="field-even">Returns<span class="colon">:</span></dt>
 <dd class="field-even"><p><em>A list of ComponentInterfaceValues</em></p>
@@ -430,53 +430,53 @@ <h3>Navigation</h3>
 <div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Interface kinds that are images:
 
   - Heat Map
-  - Segmentation
-  - Image
   - Displacement field
+  - Image
   - DICOM Image Set
+  - Segmentation
 
 
 Interface kinds that are files:
 
-  - Thumbnail jpg
+  - MP4 file
   - Newick tree-format file
-  - OBJ file
+  - SQREG file
+  - ZIP file
   - BIOM format
+  - Thumbnail jpg
+  - OBJ file
   - Thumbnail png
-  - SQREG file
-  - CSV file
   - PDF file
-  - MP4 file
-  - ZIP file
+  - CSV file
 
 
 Interface kinds that are json serializable:
 
-  - Multiple choice
-  - Anything
-  - Multiple ellipses
-  - 2D bounding box
   - Float
   - Multiple points
-  - Multiple three-point angles
-  - Multiple distance measurements
-  - Bool
+  - Affine transform registration
   - Polygon
-  - Line
-  - Distance measurement
   - Ellipse
-  - Integer
-  - Multiple 2D bounding boxes
-  - Affine transform registration
-  - Multiple lines
-  - String
-  - Point
+  - Multiple distance measurements
+  - Multiple choice
+  - Multiple ellipses
   - Three-point angle
-  - Chart
   - Choice
+  - Multiple polygons
   - Angle
+  - Anything
+  - Point
+  - Multiple lines
+  - Multiple 2D bounding boxes
+  - Integer
+  - String
   - Multiple angles
-  - Multiple polygons
+  - Line
+  - 2D bounding box
+  - Chart
+  - Bool
+  - Multiple three-point angles
+  - Distance measurement
 
 
 Example JSON file contents for String: