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

Separated config

Browse Source
This commit is contained in:
Pünkösd Marcell
2021-07-30 11:43:38 +02:00
parent bcbc69e00f
commit aa2cc0214c
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cnn_classification_service/classifier_cache.py
View File

@@ -11,8 +11,8 @@ from cnn_classifier import Classifier
class ClassifierCache:
def __init__(self, default_model_info_url: str = "http://model-service/model/cnn/$default"):
self._default_model_info_url = default_model_info_url
def __init__(self, model_info_url: str):
self._model_info_url = model_info_url
self._current_model_details = None # Should never be equal to the default model id
self._current_classifier = None # Latest classifier is a classifier that uses the $default model
@@ -37,7 +37,7 @@ class ClassifierCache:
logging.debug("Fetching model file...")
r = self._session.get( # Fun fact: urljoin is used to support both relative and absolute urls
urljoin(self._default_model_info_url, model_file_url)
urljoin(self._model_info_url, model_file_url)
)
r.raise_for_status()
@@ -48,7 +48,7 @@ class ClassifierCache:
logging.debug("Fetching weights file...")
r = self._session.get(
urljoin(self._default_model_info_url, weights_file_url)
urljoin(self._model_info_url, weights_file_url)
)
r.raise_for_status()
@@ -62,7 +62,7 @@ class ClassifierCache:
def get_default_classifier(self) -> Tuple[dict, Classifier]:
logging.debug("Fetching model info...")
r = self._session.get(self._default_model_info_url)
r = self._session.get(self._model_info_url)
r.raise_for_status()
model_details = r.json()