Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
14c5e15
ENH: (CLTARCH) Remove use of thread to run async methods.
fernandohds564 Mar 24, 2026
6299426
BUG: update requirements.txt with nest_asyncio.
fernandohds564 Mar 24, 2026
eb1a25e
STY: (CLTARCH) format code.
fernandohds564 Mar 25, 2026
7227a31
MNT: (CLTARCH) Remove nest_asyncio; use thread based method.
fernandohds564 Mar 25, 2026
949f9ca
STY: (CLTARC.TIME) import only TypeError. Only one being used.
fernandohds564 Mar 26, 2026
2f8ce32
ENH: (CLTARC.TIME) Re-implement get_time_intervals.
fernandohds564 Mar 26, 2026
b503147
ENH: (CLTARC.TIME) Improve and standardize constructor of Time class.
fernandohds564 Mar 26, 2026
2b4ba54
TST: (CLTARC.TIME) Implement tests for Time and get_time_intervals.
fernandohds564 Mar 26, 2026
33545ff
ENH: (CLTARC.EXEP) Add PayloadError to the list of exceptions.
fernandohds564 Mar 26, 2026
23b0a0b
API: (CLTARC.CLT) Now the option get_request_url will return all urls…
fernandohds564 Mar 26, 2026
22ab6e9
API: (CLTARC.CLT) Move property query_bin_interval to ClientArchiver.
fernandohds564 Mar 26, 2026
a6dd441
MNT: (CLTARC) Remove unused code relate to old parallel_query_bin_int…
fernandohds564 Mar 26, 2026
4745a5d
ENH: (CLTARC.CLT) Improve error messages in _get_request_response.
fernandohds564 Mar 26, 2026
f1f4a58
STY: (CLTARC) Apply ruff formatter to files.
fernandohds564 Mar 26, 2026
d7bf29b
BUG: (CLTARC.OTHER) Adapt other siriuspy subpackages to new clientarc…
fernandohds564 Mar 26, 2026
9084921
TST: (CLTARC.TIME) fix tests.
fernandohds564 Mar 26, 2026
db9ed8c
BUG: (CLTARC) Fix bugs from last commits..
fernandohds564 Mar 26, 2026
11f0989
API: (CLTARC.CLT) Major improvements in subpackage.
fernandohds564 Mar 27, 2026
7a0f007
BUG: (CLTARC.TIME) Fix Time class constructor to pass the tests.
fernandohds564 Mar 30, 2026
262783c
ENH: (CLTARCH.CLT)
fernandohds564 Mar 30, 2026
8e050b8
BUG: (CLTARC) Fixes inconsistent argument names and processing type c…
fernandohds564 Mar 31, 2026
b8d49a9
ENH: (CLTARC.CLT) Adds appliance and process metrics retrieval methods
fernandohds564 Mar 31, 2026
9d63a1d
ENH: (CLTARC.CLT) Adds threaded request support alongside async option
fernandohds564 Mar 31, 2026
86870ae
MNT: (CLTARC.CLT) Fixes argument formatting and docstring indentation
fernandohds564 Mar 31, 2026
48ffa12
ENH: (CLTARC.CLT) Adds flexible query method selection for requests
fernandohds564 Apr 1, 2026
10c32cb
MNT: (CLTARCH.CLT) Removes threaded and serial query support
fernandohds564 Apr 1, 2026
bc471e7
BUG: (CLTARCH.CLT) Implement correct way of getting responses with ai…
fernandohds564 Apr 1, 2026
e3a713b
BUG: (CLTARCH.CLT) Removes deprecated `return_json` flag from request…
fernandohds564 Apr 1, 2026
3ebedb0
BUG: (CLTARCH.CLT) fix way of checking for connection.
fernandohds564 Apr 1, 2026
8905e61
ENH: (CLTARCH.CLT) Adds support for fetching PV type info.
fernandohds564 Apr 1, 2026
ce001d2
ENH: (CLTARCH) Adds `query_max_concurrency` property to PVDataSet and…
fernandohds564 Apr 1, 2026
3d51d8d
ENH: (CLTARCH.CL) Adds timezone support to time interval generation
fernandohds564 Apr 1, 2026
9a14fbf
BUG: (CLTARCH) fix get_iso8601 to return correct timezone.
fernandohds564 Apr 1, 2026
be3f193
ENH: (CLTARCH) Adds string representations for data and dataset classes
fernandohds564 Apr 1, 2026
7951282
ENH: (CLTARCH) Adds timeout property to allow connector timeout confi…
fernandohds564 Apr 2, 2026
a7c6343
ENH: (CLTARCH) Improves PV data string representation formatting
fernandohds564 Apr 2, 2026
96f5153
BUG: (CLTARCH.CLT) Fixes response handling for single URL requests
fernandohds564 Apr 2, 2026
741326e
MNT: (CLTARCH.CLT) Defers debug logging until after HTTP request init…
fernandohds564 Apr 2, 2026
899a4c6
MNT: (CLTARCH.CLT) Removes timeout when awaiting async future result.
fernandohds564 Apr 2, 2026
1da30b7
API: (CLTARCH) Renames timeout to query_timeout for clarity
fernandohds564 Apr 2, 2026
71ed5a6
MNT: (CLTARCH.CLT) Refactors semaphore initialization for async requests
fernandohds564 Apr 2, 2026
dfbdd4d
DOC: (CLTARCH.CLT) Clarifies timeout error message for query operations
fernandohds564 Apr 2, 2026
b511a2b
ENH: (CLTARC) Enforces integer type for query_bin_interval parameters
fernandohds564 Apr 2, 2026
5b01ccb
BUG: (CLTARCH.MACHREP) Adapt MachReport updates for new interface of …
fernandohds564 Apr 2, 2026
165c9b8
BUG: (CLTARCH.TIME) Ensures correct subclass return for fromtimestamp…
fernandohds564 Apr 2, 2026
0f401de
BUG: (CLTARCH.CLT) Prevents logout on missing session
fernandohds564 Apr 2, 2026
2d50dc1
BUG: (CLTARCH.CLT) Prevents SSL errors for IP-based URLs in client re…
fernandohds564 Apr 2, 2026
c2a411c
ENH: (CLTARCH.CLT) Prompts for password if not provided in login
fernandohds564 Apr 6, 2026
ecbad8e
BUG: (CLTARCH.CLT) Fix login in control room, where server is defined…
fernandohds564 Apr 6, 2026
357d93d
BUG: (CLTARCH.CLT) Fix login in control room. Previous commit was not…
fernandohds564 Apr 6, 2026
e3d88df
ENH: (CLTARCH.CLT) Recover functionality of old parallel flag by allo…
fernandohds564 Apr 6, 2026
35181b1
DOC: (CLTARCH) Improves documentation of processing types property.
fernandohds564 Apr 6, 2026
5132f64
DOC: (CLTARCH) Improve documentation and reorganize code order for mo…
fernandohds564 Apr 6, 2026
71fb209
ENH: (CLTARCH.PVARCH) Improve detection of online/offline state.
fernandohds564 Apr 6, 2026
7149fb6
ENH: (CLTARCH.PVARCH) Adapt serialization of PVData and PVDataSet.
fernandohds564 Apr 6, 2026
3f40457
ENH: (CLTARCH.TIME) Make Time.now() work as expected, returning timez…
fernandohds564 Apr 6, 2026
4d37303
API: (CLTARCH) Remove timestamp_start and timestamp_stop. And initial…
fernandohds564 Apr 6, 2026
d6cab44
BUG: (CLTARCH.TIME) There is no super() in staticmethods.
fernandohds564 Apr 6, 2026
4d7d981
ENH: (CLTARCH.CLT) Add protection against negative timeouts in setter.
fernandohds564 Apr 6, 2026
0bebf9f
API: (CLTARCH) Change `query_bin_interval` to `query_split_interval`.
fernandohds564 Apr 7, 2026
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
1,079 changes: 819 additions & 260 deletions siriuspy/siriuspy/clientarch/client.py

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions siriuspy/siriuspy/clientarch/devices.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ def __init__(self, devname, propty='', connector=None):
self._times = None
self._values = None
super().__init__(pvnames, connector=connector)
self._parallel_query_bin_interval = 3600
self.query_split_interval = 3600
self.processing_type = self.ProcessingTypes.Mean
self.processing_type_param1 = 1

@property
def devnames(self):
Expand All @@ -57,12 +59,12 @@ def values(self):
"""Return retrieved orbit interpolated values."""
return self._values

def update(self, mean_sec=None, parallel=True):
def update(self, query_timeout=None):
"""Update state by retrieving data."""
super().update(mean_sec=mean_sec, parallel=parallel)
super().update(query_timeout=query_timeout)

# interpolate data
self._times, self._values = self._interpolate_data(mean_sec)
self._times, self._values = self._interpolate_data()

# --- private methods ---

Expand All @@ -71,9 +73,10 @@ def _get_pvnames(self):
pvnames = []
return devnames, pvnames

def _interpolate_data(self, mean_sec):
def _interpolate_data(self):
# calc mean_sec if not passed
nr_pvs = len(self._pvdata)
mean_sec = self.processing_type_param1
if mean_sec is None:
mean_sec = sum(
map(
Expand All @@ -84,7 +87,7 @@ def _interpolate_data(self, mean_sec):
mean_sec /= nr_pvs

# times vector
t0_, t1_ = self.timestamp_start, self.timestamp_stop
t0_, t1_ = self.time_start.timestamp(), self.time_stop.timestamp()
times = _np.arange(t0_, t1_, mean_sec)

# builds orbit matrix using interpolation
Expand Down
6 changes: 6 additions & 0 deletions siriuspy/siriuspy/clientarch/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import asyncio as _asyncio

import aiohttp.client_exceptions as _aio_excep


class ClientArchError(Exception):
"""ClientArch Abstract Exception."""
Expand All @@ -15,6 +17,10 @@ class TimeoutError(ClientArchError, _asyncio.TimeoutError):
"""ClientArch Timeout Exception."""


class PayloadError(ClientArchError, _aio_excep.ClientPayloadError):
"""ClientArch Timeout Exception."""


class RuntimeError(ClientArchError, RuntimeError):
"""ClientArch Runtime Exception."""

Expand Down
Loading
Loading