madsci.node_module 0.2.0__tar.gz → 0.3.0__tar.gz

{madsci_node_module-0.2.0 → madsci_node_module-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: madsci.node_module
-Version: 0.2.0
+Version: 0.3.0
 Summary: The Modular Autonomous Discovery for Science (MADSci) Node Module Helper Classes.
 Author-Email: Tobias Ginsburg <tginsburg@anl.gov>, "Ryan D. Lewis" <ryan.lewis@anl.gov>, Casey Stone <cstone@anl.gov>, Doga Ozgulbas <dozgulbas@anl.gov>
 License: MIT

{madsci_node_module-0.2.0 → madsci_node_module-0.3.0}/madsci/node_module/abstract_node_module.py

@@ -42,6 +42,7 @@ from madsci.common.types.location_types import (
 )
 from madsci.common.types.node_types import (
     AdminCommands,
+    NodeCapabilities,
     NodeClientCapabilities,
     NodeConfig,
     NodeDefinition,
@@ -128,14 +129,14 @@ class AbstractNode:
                 "The module version in the Node Module's source code does not match the version specified in your Node Definition. Your module may have been updated. We recommend checking to ensure compatibility, and then updating the version in your node definition to match."
             )
 
-        # * Combine the node definition and classes's capabilities
-        self._populate_capabilities()
-
         # * Synthesize the node info
         self.node_info = NodeInfo.from_node_def_and_config(
             self.node_definition, self.config
         )
 
+        # * Combine the node definition and classes's capabilities
+        self._populate_capabilities()
+
         # * Add the action decorators to the node (and node info)
         for action_callable in self.__class__.__dict__.values():
             if hasattr(action_callable, "__is_madsci_action__"):
@@ -462,7 +463,7 @@ class AbstractNode:
                     f"Adding parameter {parameter_name} of type {parameter_type} to action {action_name}",
                 )
                 if parameter_name == "return":
-                    # * Skip the return parameter
+                    # TODO: Extract the return type and add it to the action definition
                     continue
                 if (
                     parameter_name not in action_def.args
@@ -709,17 +710,19 @@ class AbstractNode:
 
     def _populate_capabilities(self) -> None:
         """Populate the node capabilities based on the node definition and the supported capabilities of the class."""
+        if self.node_info.capabilities is None:
+            self.node_info.capabilities = NodeCapabilities()
         for field in self.supported_capabilities.__pydantic_fields__:
-            if getattr(self.node_definition.capabilities, field) is None:
+            if getattr(self.node_info.capabilities, field) is None:
                 setattr(
-                    self.node_definition.capabilities,
+                    self.node_info.capabilities,
                     field,
                     getattr(self.supported_capabilities, field),
                 )
 
         # * Add the admin commands to the node info
-        self.node_definition.capabilities.admin_commands = set.union(
-            self.node_definition.capabilities.admin_commands,
+        self.node_info.capabilities.admin_commands = set.union(
+            self.node_info.capabilities.admin_commands,
             {
                 admin_command.value
                 for admin_command in AdminCommands

{madsci_node_module-0.2.0 → madsci_node_module-0.3.0}/madsci/node_module/helpers.py

@@ -65,6 +65,7 @@ def action_response_to_headers(action_response: ActionResult) -> dict[str, str]:
         "x-madsci-datapoints": json.dumps(action_response.datapoints),
         "x-madsci-errors": json.dumps(action_response.errors),
         "x-madsci-files": json.dumps(action_response.files),
+        "x-madsci-data": json.dumps(action_response.data),
     }
 
 
@@ -84,7 +85,7 @@ class ActionResultWithFiles(FileResponse):
             suffix=".zip",
             delete=False,
         ) as temp_zipfile_path:
-            temp_zip = ZipFile(temp_zipfile_path, "w")
+            temp_zip = ZipFile(temp_zipfile_path.name, "w")
             for file in action_response.files:
                 temp_zip.write(
                     action_response.files[file],
@@ -95,6 +96,6 @@ class ActionResultWithFiles(FileResponse):
                 )
 
             return ActionResultWithFiles(
-                path=temp_zipfile_path,
+                path=temp_zipfile_path.name,
                 headers=action_response_to_headers(action_response),
             )

{madsci_node_module-0.2.0 → madsci_node_module-0.3.0}/madsci/node_module/rest_node_module.py

@@ -111,7 +111,7 @@ class RestNode(AbstractNode):
 
         response = super().run_action(
             ActionRequest(
-                action_id=action_id if action_id else new_ulid_str(),
+                action_id=action_id or new_ulid_str(),
                 action_name=action_name,
                 args=args,
                 files={

{madsci_node_module-0.2.0 → madsci_node_module-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "madsci.node_module"
-version = "0.2.0"
+version = "0.3.0"
 description = "The Modular Autonomous Discovery for Science (MADSci) Node Module Helper Classes."
 authors = [
     { name = "Tobias Ginsburg", email = "tginsburg@anl.gov" },

{madsci_node_module-0.2.0 → madsci_node_module-0.3.0}/tests/test_rest_node_module.py

@@ -332,6 +332,7 @@ def test_get_action_result(test_client: TestClient) -> None:
         result = ActionResult.model_validate(response.json())
         assert result.status in [ActionStatus.RUNNING, ActionStatus.SUCCEEDED]
 
+        time.sleep(0.1)
         response = client.get(f"/action/{result.action_id}")
         assert response.status_code == 200
         fetched_result = ActionResult.model_validate(response.json())