Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/ao/CVE_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@wizzle3d
wizzle3d authored Aug 5, 2024
2 parents 0f0bf15 + daaa3aa commit c002eab
Show file tree
Hide file tree
Showing 49 changed files with 129 additions and 75 deletions.
3 changes: 3 additions & 0 deletions .whitesource
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"settingsInheritedFrom": "seeq12/whitesource-config@main"
}
2 changes: 1 addition & 1 deletion docs/.buildinfo
View file
Original file line number Diff line number Diff line change
@@ -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: e4910fd82dab3730886dc65e1965925c
config: 0e4f4ccee866fb7562737ad11b4f339c
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/.doctrees/add_on_installation.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/backend_calculations.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/changelog.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/citation.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/cross_correlations.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/docstrings.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/.doctrees/examples.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/github.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/index.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/installation.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/introduction.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/license.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/preprocessor.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/seeq_server_interactions.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/user_guide.doctree
View file
Binary file not shown.
Binary file modified docs/.doctrees/user_interface.doctree
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/_modules/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &mdash; seeq-correlation 0.1.95 documentation</title>
<title>Overview: module code &mdash; seeq-correlation 0.1.96 documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="shortcut icon" href="../_static/seeq-favicon.ico"/>
Expand Down Expand Up @@ -34,7 +34,7 @@
<img src="../_static/Seeq_logo_darkBlue_sm.png" class="logo" alt="Logo"/>
</a>
<div class="version">
0.1.95
0.1.96
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
Expand Down
38 changes: 24 additions & 14 deletions docs/_modules/seeq/addons/correlation/_heatmap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>seeq.addons.correlation._heatmap &mdash; seeq-correlation 0.1.9 documentation</title>
<title>seeq.addons.correlation._heatmap &mdash; seeq-correlation 0.1.96 documentation</title>
<link rel="stylesheet" href="../../../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../../../_static/css/theme.css" type="text/css" />
<link rel="shortcut icon" href="../../../../_static/seeq-favicon.ico"/>
<!--[if lt IE 9]>
<script src="../../../../_static/js/html5shiv.min.js"></script>
<![endif]-->

<script src="../../../../_static/jquery.js"></script>
<script src="../../../../_static/_sphinx_javascript_frameworks_compat.js"></script>
<script data-url_root="../../../../" id="documentation_options" src="../../../../_static/documentation_options.js"></script>
<script src="../../../../_static/doctools.js"></script>
<script src="../../../../_static/sphinx_highlight.js"></script>
Expand All @@ -23,14 +26,19 @@
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search" >
<a href="../../../../index.html" class="icon icon-home"> seeq-correlation



<a href="../../../../index.html" class="icon icon-home">
seeq-correlation
<img src="../../../../_static/Seeq_logo_darkBlue_sm.png" class="logo" alt="Logo"/>
</a>
<div class="version">
0.1.9
0.1.96
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
Expand Down Expand Up @@ -62,9 +70,9 @@
<div class="rst-content">
<div role="navigation" aria-label="Page navigation">
<ul class="wy-breadcrumbs">
<li><a href="../../../../index.html" class="icon icon-home"></a> &raquo;</li>
<li><a href="../../../index.html">Module code</a> &raquo;</li>
<li>seeq.addons.correlation._heatmap</li>
<li><a href="../../../../index.html" class="icon icon-home" aria-label="Home"></a></li>
<li class="breadcrumb-item"><a href="../../../index.html">Module code</a></li>
<li class="breadcrumb-item active">seeq.addons.correlation._heatmap</li>
<li class="wy-breadcrumbs-aside">
</li>
</ul>
Expand Down Expand Up @@ -222,13 +230,15 @@ <h1>Source code for seeq.addons.correlation._heatmap</h1><div class="highlight">

<span class="k">def</span> <span class="nf">rename_signals</span><span class="p">(</span><span class="n">signal_list</span><span class="p">,</span> <span class="n">max_label_chars</span><span class="p">):</span>
<span class="k">if</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([</span><span class="nb">len</span><span class="p">(</span><span class="n">x</span><span class="p">)</span> <span class="k">for</span> <span class="n">x</span> <span class="ow">in</span> <span class="n">signal_list</span><span class="p">])</span><span class="o">.</span><span class="n">max</span><span class="p">()</span> <span class="o">&gt;</span> <span class="n">max_label_chars</span><span class="p">:</span>
<span class="n">new_names</span> <span class="o">=</span> <span class="p">[</span><span class="n">name</span><span class="p">[</span><span class="o">-</span><span class="n">max_label_chars</span><span class="p">:]</span> <span class="k">for</span> <span class="n">name</span> <span class="ow">in</span> <span class="n">signal_list</span><span class="p">]</span>
<span class="c1"># TODO: Need to improve the logic of how the long labels are selected</span>
<span class="c1"># labels = []</span>
<span class="c1"># letters = list(string.ascii_uppercase)</span>
<span class="c1"># for i in range(1, 11, 1):</span>
<span class="c1"># labels.extend([letter * i for letter in letters])</span>
<span class="c1"># new_names = labels[:len(signal_list)]</span>
<span class="n">new_names</span> <span class="o">=</span> <span class="p">[]</span>
<span class="k">for</span> <span class="n">i</span><span class="p">,</span> <span class="n">name</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">signal_list</span><span class="p">):</span>
<span class="n">truncated_name</span> <span class="o">=</span> <span class="n">name</span><span class="p">[</span><span class="o">-</span><span class="n">max_label_chars</span><span class="p">:]</span>
<span class="k">if</span> <span class="n">truncated_name</span> <span class="ow">in</span> <span class="n">new_names</span><span class="p">:</span>
<span class="n">unique_name</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">truncated_name</span><span class="p">[</span><span class="mi">2</span><span class="p">:]</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="n">i</span><span class="si">}</span><span class="s2">&quot;</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">unique_name</span> <span class="o">=</span> <span class="n">truncated_name</span>
<span class="n">new_names</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">unique_name</span><span class="p">)</span>

<span class="k">else</span><span class="p">:</span>
<span class="n">new_names</span> <span class="o">=</span> <span class="n">signal_list</span>
<span class="k">return</span> <span class="n">new_names</span>
Expand Down
39 changes: 30 additions & 9 deletions docs/_modules/seeq/addons/correlation/_seeq_worksheet_writer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>seeq.addons.correlation._seeq_worksheet_writer &mdash; seeq-correlation 0.1.9 documentation</title>
<title>seeq.addons.correlation._seeq_worksheet_writer &mdash; seeq-correlation 0.1.96 documentation</title>
<link rel="stylesheet" href="../../../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../../../_static/css/theme.css" type="text/css" />
<link rel="shortcut icon" href="../../../../_static/seeq-favicon.ico"/>
<!--[if lt IE 9]>
<script src="../../../../_static/js/html5shiv.min.js"></script>
<![endif]-->

<script src="../../../../_static/jquery.js"></script>
<script src="../../../../_static/_sphinx_javascript_frameworks_compat.js"></script>
<script data-url_root="../../../../" id="documentation_options" src="../../../../_static/documentation_options.js"></script>
<script src="../../../../_static/doctools.js"></script>
<script src="../../../../_static/sphinx_highlight.js"></script>
Expand All @@ -23,14 +26,19 @@
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search" >
<a href="../../../../index.html" class="icon icon-home"> seeq-correlation



<a href="../../../../index.html" class="icon icon-home">
seeq-correlation
<img src="../../../../_static/Seeq_logo_darkBlue_sm.png" class="logo" alt="Logo"/>
</a>
<div class="version">
0.1.9
0.1.96
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
Expand Down Expand Up @@ -62,9 +70,9 @@
<div class="rst-content">
<div role="navigation" aria-label="Page navigation">
<ul class="wy-breadcrumbs">
<li><a href="../../../../index.html" class="icon icon-home"></a> &raquo;</li>
<li><a href="../../../index.html">Module code</a> &raquo;</li>
<li>seeq.addons.correlation._seeq_worksheet_writer</li>
<li><a href="../../../../index.html" class="icon icon-home" aria-label="Home"></a></li>
<li class="breadcrumb-item"><a href="../../../index.html">Module code</a></li>
<li class="breadcrumb-item active">seeq.addons.correlation._seeq_worksheet_writer</li>
<li class="wy-breadcrumbs-aside">
</li>
</ul>
Expand All @@ -77,10 +85,11 @@ <h1>Source code for seeq.addons.correlation._seeq_worksheet_writer</h1><div clas
<span></span><span class="kn">import</span> <span class="nn">warnings</span>
<span class="kn">import</span> <span class="nn">pandas</span> <span class="k">as</span> <span class="nn">pd</span>
<span class="kn">import</span> <span class="nn">pickle</span>
<span class="kn">import</span> <span class="nn">re</span>
<span class="kn">from</span> <span class="nn">IPython</span> <span class="kn">import</span> <span class="n">display</span>
<span class="kn">from</span> <span class="nn">IPython.core.display</span> <span class="kn">import</span> <span class="n">HTML</span>
<span class="kn">from</span> <span class="nn">seeq</span> <span class="kn">import</span> <span class="n">spy</span><span class="p">,</span> <span class="n">sdk</span>
<span class="kn">from</span> <span class="nn">.utils</span> <span class="kn">import</span> <span class="n">create_condition</span><span class="p">,</span> <span class="n">create_workstep_signals</span><span class="p">,</span> <span class="n">get_seeq_url</span>
<span class="kn">from</span> <span class="nn">.utils</span> <span class="kn">import</span> <span class="n">create_condition</span><span class="p">,</span> <span class="n">create_workstep_signals</span><span class="p">,</span> <span class="n">get_seeq_url</span><span class="p">,</span> <span class="n">path_list_to_string</span><span class="p">,</span> <span class="n">path_string_to_list</span>
<span class="kn">from</span> <span class="nn">.</span> <span class="kn">import</span> <span class="n">default_preprocessing_wrapper</span>
<span class="kn">from</span> <span class="nn">.</span> <span class="kn">import</span> <span class="n">lags_coeffs</span><span class="p">,</span> <span class="n">signals_from_formula</span>

Expand Down Expand Up @@ -123,6 +132,17 @@ <h1>Source code for seeq.addons.correlation._seeq_worksheet_writer</h1><div clas
<span class="n">worksheet_id</span><span class="o">=</span><span class="n">worksheet_id</span><span class="p">)</span> <span class="c1"># type: sdk.WorksheetOutputV1</span>
<span class="k">return</span> <span class="n">existing_worksheet</span>

<span class="k">def</span> <span class="nf">create_analysis_search_query</span><span class="p">(</span><span class="n">workbook</span><span class="p">):</span>
<span class="n">workbook_spec_parts</span> <span class="o">=</span> <span class="n">path_string_to_list</span><span class="p">(</span><span class="n">workbook</span><span class="p">)</span>
<span class="n">search_query</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">()</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">workbook_spec_parts</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">:</span>
<span class="n">search_query</span><span class="p">[</span><span class="s1">&#39;Path&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">path_list_to_string</span><span class="p">(</span><span class="n">workbook_spec_parts</span><span class="p">[</span><span class="mi">0</span><span class="p">:</span><span class="o">-</span><span class="mi">1</span><span class="p">])</span>
<span class="n">workbook_name</span> <span class="o">=</span> <span class="n">workbook_spec_parts</span><span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">workbook_name</span> <span class="o">=</span> <span class="n">workbook_spec_parts</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
<span class="n">search_query</span><span class="p">[</span><span class="s1">&#39;Name&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="sa">f</span><span class="s1">&#39;/^</span><span class="si">{</span><span class="n">re</span><span class="o">.</span><span class="n">escape</span><span class="p">(</span><span class="n">workbook_name</span><span class="p">)</span><span class="si">}</span><span class="s1">$/&#39;</span>
<span class="n">search_query</span><span class="p">[</span><span class="s1">&#39;Workbook Type&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;Analysis&#39;</span>
<span class="k">return</span> <span class="n">search_query</span><span class="p">,</span> <span class="n">workbook_name</span>

<span class="k">def</span> <span class="nf">get_workbook</span><span class="p">(</span><span class="n">workbook</span><span class="p">,</span> <span class="n">worksheet</span><span class="p">,</span> <span class="n">datasource</span><span class="p">):</span>
<span class="k">if</span> <span class="n">workbook</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
Expand All @@ -142,7 +162,7 @@ <h1>Source code for seeq.addons.correlation._seeq_worksheet_writer</h1><div clas
<span class="p">}]),</span> <span class="n">include_inventory</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">quiet</span><span class="o">=</span><span class="kc">True</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span>

<span class="k">else</span><span class="p">:</span>
<span class="n">search_query</span><span class="p">,</span> <span class="n">workbook_name</span> <span class="o">=</span> <span class="n">spy</span><span class="o">.</span><span class="n">_push</span><span class="o">.</span><span class="n">create_analysis_search_query</span><span class="p">(</span><span class="n">workbook</span><span class="p">)</span>
<span class="n">search_query</span><span class="p">,</span> <span class="n">workbook_name</span> <span class="o">=</span> <span class="n">create_analysis_search_query</span><span class="p">(</span><span class="n">workbook</span><span class="p">)</span>
<span class="n">search_df</span> <span class="o">=</span> <span class="n">spy</span><span class="o">.</span><span class="n">workbooks</span><span class="o">.</span><span class="n">search</span><span class="p">(</span><span class="n">search_query</span><span class="p">,</span> <span class="n">quiet</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">search_df</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="n">primary_workbook</span> <span class="o">=</span> <span class="n">spy</span><span class="o">.</span><span class="n">workbooks</span><span class="o">.</span><span class="n">Analysis</span><span class="p">({</span><span class="s1">&#39;Name&#39;</span><span class="p">:</span> <span class="n">workbook_name</span><span class="p">})</span>
Expand Down Expand Up @@ -283,6 +303,7 @@ <h1>Source code for seeq.addons.correlation._seeq_worksheet_writer</h1><div clas

<span class="n">workbook_id</span><span class="p">,</span> <span class="n">worksheet_id</span> <span class="o">=</span> <span class="n">get_workbook</span><span class="p">(</span><span class="n">workbook_id</span><span class="p">,</span> <span class="n">worksheet_name</span><span class="p">,</span> <span class="n">datasource</span><span class="p">)</span>
<span class="n">existing_worksheet</span> <span class="o">=</span> <span class="n">get_existing_worksheet</span><span class="p">(</span><span class="n">workbook_id</span><span class="p">,</span> <span class="n">worksheet_id</span><span class="p">,</span> <span class="n">api_client</span><span class="p">)</span>

<span class="n">create_workstep_signals</span><span class="p">(</span><span class="n">existing_worksheet</span><span class="p">,</span>
<span class="n">workbook_id</span><span class="p">,</span>
<span class="n">all_new_signals</span><span class="p">,</span>
Expand Down
4 changes: 4 additions & 0 deletions docs/_sources/changelog.md.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Changelog
v0.1.96
---
Bug fix for long signal name leading to duplicates dropped in heatmap plot

v0.1.95
---
Minor updates to addon manager packaging
Expand Down
2 changes: 1 addition & 1 deletion docs/_static/documentation_options.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '0.1.95',
VERSION: '0.1.96',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
4 changes: 2 additions & 2 deletions docs/add_on_installation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Add-on Installation &mdash; seeq-correlation 0.1.95 documentation</title>
<title>Add-on Installation &mdash; seeq-correlation 0.1.96 documentation</title>
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<link rel="shortcut icon" href="_static/seeq-favicon.ico"/>
Expand Down Expand Up @@ -37,7 +37,7 @@
<img src="_static/Seeq_logo_darkBlue_sm.png" class="logo" alt="Logo"/>
</a>
<div class="version">
0.1.95
0.1.96
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
Expand Down
Loading

0 comments on commit c002eab

Please sign in to comment.