Skip to content

Fix type hints for http_server #1369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 21, 2023
Merged

Fix type hints for http_server #1369

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fe02b3
don't redefine custom_actions_module
alexrudd2 Feb 19, 2023
ab25bdb
Initialize with empty string to make typing clear
alexrudd2 Feb 20, 2023
d78904a
Type hint for future feature
alexrudd2 Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pymodbus/server/simulator/http_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,17 @@ def __init__(
}
if custom_actions_module:
actions_module = importlib.import_module(custom_actions_module)
custom_actions_module = actions_module.custom_actions_dict
custom_actions_dict = actions_module.custom_actions_dict
server = setup["server_list"][modbus_server]
server["loop"] = asyncio.get_running_loop()
if server["comm"] != "serial":
server["address"] = (server["host"], server["port"])
del server["host"]
del server["port"]
device = setup["device_list"][modbus_device]
self.datastore_context = ModbusSimulatorContext(device, custom_actions_module)
self.datastore_context = ModbusSimulatorContext(
device, custom_actions_dict or None
)
datastore = ModbusServerContext(slaves=self.datastore_context, single=True)
comm = comm_class[server.pop("comm")]
framer = framer_class[server.pop("framer")]
Expand All @@ -161,10 +163,10 @@ def __init__(
self.web_app.on_startup.append(self.start_modbus_server)
self.web_app.on_shutdown.append(self.stop_modbus_server)
self.generator_html = {
"log": [None, self.build_html_log],
"registers": [None, self.build_html_registers],
"calls": [None, self.build_html_calls],
"server": [None, self.build_html_server],
"log": ["", self.build_html_log],
"registers": ["", self.build_html_registers],
"calls": ["", self.build_html_calls],
"server": ["", self.build_html_server],
}
self.generator_json = {
"log_json": [None, self.build_json_log],
Expand All @@ -178,7 +180,7 @@ def __init__(
self.generator_html[entry][0] = handle.read()
self.refresh_rate = 0
self.register_filter: List[int] = []
self.call_list = []
self.call_list: List[str] = [] # not implemented yet
self.call_monitor = CallTypeMonitor()
self.call_response = CallTypeResponse()

Expand Down