From 35aa3217c07c42011af6fdaeabbf324b71d54d67 Mon Sep 17 00:00:00 2001
From: Tomasz Noczynski <tomasz.noczynski@volue.com>
Date: Mon, 3 Feb 2025 15:55:00 +0100
Subject: [PATCH] chore: switch to current Mesh 2.17 master build

---
 .github/workflows/install_dev_env/action.yml |  4 ++--
 .github/workflows/usage.yml                  | 10 +++++-----
 src/volue/mesh/tests/test_timeseries.py      |  9 ++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/install_dev_env/action.yml b/.github/workflows/install_dev_env/action.yml
index 6956f55a..6d41cadf 100644
--- a/.github/workflows/install_dev_env/action.yml
+++ b/.github/workflows/install_dev_env/action.yml
@@ -17,7 +17,7 @@ runs:
     - name: Installing poetry
       uses: abatilo/actions-poetry@v2.0.0
       with:
-        poetry-version: '1.7.1'
+        poetry-version: "1.7.1"
 
     - name: Poetry install
       run: poetry install
@@ -41,4 +41,4 @@ runs:
       id: download-mesh-server
       with:
         GITHUB_TOKEN: ${{ inputs.token }}
-        MESH_SERVICE_TAG: 'v2.15.0.5'
+        MESH_SERVICE_TAG: "v2.17.0.2283"
diff --git a/.github/workflows/usage.yml b/.github/workflows/usage.yml
index 1da03b30..195fd8e7 100644
--- a/.github/workflows/usage.yml
+++ b/.github/workflows/usage.yml
@@ -2,9 +2,9 @@ name: Usage
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
   workflow_dispatch:
 
@@ -39,7 +39,7 @@ jobs:
         id: download-mesh-server
         with:
           GITHUB_TOKEN: ${{ secrets.OAUTH_TOKEN }}
-          MESH_SERVICE_TAG: 'v2.15.0.5'
+          MESH_SERVICE_TAG: "v2.17.0.2283"
 
       # run one example before installing pytest packages and pandas
       # to check if all dependencies are installed together with Mesh Python SDK pip package
@@ -55,8 +55,8 @@ jobs:
         uses: Vampire/setup-wsl@v1
         with:
           distribution: Ubuntu-22.04
-          set-as-default: 'true'
-          update: 'false'
+          set-as-default: "true"
+          update: "false"
 
       # run one example before installing pytest packages and pandas
       # to check if all dependencies are installed together with Mesh Python SDK pip package
diff --git a/src/volue/mesh/tests/test_timeseries.py b/src/volue/mesh/tests/test_timeseries.py
index 14279dc6..0fa63bfa 100644
--- a/src/volue/mesh/tests/test_timeseries.py
+++ b/src/volue/mesh/tests/test_timeseries.py
@@ -50,7 +50,6 @@ def verify_physical_timeseries(reply_timeseries: Timeseries):
     Verify if all time series properties and data have expected values.
     "Model/SimpleThermalTestModel/ThermalComponent/SomePowerPlant1/SomePowerPlantChimney2.TsRawAtt"
     """
-    assert reply_timeseries.timskey == 3
     assert reply_timeseries.resolution == Timeseries.Resolution.HOUR
 
     assert type(reply_timeseries) is Timeseries
@@ -310,6 +309,13 @@ def test_read_physical_timeseries_points(session):
         )
         verify_physical_timeseries(reply_timeseries)
 
+        # If we are reading physical time series by time series attribute
+        # (path, ID or object) then no time series key is returned (meaning 0).
+        # If we are reading physical time series directly via time series key,
+        # then the key should be returned.
+        expected_timeseries_key = target if isinstance(target, int) else 0
+        assert reply_timeseries.timskey == expected_timeseries_key
+
 
 @pytest.mark.database
 def test_read_calculation_timeseries_points(session):
@@ -368,6 +374,7 @@ def test_read_timeseries_points_with_different_datetime_timezones(
         TIME_SERIES_ATTRIBUTE_WITH_PHYSICAL_TIME_SERIES_PATH, start_time, end_time
     )
     verify_physical_timeseries(reply_timeseries)
+    assert reply_timeseries.timskey == 0
 
 
 @pytest.mark.database