madsci.node_module 0.4.3__tar.gz → 0.4.4__tar.gz

{madsci_node_module-0.4.3 → madsci_node_module-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: madsci.node_module
-Version: 0.4.3
+Version: 0.4.4
 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.4.3 → madsci_node_module-0.4.4}/madsci/node_module/abstract_node_module.py

@@ -26,7 +26,7 @@ from madsci.client.resource_client import ResourceClient
 from madsci.common.exceptions import (
     ActionNotImplementedError,
 )
-from madsci.common.ownership import ownership_context
+from madsci.common.ownership import global_ownership_info
 from madsci.common.types.action_types import (
     ActionDefinition,
     ActionRequest,
@@ -58,6 +58,7 @@ from madsci.common.utils import (
     pretty_type_repr,
     repeat_on_interval,
     threaded_daemon,
+    to_snake_case,
 )
 from pydantic import ValidationError
 from semver import Version
@@ -118,49 +119,48 @@ class AbstractNode:
                 self.logger.log_warning(
                     f"Node definition file '{node_definition_path}' not found, using default node definition."
                 )
+                module_name = to_snake_case(self.__class__.__name__)
+                node_name = str(Path(node_definition_path).stem)
                 self.node_definition = NodeDefinition(
-                    module_name=self.__class__.__name__,
-                    node_name=self.__class__.__name__,
-                    module_version=self.module_version,
+                    node_name=node_name, module_name=module_name
                 )
             else:
                 self.node_definition = NodeDefinition.from_yaml(node_definition_path)
+        global_ownership_info.node_id = self.node_definition.node_id
+        self._configure_clients()
 
-        with ownership_context(node_id=self.node_definition.node_id):
-            self._configure_clients()
-
-            # * Check Node Version
-            if (
-                Version.parse(self.module_version).compare(
-                    self.node_definition.module_version
-                )
-                < 0
-            ):
-                self.logger.log_warning(
-                    "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."
-                )
-
-            # * Synthesize the node info
-            self.node_info = NodeInfo.from_node_def_and_config(
-                self.node_definition, self.config
+        # * Check Node Version
+        if (
+            Version.parse(self.module_version).compare(
+                self.node_definition.module_version
+            )
+            < 0
+        ):
+            self.logger.log_warning(
+                "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()
-
-            # * 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__"):
-                    self._add_action(
-                        func=action_callable,
-                        action_name=action_callable.__madsci_action_name__,
-                        description=action_callable.__madsci_action_description__,
-                        blocking=action_callable.__madsci_action_blocking__,
-                    )
+        # * 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__"):
+                self._add_action(
+                    func=action_callable,
+                    action_name=action_callable.__madsci_action_name__,
+                    description=action_callable.__madsci_action_description__,
+                    blocking=action_callable.__madsci_action_blocking__,
+                )
 
-            # * Save the node info and update definition, if possible
-            if self.config.update_node_files:
-                self._update_node_info_and_definition()
+        # * Save the node info and update definition, if possible
+        if self.config.update_node_files:
+            self._update_node_info_and_definition()
 
     """------------------------------------------------------------------------------------------------"""
     """Node Lifecycle and Public Methods"""
@@ -169,17 +169,17 @@ class AbstractNode:
     def start_node(self) -> None:
         """Called once to start the node."""
 
-        with ownership_context(node_id=self.node_definition.node_id):
-            # * Update EventClient with logging parameters
-            self._configure_clients()
+        global_ownership_info.node_id = self.node_definition.node_id
+        # * Update EventClient with logging parameters
+        self._configure_clients()
 
-            # * Log startup info
-            self.logger.log_debug(f"{self.node_definition=}")
+        # * Log startup info
+        self.logger.log_debug(f"{self.node_definition=}")
 
-            # * Kick off the startup logic in a separate thread
-            # * This allows implementations to start servers, listeners, etc.
-            # * in parrallel
-            self._startup()
+        # * Kick off the startup logic in a separate thread
+        # * This allows implementations to start servers, listeners, etc.
+        # * in parrallel
+        self._startup()
 
     def status_handler(self) -> None:
         """Called periodically to update the node status. Should set `self.node_status`"""

{madsci_node_module-0.4.3 → madsci_node_module-0.4.4}/madsci/node_module/rest_node_module.py

@@ -15,7 +15,7 @@ from fastapi.background import BackgroundTasks
 from fastapi.datastructures import UploadFile
 from fastapi.routing import APIRouter
 from madsci.client.node.rest_node_client import RestNodeClient
-from madsci.common.ownership import ownership_context
+from madsci.common.ownership import global_ownership_info
 from madsci.common.types.action_types import (
     ActionRequest,
     ActionResult,
@@ -64,33 +64,33 @@ class RestNode(AbstractNode):
 
     def start_node(self, testing: bool = False) -> None:
         """Start the node."""
-        with ownership_context(node_id=self.node_definition.node_id):
-            url = AnyUrl(getattr(self.config, "node_url", "http://127.0.0.1:2000"))
-            if not testing:
-                self.logger.log_debug("Running node in production mode")
-                import uvicorn
-
-                self.rest_api = FastAPI(lifespan=self._lifespan)
-
-                # Middleware to set ownership context for each request
-                @self.rest_api.middleware("http")
-                async def ownership_middleware(
-                    request: Request, call_next: Callable
-                ) -> Response:
-                    with ownership_context(node_id=self.node_definition.node_id):
-                        return await call_next(request)
-
-                self._configure_routes()
-                uvicorn.run(
-                    self.rest_api,
-                    host=url.host if url.host else "127.0.0.1",
-                    port=url.port if url.port else 2000,
-                    **getattr(self.config, "uvicorn_kwargs", {}),
-                )
-            else:
-                self.logger.log_debug("Running node in test mode")
-                self.rest_api = FastAPI(lifespan=self._lifespan)
-                self._configure_routes()
+        global_ownership_info.node_id = self.node_definition.node_id
+        url = AnyUrl(getattr(self.config, "node_url", "http://127.0.0.1:2000"))
+        if not testing:
+            self.logger.log_debug("Running node in production mode")
+            import uvicorn  # noqa: PLC0415
+
+            self.rest_api = FastAPI(lifespan=self._lifespan)
+
+            # Middleware to set ownership context for each request
+            @self.rest_api.middleware("http")
+            async def ownership_middleware(
+                request: Request, call_next: Callable
+            ) -> Response:
+                global_ownership_info.node_id = self.node_definition.node_id
+                return await call_next(request)
+
+            self._configure_routes()
+            uvicorn.run(
+                self.rest_api,
+                host=url.host if url.host else "127.0.0.1",
+                port=url.port if url.port else 2000,
+                **getattr(self.config, "uvicorn_kwargs", {}),
+            )
+        else:
+            self.logger.log_debug("Running node in test mode")
+            self.rest_api = FastAPI(lifespan=self._lifespan)
+            self._configure_routes()
 
     """------------------------------------------------------------------------------------------------"""
     """Interface Methods"""

{madsci_node_module-0.4.3 → madsci_node_module-0.4.4}/pyproject.toml

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