fix validate

Author: bstuder

client/lomas_client/libraries/diffprivlib.py

@@ -2,7 +2,7 @@
 from returns.curry import partial
 from returns.io import IOResultE
 from returns.pipeline import flow
-from returns.pointfree import map_
+from returns.pointfree import bind
 from sklearn.pipeline import Pipeline
 
 from lomas_client.constants import (
@@ -75,7 +75,7 @@ def cost(
             },
             DiffPrivLibRequestModel.model_validate,
             partial(self.http_client.post, "estimate_diffprivlib_cost"),
-            map_(validate_model_response(self.http_client, CostResponse)),
+            bind(validate_model_response(self.http_client, CostResponse)),
         )
 
     def query(
@@ -137,11 +137,11 @@ def query(
                 {**body_dict, "dummy_nb_rows": nb_rows, "dummy_seed": seed},
                 DiffPrivLibDummyQueryModel.model_validate,
                 lambda body: self.http_client.post("dummy_diffprivlib_query", body),
-                map_(validate_model_response(self.http_client, QueryResponse)),
+                bind(validate_model_response(self.http_client, QueryResponse)),
             )
         return flow(
             body_dict,
             DiffPrivLibQueryModel.model_validate,
             lambda body: self.http_client.post("diffprivlib_query", body),
-            map_(validate_model_response(self.http_client, QueryResponse)),
+            bind(validate_model_response(self.http_client, QueryResponse)),
         )

client/lomas_client/libraries/opendp.py

@@ -3,7 +3,7 @@
 from returns.curry import partial
 from returns.io import IOResultE
 from returns.pipeline import flow
-from returns.pointfree import map_
+from returns.pointfree import bind
 
 from lomas_client.constants import DUMMY_NB_ROWS, DUMMY_SEED
 from lomas_client.http_client import LomasHttpClient
@@ -104,7 +104,7 @@ def cost(
             body_json,
             OpenDPRequestModel.model_validate,
             partial(self.http_client.post, "estimate_opendp_cost"),
-            map_(validate_model_response(self.http_client, CostResponse)),
+            bind(validate_model_response(self.http_client, CostResponse)),
         )
 
     def query(
@@ -154,11 +154,11 @@ def query(
                 {**body_dict, "dummy_nb_rows": nb_rows, "dummy_seed": seed},
                 OpenDPDummyQueryModel.model_validate,
                 partial(self.http_client.post, "dummy_opendp_query"),
-                map_(validate_model_response(self.http_client, QueryResponse)),
+                bind(validate_model_response(self.http_client, QueryResponse)),
             )
         return flow(
             body_dict,
             OpenDPQueryModel.model_validate,
             partial(self.http_client.post, "opendp_query"),
-            map_(validate_model_response(self.http_client, QueryResponse)),
+            bind(validate_model_response(self.http_client, QueryResponse)),
         )

client/lomas_client/libraries/smartnoise_sql.py

@@ -1,6 +1,6 @@
 from returns.io import IOResultE
 from returns.pipeline import flow
-from returns.pointfree import map_
+from returns.pointfree import bind
 
 from lomas_client.constants import DUMMY_NB_ROWS, DUMMY_SEED
 from lomas_client.http_client import LomasHttpClient
@@ -51,7 +51,7 @@ def cost(
             },
             SmartnoiseSQLRequestModel.model_validate,
             lambda body: self.http_client.post("estimate_smartnoise_sql_cost", body),
-            map_(validate_model_response(self.http_client, CostResponse)),
+            bind(validate_model_response(self.http_client, CostResponse)),
         )
 
     def query(
@@ -108,11 +108,11 @@ def query(
                 {**body_dict, "dummy_nb_rows": nb_rows, "dummy_seed": seed},
                 SmartnoiseSQLDummyQueryModel.model_validate,
                 lambda body: self.http_client.post("dummy_smartnoise_sql_query", body),
-                map_(validate_model_response(self.http_client, QueryResponse)),
+                bind(validate_model_response(self.http_client, QueryResponse)),
             )
         return flow(
             body_dict,
             SmartnoiseSQLQueryModel.model_validate,
             lambda body: self.http_client.post("smartnoise_sql_query", body),
-            map_(validate_model_response(self.http_client, QueryResponse)),
+            bind(validate_model_response(self.http_client, QueryResponse)),
         )

client/lomas_client/libraries/smartnoise_synth.py

@@ -1,6 +1,6 @@
 from returns.io import IOResultE
 from returns.pipeline import flow
-from returns.pointfree import map_
+from returns.pointfree import bind
 from smartnoise_synth_logger import serialise_constraints
 
 from lomas_client.constants import (
@@ -97,7 +97,7 @@ def cost(
             lambda body: self.http_client.post(
                 "estimate_smartnoise_synth_cost", body, SMARTNOISE_SYNTH_READ_TIMEOUT
             ),
-            map_(validate_model_response(self.http_client, CostResponse)),
+            bind(validate_model_response(self.http_client, CostResponse)),
         )
 
     def query(
@@ -195,12 +195,12 @@ def query(
                 lambda body: self.http_client.post(
                     "dummy_smartnoise_synth_query", body, SMARTNOISE_SYNTH_READ_TIMEOUT
                 ),
-                map_(validate_model_response(self.http_client, QueryResponse)),
+                bind(validate_model_response(self.http_client, QueryResponse)),
             )
         return flow(
             body_dict,
             # tap(lambda _: validate_synthesizer(synth_name, return_model)),
             SmartnoiseSynthQueryModel.model_validate,
             lambda body: self.http_client.post("smartnoise_synth_query", body, SMARTNOISE_SYNTH_READ_TIMEOUT),
-            map_(validate_model_response(self.http_client, QueryResponse)),
+            bind(validate_model_response(self.http_client, QueryResponse)),
         )

client/lomas_client/utils.py

@@ -77,7 +77,7 @@ def validate_synthesizer(synth_name: str, return_model: bool = False) -> None:
 
 def validate_model_response(
     client: LomasHttpClient, response_model: type[ResponseT]
-) -> Callable[[requests.Response], ResponseT]:
+) -> Callable[[requests.Response], IOResultE[ResponseT]]:
     """Validate and process a HTTP response.
 
     Args:
@@ -87,17 +87,17 @@ def validate_model_response(
         response_model: Model for responses requests.
     """
 
-    def validate(response: requests.Response) -> ResponseT:
+    def validate(response: requests.Response) -> IOResultE[ResponseT]:
         if response.status_code != status.HTTP_202_ACCEPTED:
-            parse_server_error(response).bind_result(specify_error_from_model).alt(raise_exception)
+            return parse_server_error(response).bind_result(specify_error_from_model)
 
         job_uid = response.json()["uid"]
         job = client.wait_for_job(job_uid)
         if job.status == "failed":
             assert job.error is not None, f"job {job_uid} failed without error !"
             specify_error_from_model(job.error)
 
-        return response_model.model_validate(job.result)
+        return impure_safe(response_model.model_validate)(job.result)
 
     return validate