Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pony
tshistory_supervision
Commits
c28e480ed572
Commit
3793ea2d
authored
Jun 12, 2019
by
Aurélien Campéas
Browse files
tsio: follow the docstring adaptation in variable names
auto -> upstream synth -> edited
parent
85cc26d89bf4
Changes
2
Hide whitespace changes
Inline
Side-by-side
test/test_supervision.py
View file @
c28e480e
...
...
@@ -517,4 +517,4 @@ def test_serie_deletion(engine, tsh):
tsh
.
insert
(
engine
,
ts
,
'deleteme'
,
'Celeste'
)
testit
(
tsh
)
testit
(
tsh
.
auto_
st
o
re
)
testit
(
tsh
.
up
stre
am
)
tshistory_supervision/tsio.py
View file @
c28e480e
...
...
@@ -55,7 +55,7 @@ class timeseries(basets):
def
__init__
(
self
,
*
a
,
**
kw
):
super
().
__init__
(
*
a
,
**
kw
)
self
.
auto_
st
o
re
=
basets
(
namespace
=
'{}-automatic'
.
format
(
self
.
namespace
))
self
.
up
stre
am
=
basets
(
namespace
=
'{}-automatic'
.
format
(
self
.
namespace
))
@
tx
def
insert
(
self
,
cn
,
ts
,
name
,
author
,
...
...
@@ -65,7 +65,7 @@ class timeseries(basets):
diff
=
ts
else
:
# insert & compute diff over automatic
diff
=
self
.
auto_
st
o
re
.
insert
(
diff
=
self
.
up
stre
am
.
insert
(
cn
,
ts
,
name
,
author
,
metadata
=
metadata
,
_insertion_date
=
_insertion_date
...
...
@@ -84,25 +84,25 @@ class timeseries(basets):
@
tx
def
delete
(
self
,
cn
,
seriename
):
super
().
delete
(
cn
,
seriename
)
self
.
auto_
st
o
re
.
delete
(
cn
,
seriename
)
self
.
up
stre
am
.
delete
(
cn
,
seriename
)
# supervision specific API
@
tx
def
get_overrides
(
self
,
cn
,
name
,
revision_date
=
None
,
from_value_date
=
None
,
to_value_date
=
None
):
auto
tsh
=
self
.
auto_
st
o
re
auto
=
auto
tsh
.
get
(
cn
,
name
,
upstream
tsh
=
self
.
up
stre
am
upstream
=
upstream
tsh
.
get
(
cn
,
name
,
revision_date
=
revision_date
,
from_value_date
=
from_value_date
,
to_value_date
=
to_value_date
,
_keep_nans
=
True
)
synth
=
self
.
get
(
cn
,
name
,
edited
=
self
.
get
(
cn
,
name
,
revision_date
=
revision_date
,
from_value_date
=
from_value_date
,
to_value_date
=
to_value_date
,
_keep_nans
=
True
)
manual
=
self
.
diff
(
auto
,
synth
)
manual
=
self
.
diff
(
upstream
,
edited
)
manual
.
name
=
name
return
manual
...
...
@@ -114,20 +114,24 @@ class timeseries(basets):
if
table
is
None
:
return
None
,
None
autotsh
=
self
.
auto_store
auto
=
autotsh
.
get
(
cn
,
name
,
revision_date
=
revision_date
,
from_value_date
=
from_value_date
,
to_value_date
=
to_value_date
,
_keep_nans
=
True
)
synth
=
self
.
get
(
cn
,
name
,
revision_date
=
revision_date
,
from_value_date
=
from_value_date
,
to_value_date
=
to_value_date
,
_keep_nans
=
True
)
manual
=
self
.
diff
(
auto
,
synth
)
upstreamtsh
=
self
.
upstream
upstream
=
upstreamtsh
.
get
(
cn
,
name
,
revision_date
=
revision_date
,
from_value_date
=
from_value_date
,
to_value_date
=
to_value_date
,
_keep_nans
=
True
)
edited
=
self
.
get
(
cn
,
name
,
revision_date
=
revision_date
,
from_value_date
=
from_value_date
,
to_value_date
=
to_value_date
,
_keep_nans
=
True
)
manual
=
self
.
diff
(
upstream
,
edited
)
unionindex
=
join_index
(
auto
,
manual
)
unionindex
=
join_index
(
upstream
,
manual
)
if
unionindex
is
None
:
# this means both series are empty
return
None
,
None
...
...
@@ -137,4 +141,4 @@ class timeseries(basets):
mask_manual
[
manual
.
index
]
=
True
mask_manual
.
name
=
name
return
synth
.
dropna
(),
mask_manual
return
edited
.
dropna
(),
mask_manual
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment