From f9a8aacf2861c16e29320293152c19e7b81107ec Mon Sep 17 00:00:00 2001 From: Rajan Date: Mon, 21 Oct 2024 02:41:22 -0400 Subject: [PATCH] pre-commit ruff --- samples/apps/cap/py/autogencap/actor.py | 3 ++- samples/apps/cap/py/autogencap/actor_connector.py | 2 +- samples/apps/cap/py/autogencap/actor_runtime.py | 1 + .../py/autogencap/ag_adapter/cap_group_chat_manager.py | 2 +- samples/apps/cap/py/autogencap/ag_adapter/cap_to_ag.py | 4 +++- samples/apps/cap/py/autogencap/zmq_actor_connector.py | 2 +- samples/apps/cap/py/autogencap/zmq_msg_receiver.py | 8 +++++--- samples/apps/cap/py/autogencap/zmq_runtime.py | 5 +++-- samples/apps/cap/py/demo/app.py | 2 +- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/samples/apps/cap/py/autogencap/actor.py b/samples/apps/cap/py/autogencap/actor.py index 6d2e8496128a..9b954f8461be 100644 --- a/samples/apps/cap/py/autogencap/actor.py +++ b/samples/apps/cap/py/autogencap/actor.py @@ -1,6 +1,7 @@ import threading import traceback -from .actor_runtime import IMsgActor, IRuntime, IMessageReceiver + +from .actor_runtime import IMessageReceiver, IMsgActor, IRuntime from .debug_log import Debug, Info diff --git a/samples/apps/cap/py/autogencap/actor_connector.py b/samples/apps/cap/py/autogencap/actor_connector.py index 5a6c93664b74..2d83d0be540c 100644 --- a/samples/apps/cap/py/autogencap/actor_connector.py +++ b/samples/apps/cap/py/autogencap/actor_connector.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing import Any, Tuple, Optional +from typing import Any, Optional, Tuple class IActorConnector(ABC): diff --git a/samples/apps/cap/py/autogencap/actor_runtime.py b/samples/apps/cap/py/autogencap/actor_runtime.py index f83c61701a2c..bd1e31a339a6 100644 --- a/samples/apps/cap/py/autogencap/actor_runtime.py +++ b/samples/apps/cap/py/autogencap/actor_runtime.py @@ -1,5 +1,6 @@ from abc import ABC, abstractmethod from typing import List + from .actor_connector import IActorConnector from .proto.CAP_pb2 import ActorInfo diff --git a/samples/apps/cap/py/autogencap/ag_adapter/cap_group_chat_manager.py b/samples/apps/cap/py/autogencap/ag_adapter/cap_group_chat_manager.py index 44f43d3d33f4..3934715028b6 100644 --- a/samples/apps/cap/py/autogencap/ag_adapter/cap_group_chat_manager.py +++ b/samples/apps/cap/py/autogencap/ag_adapter/cap_group_chat_manager.py @@ -2,8 +2,8 @@ from autogen import GroupChatManager from autogencap.actor_connector import IActorConnector -from autogencap.ag_adapter.cap_to_ag import CAP2AG from autogencap.ag_adapter.cap_group_chat import CAPGroupChat +from autogencap.ag_adapter.cap_to_ag import CAP2AG from ..actor_runtime import IRuntime diff --git a/samples/apps/cap/py/autogencap/ag_adapter/cap_to_ag.py b/samples/apps/cap/py/autogencap/ag_adapter/cap_to_ag.py index 09e1fcb5cdc4..30f5b52354fb 100644 --- a/samples/apps/cap/py/autogencap/ag_adapter/cap_to_ag.py +++ b/samples/apps/cap/py/autogencap/ag_adapter/cap_to_ag.py @@ -1,12 +1,14 @@ import json from enum import Enum from typing import Optional + from autogen import ConversableAgent + from ..actor_runtime import IRuntime from ..debug_log import Debug, Error, Info, Warn, shorten from ..proto.Autogen_pb2 import GenReplyReq, GenReplyResp, PrepChat, ReceiveReq, Terminate -from .ag_to_cap import AG2CAP from .ag_actor import AGActor +from .ag_to_cap import AG2CAP class CAP2AG(AGActor): diff --git a/samples/apps/cap/py/autogencap/zmq_actor_connector.py b/samples/apps/cap/py/autogencap/zmq_actor_connector.py index 94ecfe2a1415..6b5b30f4446f 100644 --- a/samples/apps/cap/py/autogencap/zmq_actor_connector.py +++ b/samples/apps/cap/py/autogencap/zmq_actor_connector.py @@ -5,9 +5,9 @@ import zmq from zmq.utils.monitor import recv_monitor_message +from .actor_connector import IActorConnector from .config import router_url, xpub_url, xsub_url from .debug_log import Debug, Error, Info -from .actor_connector import IActorConnector class ZMQActorSender: diff --git a/samples/apps/cap/py/autogencap/zmq_msg_receiver.py b/samples/apps/cap/py/autogencap/zmq_msg_receiver.py index 387ce7ef5578..b6a2a27fa64b 100644 --- a/samples/apps/cap/py/autogencap/zmq_msg_receiver.py +++ b/samples/apps/cap/py/autogencap/zmq_msg_receiver.py @@ -1,9 +1,11 @@ # ZMQ implementation of the message receiver -from autogencap.debug_log import Debug, Error +import threading + +import zmq + from autogencap.actor_runtime import IMessageReceiver from autogencap.config import xpub_url -import zmq -import threading +from autogencap.debug_log import Debug, Error class ZMQMsgReceiver(IMessageReceiver): diff --git a/samples/apps/cap/py/autogencap/zmq_runtime.py b/samples/apps/cap/py/autogencap/zmq_runtime.py index e52e97446709..de724b9cb735 100644 --- a/samples/apps/cap/py/autogencap/zmq_runtime.py +++ b/samples/apps/cap/py/autogencap/zmq_runtime.py @@ -2,15 +2,16 @@ from typing import List import zmq + from autogencap.debug_log import Debug, Warn from .actor import Actor -from .actor_runtime import IRuntime, IMessageReceiver +from .actor_connector import IActorConnector +from .actor_runtime import IMessageReceiver, IRuntime from .broker import Broker from .constants import Termination_Topic from .debug_log import Debug, Warn from .proto.CAP_pb2 import ActorInfo, ActorInfoCollection -from .actor_connector import IActorConnector from .zmq_actor_connector import ZMQActorConnector diff --git a/samples/apps/cap/py/demo/app.py b/samples/apps/cap/py/demo/app.py index 1db876c7e281..7f44730ee50f 100644 --- a/samples/apps/cap/py/demo/app.py +++ b/samples/apps/cap/py/demo/app.py @@ -13,9 +13,9 @@ from cap_autogen_pair_demo import cap_ag_pair_demo from complex_actor_demo import complex_actor_demo from list_agents import list_agents +from remote_autogen_demo import remote_ag_demo from simple_actor_demo import simple_actor_demo from single_threaded import single_threaded_demo -from remote_autogen_demo import remote_ag_demo ####################################################################################################