From c06075eab9bdf2bd8df498a8714bafedd5b5f618 Mon Sep 17 00:00:00 2001 From: Jake Mulford Date: Mon, 21 Mar 2022 11:03:16 -0400 Subject: [PATCH 1/4] added configurable session type to pyclient --- pyclient/pydeephaven/_console_service.py | 2 +- pyclient/pydeephaven/session.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pyclient/pydeephaven/_console_service.py b/pyclient/pydeephaven/_console_service.py index 42822d9aa92..32edabd68e7 100644 --- a/pyclient/pydeephaven/_console_service.py +++ b/pyclient/pydeephaven/_console_service.py @@ -20,7 +20,7 @@ def start_console(self): try: result_id = self.session.make_ticket() response = self._grpc_console_stub.StartConsole( - console_pb2.StartConsoleRequest(result_id=result_id, session_type='python'), + console_pb2.StartConsoleRequest(result_id=result_id, session_type=self.session.session_type), metadata=self.session.grpc_metadata) self.console_id = response.result_id except Exception as e: diff --git a/pyclient/pydeephaven/session.py b/pyclient/pydeephaven/session.py index 12429ab4e17..62a0caa8f5b 100644 --- a/pyclient/pydeephaven/session.py +++ b/pyclient/pydeephaven/session.py @@ -33,13 +33,14 @@ class Session: is_alive (bool): check if the session is still alive (may refresh the session) """ - def __init__(self, host: str = None, port: int = None, never_timeout: bool = True): + def __init__(self, host: str = None, port: int = None, never_timeout: bool = True, session_type: str = None): """ Initialize a Session object that connects to the Deephaven server Args: host (str): the host name or IP address of the remote machine, default is 'localhost' port (int): the port number that Deephaven server is listening on, default is 10000 never_timeout (bool, optional): never allow the session to timeout, default is True + session_type (str): the Deephaven session type. Defaults to 'python' Raises: DHError @@ -68,6 +69,10 @@ def __init__(self, host: str = None, port: int = None, never_timeout: bool = Tru self._never_timeout = never_timeout self._keep_alive_timer = None + self.session_type = session_type + if session_type is None: + session_type = 'python' + self._connect() def __enter__(self): From 99764e293efdb18cf067999a43058157ee04d060 Mon Sep 17 00:00:00 2001 From: Jake Mulford Date: Mon, 21 Mar 2022 11:09:37 -0400 Subject: [PATCH 2/4] self.session_type assignment if None --- pyclient/pydeephaven/session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyclient/pydeephaven/session.py b/pyclient/pydeephaven/session.py index 62a0caa8f5b..e9601f7f6b6 100644 --- a/pyclient/pydeephaven/session.py +++ b/pyclient/pydeephaven/session.py @@ -71,7 +71,7 @@ def __init__(self, host: str = None, port: int = None, never_timeout: bool = Tru self.session_type = session_type if session_type is None: - session_type = 'python' + self.session_type = 'python' self._connect() From ef4a99c0d3b3089550ffb2944f84adfae34a4575 Mon Sep 17 00:00:00 2001 From: Jake Mulford Date: Mon, 21 Mar 2022 11:24:12 -0400 Subject: [PATCH 3/4] default string in constructor --- pyclient/pydeephaven/session.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pyclient/pydeephaven/session.py b/pyclient/pydeephaven/session.py index e9601f7f6b6..d481ffd1a4f 100644 --- a/pyclient/pydeephaven/session.py +++ b/pyclient/pydeephaven/session.py @@ -33,14 +33,14 @@ class Session: is_alive (bool): check if the session is still alive (may refresh the session) """ - def __init__(self, host: str = None, port: int = None, never_timeout: bool = True, session_type: str = None): + def __init__(self, host: str = None, port: int = None, never_timeout: bool = True, session_type: str = 'python'): """ Initialize a Session object that connects to the Deephaven server Args: host (str): the host name or IP address of the remote machine, default is 'localhost' port (int): the port number that Deephaven server is listening on, default is 10000 never_timeout (bool, optional): never allow the session to timeout, default is True - session_type (str): the Deephaven session type. Defaults to 'python' + session_type (str, optional): the Deephaven session type. Defaults to 'python' Raises: DHError @@ -68,10 +68,7 @@ def __init__(self, host: str = None, port: int = None, never_timeout: bool = Tru self._tables = {} self._never_timeout = never_timeout self._keep_alive_timer = None - self.session_type = session_type - if session_type is None: - self.session_type = 'python' self._connect() From e9fabedbe7fa6fd6e701da028e2930bf6232b353 Mon Sep 17 00:00:00 2001 From: Jake Mulford Date: Mon, 21 Mar 2022 16:13:28 -0400 Subject: [PATCH 4/4] appended underscore to class variable --- pyclient/pydeephaven/_console_service.py | 2 +- pyclient/pydeephaven/session.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyclient/pydeephaven/_console_service.py b/pyclient/pydeephaven/_console_service.py index 32edabd68e7..a67a61ae758 100644 --- a/pyclient/pydeephaven/_console_service.py +++ b/pyclient/pydeephaven/_console_service.py @@ -20,7 +20,7 @@ def start_console(self): try: result_id = self.session.make_ticket() response = self._grpc_console_stub.StartConsole( - console_pb2.StartConsoleRequest(result_id=result_id, session_type=self.session.session_type), + console_pb2.StartConsoleRequest(result_id=result_id, session_type=self.session._session_type), metadata=self.session.grpc_metadata) self.console_id = response.result_id except Exception as e: diff --git a/pyclient/pydeephaven/session.py b/pyclient/pydeephaven/session.py index d481ffd1a4f..753dcdd3422 100644 --- a/pyclient/pydeephaven/session.py +++ b/pyclient/pydeephaven/session.py @@ -68,7 +68,7 @@ def __init__(self, host: str = None, port: int = None, never_timeout: bool = Tru self._tables = {} self._never_timeout = never_timeout self._keep_alive_timer = None - self.session_type = session_type + self._session_type = session_type self._connect()