Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 31 additions & 30 deletions tsp/tsp_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"""TspClient class file."""

import json
import sys
import requests

from tsp.trace import Trace
Expand Down Expand Up @@ -93,7 +94,7 @@ def fetch_traces(self):
return TspClientResponse(TraceSet(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("get traces failed: {0}".format(response.status_code))
print("get traces failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_trace(self, uuid):
Expand All @@ -109,7 +110,7 @@ def fetch_trace(self, uuid):
return TspClientResponse(Trace(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else:
print("get trace failed: {0}".format(response.status_code))
print("get trace failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def open_trace(self, name, path) -> TspClientResponse:
Expand Down Expand Up @@ -151,7 +152,7 @@ def delete_trace(self, uuid, delete_trace, remove_cache=False):
return TspClientResponse(Trace(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("delete trace failed: {0}".format(response.status_code))
print("delete trace failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_experiments(self):
Expand All @@ -166,7 +167,7 @@ def fetch_experiments(self):
return TspClientResponse(ExperimentSet(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("get experiments failed: {0}".format(response.status_code))
print("get experiments failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_experiment(self, uuid):
Expand All @@ -182,7 +183,7 @@ def fetch_experiment(self, uuid):
return TspClientResponse(Experiment(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else:
print("get trace failed: {0}".format(response.status_code))
print("get trace failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def delete_experiment(self, uuid):
Expand All @@ -198,7 +199,7 @@ def delete_experiment(self, uuid):
return TspClientResponse(Experiment(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("delete experiment failed: {0}".format(response.status_code))
print("delete experiment failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def open_experiment(self, name, traces):
Expand All @@ -218,7 +219,7 @@ def open_experiment(self, name, traces):
return TspClientResponse(Experiment(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("post experiment failed: {0}".format(response.status_code))
print("post experiment failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_experiment_outputs(self, exp_uuid):
Expand All @@ -238,7 +239,7 @@ def fetch_experiment_outputs(self, exp_uuid):
response.status_code, response.text)
else: # pragma: no cover
print("get output descriptors failed: {0}".format(
response.status_code))
response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_experiment_output(self, exp_uuid, output_id):
Expand All @@ -259,7 +260,7 @@ def fetch_experiment_output(self, exp_uuid, output_id):
return TspClientResponse(OutputDescriptor(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print(GET_TREE_FAILED.format(response.status_code))
print(GET_TREE_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_datatree(self, exp_uuid, output_id, parameters=None):
Expand All @@ -285,7 +286,7 @@ def fetch_datatree(self, exp_uuid, output_id, parameters=None):
ModelType.DATA_TREE),
response.status_code, response.text)
else: # pragma: no cover
print(GET_TREE_FAILED.format(response.status_code))
print(GET_TREE_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_virtual_table_columns(self, exp_uuid, output_id):
Expand All @@ -306,7 +307,7 @@ def fetch_virtual_table_columns(self, exp_uuid, output_id):
ModelType.VIRTUAL_TABLE_HEADER),
response.status_code, response.text)
else:
print(GET_TREE_FAILED.format(response.status_code))
print(GET_TREE_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_virtual_table_lines(self, exp_uuid, output_id, parameters=None):
Expand Down Expand Up @@ -334,7 +335,7 @@ def fetch_virtual_table_lines(self, exp_uuid, output_id, parameters=None):
ModelType.VIRTUAL_TABLE),
response.status_code, response.text)
else: # pragma: no cover
print(GET_TREE_FAILED.format(response.status_code))
print(GET_TREE_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_timegraph_tree(self, exp_uuid, output_id, parameters=None) -> TspClientResponse:
Expand All @@ -361,7 +362,7 @@ def fetch_timegraph_tree(self, exp_uuid, output_id, parameters=None) -> TspClien
ModelType.TIME_GRAPH_TREE),
response.status_code, response.text)
else: # pragma: no cover
print(GET_TREE_FAILED.format(response.status_code))
print(GET_TREE_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)


Expand Down Expand Up @@ -389,7 +390,7 @@ def fetch_timegraph_states(self, exp_uuid, output_id, parameters=None):
ModelType.TIME_GRAPH_STATE),
response.status_code, response.text)
else: # pragma: no cover
print(GET_STATES_FAILED.format(response.status_code))
print(GET_STATES_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)


Expand Down Expand Up @@ -417,7 +418,7 @@ def fetch_timegraph_arrows(self, exp_uuid, output_id, parameters=None):
ModelType.TIME_GRAPH_ARROW),
response.status_code, response.text)
else: # pragma: no cover
print(GET_ARROWS_FAILED.format(response.status_code))
print(GET_ARROWS_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_xy_tree(self, exp_uuid, output_id, parameters=None):
Expand Down Expand Up @@ -445,7 +446,7 @@ def fetch_xy_tree(self, exp_uuid, output_id, parameters=None):
ModelType.XY_TREE),
response.status_code, response.text)
else: # pragma: no cover
print(GET_TREE_FAILED.format(response.status_code))
print(GET_TREE_FAILED.format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_xy(self, exp_uuid, output_id, parameters):
Expand All @@ -472,7 +473,7 @@ def fetch_xy(self, exp_uuid, output_id, parameters):
ModelType.XY),
response.status_code, response.text)
else: # pragma: no cover
print("failed to get xy: {0}".format(response.status_code))
print("failed to get xy: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)


Expand All @@ -491,7 +492,7 @@ def fetch_output_configuration_sources(self, exp_uuid, output_id):
return TspClientResponse(ConfigurationSourceSet(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print(GET_CONFIG_SOURCE_TYPES.format(response.status_code, response.text))
print(GET_CONFIG_SOURCE_TYPES.format(response.status_code, response.text), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_output_configuration_source(self, exp_uuid, output_id, type_id):
Expand All @@ -510,7 +511,7 @@ def fetch_output_configuration_source(self, exp_uuid, output_id, type_id):
return TspClientResponse(ConfigurationSource(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print(GET_CONFIG_SOURCE_TYPES.format(response.status_code, response.text))
print(GET_CONFIG_SOURCE_TYPES.format(response.status_code, response.text), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def create_derived_output(self, exp_uuid, output_id, params):
Expand All @@ -531,7 +532,7 @@ def create_derived_output(self, exp_uuid, output_id, params):
return TspClientResponse(OutputDescriptor(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("failed to create derived output: {} {}".format(response.status_code, response.text))
print("failed to create derived output: {} {}".format(response.status_code, response.text), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def delete_derived_output(self, exp_uuid, output_id, derived_output_id):
Expand All @@ -552,7 +553,7 @@ def delete_derived_output(self, exp_uuid, output_id, derived_output_id):
return TspClientResponse(OutputDescriptor(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("delete derived output failed: {} {}".format(response.status_code, response.text))
print("delete derived output failed: {} {}".format(response.status_code, response.text), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_configuration_sources(self):
Expand All @@ -567,7 +568,7 @@ def fetch_configuration_sources(self):
return TspClientResponse(ConfigurationSourceSet(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("failed to get configuration sources: {0}".format(response.status_code))
print("failed to get configuration sources: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_configuration_source(self, type_id):
Expand All @@ -582,7 +583,7 @@ def fetch_configuration_source(self, type_id):
return TspClientResponse(ConfigurationSource(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("failed to get a configuration source: {0}".format(response.status_code))
print("failed to get a configuration source: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_configurations(self, type_id):
Expand All @@ -598,7 +599,7 @@ def fetch_configurations(self, type_id):
return TspClientResponse(ConfigurationSet(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("failed to get configurations: {0}".format(response.status_code))
print("failed to get configurations: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_configuration(self, type_id, config_id):
Expand All @@ -614,7 +615,7 @@ def fetch_configuration(self, type_id, config_id):
return TspClientResponse(Configuration(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("failed to get configuration: {0}".format(response.status_code))
print("failed to get configuration: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def post_configuration(self, type_id, params):
Expand All @@ -631,7 +632,7 @@ def post_configuration(self, type_id, params):
return TspClientResponse(Configuration(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("post extension failed: {0}".format(response.status_code))
print("post extension failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def put_configuration(self, type_id, config_id, params):
Expand All @@ -648,7 +649,7 @@ def put_configuration(self, type_id, config_id, params):
return TspClientResponse(Configuration(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("put extension failed: {0}".format(response.status_code))
print("put extension failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def delete_configuration(self, type_id, config_id):
Expand All @@ -663,7 +664,7 @@ def delete_configuration(self, type_id, config_id):
return TspClientResponse(Configuration(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("post extension failed: {0}".format(response.status_code))
print("post extension failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_health(self):
Expand All @@ -678,7 +679,7 @@ def fetch_health(self):
return TspClientResponse(Health(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("get health failed: {0}".format(response.status_code))
print("get health failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)

def fetch_identifier(self):
Expand All @@ -695,5 +696,5 @@ def fetch_identifier(self):
return TspClientResponse(Identifier(json.loads(response.content.decode('utf-8'))),
response.status_code, response.text)
else: # pragma: no cover
print("get identifiers failed: {0}".format(response.status_code))
print("get identifiers failed: {0}".format(response.status_code), file=sys.stderr)
return TspClientResponse(None, response.status_code, response.text)