luminarycloud 0.17.0__tar.gz → 0.18.0__tar.gz

{luminarycloud-0.17.0 → luminarycloud-0.18.0}/PKG-INFO

@@ -1,34 +1,34 @@
 Metadata-Version: 2.4
 Name: luminarycloud
-Version: 0.17.0
+Version: 0.18.0
 Summary: Luminary Cloud SDK
 Project-URL: Homepage, https://www.luminarycloud.com/
 Project-URL: Documentation, https://app.luminarycloud.com/docs/api/
 Author-email: "Luminary Cloud Inc." <support@luminarycloud.com>
 Keywords: Luminary Cloud,SDK
 Requires-Python: >=3.10
-Requires-Dist: google-crc32c~=1.6.0
-Requires-Dist: googleapis-common-protos~=1.58
-Requires-Dist: grpcio-status~=1.51
-Requires-Dist: grpcio-tools~=1.51
-Requires-Dist: grpcio~=1.51
-Requires-Dist: importlib-metadata~=6.0.0
+Requires-Dist: google-crc32c~=1.7
+Requires-Dist: googleapis-common-protos~=1.70
+Requires-Dist: grpcio-status~=1.65
+Requires-Dist: grpcio-tools~=1.65
+Requires-Dist: grpcio~=1.65
+Requires-Dist: importlib-metadata~=8.7
 Requires-Dist: opentelemetry-api~=1.25
 Requires-Dist: opentelemetry-exporter-otlp-proto-common~=1.25
 Requires-Dist: opentelemetry-exporter-otlp-proto-http~=1.25
-Requires-Dist: opentelemetry-instrumentation-grpc~=0.46b0
-Requires-Dist: opentelemetry-instrumentation~=0.46b0
+Requires-Dist: opentelemetry-instrumentation-grpc~=0.55b1
+Requires-Dist: opentelemetry-instrumentation~=0.55b1
 Requires-Dist: opentelemetry-proto~=1.25
 Requires-Dist: opentelemetry-sdk~=1.25
-Requires-Dist: opentelemetry-semantic-conventions~=0.46b0
-Requires-Dist: protobuf~=4.21
-Requires-Dist: pyjwt~=2.6
-Requires-Dist: python-dotenv~=1.0.0
-Requires-Dist: pyyaml~=6.0.2
-Requires-Dist: requests~=2.28
-Requires-Dist: waitress~=3.0.1
-Requires-Dist: werkzeug~=3.0.1
-Requires-Dist: zstandard
+Requires-Dist: opentelemetry-semantic-conventions~=0.55b1
+Requires-Dist: protobuf~=5.29
+Requires-Dist: pyjwt~=2.10
+Requires-Dist: python-dotenv~=1.1
+Requires-Dist: pyyaml~=6.0
+Requires-Dist: requests~=2.32
+Requires-Dist: waitress~=3.0
+Requires-Dist: werkzeug~=3.1
+Requires-Dist: zstandard~=0.23
 Provides-Extra: jupyter
 Requires-Dist: luminarycloud-jupyter; extra == 'jupyter'
 Description-Content-Type: text/markdown

{luminarycloud-0.17.0 → luminarycloud-0.18.0}/luminarycloud/_client/client.py

@@ -28,6 +28,7 @@ from .._proto.api.v0.luminarycloud.simulation_template.simulation_template_pb2_g
 from .._proto.api.v0.luminarycloud.named_variable_set.named_variable_set_pb2_grpc import (
     NamedVariableSetServiceStub,
 )
+from .._proto.api.v0.luminarycloud.pipelines.pipelines_pb2_grpc import PipelineServiceStub
 from .._proto.api.v0.luminarycloud.physics_ai.physics_ai_pb2_grpc import (
     PhysicsAiServiceStub,
 )
@@ -64,6 +65,7 @@ class Client(
     OutputDefinitionServiceStub,
     StoppingConditionServiceStub,
     NamedVariableSetServiceStub,
+    PipelineServiceStub,
     PhysicsAiServiceStub,
     InferenceServiceStub,
     OnshapeServiceStub,
@@ -222,6 +224,7 @@ class Client(
         OutputNodeServiceStub.__init__(self, self._channel)
         OutputDefinitionServiceStub.__init__(self, self._channel)
         StoppingConditionServiceStub.__init__(self, self._channel)
+        PipelineServiceStub.__init__(self, self._channel)
         PhysicsAiServiceStub.__init__(self, self._channel)
         InferenceServiceStub.__init__(self, self._channel)
         NamedVariableSetServiceStub.__init__(self, self._channel)

{luminarycloud-0.17.0 → luminarycloud-0.18.0}/luminarycloud/_helpers/_create_geometry.py

@@ -1,21 +1,152 @@
 # Copyright 2024 Luminary Cloud, Inc. All Rights Reserved.
 from luminarycloud._proto.api.v0.luminarycloud.geometry import geometry_pb2 as geometrypb
 from luminarycloud._proto.upload import upload_pb2 as uploadpb
+from luminarycloud.types.adfloat import _to_ad_proto
 from os import PathLike
 from .._client import Client
 from .upload import upload_file
-from typing import Optional
+from typing import List, Optional
 from luminarycloud._helpers import util
 import uuid
 import random
 import time
+import tempfile
+import zipfile
+from pathlib import Path
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
+def _create_zip(file_paths: List[PathLike | str]) -> Path:
+    """Create ZIP file."""
+
+    zip_path = Path(tempfile.mktemp(suffix=".zip"))
+
+    with zipfile.ZipFile(zip_path, "w") as zf:
+        for file_path in file_paths:
+            path = Path(file_path)
+            zf.write(path, path.name)  # Flatten structure
+
+    return zip_path
+
+
+def _create_geometry_from_url(
+    client: Client,
+    project_id: str,
+    url: str,
+    name: str,
+    web_geometry_id: str,
+    scaling: Optional[float],
+    wait: bool,
+) -> geometrypb.Geometry:
+    """Create geometry from already-uploaded URL (shared logic)."""
+
+    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=url,
+            web_geometry_id=web_geometry_id,
+            scaling=_to_ad_proto(scaling),
+            wait=False,
+            request_id=str(uuid.uuid4()),
+        )
+    )
+    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
+
+
+def _create_geometry_from_multiple_files(
+    client: Client,
+    cad_file_paths: List[PathLike | str],
+    project_id: str,
+    *,
+    name: Optional[str] = None,
+    scaling: Optional[float] = None,
+    wait: bool = False,
+) -> geometrypb.Geometry:
+    """
+    Create geometry from multiple files using frontend's proven pattern.
+
+    Creates a ZIP file and uploads using meshParams (not geometryParams)
+    to leverage existing FileSetManifest infrastructure.
+    """
+
+    # Create ZIP file (simple, no validation - like single-file)
+    zip_path = _create_zip(cad_file_paths)
+
+    try:
+        # Upload ZIP using meshParams
+        finish_res = upload_file(
+            client,
+            project_id,
+            uploadpb.ResourceParams(mesh_params=uploadpb.MeshParams(scaling=scaling or 1.0)),
+            zip_path,
+        )[1]
+
+        # Create geometry from uploaded ZIP URL
+        return _create_geometry_from_url(
+            client,
+            project_id,
+            finish_res.url,
+            name or "Multi-file Geometry",
+            "",
+            scaling,
+            wait,
+        )
+    finally:
+        # Clean up ZIP
+        zip_path.unlink()
+
+
 def create_geometry(
+    client: Client,
+    cad_file_path: PathLike | str | List[PathLike | str],
+    project_id: str,
+    *,
+    name: Optional[str] = None,
+    scaling: Optional[float] = None,
+    wait: bool = False,
+) -> geometrypb.Geometry:
+    """
+    Create a geometry from single or multiple CAD files.
+    """
+
+    # Route to appropriate handler based on input type
+    if isinstance(cad_file_path, (list, tuple)) and len(cad_file_path) > 1:
+        # Multi-file: use mesh upload pattern (like frontend)
+        return _create_geometry_from_multiple_files(
+            client, cad_file_path, project_id, name=name, scaling=scaling, wait=wait
+        )
+
+    # Single file: existing logic
+    single_path = cad_file_path[0] if isinstance(cad_file_path, (list, tuple)) else cad_file_path
+    return _create_geometry_from_single_file(
+        client, single_path, project_id, name=name, scaling=scaling, wait=wait
+    )
+
+
+def _create_geometry_from_single_file(
     client: Client,
     cad_file_path: PathLike | str,
     project_id: str,
@@ -24,6 +155,7 @@ def create_geometry(
     scaling: Optional[float] = None,
     wait: bool = False,
 ) -> geometrypb.Geometry:
+    """Create geometry from single file."""
 
     # TODO(onshape): Document this publicly when we release
     cad_file_path_str = str(cad_file_path)
@@ -61,34 +193,4 @@ def create_geometry(
             # if the caller did not provide a name, use the file name
             name = cad_file_meta.name
 
-    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=url,
-            web_geometry_id=web_geometry_id,
-            scaling=scaling,
-            wait=False,
-            request_id=str(uuid.uuid4()),
-        )
-    )
-    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
+    return _create_geometry_from_url(client, project_id, url, name, web_geometry_id, scaling, wait)

{luminarycloud-0.17.0 → luminarycloud-0.18.0}/luminarycloud/_helpers/cond.py

@@ -403,7 +403,6 @@ def params_to_dict(sim_params: SimulationParam) -> dict[str, Any]:
     tree = MessageToDict(
         sim_params,
         preserving_proto_field_name=True,
-        including_default_value_fields=False,
     )
     helper = CondHelper()
     return helper.prune(tree)