chore: upate models

Author: nfrasser

cryosparc/api.pyi

@@ -703,13 +703,17 @@ class ResourcesAPI(APINamespace):
 
         """
         ...
-    def add_node(self, body: SchedulerTargetNode) -> SchedulerTargetNode:
+    def add_node(self, body: SchedulerTargetNode, *, gpu: bool = True) -> SchedulerTargetNode:
         """
         Adds a node or updates an existing node. Updates existing node if they share
-        share the same name.
+        share the same name. Attempts to connect to the node via SSH to run
+        the ``cryosparcw connect`` command.
+
+        Set ``gpu`` to False to skip GPU detection.
 
         Args:
             body (SchedulerTargetNode):
+            gpu (bool, optional): Defaults to True
 
         Returns:
             SchedulerTargetNode: Successful Response

cryosparc/model_registry.py

@@ -21,6 +21,7 @@
     params,
     preview,
     project,
+    resource,
     scheduler_lane,
     scheduler_target,
     services,
@@ -38,6 +39,7 @@
 
 register_model_module(job, include_literals=True)
 register_model_module(scheduler_target, include_literals=True)
+register_model_module(resource, include_literals=True)
 register_model_module(gpu, include_literals=True)
 register_model_module(api_request, include_literals=True)
 register_model_module(session, include_literals=True)

cryosparc/models/api_response.py

@@ -1,6 +1,6 @@
 # THIS FILE IS AUTO-GENERATED, DO NOT EDIT DIRECTLY
 # SEE dev/api_generate_models.py
-from typing import List, Optional
+from typing import List, Literal, Optional
 
 from pydantic import BaseModel
 
@@ -13,7 +13,7 @@ class BrowseFile(BaseModel):
     is_link: bool = False
     mtime: Optional[float] = None
     size: Optional[int] = None
-    type: Optional[str] = None
+    type: Optional[Literal["dir", "file"]] = None
     link_path: Optional[str] = None
     errmesg: Optional[str] = None
 

cryosparc/models/job.py

@@ -7,7 +7,8 @@
 
 from .instance import InstanceInformation
 from .job_spec import JobBuildError, JobSpec
-from .scheduler_target import FixedResourceSlots, ResourceSlots, SchedulerTarget
+from .resource import FixedResourceSlots, ResourceSlots
+from .scheduler_target import SchedulerTarget
 
 
 class AllocatedResources(BaseModel):

cryosparc/models/job_spec.py

@@ -4,6 +4,8 @@
 
 from pydantic import BaseModel, ConfigDict, RootModel
 
+from .resource import ResourceSpec
+
 BuilderTag = Literal[
     "new", "interactive", "gpuEnabled", "multiGpu", "utility", "import", "live", "benchmark", "wrapper"
 ]
@@ -439,30 +441,6 @@ class Outputs(RootModel):
     """
 
 
-class ResourceSpec(BaseModel):
-    """
-    Job resource requirements. Used to allocate compute resources for a job
-    at queue time.
-    """
-
-    cpu: int = 1
-    """
-    Number of required CPU cores
-    """
-    gpu: int = 0
-    """
-    Number of required GPUs
-    """
-    ram: int = 1
-    """
-    Number of 8GiB RAM slots
-    """
-    ssd: bool = False
-    """
-    Whether an SSD is required for temporary storage.
-    """
-
-
 class JobSpec(BaseModel):
     """
     Job's unique specification details. Defines the parameters, inputs, outputs

cryosparc/models/resource.py

@@ -0,0 +1,61 @@
+# THIS FILE IS AUTO-GENERATED, DO NOT EDIT DIRECTLY
+# SEE dev/api_generate_models.py
+from typing import List
+
+from pydantic import BaseModel
+
+
+class ResourceSlots(BaseModel):
+    """
+    Listings of available resources on a worker node that may be allocated for
+    scheduling.
+    """
+
+    CPU: List[int] = []
+    """
+    List of available CPU core indices.
+    """
+    GPU: List[int] = []
+    """
+    List of available GPU indices.
+    """
+    RAM: List[int] = []
+    """
+    List of available 8GB slots.
+    """
+
+
+class FixedResourceSlots(BaseModel):
+    """
+    Available resource slots that only indicate presence, not the amount that
+    may be allocated. (i.e., "SSD is available or not available")
+    """
+
+    SSD: bool = False
+    """
+    Whether this target thas an SSD
+    """
+
+
+class ResourceSpec(BaseModel):
+    """
+    Job resource requirements. Used to allocate compute resources for a job
+    at queue time.
+    """
+
+    cpu: int = 1
+    """
+    Number of required CPU cores
+    """
+    gpu: int = 0
+    """
+    Number of required GPUs
+    """
+    ram: int = 1
+    """
+    Number of 8GiB RAM slots
+    """
+    ssd: bool = False
+    """
+    Whether an SSD is required for temporary storage.
+    """

cryosparc/models/scheduler_target.py

@@ -5,38 +5,7 @@
 from pydantic import BaseModel
 
 from .gpu import Gpu
-
-
-class ResourceSlots(BaseModel):
-    """
-    Listings of available resources on a worker node that may be allocated for
-    scheduling.
-    """
-
-    CPU: List[int] = []
-    """
-    List of available CPU core indices.
-    """
-    GPU: List[int] = []
-    """
-    List of available GPU indices.
-    """
-    RAM: List[int] = []
-    """
-    List of available 8GB slots.
-    """
-
-
-class FixedResourceSlots(BaseModel):
-    """
-    Available resource slots that only indicate presence, not the amount that
-    may be allocated. (i.e., "SSD is available or not available")
-    """
-
-    SSD: bool = False
-    """
-    Whether this target thas an SSD
-    """
+from .resource import FixedResourceSlots, ResourceSlots
 
 
 class Node(BaseModel):

cryosparc/models/session.py

@@ -52,14 +52,14 @@ class ExposureGroup(BaseModel):
     defect_path: Optional[str] = None
     file_engine_recursive: bool = False
     file_engine_watch_path_abs: str = "/"
+    file_engine_enable: bool = False
     file_engine_filter: str = "*"
     file_engine_interval: int = 10
     file_engine_min_file_size: int = 0
     file_engine_min_modified_time_delta: int = 0
     exp_group_id: int = 1
     num_exposures_found: int = 0
     file_engine_strategy: Literal["entity", "timestamp", "eclathena"] = "entity"
-    file_engine_enable: bool = False
     final: bool = False
     is_any_eer: bool = False
 
@@ -74,6 +74,7 @@ class ExposureGroupUpdate(BaseModel):
     defect_path: Optional[str] = None
     file_engine_recursive: bool = False
     file_engine_watch_path_abs: str = "/"
+    file_engine_enable: bool = False
     file_engine_filter: str = "*"
     file_engine_interval: int = 10
     file_engine_min_file_size: int = 0

cryosparc/models/session_params.py

@@ -33,7 +33,7 @@ class LivePreprocessingParams(BaseModel):
     """
     Are the samples negative stain (True) or cryo (False)?
     """
-    eer_upsampfactor: int = 2
+    eer_upsampfactor: int = 1
     """
     EER upsampling factor (applies to .eer/.ecc format data only.
     """
@@ -226,7 +226,7 @@ class LivePreprocessingParams(BaseModel):
     """
     templates_from_job: Optional[str] = None
     templates_selected: Optional[str] = None
-    thresh_score_min: Optional[float] = None
+    thresh_score_min: float = 0.3
     """
     Minimum picking score threshold
     """