luminarycloud 0.11.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

luminarycloud/__init__.py

@@ -7,6 +7,7 @@ from . import (
     _patch as _patch,
     exceptions as exceptions,
     meshing as meshing,
+    outputs as outputs,
     params as params,
     types as types,
     vis as vis,

luminarycloud/_client/client.py

@@ -11,6 +11,13 @@ import grpc
 from .._auth import Auth0Client
 from .._proto.api.v0.luminarycloud.geometry.geometry_pb2_grpc import GeometryServiceStub
 from .._proto.api.v0.luminarycloud.mesh.mesh_pb2_grpc import MeshServiceStub
+from .._proto.api.v0.luminarycloud.output_node.output_node_pb2_grpc import OutputNodeServiceStub
+from .._proto.api.v0.luminarycloud.output_definition.output_definition_pb2_grpc import (
+    OutputDefinitionServiceStub,
+)
+from .._proto.api.v0.luminarycloud.stopping_condition.stopping_condition_pb2_grpc import (
+    StoppingConditionServiceStub,
+)
 from .._proto.api.v0.luminarycloud.project.project_pb2_grpc import ProjectServiceStub
 from .._proto.api.v0.luminarycloud.simulation.simulation_pb2_grpc import (
     SimulationServiceStub,
@@ -40,6 +47,9 @@ class Client(
     SolutionServiceStub,
     UploadServiceStub,
     VisAPIServiceStub,
+    OutputNodeServiceStub,
+    OutputDefinitionServiceStub,
+    StoppingConditionServiceStub,
 ):
     """
     Creates a Luminary API client.
@@ -180,7 +190,9 @@ class Client(
         SolutionServiceStub.__init__(self, self._channel)
         SimulationTemplateServiceStub.__init__(self, self._channel)
         VisAPIServiceStub.__init__(self, self._channel)
-
+        OutputNodeServiceStub.__init__(self, self._channel)
+        OutputDefinitionServiceStub.__init__(self, self._channel)
+        StoppingConditionServiceStub.__init__(self, self._channel)
         for name, value in self.__dict__.items():
             if isinstance(value, grpc.UnaryUnaryMultiCallable):
                 setattr(self, name, rpc_error(value))

luminarycloud/_client/retry_interceptor.py

@@ -52,6 +52,6 @@ class RetryInterceptor(UnaryUnaryClientInterceptor):
             call.result()
         except grpc.RpcError as e:
             if e.code() == grpc.StatusCode.UNAUTHENTICATED:
-                raise AuthenticationError() from None  # type: ignore[type-arg]
+                raise AuthenticationError(e.details(), e.code()) from None
             raise
         return call

luminarycloud/_client/rpc_error.py

@@ -27,7 +27,7 @@ def rpc_error(func: Callable[..., Any]) -> Callable[..., Any]:
             for code, exception in _CODE_TO_EXCEPTION.items():
                 if e.code() == code:
                     logger.debug(f"RPC failed: {e.code().name}", exc_info=True)
-                    raise exception(e.details()) from None
+                    raise exception(e.details(), code) from None
             raise e
 
     return wrapper

luminarycloud/_client/tracing.py

@@ -64,7 +64,11 @@ class Auth0SpanExporter(OTLPSpanExporter):
             "authorization": "Bearer " + token,
         }
         self._session.headers.update(headers)
-        return OTLPSpanExporter.export(self, spans)
+        try:
+            return OTLPSpanExporter.export(self, spans)
+        except Exception as e:
+            logger.debug(f"Failed to export traces: {e}")
+            return SpanExportResult.FAILURE
 
 
 class ApiKeySpanExporter(OTLPSpanExporter):
@@ -88,7 +92,11 @@ class ApiKeySpanExporter(OTLPSpanExporter):
             "x-api-key": self.api_key,
         }
         self._session.headers.update(headers)
-        return OTLPSpanExporter.export(self, spans)
+        try:
+            return OTLPSpanExporter.export(self, spans)
+        except Exception as e:
+            logger.debug(f"Failed to export traces: {e}")
+            return SpanExportResult.FAILURE
 
 
 def _get_collector_endpoint(primary_domain: str) -> str:

luminarycloud/_helpers/__init__.py

@@ -1,39 +1,39 @@
 # Copyright 2023-2024 Luminary Cloud, Inc. All Rights Reserved.
-from .create_geometry import (
-    create_geometry,
+from ._create_geometry import (
+    create_geometry as create_geometry,
 )
-from .create_simulation import (
-    create_simulation,
+from ._create_simulation import (
+    create_simulation as create_simulation,
 )
 from .download import (
-    download_surface_solution,
-    download_volume_solution,
-    download_surface_deformation_template,
-    download_surface_sensitivity_data,
-    save_file,
+    download_surface_solution as download_surface_solution,
+    download_volume_solution as download_volume_solution,
+    download_surface_deformation_template as download_surface_deformation_template,
+    download_surface_sensitivity_data as download_surface_sensitivity_data,
+    save_file as save_file,
 )
 from .file_chunk_stream import (
-    FileChunkStream,
+    FileChunkStream as FileChunkStream,
 )
-from .simulation_params_from_json import (
-    simulation_params_from_json,
-    simulation_params_from_json_path,
+from ._simulation_params_from_json import (
+    simulation_params_from_json as simulation_params_from_json,
+    simulation_params_from_json_path as simulation_params_from_json_path,
 )
-from .timestamp_to_datetime import (
-    timestamp_to_datetime,
+from ._timestamp_to_datetime import (
+    timestamp_to_datetime as timestamp_to_datetime,
 )
 from .upload import (
-    upload_file,
+    upload_file as upload_file,
 )
 from ._upload_mesh import (
-    upload_mesh,
-    upload_mesh_from_local_file,
-    upload_mesh_from_url,
+    upload_mesh as upload_mesh,
+    upload_mesh_from_local_file as upload_mesh_from_local_file,
+    upload_mesh_from_url as upload_mesh_from_url,
 )
 from ._upload_table import (
-    upload_table_as_json,
-    upload_c81_as_json,
+    upload_table_as_json as upload_table_as_json,
+    upload_c81_as_json as upload_c81_as_json,
 )
-from .wait_for_simulation import (
-    wait_for_simulation,
+from ._wait_for_simulation import (
+    wait_for_simulation as wait_for_simulation,
 )

luminarycloud/_helpers/{create_geometry.py → _create_geometry.py}

@@ -4,8 +4,11 @@ from luminarycloud._proto.upload import upload_pb2 as uploadpb
 from os import PathLike
 from .._client import Client
 from .upload import upload_file
-from typing import Any, Optional
+from typing import Optional
 from luminarycloud._helpers import util
+import uuid
+import random
+import time
 
 import logging
 
@@ -14,18 +17,19 @@ logger = logging.getLogger(__name__)
 
 def create_geometry(
     client: Client,
-    cad_file_path: PathLike,
+    cad_file_path: PathLike | str,
     project_id: str,
     *,
     name: Optional[str] = None,
     scaling: Optional[float] = None,
     wait: bool = False,
+    convert_to_discrete: bool = False,
 ) -> geometrypb.Geometry:
 
     cad_file_meta = util.get_file_metadata(cad_file_path)
     logger.info(
         f"creating geometry in {project_id} by uploading file: {cad_file_meta.name}.{cad_file_meta.ext}, "
-        + f"size: {cad_file_meta.size} bytes, sha256: {cad_file_meta.sha256_checksum}, "
+        + f"size: {cad_file_meta.size} bytes, sha256: {str(cad_file_meta.sha256_checksum)}, "
         + f"crc32c: {cad_file_meta.crc32c_checksum}"
     )
 
@@ -43,11 +47,31 @@ def create_geometry(
     if scaling is None:
         # default to no scaling
         scaling = 1.0
+
     create_geo_res: geometrypb.CreateGeometryResponse = client.CreateGeometry(
         geometrypb.CreateGeometryRequest(
-            project_id=project_id, name=name, url=finish_res.url, scaling=scaling, wait=wait
+            project_id=project_id,
+            name=name,
+            url=finish_res.url,
+            scaling=scaling,
+            wait=False,
+            request_id=str(uuid.uuid4()),
+            force_discrete=convert_to_discrete,
         )
     )
     geo = create_geo_res.geometry
+
+    # Prefer polling on the client than waiting on the server (although waiting on the server
+    # notifies the clients potentially faster).
+    if wait:
+        last_version_id = ""
+        while not last_version_id:
+            jitter = random.uniform(0.5, 1.5)
+            time.sleep(2 + jitter)
+            req = geometrypb.GetGeometryRequest(geometry_id=create_geo_res.geometry.id)
+            res_geo: geometrypb.GetGeometryResponse = client.GetGeometry(req)
+            geo = res_geo.geometry
+            last_version_id = geo.last_version_id
+
     logger.info(f"created geometry {geo.name} ({geo.id})")
     return geo

luminarycloud/_helpers/{create_simulation.py → _create_simulation.py}

@@ -36,8 +36,8 @@ def create_simulation(
             description=description,
             simulation_options=SimulationOptions(
                 batch_processing=batch_processing,
-                gpu_type=gpu_type,
-                gpu_count=gpu_count,
+                gpu_type=gpu_type.value if gpu_type is not None else GPUType.UNSPECIFIED.value,
+                gpu_count=gpu_count or 0,
             ),
         )
     )

luminarycloud/_helpers/_get_project_id.py

@@ -0,0 +1,29 @@
+from ..simulation import get_simulation
+from ..geometry import Geometry
+from ..solution import Solution
+from ..mesh import Mesh
+
+
+def _get_project_id(entity: Geometry | Solution | Mesh) -> str | None:
+    """
+    A helper function to get the project id from various entities.
+    Returns the project id or None if the entity type is unknown.
+
+    Parameters
+    ----------
+    entiry: Geometry | Solution | Mesh
+        The entity to get the project id from.
+    """
+    if isinstance(entity, Solution):
+        solution: Solution = entity
+        sim = get_simulation(solution.simulation_id)
+        return sim.project_id
+    elif isinstance(entity, Mesh):
+        mesh: Mesh = entity
+        return mesh.project_id
+    elif isinstance(entity, Geometry):
+        geometry: Geometry = entity
+        project = geometry.project()
+        return project.id
+    else:
+        return None

luminarycloud/_helpers/{simulation_params_from_json.py → _simulation_params_from_json.py}

@@ -11,7 +11,7 @@ def simulation_params_from_json(text: Union[str, bytes]) -> SimulationParam:
     return Parse(text, SimulationParam(), ignore_unknown_fields=True)
 
 
-def simulation_params_from_json_path(json_path: PathLike) -> SimulationParam:
+def simulation_params_from_json_path(json_path: PathLike | str) -> SimulationParam:
     with open(json_path, "rb") as fp:
         json_bytes = fp.read()
     return simulation_params_from_json(json_bytes)

luminarycloud/_helpers/_upload_mesh.py

@@ -55,7 +55,7 @@ def _upload_mesh_from_path(
     project_id: str,
     filepath: Union[os.PathLike, str],
     size: int,
-    sha256_checksum: str,
+    sha256_checksum: bytes,
     crc32c_checksum: bytes,
     mesh_type: MeshType,
     *,
@@ -79,9 +79,9 @@ def _upload_mesh_from_path(
         appropriate filename extension.
     size: int
         The size of the stream to be read
-    sha256checksum: str
+    sha256checksum: bytes
         The SHA256 digest of the mesh file to upload
-    crc32c_checksum: str
+    crc32c_checksum: bytes
         The CRC32C digest of the mesh file to upload
     mesh_type : MeshType
         The file format of the mesh file.
@@ -110,7 +110,7 @@ def _upload_mesh_from_path(
         ext=file_ext,  # note: this must be the extension without the dot
         size=size,
         sha256_checksum=sha256_checksum,
-        crc32c_checksum=crc32c_checksum,
+        crc32c_checksum=crc32c_checksum.decode(),
     )
     create_upload_res: uploadpb.CreateUploadReply = client.CreateUpload(
         uploadpb.CreateUploadRequest(
@@ -118,10 +118,10 @@ def _upload_mesh_from_path(
             file_meta=file_metadata,
             resource_params=uploadpb.ResourceParams(
                 mesh_params=uploadpb.MeshParams(
-                    mesh_name=name,
+                    mesh_name=name or file_name_without_ext,
                     scaling=scaling if scaling is not None else 1.0,
-                    mesh_type=mesh_type,
-                    do_not_read_zones_openfoam=do_not_read_zones_openfoam,
+                    mesh_type=mesh_type.value,
+                    do_not_read_zones_openfoam=do_not_read_zones_openfoam or False,
                     # We force disconnect to True here because we are not exposing this parameter.
                     disconnect=True,
                 )

luminarycloud/_helpers/_upload_table.py

@@ -63,7 +63,7 @@ def upload_table_as_json(
 def upload_c81_as_json(
     client: Client,
     project_id: str,
-    c81: PathLike,
+    c81: PathLike | str,
 ) -> str:
     """
     Uploads a c81 table and converts it to RectilinearTable json.
@@ -74,7 +74,7 @@ def upload_c81_as_json(
         A LuminaryCloud Client (see client.py)
     project_id: str
         The ID of the project to upload the table under
-    c81: PathLike
+    c81: PathLike or str
         Path to c81 file to upload
 
     Returns

luminarycloud/_helpers/{wait_for_simulation.py → _wait_for_simulation.py}

@@ -75,7 +75,7 @@ def _print_residuals(client: Client, simulation_id: str, last_printed_iter: int)
     residuals: GetSimulationGlobalResidualsResponse = client.GetSimulationGlobalResiduals(
         GetSimulationGlobalResidualsRequest(id=simulation_id)
     )
-    with io.StringIO(residuals.csv_file.data.decode()) as stream:
+    with io.StringIO(residuals.csv_file.full_contents.decode()) as stream:
         if last_printed_iter < 0:  # we haven't printed the header yet
             first_line = stream.readline().strip().split(",")
             header = "\t".join("{:>18}".format(s) for s in first_line)

luminarycloud/_helpers/cond.py

@@ -1,4 +1,6 @@
 # Copyright 2024 Luminary Cloud, Inc. All Rights Reserved.
+# type: ignore
+
 import json
 from contextlib import contextmanager
 from dataclasses import dataclass

luminarycloud/_helpers/defaults.py

@@ -1,14 +1,13 @@
 # Copyright 2024 Luminary Cloud, Inc. All Rights Reserved.
-from typing import Any
-
 from google.protobuf.any_pb2 import Any as AnyPB
 from google.protobuf.descriptor import FieldDescriptor
 
 import luminarycloud._proto.base.base_pb2 as basepb
 import luminarycloud._proto.options.options_pb2 as optionspb
+from luminarycloud.types.vector3 import _to_vector3_proto
 
 
-def _reset_defaults(params):
+def _reset_defaults(params: AnyPB) -> None:
     for field in params.DESCRIPTOR.fields:
         if field.label == FieldDescriptor.LABEL_REPEATED:
             for nested in getattr(params, field.name):
@@ -19,7 +18,7 @@ def _reset_defaults(params):
                 _reset_defaults(getattr(params, field.name))
 
 
-def _set_default(params: AnyPB, name: str) -> Any:
+def _set_default(params: AnyPB, name: str) -> None:
     field = params.DESCRIPTOR.fields_by_name[name]
     dfl: optionspb.Value = field.GetOptions().Extensions[optionspb.default_value]
     type = dfl.WhichOneof("typ")
@@ -30,12 +29,12 @@ def _set_default(params: AnyPB, name: str) -> Any:
     elif type == "strval":
         setattr(params, name, dfl.strval)
     elif type == "intval":
-        param: basepb.Int = getattr(params, name)
-        param.value = dfl.intval
+        int_param: basepb.Int = getattr(params, name)
+        int_param.value = dfl.intval
     elif type == "real":
-        param: basepb.AdFloatType = getattr(params, name)
-        param.CopyFrom(dfl.real)
+        real_param: basepb.AdFloatType = getattr(params, name)
+        real_param.CopyFrom(dfl.real)
     elif type == "vector3":
-        param: basepb.Vector3 = getattr(params, name)
+        param: basepb.AdVector3 = getattr(params, name)
         param.CopyFrom(dfl.vector3)
     return None

luminarycloud/_helpers/proto_decorator.py

@@ -21,6 +21,8 @@ class proto_decorator(Generic[P]):
     NOTE: only works for primitive and basepb.Vector3 fields right now.
     """
 
+    proto_type: type[P]
+
     def __init__(decorator, proto_type: type[P]):
         decorator.proto_type = proto_type
 
@@ -28,7 +30,7 @@ class proto_decorator(Generic[P]):
         type_hints = get_type_hints(cls)
         fields = decorator.proto_type.DESCRIPTOR.fields
 
-        def _to_proto(self) -> decorator.proto_type:
+        def _to_proto(self: type[C]) -> P:
             proto = decorator.proto_type()
             for field in fields:
                 _type = type_hints.get(field.name, None)

luminarycloud/_helpers/upload.py

@@ -14,7 +14,7 @@ logger = logging.getLogger(__name__)
 
 
 def gcs_resumable_upload(
-    filepath: PathLike, signed_url: str, http_headers: Mapping[str, str]
+    filepath: PathLike | str, signed_url: str, http_headers: Mapping[str, str]
 ) -> None:
     """
     Performs a resumable upload to a GCS signed url.
@@ -70,7 +70,7 @@ def upload_file(
     client: Client,
     project_id: str,
     resource_params: uploadpb.ResourceParams,
-    file_path: PathLike,
+    file_path: PathLike | str,
 ) -> tuple[str, uploadpb.FinishUploadReply]:
     file_metadata = util.get_file_metadata(pathlib.Path(file_path))
 

luminarycloud/_helpers/util.py

@@ -5,7 +5,7 @@ import io
 import logging
 import os
 from os import PathLike
-from typing import Iterator, Tuple, Union
+from typing import Iterator, Tuple
 
 import google_crc32c as crc32c
 
@@ -18,7 +18,7 @@ DEFAULT_CHUNK_SIZE_BYTES = 1024 * 1024
 
 def _chunker(
     stream: io.BufferedIOBase,
-    chunk_size: int = None,
+    chunk_size: int | None = None,
 ) -> Iterator[Tuple[int, bytes]]:
     """
     Generator which breaks the stream into chunks.
@@ -51,9 +51,9 @@ def _chunker(
 
 
 def digest_sha256(
-    path: Union[os.PathLike, str],
+    path: PathLike | str,
     *,
-    chunk_size: int = None,
+    chunk_size: int | None = None,
 ) -> bytes:
     """
     Computes the sha256 digest of the file at the given path.
@@ -79,9 +79,9 @@ def digest_sha256(
 
 
 def digest_crc32c(
-    path: Union[os.PathLike, str],
+    path: PathLike | str,
     *,
-    chunk_size: int = None,
+    chunk_size: int | None = None,
 ) -> bytes:
     """
     Computes the crc32c digest of the file at the given path and returns it as
@@ -109,7 +109,7 @@ def digest_crc32c(
 
 
 def get_file_metadata(
-    file_path: PathLike,
+    file_path: PathLike | str,
 ) -> filepb.FileMetadata:
 
     if not os.path.exists(file_path):
@@ -131,5 +131,5 @@ def get_file_metadata(
         ext=file_ext,
         size=os.path.getsize(file_path),
         sha256_checksum=digest_sha256(file_path),
-        crc32c_checksum=digest_crc32c(file_path),
+        crc32c_checksum=digest_crc32c(file_path).decode(),
     )

luminarycloud/_helpers/warnings/deprecated.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import warnings
 from functools import wraps
 from typing import Callable, TypeVar

luminarycloud/_helpers/warnings/experimental.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import warnings
 from functools import wraps
 from typing import Callable, TypeVar

luminarycloud/_patch.py

@@ -1,3 +1,6 @@
+# Copyright 2024 Luminary Cloud, Inc. All Rights Reserved.
+# type: ignore
+
 from functools import wraps
 from typing import TypeVar