Wip 369 doc to models

client/lomas_client/libraries/smartnoise_synth.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Type
 
 from lomas_core.models.requests import (
     SmartnoiseSynthDummyQueryModel,
@@ -38,6 +38,7 @@ def cost(
         constraints: dict = {},
     ) -> Optional[CostResponse]:
         """This function estimates the cost of executing a SmartNoise query.
+
         Args:
             synth_name (str): name of the Synthesizer model to use.
                 Available synthesizer are
@@ -113,6 +114,7 @@ def query(
         seed: int = DUMMY_SEED,
     ) -> Optional[QueryResponse]:
         """This function executes a SmartNoise Synthetic query.
+
         Args:
             synth_name (str): name of the Synthesizer model to use.
                 Available synthesizer are
@@ -181,6 +183,7 @@ def query(
             "condition": condition,
             "nb_samples": nb_samples,
         }
+        request_model: Type[SmartnoiseSynthRequestModel]
         if dummy:
             endpoint = "dummy_smartnoise_synth_query"
             body_dict["dummy_nb_rows"] = nb_rows

client/lomas_client/utils.py

@@ -10,6 +10,13 @@
     InvalidQueryException,
     UnauthorizedAccessException,
 )
+from lomas_core.models.exceptions import (
+    ExternalLibraryExceptionModel,
+    InternalServerExceptionModel,
+    InvalidQueryExceptionModel,
+    LomasServerExceptionTypeAdapter,
+    UnauthorizedAccessExceptionModel,
+)
 
 
 def raise_error(response: requests.Response) -> str:
@@ -21,18 +28,18 @@ def raise_error(response: requests.Response) -> str:
     Raise:
         Server Error
     """
-    error_message = response.json()
-    if response.status_code == status.HTTP_400_BAD_REQUEST:
-        raise InvalidQueryException(error_message["InvalidQueryException"])
-    if response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY:
-        raise ExternalLibraryException(
-            error_message["library"], error_message["ExternalLibraryException"]
-        )
-    if response.status_code == status.HTTP_403_FORBIDDEN:
-        raise UnauthorizedAccessException(error_message["UnauthorizedAccessException"])
-    if response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR:
-        raise InternalServerException(error_message["InternalServerException"])
-    raise InternalServerException(f"Unknown {InternalServerException}")
+    error_model = LomasServerExceptionTypeAdapter.validate_json(response.json())
+    match error_model:
+        case InvalidQueryExceptionModel():
+            raise InvalidQueryException(error_model.message)
+        case ExternalLibraryExceptionModel():
+            raise ExternalLibraryException(error_model.library, error_model.message)
+        case UnauthorizedAccessExceptionModel():
+            raise UnauthorizedAccessException(error_model.message)
+        case InternalServerExceptionModel():
+            raise InternalServerException("Internal Server Exception.")
+        case _:
+            raise InternalServerException(f"Unknown {InternalServerException}")
 
 
 def validate_synthesizer(synth_name: str, return_model: bool = False):