From e284a4debdd0bd8e1e364f17e9dfeb39e2dd801a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20TERRIER?= Date: Thu, 5 Dec 2024 13:33:33 +0000 Subject: [PATCH 1/2] fix boundary type --- custom-recipes/pi-system-retrieve-list/recipe.py | 1 + python-lib/osisoft_client.py | 4 ++-- python-lib/osisoft_plugin_common.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/custom-recipes/pi-system-retrieve-list/recipe.py b/custom-recipes/pi-system-retrieve-list/recipe.py index b09c071..15636c3 100644 --- a/custom-recipes/pi-system-retrieve-list/recipe.py +++ b/custom-recipes/pi-system-retrieve-list/recipe.py @@ -48,6 +48,7 @@ end_time_column = config.get("end_time_column") server_url_column = config.get("server_url_column") interval, sync_time, boundary_type = get_interpolated_parameters(config) +boundary_type = config.get("boundary_type") if boundary_type is None else boundary_type summary_type, summary_duration = get_summary_parameters(config) network_timer = PerformanceTimer() diff --git a/python-lib/osisoft_client.py b/python-lib/osisoft_client.py index 6d66ad0..a4cd596 100644 --- a/python-lib/osisoft_client.py +++ b/python-lib/osisoft_client.py @@ -404,7 +404,7 @@ def get_link_from_item(self, item, data_type, start_date, end_date, interval=Non headers = self.get_requests_headers() params = build_requests_params( start_time=start_date, end_time=end_date, interval=interval, - sync_time=sync_time, sync_time_boundary_type=boundary_type, search_full_hierarchy=search_full_hierarchy, + sync_time=sync_time, boundary_type=boundary_type, search_full_hierarchy=search_full_hierarchy, max_count=max_count, summary_type=summary_type, summary_duration=summary_duration ) json_response = self.get( @@ -637,7 +637,7 @@ def get_requests_params(self, start_date=None, end_date=None, interval=None, syn if sync_time: params.update({"syncTime": sync_time}) if boundary_type: - params.update({"syncTimeBoundaryType": boundary_type}) + params.update({"boundaryType": boundary_type}) if selected_fields: params.update({"selectedFields": selected_fields}) if search_full_hierarchy: diff --git a/python-lib/osisoft_plugin_common.py b/python-lib/osisoft_plugin_common.py index aae0ac1..f872248 100644 --- a/python-lib/osisoft_plugin_common.py +++ b/python-lib/osisoft_plugin_common.py @@ -132,7 +132,7 @@ def build_requests_params(**kwargs): "end_time": "endtime", "interval": "interval", "sync_time": "syncTime", - "sync_time_boundary_type": "syncTimeBoundaryType", + "boundary_type": "boundaryType", "name_filter": "nameFilter", "category_name": "categoryName", "template_name": "templateName", From cc039e8b022095b16463abbb82cba567fcb08c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20TERRIER?= Date: Thu, 5 Dec 2024 13:48:42 +0000 Subject: [PATCH 2/2] add boundary to recipe --- custom-recipes/pi-system-retrieve-list/recipe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-recipes/pi-system-retrieve-list/recipe.json b/custom-recipes/pi-system-retrieve-list/recipe.json index 78f58a7..1777ba1 100644 --- a/custom-recipes/pi-system-retrieve-list/recipe.json +++ b/custom-recipes/pi-system-retrieve-list/recipe.json @@ -194,7 +194,7 @@ { "name": "boundary_type", "label": "Boundary type", - "visibilityCondition": "['InterpolatedData'].includes(model.data_type)", + "visibilityCondition": "['InterpolatedData', 'RecordedData'].includes(model.data_type)", "type": "SELECT", "selectChoices":[ {"value": "Inside", "label": "Inside"},