mx/AareDAQ
0
1 Fork 0
Code Issues 27 Pull Requests 1 Actions Packages Projects Releases 99 Wiki Activity

aaredb: changed certification, host and logging statements

Browse Source
This commit is contained in:
appleb_m committed 2026-03-25 13:57:10 +01:00
1 parent b24e3aa12a
commit 6e3e14a837
1 file changed
+20 -22
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/daq/aaredb.py
+20 -22
View File
@@ -38,22 +38,20 @@ from jfjoch_client.models import ScanResult
logger = setup_logger("aareDAQ")
class AareWrapper:
def __init__(
self,
bl: MXBeamline,
host: str = "https://mx-db-01.psi.ch/dispatcher",
host: str = "https://mx-aaredb-dmz-01.psi.ch/dispatcher",
):
configuration = aareDB.Configuration(host=host)
# --- mTLS & SSL CONFIGURATION ---
configuration.cert_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_db-01.crt"
configuration.key_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_db-01.key"
# Point this to the CA bundle that signed the server's certificate
configuration.verify_ssl = True
configuration.ssl_ca_cert = "/etc/ssl/certs/secrets/mx-aaredb-dmz-01_Full_Chain_CA.pem"
configuration.cert_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.crt"
configuration.key_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.key"
self.client = aareDB.ApiClient(configuration)
self.client.default_headers["X-Shared-Password"] = os.getenv("AAREDB_SHARED_PASSWORD")
@@ -78,7 +76,7 @@ class AareWrapper:
ret = self.__tell_api.set_tell_positions(
set_tell_position_request=payload,
)
print(ret)
logger.debug(ret)
def create_manual_sample(self, s: SampleShortInfo):
from aareDB.models import ManualSampleCreate
@@ -92,7 +90,7 @@ class AareWrapper:
try:
s.db_id = self.__sample_api.insert_sample(manual_sample).id
except Exception as e:
print(f"Error inserting sample: {e}")
logger.error(f"Error inserting sample: {e}")
def sample_mounted(self, s: Optional[SampleShortInfo]):
if s is not None:
@@ -102,7 +100,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("Mounted")),
)
except Exception as e:
print(e)
logger.error(e)
def sample_unmounted(self, s: Optional[SampleShortInfo]):
if s is not None:
@@ -112,7 +110,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("Unmounted")),
)
except Exception as e:
print(e)
logger.error(e)
def sample_centered(self, s: Optional[SampleShortInfo]):
if s is not None:
@@ -122,7 +120,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("Centered")),
)
except Exception as e:
print(e)
logger.error(e)
def sample_collected(self, s: Optional[SampleShortInfo]):
if s is None:
@@ -133,7 +131,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("Collected")),
)
except Exception as e:
print(e)
logger.error(e)
def sample_failed(self, s: Optional[SampleShortInfo], failed_comment: Optional[str] = None):
if s is None:
@@ -144,7 +142,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("Failed"), comment=failed_comment),
)
except Exception as e:
print(e)
logger.error(e)
def axc_failed(self, s: Optional[SampleShortInfo]):
if s is None:
@@ -155,7 +153,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("AXCFailed")),
)
except Exception as e:
print(e)
logger.error(e)
def alc_failed(self, s: Optional[SampleShortInfo], alc_comment: Optional[str] = None):
if s is None:
@@ -166,7 +164,7 @@ class AareWrapper:
sample_event_create=SampleEventCreate(event_type=SampleEventType("ALCFailed"), comment=alc_comment),
)
except Exception as e:
print(e)
logger.error(e)
def sample_lost(self, s: Optional[SampleShortInfo]):
if s is None:
@@ -296,9 +294,9 @@ class AareWrapper:
sample_id=s.db_id,
experiment_parameters_create=experiment_params_payload
)
print("Experiment parameters created:", response)
logger.debug("Experiment parameters created:", response)
except Exception as e:
print(e)
logger.error(e)
def create_gridscan_run(self, s: Optional[SampleShortInfo], r:RasterGridRequest, d:DAQStatusModel):
if s is None:
@@ -360,9 +358,9 @@ class AareWrapper:
sample_id=s.db_id,
experiment_parameters_create=experiment_params_payload
)
print("Experiment parameters created:", response)
logger.info("Experiment parameters created:", response)
except Exception as e:
print(e)
logger.debug(e)
def ingest_gridscan(self, sample: Optional[SampleShortInfo], raster_result: ScanResult,
raster_request: RasterGridRequest, geom: SampleGeometryModel,
@@ -386,7 +384,7 @@ class AareWrapper:
headers=headers, data=json.dumps(payload), timeout=30, verify=False)
response.raise_for_status()
print(f"Response status code: {response.status_code}")
logger.info(f"Response status code: {response.status_code}")
def format_gridscan_payload(self, sample: Optional[SampleShortInfo], raster_result:ScanResult,
@@ -429,7 +427,7 @@ class AareWrapper:
return payload
except Exception as e:
print(e)
logger.error(e)
raise e
def ingest_scan(self, sample: Optional[SampleShortInfo], result: ScanResult,
@@ -453,7 +451,7 @@ class AareWrapper:
headers=headers, data=json.dumps(payload), timeout=30, verify=False)
response.raise_for_status()
print(f"Response status code: {response.status_code}")
logger.info(f"Response status code: {response.status_code}")
def format_scan_payload(self, sample: Optional[SampleShortInfo], result:ScanResult,
geom:SampleGeometryModel,
@@ -471,5 +469,5 @@ class AareWrapper:
return payload
except Exception as e:
print(e)
logger.error(e)
raise e