Merge branch 'master' into ENG-2974

docs/commonly_used_data_types/asset_selection.md

@@ -16,4 +16,14 @@ asset_selection: {
 }
 ```
 
-NOTE: The machine_type strings must match source_type, NOT source_type_clean.
+~~NOTE: The machine_type strings must match source_type, NOT source_type_clean.~~
+
+NOTE: Now we can use source_type_clean as well in asset_selection like below for KPIs related SDK functions-
+
+```
+asset_selection: {
+    machine_type: ["Pick & Place"],
+    machine_source: ["Nagoya - Pick and Place 6", ...]
+
+}
+```

smsdk/const.py

@@ -0,0 +1,3 @@
+API_KEY = "cea8969e-2acd-4ff4-b88b-e6b62d5cd857"
+API_SECRETE = "sma_nBy04LSDJhwxXNct8R8pREkwzbUTWjU4ZmQj7Y2ApAi_"
+TENANT = "demo-sdk-test"

tests/Auth/test_auth.py

@@ -8,7 +8,7 @@
 
 def test_auth_init():
     """Test that Authenticator host is set properly"""
-    tenant = "demo"
+    tenant = "demo-sdk-test"
     cli = client.Client(tenant)
     authed = cli.auth
 
@@ -64,7 +64,7 @@ def json():
         post=MagicMock(return_value=Response()), get=MagicMock(return_value=Response())
     )
 
-    tenant = "demo"
+    tenant = "demo-sdk-test"
     user = "user@domain.com"
     passw = "password"
     cli = client.Client(tenant)
@@ -80,7 +80,7 @@ def test_auth_route_auth(mocked_apikey, mocked_basic):
     """
     Test that Authenticator can properly route to auth methods
     """
-    tenant = "demo"
+    tenant = "demo-sdk-test"
     user = "user@domain.com"
     passw = "password"
 
@@ -144,7 +144,7 @@ def json():
         post=MagicMock(return_value=Response()), get=MagicMock(return_value=Response())
     )
 
-    tenant = "demo"
+    tenant = "demo-sdk-test"
     user = "user@domain.com"
     passw = "password"
 
@@ -172,7 +172,7 @@ def json():
         post=MagicMock(return_value=Response()), get=MagicMock(return_value=Response())
     )
 
-    tenant = "demo"
+    tenant = "demo-sdk-test"
     cli = client.Client(tenant)
     authed = cli.auth
 
@@ -199,7 +199,7 @@ def json():
 #         post=MagicMock(return_value=Response()), get=MagicMock(return_value=Response())
 #     )
 
-#     tenant = "demo"
+#     tenant = "demo-sdk-test"
 #     cli = client.Client(tenant)
 #     authed = cli.auth
 

tests/conftest.py

@@ -1,14 +1,15 @@
 from smsdk import client
 from requests.sessions import Session
 import pytest
-
+from smsdk import const
 
 # Define all the constants used in the test
 # These values may change for each run.
-API_KEY = "5a73aa5a-1962-4df9-b56e-4a59462f0f00"
-API_SECRETE = "sma_FajgH3VbPu68gwy0PzccvhyGRyy1a8CCHhhvy6ooeg1O_"
 
-TENANT = "demo"
+API_KEY = const.API_KEY
+API_SECRETE = const.API_SECRETE
+
+TENANT = const.TENANT
 
 
 @pytest.fixture(scope="session")

tests/cookbook/test_cookbook.py

@@ -19,7 +19,7 @@ def json():
 
     mocked.return_value = MagicMock(get=MagicMock(return_value=ResponseGet()))
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     cookbooks = dt.get_cookbooks()
@@ -43,7 +43,7 @@ def json():
 
     mocked.return_value = MagicMock(get=MagicMock(return_value=ResponseGet()))
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     runs = dt.get_cookbook_top_results("recipe_group_id", 1)
@@ -65,7 +65,7 @@ def json():
 
     mocked.return_value = MagicMock(post=MagicMock(return_value=ResponseGet()))
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     value = dt.get_cookbook_current_value([{"asset": "test", "name": "test_field"}])

tests/data_viz/test_share_link.py

@@ -17,13 +17,15 @@ def json():
     mocked.return_value = ResponsePost()
     mock_type.return_value = "test_machine"
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     sharelink = dt.create_share_link(["test"], "line", {"id": "cans"})
 
     # Verify
-    assert sharelink == "https://demo.sightmachine.io/#/analysis/datavis/s/test"
+    assert (
+        sharelink == "https://demo-sdk-test.sightmachine.io/#/analysis/datavis/s/test"
+    )
     assert mocked.call_args[1]["json"]["state"]["asset"] == {
         "machine_source": ["test"],
         "machine_type": ["test_machine"],
@@ -45,13 +47,15 @@ def json():
     mocked.return_value = ResponsePost()
     mock_type.return_value = "test_machine"
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     sharelink = dt.create_share_link(["test"], "line", {"id": "cans"}, model="kpi")
 
     # Verify
-    assert sharelink == "https://demo.sightmachine.io/#/analysis/datavis/s/test"
+    assert (
+        sharelink == "https://demo-sdk-test.sightmachine.io/#/analysis/datavis/s/test"
+    )
     assert mocked.call_args[1]["json"]["state"]["asset"] == {
         "machine_source": ["test"],
         "machine_type": ["test_machine"],
@@ -74,15 +78,17 @@ def json():
     mocked.return_value = ResponsePost()
     mock_type.return_value = "test_machine"
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     sharelink = dt.create_share_link(
         ["test"], "line", {"field": "cans", "machineName": "test"}, model="line"
     )
 
     # Verify
-    assert sharelink == "https://demo.sightmachine.io/#/analysis/datavis/s/test"
+    assert (
+        sharelink == "https://demo-sdk-test.sightmachine.io/#/analysis/datavis/s/test"
+    )
     assert mocked.call_args[1]["json"]["state"]["lineProcess"] == {
         "selectedMachines": [{"machineName": "test"}]
     }
@@ -109,7 +115,7 @@ def json():
     mocked.return_value = ResponsePost()
     mock_type.return_value = "test_machine"
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     sharelink = dt.create_share_link(
@@ -123,7 +129,9 @@ def json():
     )
 
     # Verify
-    assert sharelink == "https://demo.sightmachine.io/#/analysis/datavis/s/test"
+    assert (
+        sharelink == "https://demo-sdk-test.sightmachine.io/#/analysis/datavis/s/test"
+    )
     assert mocked.call_args[1]["json"]["state"]["lineProcess"] == {
         "assetOffsets": {"test": {"interval": "minutes", "period": 1}},
         "selectedMachines": [{"machineName": "test"}],

tests/downtime/test_downtime.py

@@ -36,7 +36,7 @@ def mockapi(self, session, endpoint, **kwargs):
 
     monkeypatch.setattr(Downtime, "get_downtime", mockapi)
 
-    dt = Downtime(get_session, "demo")
+    dt = Downtime(get_session, "demo-sdk-test")
 
     # Run
     df = dt.get_downtime(get_session, URL_V1)

tests/kpi/test_kpi.py

@@ -19,7 +19,7 @@ def json():
 
     mocked.return_value = MagicMock(get=MagicMock(return_value=ResponseGet()))
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     kpis = dt.get_kpis()
@@ -39,7 +39,7 @@ def mockapi(self, session, endpoint):
 
     monkeypatch.setattr(KPI, "get_kpis_for_asset", mockapi)
 
-    dt = KPI(Session(), "demo")
+    dt = KPI(Session(), "demo-sdk-test")
 
     # Run
     df = dt.get_kpis_for_asset(Session(), "/v1/selector/datavis/kpi/y_axis")
@@ -79,7 +79,7 @@ def json():
         get=MagicMock(return_value=ResponseGet()),
     )
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
     data = dt.get_kpi_data_viz()
     assert len(data) == 3
     assert data[0]["d_vals"]["quality"]["avg"] == 95.18072289156626

tests/machine/test_machine.py

@@ -16,7 +16,7 @@ def mockapi(self, session, endpoint):
 
     monkeypatch.setattr(Machine, "get_machines", mockapi)
 
-    dt = Machine(Session(), "demo")
+    dt = Machine(Session(), "demo-sdk-test")
 
     # Run
     df = dt.get_machines(Session(), "/api/machine")
@@ -50,7 +50,7 @@ def json():
 
     mocked.return_value = MagicMock(get=MagicMock(return_value=ResponseGet()))
 
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     type = dt.get_type_from_machine("test")
@@ -64,7 +64,7 @@ def json():
 def test_get_machine_schema(mocked_types, mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE
     mocked_types.return_value = "test"
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_machine_schema("test")
@@ -81,7 +81,7 @@ def test_get_machine_schema(mocked_types, mocked_machines):
 def test_get_machine_schema_hidden(mocked_types, mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE
     mocked_types.return_value = "test"
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_machine_schema("test", show_hidden=True)
@@ -100,7 +100,7 @@ def test_get_machine_schema_hidden(mocked_types, mocked_machines):
 def test_get_machine_schema_types(mocked_types, mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE
     mocked_types.return_value = "test"
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_machine_schema("test", types=["float"])
@@ -115,7 +115,7 @@ def test_get_machine_schema_types(mocked_types, mocked_machines):
 def test_get_machine_schema_types_return_mtype(mocked_types, mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE
     mocked_types.return_value = "test"
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_machine_schema("test", return_mtype=True)
@@ -129,7 +129,7 @@ def test_get_machine_schema_types_return_mtype(mocked_types, mocked_machines):
 
 
 """
-This test is against the demo environment and if the environment is changed then this test has to change as well.
+This test is against the demo-sdk-test environment and if the environment is changed then this test has to change as well.
 """
 
 

tests/machine_type/test_machine_type.py

@@ -15,7 +15,7 @@ def mockapi(self, session, endpoint):
 
     monkeypatch.setattr(MachineType, "get_machine_types", mockapi)
 
-    dt = MachineType(Session(), "demo")
+    dt = MachineType(Session(), "demo-sdk-test")
 
     # Run
     df = dt.get_machine_types(Session(), "/api/machinetype")
@@ -54,7 +54,7 @@ def mockapi(self, session, endpoint):
 @patch("smsdk.smsdk_entities.machine_type.machinetype.MachineType.get_fields")
 def test_get_fields_of_machine_type(mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE_FIELDS
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_fields_of_machine_type("test")
@@ -67,7 +67,7 @@ def test_get_fields_of_machine_type(mocked_machines):
 @patch("smsdk.smsdk_entities.machine_type.machinetype.MachineType.get_fields")
 def test_get_fields_of_machine_type_hidden(mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE_FIELDS
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_fields_of_machine_type("test", show_hidden=True)
@@ -82,7 +82,7 @@ def test_get_fields_of_machine_type_hidden(mocked_machines):
 @patch("smsdk.smsdk_entities.machine_type.machinetype.MachineType.get_fields")
 def test_get_fields_of_machine_type_types(mocked_machines):
     mocked_machines.return_value = MACHINE_TYPE_FIELDS
-    dt = Client("demo")
+    dt = Client("demo-sdk-test")
 
     # Run
     fields = dt.get_fields_of_machine_type("test", types=["float"])
@@ -94,7 +94,7 @@ def test_get_fields_of_machine_type_types(mocked_machines):
 
 
 """
-This test is against the demo environment and if the environment is changed then this test has to change as well.
+This test is against the demo-sdk-test environment and if the environment is changed then this test has to change as well.
 """
 
 

tests/raw_data/test_raw_data.py

@@ -20,7 +20,16 @@ def test_get_utilities(get_session):
 
 
 def test_get_raw_data(get_client):
-    raw_data = get_client.get_raw_data(RAW_DATA_TABLE)
+    timeselection = {
+        "time_type": "absolute",
+        "start_time": "2023-10-18T18:30:00.000Z",
+        "end_time": "2023-10-19T18:29:59.999Z",
+        "time_zone": "America/Los_Angeles",
+    }
+    select = []
+    raw_data = get_client.get_raw_data(
+        RAW_DATA_TABLE, fields=select, time_selection=timeselection
+    )
 
     # check index
     assert raw_data.index.name == "_id"

tests/test_client.py

@@ -6,13 +6,13 @@
 def test_client_init():
     """Test the client initialization."""
 
-    cli = client.Client("demo")
+    cli = client.Client("demo-sdk-test")
 
-    assert cli.tenant == "demo"
+    assert cli.tenant == "demo-sdk-test"
     assert cli.config["site.domain"] == "sightmachine.io"
 
-    cli = client.Client("demo")
+    cli = client.Client("demo-sdk-test")
 
     # VERIFY
-    assert cli.tenant == "demo"
+    assert cli.tenant == "demo-sdk-test"
     assert cli.config["site.domain"] == "sightmachine.io"