From 3c09c16f2f98331b52f9aa8b2b5a8a2ac751a53c Mon Sep 17 00:00:00 2001 From: VisualDust Date: Thu, 23 Nov 2023 16:06:42 +0800 Subject: [PATCH] fixed typing issue --- neetbox.toml | 1 + neetbox/daemon/client/_action_agent.py | 8 ++------ neetbox/daemon/client/_connection.py | 13 ++++++------- neetbox/daemon/server/_server.py | 2 +- neetbox/pipeline/_signal_and_slot.py | 6 ++++-- pyproject.toml | 1 + tests/test_daemon.py | 6 +++--- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/neetbox.toml b/neetbox.toml index e78f5054..6895bbcc 100644 --- a/neetbox.toml +++ b/neetbox.toml @@ -1,6 +1,7 @@ name = "neetbox" [logging] +level = "DEBUG" [pipeline] updateInterval = 10 diff --git a/neetbox/daemon/client/_action_agent.py b/neetbox/daemon/client/_action_agent.py index e0db73dc..18ed5e86 100644 --- a/neetbox/daemon/client/_action_agent.py +++ b/neetbox/daemon/client/_action_agent.py @@ -44,7 +44,7 @@ def get_action_dict(): action_dict[name] = action.argspec.args return action_dict - def eval_call(self, name: str, params: dict, callback: None): + def eval_call(name: str, params: dict, callback: None): if name not in _NeetActionManager.__ACTION_POOL: logger.err(f"Could not find action with name {name}, action stopped.") return False @@ -82,10 +82,6 @@ def _register(function: Callable, name: str = None, blocking: bool = False): return function -# singleton -neet_action = _NeetActionManager() - - # example if __name__ == "__main__": import time @@ -102,6 +98,6 @@ def some(a, b): def callback_fun(text): print(f"callback_fun print: {text}") - neet_action.eval_call("some", {"a": "3", "b": "4"}, callback=callback_fun) + _NeetActionManager.eval_call(name="some", params={"a": "3", "b": "4"}, callback=callback_fun) print("you should see this line first before callback_fun print") time.sleep(4) diff --git a/neetbox/daemon/client/_connection.py b/neetbox/daemon/client/_connection.py index 3ee82b87..65e54ec9 100644 --- a/neetbox/daemon/client/_connection.py +++ b/neetbox/daemon/client/_connection.py @@ -4,7 +4,6 @@ from typing import Callable, Optional import httpx -import websocket from neetbox.config import get_module_level_config from neetbox.core import Registry @@ -14,11 +13,6 @@ httpx_logger = logging.getLogger("httpx") httpx_logger.setLevel(logging.ERROR) -__no_proxy = { - "http://": None, - "https://": None, -} - EVENT_TYPE_NAME_KEY = "event-type" EVENT_PAYLOAD_NAME_KEY = "payload" @@ -34,7 +28,12 @@ def __init__(self) -> None: cfg = get_module_level_config() def __load_http_client(): - __local_http_client = httpx.Client(proxies=__no_proxy) # type: ignore + __local_http_client = httpx.Client( + proxies={ + "http://": None, + "https://": None, + } + ) # type: ignore return __local_http_client # create htrtp client diff --git a/neetbox/daemon/server/_server.py b/neetbox/daemon/server/_server.py index 1b978d0c..455ce905 100644 --- a/neetbox/daemon/server/_server.py +++ b/neetbox/daemon/server/_server.py @@ -116,7 +116,7 @@ def ws_send(self): - remove from connected_clients dict on server receive json - - sent by client with name + - sent by client with name - name exist: (name must exist) - for websocket of frontend within name: - forward message diff --git a/neetbox/pipeline/_signal_and_slot.py b/neetbox/pipeline/_signal_and_slot.py index 9855ba66..5e81d9ad 100644 --- a/neetbox/pipeline/_signal_and_slot.py +++ b/neetbox/pipeline/_signal_and_slot.py @@ -95,10 +95,12 @@ def _watch(func: Callable, name: str, freq: float, initiative=False, force=False force=force, ) if initiative: # initiatively update the value dict when the function was called manually - logger.log(f"added {name} to daemon monitor. It will update on each call of the function.") + logger.debug( + f"added {name} to daemon monitor. It will update on each call of the function." + ) return partial(__update_and_get, name) else: - logger.log( + logger.debug( f"added {name} to daemon monitor. It will update every {freq*__TIME_UNIT_SEC} second(s)." ) return partial(__get, name) diff --git a/pyproject.toml b/pyproject.toml index 031aff33..ee5f1492 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ pyfiglet = "^1.0.2" httpx = "^0.24.0" flask = "^2.2.3" flask-socketio = "^5.3.6" +websockets = "^12.0" [tool.poetry.group.dev.dependencies] pytest = "^7.0.0" diff --git a/tests/test_daemon.py b/tests/test_daemon.py index 07f12bf6..b3a8e5f2 100644 --- a/tests/test_daemon.py +++ b/tests/test_daemon.py @@ -5,7 +5,7 @@ def test_neet_action(): @action(name="some_func") def some(a, b): - time.sleep(1) + time.sleep(0.1) return f"a = {a}, b = {b}" print("registered actions:") @@ -15,6 +15,6 @@ def some(a, b): def callback_fun(text): print(f"callback_fun print: {text}") - NeetActionManager.eval_call("some", {"a": "3", "b": "4"}, callback=callback_fun) + NeetActionManager.eval_call("some_func", params={"a": "3", "b": "4"}, callback=callback_fun) print("you should see this line first before callback_fun print") - time.sleep(4) + time.sleep(0.2)