Skip to content

Commit bae43f9

Browse files
arfioMatthewKhouzam
authored andcommitted
add indexing status model
Signed-off-by: Arnaud Fiorini <[email protected]>
1 parent 4e22e3d commit bae43f9

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

tsp/experiment.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"""Experiment class file."""
2424

2525
from tsp.trace_set import TraceSet
26+
from tsp.indexing_status import IndexingStatus
2627

2728
NA = "N/A"
2829
UUID_KEY = "UUID"
@@ -86,10 +87,10 @@ def __init__(self, params):
8687
# Indicate if the indexing of the experiment is completed or still running.
8788
# If it still running, the end time and number of events are not final
8889
if INDEXING_STATUS_KEY in params:
89-
self.indexin_status = params.get(INDEXING_STATUS_KEY)
90+
self.indexing_status = IndexingStatus[params.get(INDEXING_STATUS_KEY)]
9091
del params[INDEXING_STATUS_KEY]
9192
else: # pragma: no cover
92-
self.indexin_status = 0
93+
self.indexing_status = 0
9394

9495
# Array of all the traces contained in the experiment
9596
if TRACES_TIME_KEY in params:

tsp/indexing_status.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
from enum import Enum
2+
3+
class IndexingStatus(Enum):
4+
'''
5+
Model is partial, data provider is still computing. If this status is
6+
returned, it's viewer responsability to request again the data provider after
7+
waiting some time. Request data provider until COMPLETED status is received
8+
'''
9+
RUNNING = "RUNNING"
10+
11+
'''
12+
Model is complete, no need to request data provider again
13+
'''
14+
COMPLETED = "COMPLETED"
15+
16+
'''
17+
18+
'''
19+
CLOSED = "CLOSED"
20+

tsp/trace.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
"""Trace class file."""
2424

25+
from tsp.indexing_status import IndexingStatus
26+
27+
2528
NA = "N/A"
2629
UUID_KEY = "UUID"
2730
NAME_KEY = "name"
@@ -91,7 +94,7 @@ def __init__(self, params):
9194
# Indicate if the indexing of the trace is completed or still running.
9295
# If it still running, the end time and number of events are not final
9396
if INDEXING_STATUS_KEY in params:
94-
self.indexin_status = params.get(INDEXING_STATUS_KEY)
97+
self.indexing_status = IndexingStatus[params.get(INDEXING_STATUS_KEY)]
9598
del params[INDEXING_STATUS_KEY]
9699
else: # pragma: no cover
97-
self.indexin_status = 0
100+
self.indexing_status = 0

tsp_cli_client

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def __print_experiment(elem):
5656
print('----------')
5757
print(' {0}: ({1}) start={2} end={3} nbEvents={4} indexing={5}'.format(
5858
elem.name, __print_uuid(elem), elem.start, elem.end,
59-
elem.number_of_events, elem.indexin_status))
59+
elem.number_of_events, elem.indexing_status))
6060
print('Trace(s):')
6161
print('------')
6262
for elem_trace in elem.traces.traces:
@@ -68,7 +68,7 @@ def __print_experiment(elem):
6868
def __print_trace(elem):
6969
print(' {0}: {1} ({2}) start={3} end={4} nbEvents={5} indexing={6}'.format(
7070
elem.name, elem.path, __print_uuid(elem), elem.start, elem.end,
71-
elem.number_of_events, elem.indexin_status))
71+
elem.number_of_events, elem.indexing_status))
7272

7373

7474
def __print_output(output):

0 commit comments

Comments
 (0)