luminarycloud 0.21.0__tar.gz → 0.21.1__tar.gz

{luminarycloud-0.21.0 → luminarycloud-0.21.1}/PKG-INFO

@@ -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 → luminarycloud-0.21.1}/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-0.21.0 → luminarycloud-0.21.1}/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-0.21.0 → luminarycloud-0.21.1}/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 → luminarycloud-0.21.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "luminarycloud"
-version = "0.21.0"
+version = "0.21.1"
 description = "Luminary Cloud SDK"
 readme = "DESCRIPTION.md"
 requires-python = ">=3.10"