From 03b14ccccf22b2689baa5f7779ff193f3264f99d Mon Sep 17 00:00:00 2001 From: JMkrish Date: Mon, 18 Mar 2024 18:13:02 +0530 Subject: [PATCH 1/2] ENG-4849:get_machine_names doesn't error if machine type doesn't exist --- smsdk/client.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/smsdk/client.py b/smsdk/client.py index 68ce7a1..e76d775 100644 --- a/smsdk/client.py +++ b/smsdk/client.py @@ -712,12 +712,9 @@ def get_machine_types(self, source_type=None, *args, **kwargs): mts = self.get_data_v1("machine_type_v1", "get_machine_types", *args, **kwargs) if source_type is not None: - mts = mts[ - np.logical_or( - mts["source_type"] == source_type, - mts["source_type_clean"] == source_type, - ) - ] + mts = mts[mts["source_type"] == source_type] + if "source_type_clean" in kwargs and kwargs["source_type_clean"] is not None: + mts = mts[mts["source_type_clean"] == kwargs["source_type_clean"]] return mts From 1c6a8ddce033ade49df094e79046f6c9eee9e714 Mon Sep 17 00:00:00 2001 From: JMkrish Date: Tue, 19 Mar 2024 00:25:10 +0530 Subject: [PATCH 2/2] Implementing code review comments --- smsdk/client.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/smsdk/client.py b/smsdk/client.py index e76d775..3d8eaf1 100644 --- a/smsdk/client.py +++ b/smsdk/client.py @@ -711,10 +711,11 @@ def get_machine_types(self, source_type=None, *args, **kwargs): """ mts = self.get_data_v1("machine_type_v1", "get_machine_types", *args, **kwargs) - if source_type is not None: + if source_type: # will not match empty string mts = mts[mts["source_type"] == source_type] - if "source_type_clean" in kwargs and kwargs["source_type_clean"] is not None: - mts = mts[mts["source_type_clean"] == kwargs["source_type_clean"]] + else: + if kwargs.get("source_type_clean"): + mts = mts[mts["source_type_clean"] == kwargs["source_type_clean"]] return mts