tagreader 4.2.2__tar.gz → 4.2.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {tagreader-4.2.2 → tagreader-4.2.4}/PKG-INFO +1 -1
- {tagreader-4.2.2 → tagreader-4.2.4}/pyproject.toml +1 -1
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/cache.py +7 -7
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/clients.py +7 -1
- {tagreader-4.2.2 → tagreader-4.2.4}/LICENSE +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/README.md +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/__init__.py +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/__version__.py +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/logger.py +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/odbc_handlers.py +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/utils.py +0 -0
- {tagreader-4.2.2 → tagreader-4.2.4}/tagreader/web_handlers.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "tagreader"
|
|
3
|
-
version = "4.2.
|
|
3
|
+
version = "4.2.4"
|
|
4
4
|
description = "Tagreader is a Python package for reading trend data from the OSIsoft PI and Aspen Infoplus.21 IMS systems."
|
|
5
5
|
authors = ["Einar S. Idsø <eiids@equinor.com>"]
|
|
6
6
|
license = "MIT"
|
|
@@ -111,8 +111,8 @@ class BucketCache(BaseCache):
|
|
|
111
111
|
ts: timedelta,
|
|
112
112
|
stepped: bool,
|
|
113
113
|
get_status: bool,
|
|
114
|
-
start: Optional[datetime]
|
|
115
|
-
end: Optional[datetime]
|
|
114
|
+
start: Optional[datetime],
|
|
115
|
+
end: Optional[datetime],
|
|
116
116
|
) -> str:
|
|
117
117
|
"""Return a string on the form
|
|
118
118
|
$tagname$read_type[$sample_time][$stepped][$get_status]$_start_end
|
|
@@ -307,7 +307,7 @@ class SmartCache(BaseCache):
|
|
|
307
307
|
tagname: str,
|
|
308
308
|
read_type: ReaderType,
|
|
309
309
|
ts: timedelta,
|
|
310
|
-
get_status: bool
|
|
310
|
+
get_status: bool,
|
|
311
311
|
) -> str:
|
|
312
312
|
name = safe_tagname(tagname)
|
|
313
313
|
status = get_status * "$status"
|
|
@@ -324,7 +324,7 @@ class SmartCache(BaseCache):
|
|
|
324
324
|
tagname: str,
|
|
325
325
|
read_type: ReaderType,
|
|
326
326
|
ts: timedelta,
|
|
327
|
-
get_status: bool
|
|
327
|
+
get_status: bool,
|
|
328
328
|
) -> None:
|
|
329
329
|
key = self._key_path(
|
|
330
330
|
tagname=tagname, read_type=read_type, ts=ts, get_status=get_status
|
|
@@ -349,9 +349,9 @@ class SmartCache(BaseCache):
|
|
|
349
349
|
tagname: str,
|
|
350
350
|
read_type: ReaderType,
|
|
351
351
|
ts: timedelta,
|
|
352
|
-
start: Optional[datetime]
|
|
353
|
-
end: Optional[datetime]
|
|
354
|
-
get_status: bool
|
|
352
|
+
start: Optional[datetime],
|
|
353
|
+
end: Optional[datetime],
|
|
354
|
+
get_status: bool,
|
|
355
355
|
) -> pd.DataFrame:
|
|
356
356
|
key = self._key_path(
|
|
357
357
|
tagname=tagname, read_type=read_type, ts=ts, get_status=get_status
|
|
@@ -446,7 +446,13 @@ class IMSClient:
|
|
|
446
446
|
)
|
|
447
447
|
if not df.empty and read_type != ReaderType.RAW:
|
|
448
448
|
if isinstance(cache, SmartCache):
|
|
449
|
-
cache.store(
|
|
449
|
+
cache.store(
|
|
450
|
+
df=df,
|
|
451
|
+
tagname=tag,
|
|
452
|
+
read_type=read_type,
|
|
453
|
+
ts=ts,
|
|
454
|
+
get_status=get_status,
|
|
455
|
+
)
|
|
450
456
|
if isinstance(cache, BucketCache):
|
|
451
457
|
cache.store(
|
|
452
458
|
df=df,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|