Merge pull request #8 from IBM/v0.3.0.1b

V0.3.0.1

CHANGELOG.md

@@ -6,11 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.0.1] - 2020-03-04
+## Added
+- DOModelExporter: export DO models in CPDv2.5
+- cpd25utilities: some data asset read and write functions
+
 ## [0.3.0.0] - 2020-02-22
 ### Changed
 - Support for CPD2.5
-- Writing files and add them as Data Asset
-- Imports so that can use as set of modules
+- Writing files and add them as Data Asset in CPD v2.5
+- Only for Python 3.6
+- Adding try-except to import dse_do_utils modules to support DO Model Builder adding modules as additional files.
+- Maintained backward compatibility with CPD v2.1
 
 ## [0.2.2.3] - 2019-07-10
 ### Added

VersioningReadMe.md

@@ -16,7 +16,9 @@ b. Open Terminal, from root, run <br>
 4. Upload to PyPI (from PyCharm terminal run):<br>
 `twine upload dist/*  --verbose`
 Enter username and password when prompted.
-(For TestPyPI use: `twine upload --repository-url https://test.pypi.org/legacy/ dist/* --verbose`)
+(For TestPyPI use: `twine upload --repository-url https://test.pypi.org/legacy/ dist/* --verbose`)<br>
+Before the twine upload, you can check the distribution with:<br>
+`twine check dist/*`
 
 5. For JFrog, run `setup.py` with the following arguments:<br>
 `python setup.py sdist bdist_wheel upload -r local`<br>

docs/doc_build/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: e0ac2326caedf89bab74943b58fdfdb2
+config: 18805d56ab22e017ff794e949f9f600f
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/doc_build/html/_modules/dse_do_utils.html

@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>dse_do_utils &mdash; DSE DO Utils 0.3.0.0 documentation</title>
+  <title>dse_do_utils &mdash; DSE DO Utils 0.3.0.1 documentation</title>
 
 
 
@@ -23,7 +23,7 @@
       <script type="text/javascript">
           var DOCUMENTATION_OPTIONS = {
               URL_ROOT:'../',
-              VERSION:'0.3.0.0',
+              VERSION:'0.3.0.1',
               LANGUAGE:'None',
               COLLAPSE_INDEX:false,
               FILE_SUFFIX:'.html',
@@ -67,7 +67,7 @@
 
 
               <div class="version">
-                0.3.0.0
+                0.3.0.1
               </div>
 
 
@@ -162,10 +162,10 @@ <h1>Source code for dse_do_utils</h1><div class="highlight"><pre>
 <span></span><span class="c1"># Copyright IBM All Rights Reserved.</span>
 <span class="c1"># SPDX-License-Identifier: Apache-2.0</span>
 
-<span class="kn">from</span> <span class="nn">.version</span> <span class="k">import</span> <span class="n">__version__</span>
-<span class="kn">from</span> <span class="nn">.datamanager</span> <span class="k">import</span> <span class="n">DataManager</span>
-<span class="kn">from</span> <span class="nn">.optimizationengine</span> <span class="k">import</span> <span class="n">OptimizationEngine</span>
-<span class="kn">from</span> <span class="nn">.scenariomanager</span> <span class="k">import</span> <span class="n">ScenarioManager</span>
+<span class="kn">from</span> <span class="nn">.version</span> <span class="kn">import</span> <span class="n">__version__</span>
+<span class="kn">from</span> <span class="nn">.datamanager</span> <span class="kn">import</span> <span class="n">DataManager</span>
+<span class="kn">from</span> <span class="nn">.optimizationengine</span> <span class="kn">import</span> <span class="n">OptimizationEngine</span>
+<span class="kn">from</span> <span class="nn">.scenariomanager</span> <span class="kn">import</span> <span class="n">ScenarioManager</span>
 <span class="c1"># from .scenariopicker import ScenarioPicker</span>
 <span class="c1"># from .deployeddomodel import DeployedDOModel</span>
 <span class="c1"># from .mapmanager import MapManager</span>

docs/doc_build/html/_modules/dse_do_utils/datamanager.html

@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>dse_do_utils.datamanager &mdash; DSE DO Utils 0.3.0.0 documentation</title>
+  <title>dse_do_utils.datamanager &mdash; DSE DO Utils 0.3.0.1 documentation</title>
 
 
 
@@ -23,7 +23,7 @@
       <script type="text/javascript">
           var DOCUMENTATION_OPTIONS = {
               URL_ROOT:'../../',
-              VERSION:'0.3.0.0',
+              VERSION:'0.3.0.1',
               LANGUAGE:'None',
               COLLAPSE_INDEX:false,
               FILE_SUFFIX:'.html',
@@ -67,7 +67,7 @@
 
 
               <div class="version">
-                0.3.0.0
+                0.3.0.1
               </div>
 
 
@@ -170,9 +170,9 @@ <h1>Source code for dse_do_utils.datamanager</h1><div class="highlight"><pre>
 <span class="c1"># -----------------------------------------------------------------------------------</span>
 <span class="c1"># -----------------------------------------------------------------------------------</span>
 
-<span class="kn">from</span> <span class="nn">__future__</span> <span class="k">import</span> <span class="n">absolute_import</span>
-<span class="kn">from</span> <span class="nn">__future__</span> <span class="k">import</span> <span class="n">division</span>
-<span class="kn">from</span> <span class="nn">__future__</span> <span class="k">import</span> <span class="n">print_function</span>
+<span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">absolute_import</span>
+<span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">division</span>
+<span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">print_function</span>
 
 <span class="kn">import</span> <span class="nn">pandas</span> <span class="k">as</span> <span class="nn">pd</span>
 
@@ -195,7 +195,7 @@ <h1>Source code for dse_do_utils.datamanager</h1><div class="highlight"><pre>
 <span class="sd">        * Contains a set of methods that create intermediate data (&#39;pre-processing&#39;). Intermediate data will also be assigned as a direct member property.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
 
-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">inputs</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">outputs</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
+    <span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">inputs</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">outputs</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">inputs</span> <span class="o">=</span> <span class="n">inputs</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">outputs</span> <span class="o">=</span> <span class="n">outputs</span>
         <span class="k">return</span>
@@ -257,7 +257,7 @@ <h1>Source code for dse_do_utils.datamanager</h1><div class="highlight"><pre>
 
 <span class="sd">        Returns:</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="kn">from</span> <span class="nn">datetime</span> <span class="k">import</span> <span class="n">datetime</span>
+        <span class="kn">from</span> <span class="nn">datetime</span> <span class="kn">import</span> <span class="n">datetime</span>
         <span class="c1"># assert &#39;param&#39; in params.index #Not absolutely necessary, as long as single index</span>
         <span class="k">assert</span> <span class="s1">&#39;value&#39;</span> <span class="ow">in</span> <span class="n">params</span><span class="o">.</span><span class="n">columns</span>
         <span class="k">if</span> <span class="n">param_name</span> <span class="ow">in</span> <span class="n">params</span><span class="o">.</span><span class="n">index</span><span class="p">:</span>

docs/doc_build/html/_modules/dse_do_utils/deployeddomodel.html

@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>dse_do_utils.deployeddomodel &mdash; DSE DO Utils 0.3.0.0 documentation</title>
+  <title>dse_do_utils.deployeddomodel &mdash; DSE DO Utils 0.3.0.1 documentation</title>
 
 
 
@@ -23,7 +23,7 @@
       <script type="text/javascript">
           var DOCUMENTATION_OPTIONS = {
               URL_ROOT:'../../',
-              VERSION:'0.3.0.0',
+              VERSION:'0.3.0.1',
               LANGUAGE:'None',
               COLLAPSE_INDEX:false,
               FILE_SUFFIX:'.html',
@@ -67,7 +67,7 @@
 
 
               <div class="version">
-                0.3.0.0
+                0.3.0.1
               </div>
 
 
@@ -214,7 +214,7 @@ <h1>Source code for dse_do_utils.deployeddomodel</h1><div class="highlight"><pre
 
 <span class="sd">    &quot;&quot;&quot;</span>
 
-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">url</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">server</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">route</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">service_name</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">model_name</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">token</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">inputs</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+    <span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">url</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">server</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">route</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">service_name</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">model_name</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">token</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">inputs</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
                  <span class="n">attachment_type</span><span class="o">=</span><span class="s1">&#39;CONTAINER&#39;</span><span class="p">,</span> <span class="n">suppress_warnings</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">debug</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">debug_file_dir</span><span class="o">=</span><span class="s1">&#39;../datasets&#39;</span><span class="p">,</span> <span class="n">log_file_name</span><span class="o">=</span><span class="s1">&#39;log.txt&#39;</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;Initialize the interface object.</span>
 
@@ -446,7 +446,7 @@ <h1>Source code for dse_do_utils.deployeddomodel</h1><div class="highlight"><pre
 <span class="sd">            self.cleanup()</span>
 
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="kn">from</span> <span class="nn">time</span> <span class="k">import</span> <span class="n">sleep</span>
+        <span class="kn">from</span> <span class="nn">time</span> <span class="kn">import</span> <span class="n">sleep</span>
         <span class="kn">import</span> <span class="nn">warnings</span>
         <span class="k">with</span> <span class="n">warnings</span><span class="o">.</span><span class="n">catch_warnings</span><span class="p">():</span>
             <span class="c1"># TODO: turn-off the ignore warning is NOT working</span>
@@ -540,7 +540,7 @@ <h1>Source code for dse_do_utils.deployeddomodel</h1><div class="highlight"><pre
 <span class="sd">        TODO: Time-out?</span>
 <span class="sd">        TODO: control the loop delay?</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="kn">from</span> <span class="nn">time</span> <span class="k">import</span> <span class="n">sleep</span>
+        <span class="kn">from</span> <span class="nn">time</span> <span class="kn">import</span> <span class="n">sleep</span>
         <span class="k">while</span> <span class="kc">True</span><span class="p">:</span>
             <span class="n">r</span> <span class="o">=</span> <span class="n">requests</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">get_job_url</span><span class="p">(),</span> <span class="n">headers</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">get_headers</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="bp">self</span><span class="o">.</span><span class="n">execution_status_json</span> <span class="o">=</span> <span class="n">r</span><span class="o">.</span><span class="n">json</span><span class="p">()</span>
@@ -664,9 +664,9 @@ <h1>Source code for dse_do_utils.deployeddomodel</h1><div class="highlight"><pre
         <span class="sd">&quot;&quot;&quot;Call REST API to GET the data from a table attachment and load into a DataFrame.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">version_info</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">&lt;</span> <span class="mi">3</span><span class="p">:</span>
-            <span class="kn">from</span> <span class="nn">StringIO</span> <span class="k">import</span> <span class="n">StringIO</span>
+            <span class="kn">from</span> <span class="nn">StringIO</span> <span class="kn">import</span> <span class="n">StringIO</span>
         <span class="k">else</span><span class="p">:</span>
-            <span class="kn">from</span> <span class="nn">io</span> <span class="k">import</span> <span class="n">StringIO</span>
+            <span class="kn">from</span> <span class="nn">io</span> <span class="kn">import</span> <span class="n">StringIO</span>
 
         <span class="n">r</span> <span class="o">=</span> <span class="n">requests</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">data_url</span><span class="p">,</span> <span class="n">headers</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">get_headers</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">df</span> <span class="o">=</span> <span class="n">pd</span><span class="o">.</span><span class="n">read_csv</span><span class="p">(</span><span class="n">StringIO</span><span class="p">(</span><span class="n">r</span><span class="o">.</span><span class="n">content</span><span class="p">))</span>
@@ -691,9 +691,9 @@ <h1>Source code for dse_do_utils.deployeddomodel</h1><div class="highlight"><pre
 <span class="sd">        &quot;&quot;&quot;</span>
 
         <span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">version_info</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">&lt;</span> <span class="mi">3</span><span class="p">:</span>
-            <span class="kn">from</span> <span class="nn">StringIO</span> <span class="k">import</span> <span class="n">StringIO</span>
+            <span class="kn">from</span> <span class="nn">StringIO</span> <span class="kn">import</span> <span class="n">StringIO</span>
         <span class="k">else</span><span class="p">:</span>
-            <span class="kn">from</span> <span class="nn">io</span> <span class="k">import</span> <span class="n">StringIO</span>
+            <span class="kn">from</span> <span class="nn">io</span> <span class="kn">import</span> <span class="n">StringIO</span>
 
         <span class="n">csv</span> <span class="o">=</span> <span class="n">StringIO</span><span class="p">()</span>
         <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">table</span><span class="p">[</span><span class="s1">&#39;rows&#39;</span><span class="p">]:</span>