oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2706 - Type-hint changes following review

Browse Source
This commit is contained in:
Charlie Crane
2024-08-06 10:37:11 +01:00
parent 457395baee
commit 89107f2c4b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/primaite/simulator/system/services/terminal/terminal.py
View File

@@ -8,7 +8,7 @@ from uuid import uuid4
from prettytable import MARKDOWN, PrettyTable from prettytable import MARKDOWN, PrettyTable
from pydantic import BaseModel from pydantic import BaseModel
from primaite.interface.request import RequestResponse from primaite.interface.request import RequestFormat, RequestResponse
from primaite.simulator.core import RequestManager, RequestType from primaite.simulator.core import RequestManager, RequestType
from primaite.simulator.network.protocols.ssh import ( from primaite.simulator.network.protocols.ssh import (
SSHConnectionMessage, SSHConnectionMessage,
@@ -116,27 +116,27 @@ class Terminal(Service):
request_type=RequestType(func=lambda request, context: RequestResponse.from_bool(self.send())), request_type=RequestType(func=lambda request, context: RequestResponse.from_bool(self.send())),
) )
def _login(request: List[Any], context: Any) -> RequestResponse: def _login(request: RequestFormat, context: Dict) -> RequestResponse:
login = self._process_local_login(username=request[0], password=request[1]) login = self._process_local_login(username=request[0], password=request[1])
if login: if login:
return RequestResponse(status="success", data={}) return RequestResponse(status="success", data={})
else: else:
return RequestResponse(status="failure", data={}) return RequestResponse(status="failure", data={})
def _remote_login(request: List[Any], context: Any) -> RequestResponse: def _remote_login(request: RequestFormat, context: Dict) -> RequestResponse:
login = self._send_remote_login(username=request[0], password=request[1], ip_address=request[2]) login = self._send_remote_login(username=request[0], password=request[1], ip_address=request[2])
if login: if login:
return RequestResponse(status="success", data={}) return RequestResponse(status="success", data={})
else: else:
return RequestResponse(status="failure", data={}) return RequestResponse(status="failure", data={})
def _execute_request(request: List[Any], context: Any) -> RequestResponse: def _execute_request(request: RequestFormat, context: Dict) -> RequestResponse:
"""Execute an instruction.""" """Execute an instruction."""
command: str = request[0] command: str = request[0]
self.execute(command) self.execute(command)
return RequestResponse(status="success", data={}) return RequestResponse(status="success", data={})
def _logoff(request: List[Any]) -> RequestResponse: def _logoff(request: RequestFormat, context: Dict) -> RequestResponse:
"""Logoff from connection.""" """Logoff from connection."""
connection_uuid = request[0] connection_uuid = request[0]
# TODO: Uncomment this when UserSessionManager merged. # TODO: Uncomment this when UserSessionManager merged.