Merge pull request #85 from sightmachine/ENG-6332

Eng-6332: SMSDK bug for EFMW Arolsen - cli.get_machine_type_names() hits an error

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"
                 )

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:

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"

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

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)