Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 2 additions & 44 deletions src/api/v1/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,42 +350,16 @@ class TagsBodyParams(BaseModel):
class PlotQueryParams:
def __init__(
self,
sample_rate: str = Query(
...,
description="sample_rate is deprecated and will be removed in v1.0.0. Please use time_interval_rate instead.",
examples=[5],
deprecated=True,
),
sample_unit: str = Query(
...,
description="sample_unit is deprecated and will be removed in v1.0.0. Please use time_interval_unit instead.",
examples=["second", "minute", "hour", "day"],
deprecated=True,
),
time_interval_rate: str = DuplicatedQueryParameters.time_interval_rate,
time_interval_unit: str = DuplicatedQueryParameters.time_interval_unit,
):
self.sample_rate = sample_rate
self.sample_unit = sample_unit
self.time_interval_rate = time_interval_rate
self.time_interval_unit = time_interval_unit


class ResampleQueryParams:
def __init__(
self,
sample_rate: str = Query(
...,
description="sample_rate is deprecated and will be removed in v1.0.0. Please use time_interval_rate instead.",
examples=[5],
deprecated=True,
),
sample_unit: str = Query(
...,
description="sample_unit is deprecated and will be removed in v1.0.0. Please use time_interval_unit instead.",
examples=["second", "minute", "hour", "day"],
deprecated=True,
),
time_interval_rate: str = DuplicatedQueryParameters.time_interval_rate,
time_interval_unit: str = DuplicatedQueryParameters.time_interval_unit,
agg_method: str = Query(
Expand All @@ -394,8 +368,6 @@ def __init__(
examples=["first", "last", "avg", "min", "max"],
),
):
self.sample_rate = sample_rate
self.sample_unit = sample_unit
self.time_interval_rate = time_interval_rate
self.time_interval_unit = time_interval_unit
self.agg_method = agg_method
Expand Down Expand Up @@ -431,23 +403,9 @@ def __init__(
class InterpolateQueryParams:
def __init__(
self,
sample_rate: str = Query(
...,
description="sample_rate is deprecated and will be removed in v1.0.0. Please use time_interval_rate instead.",
examples=[5],
deprecated=True,
),
sample_unit: str = Query(
...,
description="sample_unit is deprecated and will be removed in v1.0.0. Please use time_interval_unit instead.",
examples=["second", "minute", "hour", "day"],
deprecated=True,
),
time_interval_rate: str = DuplicatedQueryParameters.time_interval_rate,
time_interval_unit: str = DuplicatedQueryParameters.time_interval_unit,
):
self.sample_rate = sample_rate
self.sample_unit = sample_unit
self.time_interval_rate = time_interval_rate
self.time_interval_unit = time_interval_unit

Expand All @@ -462,8 +420,8 @@ def __init__(
),
timestamps: List[Union[date, datetime]] = Query(
...,
description="Timestamps in format YYYY-MM-DD or YYYY-MM-DDTHH:mm:ss or YYYY-MM-DDTHH:mm:ss+zz:zz",
examples=[EXAMPLE_DATE, EXAMPLE_DATETIME, EXAMPLE_DATETIME_TIMEZOME],
description="Timestamps in format YYYY-MM-DDTHH:mm:ss or YYYY-MM-DDTHH:mm:ss+zz:zz",
examples=[EXAMPLE_DATETIME, EXAMPLE_DATETIME_TIMEZOME],
),
window_length: int = Query(
..., description="Window Length in days", examples=[1]
Expand Down
14 changes: 0 additions & 14 deletions src/sdk/python/rtdip_sdk/queries/time_series/interpolate.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ def get(connection: object, parameters_dict: dict) -> pd.DataFrame:
tag_names (list): List of tagname or tagnames ["tag_1", "tag_2"]
start_date (str): Start date (Either a date in the format YY-MM-DD or a datetime in the format YYY-MM-DDTHH:MM:SS or specify the timezone offset in the format YYYY-MM-DDTHH:MM:SS+zz:zz)
end_date (str): End date (Either a date in the format YY-MM-DD or a datetime in the format YYY-MM-DDTHH:MM:SS or specify the timezone offset in the format YYYY-MM-DDTHH:MM:SS+zz:zz)
sample_rate (int): (deprecated) Please use time_interval_rate instead. See below.
sample_unit (str): (deprecated) Please use time_interval_unit instead. See below.
time_interval_rate (str): The time interval rate (numeric input)
time_interval_unit (str): The time interval unit (second, minute, day, hour)
include_bad_data (bool): Include "Bad" data points with True or remove "Bad" data points with False
Expand Down Expand Up @@ -67,18 +65,6 @@ def get(connection: object, parameters_dict: dict) -> pd.DataFrame:
if parameters_dict["pivot"] is True and parameters_dict["display_uom"] is True:
raise ValueError("pivot True and display_uom True cannot be used together")

if "sample_rate" in parameters_dict:
logging.warning(
"Parameter sample_rate is deprecated and will be removed in v1.0.0. Please use time_interval_rate instead."
)
parameters_dict["time_interval_rate"] = parameters_dict["sample_rate"]

if "sample_unit" in parameters_dict:
logging.warning(
"Parameter sample_unit is deprecated and will be removed in v1.0.0. Please use time_interval_unit instead."
)
parameters_dict["time_interval_unit"] = parameters_dict["sample_unit"]

try:
query = _query_builder(parameters_dict, "interpolate")

Expand Down
14 changes: 0 additions & 14 deletions src/sdk/python/rtdip_sdk/queries/time_series/plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ def get(connection: object, parameters_dict: dict) -> pd.DataFrame:
tag_names (list): List of tagname or tagnames ["tag_1", "tag_2"]
start_date (str): Start date (Either a date in the format YY-MM-DD or a datetime in the format YYY-MM-DDTHH:MM:SS or specify the timezone offset in the format YYYY-MM-DDTHH:MM:SS+zz:zz)
end_date (str): End date (Either a date in the format YY-MM-DD or a datetime in the format YYY-MM-DDTHH:MM:SS or specify the timezone offset in the format YYYY-MM-DDTHH:MM:SS+zz:zz)
sample_rate (int): (deprecated) Please use time_interval_rate instead. See below.
sample_unit (str): (deprecated) Please use time_interval_unit instead. See below.
time_interval_rate (str): The time interval rate (numeric input)
time_interval_unit (str): The time interval unit (second, minute, day, hour)
include_bad_data (bool): Include "Bad" data points with True or remove "Bad" data points with False
Expand All @@ -67,18 +65,6 @@ def get(connection: object, parameters_dict: dict) -> pd.DataFrame:
if parameters_dict["pivot"] is True and parameters_dict["display_uom"] is True:
raise ValueError("pivot True and display_uom True cannot be used together")

if "sample_rate" in parameters_dict:
logging.warning(
"Parameter sample_rate is deprecated and will be removed in v1.0.0. Please use time_interval_rate instead."
)
parameters_dict["time_interval_rate"] = parameters_dict["sample_rate"]

if "sample_unit" in parameters_dict:
logging.warning(
"Parameter sample_unit is deprecated and will be removed in v1.0.0. Please use time_interval_unit instead."
)
parameters_dict["time_interval_unit"] = parameters_dict["sample_unit"]

try:
query = _query_builder(parameters_dict, "plot")

Expand Down
14 changes: 0 additions & 14 deletions src/sdk/python/rtdip_sdk/queries/time_series/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ def get(connection: object, parameters_dict: dict) -> pd.DataFrame:
tag_names (list): List of tagname or tagnames ["tag_1", "tag_2"]
start_date (str): Start date (Either a date in the format YY-MM-DD or a datetime in the format YYY-MM-DDTHH:MM:SS or specify the timezone offset in the format YYYY-MM-DDTHH:MM:SS+zz:zz)
end_date (str): End date (Either a date in the format YY-MM-DD or a datetime in the format YYY-MM-DDTHH:MM:SS or specify the timezone offset in the format YYYY-MM-DDTHH:MM:SS+zz:zz)
sample_rate (int): (deprecated) Please use time_interval_rate instead. See below.
sample_unit (str): (deprecated) Please use time_interval_unit instead. See below.
time_interval_rate (str): The time interval rate (numeric input)
time_interval_unit (str): The time interval unit (second, minute, day, hour)
agg_method (str): Aggregation Method (first, last, avg, min, max)
Expand Down Expand Up @@ -72,18 +70,6 @@ def get(connection: object, parameters_dict: dict) -> pd.DataFrame:
if parameters_dict["pivot"] is True and parameters_dict["display_uom"] is True:
raise ValueError("pivot True and display_uom True cannot be used together")

if "sample_rate" in parameters_dict:
logging.warning(
"Parameter sample_rate is deprecated and will be removed in v1.0.0. Please use time_interval_rate instead."
)
parameters_dict["time_interval_rate"] = parameters_dict["sample_rate"]

if "sample_unit" in parameters_dict:
logging.warning(
"Parameter sample_unit is deprecated and will be removed in v1.0.0. Please use time_interval_unit instead."
)
parameters_dict["time_interval_unit"] = parameters_dict["sample_unit"]

try:
query = _query_builder(parameters_dict, "resample")

Expand Down