From 66716f87a5d9eaabd276178a16e76dfad49bc85b Mon Sep 17 00:00:00 2001 From: Lee Hudson Date: Mon, 30 Sep 2024 09:55:23 +0100 Subject: [PATCH 1/5] Added optional separator argument to TcpIo constructor --- src/tickit/adapters/io/tcp_io.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/tickit/adapters/io/tcp_io.py b/src/tickit/adapters/io/tcp_io.py index cfc4cadb0..83def45af 100644 --- a/src/tickit/adapters/io/tcp_io.py +++ b/src/tickit/adapters/io/tcp_io.py @@ -20,9 +20,10 @@ class TcpIo(AdapterIo[CommandAdapter]): host: str port: int - def __init__(self, host: str, port: int) -> None: + def __init__(self, host: str, port: int, separator: str = None) -> None: self.host = host self.port = port + self.separator = separator async def setup( self, adapter: CommandAdapter, raise_interrupt: RaiseInterrupt @@ -79,7 +80,11 @@ async def reply(replies: AsyncIterable[Optional[bytes]]) -> None: tasks.append(asyncio.create_task(reply(on_connect()))) while True: - data: bytes = await reader.read(1024) + if self.separator != None: + data: bytes = await reader.readuntil(separator=self.separator.encode()) + else: + data: bytes = await reader.read(1024) + if data == b"": break addr = writer.get_extra_info("peername") From a12fd711cab40eb784dd05af3c3c6f2b455bf4da Mon Sep 17 00:00:00 2001 From: LeeHudsonDLS Date: Tue, 15 Oct 2024 07:34:30 +0100 Subject: [PATCH 2/5] Update src/tickit/adapters/io/tcp_io.py Co-authored-by: Abigail Emery --- src/tickit/adapters/io/tcp_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tickit/adapters/io/tcp_io.py b/src/tickit/adapters/io/tcp_io.py index 83def45af..3f857c8c7 100644 --- a/src/tickit/adapters/io/tcp_io.py +++ b/src/tickit/adapters/io/tcp_io.py @@ -80,7 +80,7 @@ async def reply(replies: AsyncIterable[Optional[bytes]]) -> None: tasks.append(asyncio.create_task(reply(on_connect()))) while True: - if self.separator != None: + if self.separator is not None: data: bytes = await reader.readuntil(separator=self.separator.encode()) else: data: bytes = await reader.read(1024) From c5d3f3810d0062c16985c852de669c95e2df3761 Mon Sep 17 00:00:00 2001 From: LeeHudsonDLS Date: Tue, 15 Oct 2024 07:34:40 +0100 Subject: [PATCH 3/5] Update src/tickit/adapters/io/tcp_io.py Co-authored-by: Abigail Emery --- src/tickit/adapters/io/tcp_io.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tickit/adapters/io/tcp_io.py b/src/tickit/adapters/io/tcp_io.py index 3f857c8c7..54e2251ac 100644 --- a/src/tickit/adapters/io/tcp_io.py +++ b/src/tickit/adapters/io/tcp_io.py @@ -81,7 +81,9 @@ async def reply(replies: AsyncIterable[Optional[bytes]]) -> None: while True: if self.separator is not None: - data: bytes = await reader.readuntil(separator=self.separator.encode()) + data: bytes = ( + await reader.readuntil(separator=self.separator.encode()) + ) else: data: bytes = await reader.read(1024) From 62b74a1ed8de285a3993a8257289a5e9e971c244 Mon Sep 17 00:00:00 2001 From: LeeHudsonDLS Date: Fri, 22 Nov 2024 09:52:20 +0000 Subject: [PATCH 4/5] Correction to type hint Co-authored-by: Callum Forrester --- src/tickit/adapters/io/tcp_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tickit/adapters/io/tcp_io.py b/src/tickit/adapters/io/tcp_io.py index 54e2251ac..6451fb676 100644 --- a/src/tickit/adapters/io/tcp_io.py +++ b/src/tickit/adapters/io/tcp_io.py @@ -20,7 +20,7 @@ class TcpIo(AdapterIo[CommandAdapter]): host: str port: int - def __init__(self, host: str, port: int, separator: str = None) -> None: + def __init__(self, host: str, port: int, separator: str | None = None) -> None: self.host = host self.port = port self.separator = separator From 3e62b7c546c454e1f33a13d199e5777c21973dad Mon Sep 17 00:00:00 2001 From: Lee Hudson Date: Fri, 22 Nov 2024 10:06:27 +0000 Subject: [PATCH 5/5] Renamed separator to terminator --- src/tickit/adapters/io/tcp_io.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tickit/adapters/io/tcp_io.py b/src/tickit/adapters/io/tcp_io.py index 6451fb676..0b3a74ce4 100644 --- a/src/tickit/adapters/io/tcp_io.py +++ b/src/tickit/adapters/io/tcp_io.py @@ -20,10 +20,10 @@ class TcpIo(AdapterIo[CommandAdapter]): host: str port: int - def __init__(self, host: str, port: int, separator: str | None = None) -> None: + def __init__(self, host: str, port: int, terminator: str | None = None) -> None: self.host = host self.port = port - self.separator = separator + self.terminator = terminator async def setup( self, adapter: CommandAdapter, raise_interrupt: RaiseInterrupt @@ -80,9 +80,9 @@ async def reply(replies: AsyncIterable[Optional[bytes]]) -> None: tasks.append(asyncio.create_task(reply(on_connect()))) while True: - if self.separator is not None: + if self.terminator is not None: data: bytes = ( - await reader.readuntil(separator=self.separator.encode()) + await reader.readuntil(separator=self.terminator.encode()) ) else: data: bytes = await reader.read(1024)