Fast Api JSONResponst change (#118)

* Changes response unpacking to single value

* Adds config change

---------

Co-authored-by: JWittmeyer <[email protected]>

Author: JWittmeyer

controller/data_slice/neural_search_connector.py

@@ -11,5 +11,4 @@ def request_outlier_detection(project_id: str, embedding_id: str, limit: int):
         "embedding_id": embedding_id,
         "limit": limit,
     }
-    result = service_requests.get_call_or_raise(url, params)
-    return result
+    return service_requests.get_call_or_raise(url, params)

controller/misc/config_service.py

@@ -7,7 +7,7 @@
 
 __config = None
 
-# these are ment to be constant values since os variables will sooner or later be removed for adresses (and used with values from config-service)
+# these are ment to be constant values since os variables will sooner or later be removed for addresses (and used with values from config-service)
 REQUEST_URL = "http://refinery-config:80/full_config"
 CHANGE_URL = "http://refinery-config:80/change_config"
 
@@ -22,22 +22,21 @@ def __get_config() -> Dict[str, Any]:
 
 def refresh_config():
     response = requests.get(REQUEST_URL)
-    if response.status_code == 200:
-        global __config
-        __config = json.loads(json.loads(response.text))
-        daemon.run(invalidate_after, 3600)  # one hour as failsave
-    else:
-        raise Exception(
+    if response.status_code != 200:
+        raise ValueError(
             f"Config service cant be reached -- response.code{response.status_code}"
         )
+    global __config
+    __config = response.json()
+    daemon.run(invalidate_after, 3600)  # one hour as failsave
 
 
 def get_config_value(
     key: str, subkey: Optional[str] = None
 ) -> Union[str, Dict[str, str]]:
     config = __get_config()
     if key not in config:
-        raise Exception(f"Key {key} coudn't be found in config")
+        raise ValueError(f"Key {key} coudn't be found in config")
     value = config[key]
 
     if not subkey:
@@ -46,7 +45,7 @@ def get_config_value(
     if isinstance(value, dict) and subkey in value:
         return value[subkey]
     else:
-        raise Exception(f"Subkey {subkey} coudn't be found in config[{key}]")
+        raise ValueError(f"Subkey {subkey} coudn't be found in config[{key}]")
 
 
 def invalidate_after(sec: int) -> None:

controller/misc/manager.py

@@ -29,7 +29,7 @@ def get_black_white_demo() -> Dict[str, List[str]]:
 def get_version_overview() -> List[ServiceVersionResult]:
     updater_version_overview = __updater_version_overview()
     date_format = "%Y-%m-%dT%H:%M:%S.%f"  # 2022-09-06T12:10:39.167397
-    version_overview = [
+    return [
         ServiceVersionResult(
             service=service["name"],
             installed_version=service["installed_version"],
@@ -40,12 +40,10 @@ def get_version_overview() -> List[ServiceVersionResult]:
         )
         for service in updater_version_overview
     ]
-    return version_overview
 
 
 def has_updates() -> List[ServiceVersionResult]:
-    has_updates = __updater_has_updates()
-    return has_updates
+    return __updater_has_updates()
 
 
 def __updater_version_overview() -> List[Dict[str, Any]]:

util/service_requests.py

@@ -6,23 +6,28 @@
 
 def post_call_or_raise(url: str, data: Dict[str, Any]) -> Any:
     response = requests.post(url, json=data)
-    if response.status_code == 200:
-        result, _ = response.json()
-        return result
-    else:
+
+    if response.status_code != 200:
         raise GraphQLError(response.text)
 
+    if response.headers.get("content-type") == "application/json":
+        return response.json()
+    else:
+        return response.text
+
 
 def get_call_or_raise(url: str, params: Dict = None) -> Any:
     if params is None:
         params = {}
     response = requests.get(url=url, params=params)
-    if response.status_code == 200:
-        result, _ = response.json()
-        return result
-    else:
+    if response.status_code != 200:
         raise GraphQLError(response.text)
 
+    if response.headers.get("content-type") == "application/json":
+        return response.json()
+    else:
+        return response.text
+
 
 def delete_call_or_raise(url: str, params: Dict = None) -> int:
     if params is None: