diff --git a/smsdk/client.py b/smsdk/client.py index 051b086..42a9db6 100644 --- a/smsdk/client.py +++ b/smsdk/client.py @@ -76,6 +76,8 @@ def dict_to_df(data, normalize=True): # machine type stats are list cols = [*data[0]] cols.remove("stats") + if "part_types" in cols: + cols.remove("part_types") df = json_normalize( data, "stats", cols, record_prefix="stats.", errors="ignore" ) diff --git a/smsdk/client_v0.py b/smsdk/client_v0.py index 4c9e2d5..a6652a7 100644 --- a/smsdk/client_v0.py +++ b/smsdk/client_v0.py @@ -55,6 +55,8 @@ def dict_to_df(data, normalize=True): # machine type stats are list cols = [*data[0]] cols.remove("stats") + if "part_types" in cols: + cols.remove("part_types") df = json_normalize(data, "stats", cols, record_prefix="stats.") else: try: diff --git a/tests/Uri/test_uri.py b/tests/Uri/test_uri.py index e948b4e..2267cb2 100644 --- a/tests/Uri/test_uri.py +++ b/tests/Uri/test_uri.py @@ -62,7 +62,7 @@ def test_create_client_using_uri() -> None: assert cli.tenant == "demo-sdk-test", "Tenant should be initialized correctly" assert cli.config["protocol"] == "https", "Protocol should be set to HTTPS" assert ( - cli.config["site.domain"] == "localnet" + cli.config["site.domain"] == "localnet.sightmachine.io" ), "Site domain should be set to localnet" tenant = "https://demo-sdk-test.localnet" @@ -71,7 +71,7 @@ def test_create_client_using_uri() -> None: assert cli.tenant == "demo-sdk-test", "Tenant should be initialized correctly" assert cli.config["protocol"] == "https", "Protocol should be set to HTTPS" assert ( - cli.config["site.domain"] == "localnet" + cli.config["site.domain"] == "localnet.sightmachine.io" ), "Site domain should be set to localnet" tenant = "http://demo-sdk-test.localnet:8080/" @@ -80,7 +80,7 @@ def test_create_client_using_uri() -> None: assert cli.tenant == "demo-sdk-test", "Tenant should be initialized correctly" assert cli.config["protocol"] == "http", "Protocol should be set to HTTP" assert ( - cli.config["site.domain"] == "localnet" + cli.config["site.domain"] == "localnet.sightmachine.io" ), "Site domain should be set to localnet" @@ -91,7 +91,7 @@ def test_create_client_uri_special_cases() -> None: assert cli.tenant == "demo-sdk-test", "Tenant should be initialized correctly" assert cli.config["protocol"] == "https", "Protocol should be set to HTTPS" assert ( - cli.config["site.domain"] == "localnet" + cli.config["site.domain"] == "localnet.sightmachine.io" ), "Site domain should be set to localnet" tenant = "http://demo-sdk-test" @@ -109,7 +109,7 @@ def test_create_client_uri_special_cases() -> None: assert cli.tenant == "demo-sdk-test", "Tenant should be initialized correctly" assert cli.config["protocol"] == "https", "Protocol should be set to HTTPS" assert ( - cli.config["site.domain"] == "localnet" + cli.config["site.domain"] == "localnet.sightmachine.io" ), "Site domain should be set to localnet" tenant = "://demo-sdk-test.localnet:8080" @@ -118,5 +118,5 @@ def test_create_client_uri_special_cases() -> None: assert cli.tenant == "demo-sdk-test", "Tenant should be initialized correctly" assert cli.config["protocol"] == "https", "Protocol should be set to HTTPS" assert ( - cli.config["site.domain"] == "localnet" + cli.config["site.domain"] == "localnet.sightmachine.io" ), "Site domain should be set to localnet" diff --git a/tests/machine/test_machine.py b/tests/machine/test_machine.py index 836fe82..3d1e0e2 100644 --- a/tests/machine/test_machine.py +++ b/tests/machine/test_machine.py @@ -235,21 +235,21 @@ def test_get_machine_schema(get_client): # Run df = get_client.get_machine_schema(machine) - assert df.shape == (35, 13) + assert df.shape == (36, 15) # Run df = get_client.get_machine_schema(machine, types) - assert df.shape == (16, 13) + assert df.shape == (16, 14) query = {"machine_source": machine, "types": types} # Run df = get_client.get_machine_schema(**query) - assert df.shape == (16, 13) + assert df.shape == (16, 14) query = {"machine_source": machine, "types": types, "return_mtype": True} # Run df = get_client.get_machine_schema(**query) - assert df[1].shape == (16, 13) + assert df[1].shape == (16, 14) assert df[0] == LASERCUT_MACHINE_TYPE diff --git a/tests/machine_type/test_machine_type.py b/tests/machine_type/test_machine_type.py index 48854a3..b85d842 100644 --- a/tests/machine_type/test_machine_type.py +++ b/tests/machine_type/test_machine_type.py @@ -138,7 +138,7 @@ def test_get_fields_of_machine_type(get_client): # Run fields = get_client.get_fields_of_machine_type(machine_type) - assert len(fields) == 35 + assert len(fields) == 36 # Run fields = get_client.get_fields_of_machine_type(machine_type, types)