From 13f78868c3ecb9ec625a7243b7a459124f915e6d Mon Sep 17 00:00:00 2001 From: ango1994 Date: Tue, 18 Jul 2023 11:12:52 +0200 Subject: [PATCH] Fix pydantic missing type annotations --- manager/comms/consumer_message.py | 4 ++-- manager/manager/launcher/launcher_console.py | 9 +++++---- manager/manager/launcher/launcher_engine.py | 2 +- manager/manager/launcher/launcher_gazebo_view.py | 9 +++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manager/comms/consumer_message.py b/manager/comms/consumer_message.py index b0967a0..7b621da 100644 --- a/manager/comms/consumer_message.py +++ b/manager/comms/consumer_message.py @@ -2,7 +2,7 @@ import json from functools import singledispatchmethod -from typing import Any +from typing import Any, Optional from pydantic import BaseModel @@ -16,7 +16,7 @@ class ManagerConsumerMessage(BaseModel): """ id: str command: str - data: Any + data: Optional[Any] = None def response(self, response: Any = None) -> ManagerConsumerMessage: """ diff --git a/manager/manager/launcher/launcher_console.py b/manager/manager/launcher/launcher_console.py index 71e0e49..e694ce7 100644 --- a/manager/manager/launcher/launcher_console.py +++ b/manager/manager/launcher/launcher_console.py @@ -4,14 +4,15 @@ import time import os import stat +from typing import List, Any class LauncherConsole(ILauncher): display: str - internal_port: str - external_port: str - running = False - threads = [] + internal_port: int + external_port: int + running:bool = False + threads: List[Any] = [] def run(self, callback): DRI_PATH = os.path.join("/dev/dri", os.environ.get("DRI_NAME", "card0")) diff --git a/manager/manager/launcher/launcher_engine.py b/manager/manager/launcher/launcher_engine.py index a435ec9..e3905fe 100644 --- a/manager/manager/launcher/launcher_engine.py +++ b/manager/manager/launcher/launcher_engine.py @@ -10,7 +10,7 @@ class LauncherEngine(BaseModel): exercise_id: str launch: dict - module = '.'.join(__name__.split('.')[:-1]) + module:str = '.'.join(__name__.split('.')[:-1]) terminated_callback: Any = None def run(self): diff --git a/manager/manager/launcher/launcher_gazebo_view.py b/manager/manager/launcher/launcher_gazebo_view.py index 2779951..325afff 100644 --- a/manager/manager/launcher/launcher_gazebo_view.py +++ b/manager/manager/launcher/launcher_gazebo_view.py @@ -4,17 +4,18 @@ import time import os import stat +from typing import List, Any class LauncherGazeboView(ILauncher): exercise_id: str display: str - internal_port: str - external_port: str + internal_port: int + external_port: int height: int width: int - running = False - threads = [] + running: bool = False + threads: List[Any] = [] def run(self, callback): DRI_PATH = os.path.join(