Skip to content

Bug/sc 229162 missing timestamps #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexbourret merged 3 commits into from
Mar 11, 2025
Merged

Bug/sc 229162 missing timestamps #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fa074e
Fix for [sc-229162]
alexbourret Feb 13, 2025
ecb01ed
beta 5
alexbourret Feb 13, 2025
74e6328
add interpolate boundary type for record data type
alexbourret Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion custom-recipes/pi-system-retrieve-list/recipe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,26 @@
{
"name": "boundary_type",
"label": "Boundary type",
"visibilityCondition": "['InterpolatedData','RecordedData'].includes(model.data_type)",
"visibilityCondition": "((model.must_retrieve_metrics) && ['InterpolatedData'].includes(model.data_type))",
"type": "SELECT",
"selectChoices":[
{"value": "Inside", "label": "Inside"},
{"value": "Outside", "label": "Outside"}
],
"defaultValue": "Inside"
},
{
"name": "record_boundary_type",
"label": "Boundary type",
"visibilityCondition": "((model.must_retrieve_metrics) && ['RecordedData'].includes(model.data_type))",
"type": "SELECT",
"selectChoices":[
{"value": "Inside", "label": "Inside"},
{"value": "Interpolated", "label": "Interpolated"},
{"value": "Outside", "label": "Outside"}
],
"defaultValue": "Inside"
},
{
"type": "SEPARATOR",
"description": "Data to retrieve"
Expand Down
2 changes: 1 addition & 1 deletion custom-recipes/pi-system-retrieve-list/recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +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)
record_boundary_type = config.get("boundary_type") if data_type == "RecordedData" else None
record_boundary_type = config.get("record_boundary_type") if data_type == "RecordedData" else None
summary_type, summary_duration = get_summary_parameters(config)
do_duplicate_input_row = config.get("do_duplicate_input_row", False)

Expand Down
14 changes: 13 additions & 1 deletion python-connectors/pi-system_attribute-search/connector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,26 @@
{
"name": "boundary_type",
"label": "Boundary type",
"visibilityCondition": "((model.must_retrieve_metrics) && ['InterpolatedData','RecordedData'].includes(model.data_type))",
"visibilityCondition": "((model.must_retrieve_metrics) && ['InterpolatedData'].includes(model.data_type))",
"type": "SELECT",
"selectChoices":[
{"value": "Inside", "label": "Inside"},
{"value": "Outside", "label": "Outside"}
],
"defaultValue": "Inside"
},
{
"name": "record_boundary_type",
"label": "Boundary type",
"visibilityCondition": "((model.must_retrieve_metrics) && ['RecordedData'].includes(model.data_type))",
"type": "SELECT",
"selectChoices":[
{"value": "Inside", "label": "Inside"},
{"value": "Interpolated", "label": "Interpolated"},
{"value": "Outside", "label": "Outside"}
],
"defaultValue": "Inside"
},
{
"name": "summary_duration",
"label": "Summary duration",
Expand Down
2 changes: 1 addition & 1 deletion python-connectors/pi-system_attribute-search/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __init__(self, config, plugin_config):
self.config = config
self.summary_type, self.summary_duration = get_summary_parameters(config)

self.record_boundary_type = config.get("boundary_type") if self.data_type == "RecordedData" else None
self.record_boundary_type = config.get("record_boundary_type") if self.data_type == "RecordedData" else None

def extract_database_webid(self, database_endpoint):
return database_endpoint.split("/")[-1]
Expand Down
2 changes: 1 addition & 1 deletion python-lib/osisoft_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ class OSIsoftConstants(object):
"Security": "{base_url}/eventframes/{webid}/security",
"SecurityEntries": "{base_url}/eventframes/{webid}/securityentries"
}
PLUGIN_VERSION = "1.2.4-beta.4"
PLUGIN_VERSION = "1.2.4-beta.5"
VALUE_COLUMN_SUFFIX = "_val"
WEB_API_PATH = "piwebapi"
WRITE_HEADERS = {'X-Requested-With': 'XmlHttpRequest'}
2 changes: 1 addition & 1 deletion python-lib/osisoft_plugin_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def format_output(input_row, reference_row=None, is_enumeration_value=False):
type_column = None
if "Value" in output_row and isinstance(output_row.get("Value"), dict):
type_column = output_row.get("Type")
output_row = output_row.get("Value")
output_row.update(output_row.get("Value"))
output_row.pop("Good", None)
output_row.pop("Questionable", None)
output_row.pop("Substituted", None)
Expand Down