luminarycloud 0.21.0__py3-none-any.whl → 0.21.1__py3-none-any.whl

luminarycloud/_client/http_client.py

@@ -113,9 +113,11 @@ class HttpClient:
                 f"Bearer {self.auth0_client.fetch_access_token()}"
             )
 
-    def _request(self, method: str, path: str, **kwargs) -> requests.Response:
+    # This method, which takes a full URL instead of just a path, is made public so the upload
+    # helper can use it to make authenticated requests to a gcsproxy endpoint which is hosted by
+    # jobmaster, not apiserver
+    def raw_request(self, method: str, url: str, **kwargs) -> requests.Response:
         self._authenticate_session()
-        url = self._url(path)
         self._log_request(method, url, kwargs)
         resp = self.session.request(method, url, timeout=self.timeout, **kwargs)
         self._log_response(resp)
@@ -128,22 +130,22 @@ class HttpClient:
 
     # ---- Raw methods ----
     def raw_get(self, path: str, **kwargs) -> requests.Response:
-        return self._request("GET", path, **kwargs)
+        return self.raw_request("GET", self._url(path), **kwargs)
 
     def raw_post(self, path: str, body: dict | None = None, **kwargs) -> requests.Response:
-        return self._request("POST", path, json=body, **kwargs)
+        return self.raw_request("POST", self._url(path), json=body, **kwargs)
 
     def raw_put(self, path: str, body: dict | None = None, **kwargs) -> requests.Response:
-        return self._request("PUT", path, json=body, **kwargs)
+        return self.raw_request("PUT", self._url(path), json=body, **kwargs)
 
     def raw_patch(self, path: str, body: dict | None = None, **kwargs) -> requests.Response:
-        return self._request("PATCH", path, json=body, **kwargs)
+        return self.raw_request("PATCH", self._url(path), json=body, **kwargs)
 
     def raw_delete(self, path: str, **kwargs) -> requests.Response:
-        return self._request("DELETE", path, **kwargs)
+        return self.raw_request("DELETE", self._url(path), **kwargs)
 
     def raw_head(self, path: str, **kwargs) -> requests.Response:
-        return self._request("HEAD", path, **kwargs)
+        return self.raw_request("HEAD", self._url(path), **kwargs)
 
     # ---- JSON convenience methods ----
     def get(self, path: str, **kwargs) -> dict:

luminarycloud/_helpers/_upload_mesh.py

@@ -137,6 +137,7 @@ def _upload_mesh_from_path(
     logger.debug(f"started upload")
 
     gcs_resumable_upload(
+        client=client,
         filepath=pathlib.Path(filepath),
         signed_url=start_res.upload.gcs_resumable.signed_url,
         http_headers=start_res.upload.gcs_resumable.http_headers,

luminarycloud/_helpers/upload.py

@@ -3,6 +3,7 @@ from os import PathLike
 import os
 import pathlib
 from typing import Mapping
+from urllib.parse import urlparse
 import requests
 import logging
 import grpc
@@ -15,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 
 def gcs_resumable_upload(
-    filepath: PathLike | str, signed_url: str, http_headers: Mapping[str, str]
+    client: Client, filepath: PathLike | str, signed_url: str, http_headers: Mapping[str, str]
 ) -> None:
     """
     Performs a resumable upload to a GCS signed url.
@@ -24,12 +25,17 @@ def gcs_resumable_upload(
     """
 
     # initiate the upload
+    parsed_url = urlparse(signed_url)
     try:
-        post_res = requests.post(
-            url=signed_url,
-            headers=http_headers,
-            json={},  # intentionally empty, we're not uploading the file data yet
-        )
+        if parsed_url.hostname and parsed_url.hostname.endswith(".luminarycloud.com"):
+            # we must be using the gcsproxy, so we'll use the `client.http` client to authenticate
+            # with our backend
+            logger.debug("signed url points to LC backend, will use authenticated client")
+            post_res = client.http.raw_request("POST", signed_url, headers=http_headers)
+        else:
+            # we're using the GCS signed url directly, no additional authentication is needed
+            logger.debug("signed url points to GCS, will use unauthenticated client")
+            post_res = requests.post(url=signed_url, headers=http_headers)
         logger.debug(
             f"sucessfully initialized signed URL upload for {filepath}, POST status code: {post_res.status_code}"
         )
@@ -49,6 +55,8 @@ def gcs_resumable_upload(
         session_uri = post_res.headers["Location"]
         size = os.path.getsize(filepath)
         with open(filepath, "rb") as fp:
+            # even if a signed url upload is initiated via the gcsproxy, the subsequent PUT request
+            # goes straight to GCS, so we don't want to use the authenticated client here
             put_res = requests.put(
                 url=session_uri,
                 headers={
@@ -89,6 +97,7 @@ def upload_file(
         logger.debug("started gcs upload")
 
         gcs_resumable_upload(
+            client=client,
             filepath=pathlib.Path(file_path),
             signed_url=start_res.upload.gcs_resumable.signed_url,
             http_headers=start_res.upload.gcs_resumable.http_headers,

{luminarycloud-0.21.0.dist-info → luminarycloud-0.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: luminarycloud
-Version: 0.21.0
+Version: 0.21.1
 Summary: Luminary Cloud SDK
 Project-URL: Homepage, https://www.luminarycloud.com/
 Project-URL: Documentation, https://app.luminarycloud.com/docs/api/

{luminarycloud-0.21.0.dist-info → luminarycloud-0.21.1.dist-info}/RECORD

@@ -29,7 +29,7 @@ luminarycloud/_client/__init__.py,sha256=q-q1lnJE9EirX5p_O15FnanUoSYdEOD5zP1XrUe
 luminarycloud/_client/authentication_plugin.py,sha256=eJXs0b8pYih12fBU1vgJ8gGpAdtjfbqCuxSprjR-p9E,1351
 luminarycloud/_client/client.py,sha256=KiugyhRBcWIQY61bS22HjTz0-beRdBms3NGkgC36388,11307
 luminarycloud/_client/config.py,sha256=o_HJsmPOLaeorYToR9_wzNhJYRoFnmeqcxCRAoUAqZk,236
-luminarycloud/_client/http_client.py,sha256=yWx6BJ5C40PRI6Y5qo7b4abUecME_QGcWu1IQVwMHDU,6423
+luminarycloud/_client/http_client.py,sha256=d_Yqxa6BMoq44ikF5uWVERucIhCQ9ISH7WmsqMSNFbM,6702
 luminarycloud/_client/logging_interceptor.py,sha256=I7xJzTQoV5O_Ioi7OjWXI2mQWxdpbagu7QnzbJSFcHg,2593
 luminarycloud/_client/retry_interceptor.py,sha256=EnswA3e7v8je2AqNCIcOoBVd1yKg6gLn_3nuUtwW8Mo,2908
 luminarycloud/_client/rpc_error.py,sha256=SgOYyLs5YYAuODFfyHMgJeJ3j2R7SJ8lUiqywvNRTfg,1250
@@ -42,7 +42,7 @@ luminarycloud/_helpers/_entity_identifier.py,sha256=Elb9gD5NFVxUxngiikGuNvNZ5YfS
 luminarycloud/_helpers/_get_project_id.py,sha256=OC0JI0gEXd_j8frss5AsjdzMX9C0mV3lAJdmB_cRmgw,885
 luminarycloud/_helpers/_simulation_params_from_json.py,sha256=Iq7S8XUqh3Y-6cZ2rvekJJxM3C-o8eFqTkBJpwdlHvU,726
 luminarycloud/_helpers/_timestamp_to_datetime.py,sha256=Vh2-e7MRrxG8z7CMA-DRIIAhqGSUGYuIhW9csoh9pBw,299
-luminarycloud/_helpers/_upload_mesh.py,sha256=eiWBSheNNdejfH3gkE7UohPXLRT3COOPPTN-yn2OU24,11955
+luminarycloud/_helpers/_upload_mesh.py,sha256=b-QFxr0z-z02XUOXyPad8QEutcYM-PZyxhdvIaJKwcg,11978
 luminarycloud/_helpers/_upload_table.py,sha256=B7Svu97Dr6UYt8pubD99kGvXkR0oKUtKSi3Ppj_qUMI,2211
 luminarycloud/_helpers/_wait_for_mesh.py,sha256=p7Zp6ulifpZDAfRcN0kOPVjOU2e9oWutSrPIbMcsreg,1871
 luminarycloud/_helpers/_wait_for_simulation.py,sha256=DusHJLmLi7NvLu3K7cfrb2ZSbPBrySK8t7TLS22oTms,3520
@@ -53,7 +53,7 @@ luminarycloud/_helpers/file_chunk_stream.py,sha256=Z5dfuGWZMZ3JDhZH9jgxSqgkFu_e8
 luminarycloud/_helpers/named_variables.py,sha256=GLjBEQxf0SwfzLemY6_hnNbReD2gTcX0N9Hfvrk3-xc,481
 luminarycloud/_helpers/pagination.py,sha256=MYBuFvxYWe4U2QQ9UyZt-TvTTo69Qv2bXREiD6f5i5E,2076
 luminarycloud/_helpers/proto_decorator.py,sha256=Jrls0V2epTjH1P1ezwAsn24_I2e3Lyys87ftivTdqGg,1429
-luminarycloud/_helpers/upload.py,sha256=22Qqu4TN6iWDKLBLuXWT8Cw6IT0ujJt7ViUBIXxx8BU,4110
+luminarycloud/_helpers/upload.py,sha256=aZ_aqCyiBEdcwtP7nOLLjLLo6XtGDfGcI4te2tx1tx8,4892
 luminarycloud/_helpers/util.py,sha256=GeBb9h10c-hWYkeBIxmK0UNgfbLryiRTE3EXNWhZLxI,3179
 luminarycloud/_helpers/warnings/__init__.py,sha256=I0nW7YIKZnapCdITVFopE60wQ6MfLy38tB4m8kuOVRQ,35
 luminarycloud/_helpers/warnings/deprecated.py,sha256=1SnhBAUqntgxHRMFG4Gzy_yqOMnBcAPN9b9Xxk0eieM,1259
@@ -521,6 +521,6 @@ luminarycloud/vis/primitives.py,sha256=_EDSEAddSAFTRUU9at1Gxt-5chLO723f9c8V5atTe
 luminarycloud/vis/report.py,sha256=wlRT-zj8MoVYfa9E5vUyZLYi_STBsShExN-TZtN0LlU,10552
 luminarycloud/vis/vis_util.py,sha256=AWGmHcfYXGmfe5t5Jbb1Fqe2nxVdEQbBitCaWSeT89M,1821
 luminarycloud/vis/visualization.py,sha256=pZSscRSCcwe8a0Z4-nRkL5kJ2btqLtkaUyQ76o1_AbA,61003
-luminarycloud-0.21.0.dist-info/METADATA,sha256=-89y2gZ9MhnLyfbh8gG-ixcNPAsnnI64-ZrleO7vBOw,2574
-luminarycloud-0.21.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-luminarycloud-0.21.0.dist-info/RECORD,,
+luminarycloud-0.21.1.dist-info/METADATA,sha256=QMDYlQvnNX7nNoBg12jLLMS5qV89eiUB1hpjGt7BBNM,2574
+luminarycloud-0.21.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+luminarycloud-0.21.1.dist-info/RECORD,,