From ba2a18d5f381d590d2bbec559f5fe9f3dd5cd228 Mon Sep 17 00:00:00 2001 From: Rajan Date: Mon, 21 Oct 2024 02:32:28 -0400 Subject: [PATCH] pre-commit fixes --- samples/apps/cap/py/autogencap/actor.py | 1 + samples/apps/cap/py/autogencap/actor_connector.py | 9 +++++++-- samples/apps/cap/py/autogencap/actor_runtime.py | 9 ++++++--- samples/apps/cap/py/autogencap/ag_adapter/ag_actor.py | 3 ++- samples/apps/cap/py/autogencap/zmq_directory_svc.py | 4 +++- samples/apps/cap/py/autogencap/zmq_msg_receiver.py | 3 ++- samples/apps/cap/py/autogencap/zmq_runtime.py | 2 ++ 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/samples/apps/cap/py/autogencap/actor.py b/samples/apps/cap/py/autogencap/actor.py index ab1bbc307c31..6d2e8496128a 100644 --- a/samples/apps/cap/py/autogencap/actor.py +++ b/samples/apps/cap/py/autogencap/actor.py @@ -3,6 +3,7 @@ from .actor_runtime import IMsgActor, IRuntime, IMessageReceiver from .debug_log import Debug, Info + class Actor(IMsgActor): def __init__(self, agent_name: str, description: str, start_thread: bool = True): """Initialize the Actor with a name, description, and threading option.""" diff --git a/samples/apps/cap/py/autogencap/actor_connector.py b/samples/apps/cap/py/autogencap/actor_connector.py index bec026f6ce3e..5a6c93664b74 100644 --- a/samples/apps/cap/py/autogencap/actor_connector.py +++ b/samples/apps/cap/py/autogencap/actor_connector.py @@ -1,6 +1,7 @@ from abc import ABC, abstractmethod from typing import Any, Tuple, Optional + class IActorConnector(ABC): @abstractmethod def send_txt_msg(self, msg: str) -> None: @@ -15,11 +16,15 @@ def send_proto_msg(self, msg: Any) -> None: pass @abstractmethod - def send_recv_proto_msg(self, msg: Any, num_attempts: int = 5) -> Tuple[Optional[str], Optional[str], Optional[bytes]]: + def send_recv_proto_msg( + self, msg: Any, num_attempts: int = 5 + ) -> Tuple[Optional[str], Optional[str], Optional[bytes]]: pass @abstractmethod - def send_recv_msg(self, msg_type: str, msg: bytes, num_attempts: int = 5) -> Tuple[Optional[str], Optional[str], Optional[bytes]]: + def send_recv_msg( + self, msg_type: str, msg: bytes, num_attempts: int = 5 + ) -> Tuple[Optional[str], Optional[str], Optional[bytes]]: pass @abstractmethod diff --git a/samples/apps/cap/py/autogencap/actor_runtime.py b/samples/apps/cap/py/autogencap/actor_runtime.py index 37786225e3a9..ee81c8695102 100644 --- a/samples/apps/cap/py/autogencap/actor_runtime.py +++ b/samples/apps/cap/py/autogencap/actor_runtime.py @@ -3,9 +3,10 @@ from .actor_connector import IActorConnector from .proto.CAP_pb2 import ActorInfo + class IMsgActor(ABC): @abstractmethod - def on_connect(self, runtime: 'IRuntime'): + def on_connect(self, runtime: "IRuntime"): """Called when the actor connects to the runtime.""" pass @@ -34,13 +35,14 @@ def dispatch_message(self, message): """Dispatch the received message based on its type.""" pass + # Abstract base class for message receivers class IMessageReceiver(ABC): @abstractmethod def init(self, actor_name: str): """Initialize the message receiver.""" pass - + @abstractmethod def add_listener(self, topic: str): """Add a topic to the message receiver.""" @@ -56,6 +58,7 @@ def stop(self): """Stop the message receiver.""" pass + # Abstract base class for the runtime environment class IRuntime(ABC): @abstractmethod @@ -94,6 +97,6 @@ def find_termination(self) -> IActorConnector: pass @abstractmethod - def find_by_name_regex(self, name_regex) -> List['ActorInfo']: + def find_by_name_regex(self, name_regex) -> List["ActorInfo"]: """Find actors by name using a regular expression.""" pass diff --git a/samples/apps/cap/py/autogencap/ag_adapter/ag_actor.py b/samples/apps/cap/py/autogencap/ag_adapter/ag_actor.py index 7ad87e901e3a..410a042b8ae7 100644 --- a/samples/apps/cap/py/autogencap/ag_adapter/ag_actor.py +++ b/samples/apps/cap/py/autogencap/ag_adapter/ag_actor.py @@ -2,9 +2,10 @@ from autogencap.constants import Termination_Topic from autogencap.debug_log import Debug + class AGActor(Actor): def on_start(self, runtime): super().on_start(runtime) str_topic = Termination_Topic self._msg_receiver.add_listener(str_topic) - Debug(self.actor_name, f"subscribe to: {str_topic}") \ No newline at end of file + Debug(self.actor_name, f"subscribe to: {str_topic}") diff --git a/samples/apps/cap/py/autogencap/zmq_directory_svc.py b/samples/apps/cap/py/autogencap/zmq_directory_svc.py index fa3141f551a2..eb0f2ee37924 100644 --- a/samples/apps/cap/py/autogencap/zmq_directory_svc.py +++ b/samples/apps/cap/py/autogencap/zmq_directory_svc.py @@ -120,7 +120,9 @@ def start(self, runtime): Debug("DirectorySvc", "Starting.") self._directory_connector = ZMQActorConnector(self._context, Directory_Svc_Topic) if self._no_other_directory(): - self._directory_actor = ZMQDirectoryActor(Directory_Svc_Topic, "Directory Service", self._context) # Update this line + self._directory_actor = ZMQDirectoryActor( + Directory_Svc_Topic, "Directory Service", self._context + ) # Update this line self._directory_actor.on_start(runtime) Info("DirectorySvc", "Directory service started.") else: diff --git a/samples/apps/cap/py/autogencap/zmq_msg_receiver.py b/samples/apps/cap/py/autogencap/zmq_msg_receiver.py index e5a4c2205070..387ce7ef5578 100644 --- a/samples/apps/cap/py/autogencap/zmq_msg_receiver.py +++ b/samples/apps/cap/py/autogencap/zmq_msg_receiver.py @@ -5,6 +5,7 @@ import zmq import threading + class ZMQMsgReceiver(IMessageReceiver): def __init__(self, context: zmq.Context): self._socket = None @@ -45,4 +46,4 @@ def stop(self): """Stop the ZMQ message receiver.""" self.run = False self._socket.setsockopt(zmq.LINGER, 0) - self._socket.close() \ No newline at end of file + self._socket.close() diff --git a/samples/apps/cap/py/autogencap/zmq_runtime.py b/samples/apps/cap/py/autogencap/zmq_runtime.py index 7ed89f2b6f05..e52e97446709 100644 --- a/samples/apps/cap/py/autogencap/zmq_runtime.py +++ b/samples/apps/cap/py/autogencap/zmq_runtime.py @@ -38,6 +38,7 @@ def _init_runtime(self): self._broker = None if self._directory_svc is None: from .zmq_directory_svc import ZMQDirectorySvc + self._directory_svc = ZMQDirectorySvc(self._context) self._directory_svc.start(self) time.sleep(0.25) # Process queued thread events in Broker and Directory @@ -51,6 +52,7 @@ def register(self, actor: Actor): def get_new_msg_receiver(self) -> IMessageReceiver: from .zmq_msg_receiver import ZMQMsgReceiver + return ZMQMsgReceiver(self._context) def connect(self):