birbnetes/cnn-classification-service
birbnetes/cnn-classification-service
4
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fixed tracing
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pünkösd Marcell 2021-08-04 15:00:41 +02:00
parent 188a31508e
commit 977fc98ed2
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cnn_classification_service/cnn_classifier.py
View File

@ -84,11 +84,13 @@ class Classifier(object):
return predicted_class_name, labeled_predictions return predicted_class_name, labeled_predictions
def predict(self, wav_filename: str, span: opentracing.span.Span) -> Tuple[str, dict]: def predict(self, wav_filename: str) -> Tuple[str, dict]:
with opentracing.tracer.start_span('createSpectrogram', child_of=span): span = opentracing.tracer.scope_manager.active().span
with opentracing.tracer.start_active_span('createSpectrogram', child_of=span):
directory, _ = self.create_spectrogram(wav_filename) directory, _ = self.create_spectrogram(wav_filename)
with opentracing.tracer.start_span('runPredictor', child_of=span): with opentracing.tracer.start_active_span('runPredictor', child_of=span):
result = self._run_predictor(directory) result = self._run_predictor(directory)
shutil.rmtree(directory) # The image is no longer needed shutil.rmtree(directory) # The image is no longer needed

12
cnn_classification_service/magic_doer.py
View File

@ -18,14 +18,16 @@ class MagicDoer:
requests_session = SessionTracing(propagate=True) requests_session = SessionTracing(propagate=True)
@classmethod @classmethod
def run_everything(cls, parameters: dict, span: opentracing.span.Span) -> dict: def run_everything(cls, parameters: dict) -> dict:
span = opentracing.tracer.scope_manager.active().span
tag = parameters['tag'] tag = parameters['tag']
sample_file_handle, sample_file_path = tempfile.mkstemp(prefix=f"{tag}_", suffix=".wav", dir="/dev/shm") sample_file_handle, sample_file_path = tempfile.mkstemp(prefix=f"{tag}_", suffix=".wav", dir="/dev/shm")
span.log_kv({'event': 'sampleFileOpened', 'sampleTag': tag}) span.log_kv({'event': 'sampleFileOpened', 'sampleTag': tag})
response = None response = None
try: try:
with opentracing.tracer.start_span('downloadSample', child_of=span): with opentracing.tracer.start_active_span('downloadSample', child_of=span):
# Download Sample # Download Sample
object_path = urljoin(Config.STORAGE_SERVICE_URL, f"object/{tag}") object_path = urljoin(Config.STORAGE_SERVICE_URL, f"object/{tag}")
@ -36,14 +38,14 @@ class MagicDoer:
logging.debug(f"Downloaded sample to {sample_file_path}") logging.debug(f"Downloaded sample to {sample_file_path}")
with opentracing.tracer.start_span('loadClassifier', child_of=span): with opentracing.tracer.start_active_span('loadClassifier', child_of=span):
# Get a classifier that uses the default model # Get a classifier that uses the default model
model_details, classifier = cls.classifier_cache.get_default_classifier() model_details, classifier = cls.classifier_cache.get_default_classifier()
with opentracing.tracer.start_span('runClassifier', child_of=span) as child_span: with opentracing.tracer.start_active_span('runClassifier', child_of=span) as child_span:
# do the majic # do the majic
classification_start_time = time.time() classification_start_time = time.time()
predicted_class_name, labeled_predictions = classifier.predict(sample_file_path, child_span) predicted_class_name, labeled_predictions = classifier.predict(sample_file_path)
classification_duration = time.time() - classification_start_time classification_duration = time.time() - classification_start_time
response = { response = {

6
cnn_classification_service/main.py
View File

@ -19,7 +19,7 @@ from magic_doer import MagicDoer
def message_callback(channel, method, properties, body): def message_callback(channel, method, properties, body):
with opentracing.tracer.start_span('messageHandling') as span: with opentracing.tracer.start_active_span('messageHandling', finish_on_close=True) as span:
try: try:
msg = json.loads(body.decode('utf-8')) msg = json.loads(body.decode('utf-8'))
except (UnicodeDecodeError, json.JSONDecodeError) as e: except (UnicodeDecodeError, json.JSONDecodeError) as e:
@ -28,8 +28,8 @@ def message_callback(channel, method, properties, body):
span.log_kv({'event': 'messageParsed', 'sampleTag': msg['tag']}) span.log_kv({'event': 'messageParsed', 'sampleTag': msg['tag']})
with opentracing.tracer.start_span('runAlgorithm', child_of=span) as child_span: with opentracing.tracer.start_active_span('runAlgorithm', child_of=span) as child_span:
results = MagicDoer.run_everything(msg, child_span) # <- This is where the magic happens results = MagicDoer.run_everything(msg) # <- This is where the magic happens
if results: if results:
channel.basic_publish( channel.basic_publish(