fix already broken unit tests

Author: dfreidin

smsdk/client_v0.py

@@ -1033,7 +1033,7 @@ def get_part_schema(self, part_type, types=[], **kwargs):
 
         stats = all_parts.loc[
             (all_parts.part_type == pt) | (all_parts.part_type_clean == pt), "stats"
-        ][0]
+        ].iloc[0]
 
         for machine in stats.keys():
             m_stats = stats[machine]

tests/cycle/test_cycle.py

@@ -9,8 +9,8 @@
 # Define all the constants used in the test
 MACHINE_TYPE = "Lasercut"
 MACHINE_INDEX = 5
-START_DATETIME = datetime(2023, 4, 1)
-END_DATETIME = datetime(2023, 4, 2)
+START_DATETIME = datetime(2026, 3, 1)
+END_DATETIME = datetime(2026, 3, 2)
 NUM_ROWS = 500
 URL_V1 = "/v1/datatab/cycle"
 
@@ -58,6 +58,8 @@ def test_get_cycles(get_client):
         "_only": columns,
     }
 
+    # breakpoint()
+
     df = get_client.get_cycles(**query)
 
     assert df.shape == (NUM_ROWS, len(columns))

tests/downtime/test_downtime.py

@@ -8,9 +8,9 @@
 # Define all the constants used in the test
 MACHINE_TYPE = "Lasercut"
 MACHINE_INDEX = 0
-START_DATETIME = datetime(2023, 4, 1)
-END_DATETIME = datetime(2023, 4, 2)
-EXPECTED_ROWS = 18
+START_DATETIME = datetime(2026, 3, 1)
+END_DATETIME = datetime(2026, 3, 2)
+EXPECTED_ROWS = 11
 EXPECTED_COL = 8
 URL_V1 = "/v1/datatab/downtime"
 

tests/lines/test_line.py

@@ -7,8 +7,8 @@
 
 
 # # Define all the constants used in the test
-START_DATETIME = "2023-04-01T08:00:00.000Z"
-END_DATETIME = "2023-04-02T23:00:00.000Z"
+START_DATETIME = "2026-03-01T08:00:00.000Z"
+END_DATETIME = "2026-03-02T23:00:00.000Z"
 TIME_ZONE = "America/Los_Angeles"
 MAX_ROWS = 50
 LINE_INDEX = 0
@@ -19,7 +19,7 @@
 FIELD_NAME1 = "stats__BLOCKED__val"
 FIELD_NAME2 = "stats__PneumaticPressure__val"
 MIN_PRESSURE = 75.25
-EXP_NUM_ROWS = 14
+EXP_NUM_ROWS = 3
 URL_V1 = "/v1/datatab/line"
 
 

tests/machine/test_machine.py

@@ -235,7 +235,7 @@ def test_get_machine_schema(get_client):
 
     # Run
     df = get_client.get_machine_schema(machine)
-    assert df.shape == (36, 15)
+    assert df.shape == (38, 15)
 
     # Run
     df = get_client.get_machine_schema(machine, types)

tests/machine_type/test_machine_type.py

@@ -105,31 +105,33 @@ def test_get_fields_of_machine_type_types(mocked_machines):
 def test_get_machines_types(get_client):
     machine_types = get_client.get_machine_types()
     unique_machine_types = machine_types["source_type"].dropna().unique()
-    assert unique_machine_types.tolist() == MACHINE_TYPE_NAMES_INTERNAL_EXPECT
+    assert sorted(unique_machine_types.tolist()) == sorted(
+        MACHINE_TYPE_NAMES_INTERNAL_EXPECT
+    )
 
     query = {
         "source_type": "Lasercut",
     }
 
     machine_types = get_client.get_machine_types(**query)
-    assert machine_types.shape == (29, 25)
+    assert machine_types.shape == (45, 27)
 
 
 def test_get_machines_types_v1(get_client):
     machine_types = get_client.get_machine_types()
-    assert machine_types.shape == (114, 25)
+    assert machine_types.shape == (178, 27)
 
 
 def test_get_machines_type_names_v1(get_client):
     machine_types_ui_based = get_client.get_machine_type_names()
-    assert machine_types_ui_based == MACHINE_TYPE_NAMES_UI_BASED_EXPECT
+    assert sorted(machine_types_ui_based) == sorted(MACHINE_TYPE_NAMES_UI_BASED_EXPECT)
 
     query = {
         "clean_strings_out": False,
     }
 
     machine_types_internal = get_client.get_machine_type_names(**query)
-    assert machine_types_internal == MACHINE_TYPE_NAMES_INTERNAL_EXPECT
+    assert sorted(machine_types_internal) == sorted(MACHINE_TYPE_NAMES_INTERNAL_EXPECT)
 
 
 def test_get_fields_of_machine_type(get_client):
@@ -138,7 +140,7 @@ def test_get_fields_of_machine_type(get_client):
 
     # Run
     fields = get_client.get_fields_of_machine_type(machine_type)
-    assert len(fields) == 36
+    assert len(fields) == 38
 
     # Run
     fields = get_client.get_fields_of_machine_type(machine_type, types)

tests/parts/test_part.py

@@ -8,12 +8,18 @@
 # Define all the constants used in the test
 MACHINE_TYPE = "Lasercut"
 PART_TYPE_INDEX = 1
-START_DATETIME = datetime(2023, 4, 1)
-END_DATETIME = datetime(2023, 4, 2)
+START_DATETIME = datetime(2026, 3, 1)
+END_DATETIME = datetime(2026, 3, 2)
 NUM_ROWS = 10
-NUM_COLUMNS_FOR_QUERY = 31
+NUM_COLUMNS_FOR_QUERY = 28
 URL_V1 = "/v1/datatab/part"
 
+# These columns have never been selectable for datatab parts queries since moving to Postgres
+INVALID_PART_TYPE_COLUMNS = [
+    "Output",
+    "Machine Sources",
+]
+
 
 def test_get_utilities(get_session):
     part = Parts(get_session, TENANT)
@@ -82,14 +88,15 @@ def test_get_parts(get_client):
     part_type = part_types[PART_TYPE_INDEX]
 
     columns = get_client.get_part_schema(part_type)["display"].to_list()
+    columns = [col for col in columns if col not in INVALID_PART_TYPE_COLUMNS]
 
     query = {
         "Part": part_type,
         "End Time__gte": START_DATETIME,
         "End Time__lte": END_DATETIME,
         "DefectReason__exists": True,
         "_limit": NUM_ROWS,
-        "_only": columns[: NUM_COLUMNS_FOR_QUERY - 1],
+        "_only": columns[:NUM_COLUMNS_FOR_QUERY],
     }
 
     df = get_client.get_parts(**query)

tests/raw_data/test_raw_data.py

@@ -24,8 +24,8 @@ def test_get_raw_data(get_client):
     select = []
     timeselection = {
         "time_type": "absolute",
-        "start_time": "2023-10-18T18:30:00.000Z",
-        "end_time": "2023-10-19T18:29:59.999Z",
+        "start_time": "2026-3-18T18:30:00.000Z",
+        "end_time": "2026-3-19T18:29:59.999Z",
         "time_zone": "America/Los_Angeles",
     }
     limit = 100