fixes

Author: phil-scale

launch/api_client/api/default_api.py

@@ -87,7 +87,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (CreateAsyncTaskResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/async-tasks",
+                "endpoint_path": "/v1/async-tasks",
                 "operation_id": "create_async_inference_task_v1_async_tasks_post",
                 "http_method": "POST",
                 "servers": None,
@@ -135,7 +135,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (CreateModelBundleResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-bundles",
+                "endpoint_path": "/v1/model-bundles",
                 "operation_id": "create_model_bundle_v1_model_bundles_post",
                 "http_method": "POST",
                 "servers": None,
@@ -178,7 +178,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (CreateModelEndpointResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-endpoints",
+                "endpoint_path": "/v1/model-endpoints",
                 "operation_id": "create_model_endpoint_v1_model_endpoints_post",
                 "http_method": "POST",
                 "servers": None,
@@ -223,7 +223,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (SyncEndpointPredictResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/sync-tasks",
+                "endpoint_path": "/v1/sync-tasks",
                 "operation_id": "create_sync_inference_task_v1_sync_tasks_post",
                 "http_method": "POST",
                 "servers": None,
@@ -271,7 +271,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (DeleteModelEndpointResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-endpoints/{model_endpoint_id}",
+                "endpoint_path": "/v1/model-endpoints/{model_endpoint_id}",
                 "operation_id": "delete_model_endpoint_v1_model_endpoints_model_endpoint_id_delete",
                 "http_method": "DELETE",
                 "servers": None,
@@ -315,7 +315,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (GetAsyncTaskResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/async-tasks/{task_id}",
+                "endpoint_path": "/v1/async-tasks/{task_id}",
                 "operation_id": "get_async_inference_task_v1_async_tasks_task_id_get",
                 "http_method": "GET",
                 "servers": None,
@@ -359,7 +359,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (ModelBundleResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-bundles/latest",
+                "endpoint_path": "/v1/model-bundles/latest",
                 "operation_id": "get_latest_model_bundle_v1_model_bundles_latest_get",
                 "http_method": "GET",
                 "servers": None,
@@ -403,7 +403,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (ModelBundleResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-bundles/{model_bundle_id}",
+                "endpoint_path": "/v1/model-bundles/{model_bundle_id}",
                 "operation_id": "get_model_bundle_v1_model_bundles_model_bundle_id_get",
                 "http_method": "GET",
                 "servers": None,
@@ -447,7 +447,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (GetModelEndpointResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-endpoints/{model_endpoint_id}",
+                "endpoint_path": "/v1/model-endpoints/{model_endpoint_id}",
                 "operation_id": "get_model_endpoint_v1_model_endpoints_model_endpoint_id_get",
                 "http_method": "GET",
                 "servers": None,
@@ -611,7 +611,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (ListModelBundlesResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-bundles",
+                "endpoint_path": "/v1/model-bundles",
                 "operation_id": "list_model_bundles_v1_model_bundles_get",
                 "http_method": "GET",
                 "servers": None,
@@ -657,7 +657,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (ListModelEndpointsResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-endpoints",
+                "endpoint_path": "/v1/model-endpoints",
                 "operation_id": "list_model_endpoints_v1_model_endpoints_get",
                 "http_method": "GET",
                 "servers": None,
@@ -703,7 +703,7 @@ def __init__(self, api_client=None):
             settings={
                 "response_type": (UpdateModelEndpointResponse,),
                 "auth": ["HTTPBasic"],
-                "endpoint_path": "/model-endpoints/{model_endpoint_id}",
+                "endpoint_path": "/v1/model-endpoints/{model_endpoint_id}",
                 "operation_id": "update_model_endpoint_v1_model_endpoints_model_endpoint_id_put",
                 "http_method": "PUT",
                 "servers": None,

launch/client.py

@@ -115,7 +115,9 @@ def __init__(
             endpoint: The Scale Launch Endpoint (this should not need to be changed)
             self_hosted: True iff you are connecting to a self-hosted Scale Launch
         """
-        self.connection = Connection(api_key, endpoint or SCALE_LAUNCH_ENDPOINT)
+        self.connection = Connection(
+            api_key, endpoint or SCALE_LAUNCH_ENDPOINT
+        )
         self.self_hosted = self_hosted
         self.upload_bundle_fn: Optional[Callable[[str, str], None]] = None
         self.upload_batch_csv_fn: Optional[Callable[[str, str], None]] = None
@@ -125,7 +127,7 @@ def __init__(
         self.bundle_location_fn: Optional[Callable[[], str]] = None
         self.batch_csv_location_fn: Optional[Callable[[], str]] = None
         self.configuration = Configuration(
-            host=endpoint,
+            host=endpoint,  # host="host.docker.internal:3000/v1/launch",
             discard_unknown_keys=True,
             username=api_key,
             password="",
@@ -851,9 +853,13 @@ def get_model_endpoint(
             resp = resp.model_endpoints[0]
 
         if resp["endpoint_type"].value == "async":
-            return AsyncEndpoint(ModelEndpoint.from_dict(resp.to_dict()), client=self)  # type: ignore
+            return AsyncEndpoint(
+                ModelEndpoint.from_dict(resp.to_dict()), client=self  # type: ignore
+            )
         elif resp["endpoint_type"].value == "sync":
-            return SyncEndpoint(ModelEndpoint.from_dict(resp.to_dict()), client=self)  # type: ignore
+            return SyncEndpoint(
+                ModelEndpoint.from_dict(resp.to_dict()), client=self  # type: ignore
+            )
         else:
             raise ValueError(
                 "Endpoint should be one of the types 'sync' or 'async'"
@@ -1071,12 +1077,17 @@ def _async_request(
         with ApiClient(self.configuration) as api_client:
             api_instance = DefaultApi(api_client)
             request = EndpointPredictRequest(
-                return_pickled=return_pickled, url=url, args=args
+                return_pickled=return_pickled,
+                url=url,
+                args=args,
+                _check_type=False,
             )
             model_endpoint_id = endpoint.model_endpoint.id  # type: ignore
-            resp = api_instance.create_sync_inference_task_v1_sync_tasks_post(
-                model_endpoint_id=model_endpoint_id,
-                endpoint_predict_request=request,
+            resp = (
+                api_instance.create_async_inference_task_v1_async_tasks_post(
+                    model_endpoint_id=model_endpoint_id,
+                    endpoint_predict_request=request,
+                )
             )
         return resp
 
@@ -1098,7 +1109,7 @@ def _get_async_endpoint_response(
 
             The dictionary's keys are as follows:
 
-            - ``state``: ``'PENDING'`` or ``'SUCCESS'`` or ``'FAILURE'``
+            - ``status``: ``'PENDING'`` or ``'SUCCESS'`` or ``'FAILURE'``
             - ``result_url``: a url pointing to inference results. This url is accessible for 12 hours after the request has been made.
             - ``result``: the value returned by the endpoint's `predict` function, serialized as json
 
@@ -1107,7 +1118,7 @@ def _get_async_endpoint_response(
             .. code-block:: json
 
                 {
-                    'state': 'SUCCESS',
+                    'status': 'SUCCESS',
                     'result_url': 'https://foo.s3.us-west-2.amazonaws.com/bar/baz/qux?xyzzy'
                 }
 

launch/model_endpoint.py

@@ -195,28 +195,29 @@ def get(self) -> EndpointResponse:
             async_response = self.client._get_async_endpoint_response(  # pylint: disable=W0212
                 self.endpoint_name, self.async_task_id
             )
-            if async_response["state"] == "PENDING":
+            status = async_response["status"].value
+            if status == "PENDING":
                 time.sleep(2)
             else:
-                if async_response["state"] == "SUCCESS":
+                if status == "SUCCESS":
                     return EndpointResponse(
                         client=self.client,
-                        status=async_response["state"],
+                        status=status,
                         result_url=async_response.get("result_url", None),
                         result=async_response.get("result", None),
                         traceback=None,
                     )
-                elif async_response["state"] == "FAILURE":
+                elif status == "FAILURE":
                     return EndpointResponse(
                         client=self.client,
-                        status=async_response["state"],
+                        status=status,
                         result_url=None,
                         result=None,
                         traceback=async_response.get("traceback", None),
                     )
                 else:
                     raise ValueError(
-                        f"Unrecognized state: {async_response['state']}"
+                        f"Unrecognized status: {async_response['status']}"
                     )
 
 
@@ -291,7 +292,7 @@ def predict(self, request: EndpointRequest) -> EndpointResponse:
         )
         return EndpointResponse(
             client=self.client,
-            status=raw_response.get("state"),
+            status=raw_response.get("status"),
             result_url=raw_response.get("result_url", None),
             result=raw_response.get("result", None),
             traceback=raw_response.get("traceback", None),
@@ -450,7 +451,7 @@ def single_request(inner_url, inner_task_id):
             return (
                 inner_url,
                 inner_task_id,
-                inner_response.get("state", None),
+                inner_response.get("status", None),
                 inner_response,
             )
 
@@ -464,13 +465,13 @@ def single_request(inner_url, inner_task_id):
         for response in responses:
             if response is None:
                 continue
-            url, _, state, raw_response = response
-            if state:
-                self.statuses[url] = state
+            url, _, status, raw_response = response
+            if status:
+                self.statuses[url] = status
             if raw_response:
                 response_object = EndpointResponse(
                     client=self.client,
-                    status=raw_response["state"],
+                    status=raw_response["status"],
                     result_url=raw_response.get("result_url", None),
                     result=raw_response.get("result", None),
                     traceback=raw_response.get("traceback", None),
@@ -479,10 +480,10 @@ def single_request(inner_url, inner_task_id):
 
     def is_done(self, poll=True) -> bool:
         """
-        Checks the client local state to see if all requests are done.
+        Checks the client local status to see if all requests are done.
 
         Parameters:
-            poll: If ``True``, then this will first check the state for a subset
+            poll: If ``True``, then this will first check the status for a subset
             of the remaining incomplete tasks on the Launch server.
         """
         # TODO: make some request to some endpoint