feat(flomni,lamni): repoint all omny endpoints from myfritz/omny-test to omny.psi.ch
CI for csaxs_bec / test (push) Successful in 1m51s
CI for csaxs_bec / test (push) Successful in 1m51s
Cuts over the webpage status-page mirror, TomoIDManager's sample-counter registration, and the samples-folder PDF upload to omny.psi.ch exclusively, replacing v1p0zyg2w9n2k9c1.myfritz.net and omny-test.psi.ch everywhere. Note: omny.psi.ch currently has known server-side issues (a permission error on /upload.php, and a WAF blocking /samples/* outright) tracked separately with PSI admins -- this switch is expected to be broken until those are fixed. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
6bb8d8027d
commit
50d4f8e425
4 files changed
+8
-23
No files matched your search
@@ -251,13 +251,7 @@ class LamNI(TomoQueueMixin, LamNIAlignmentMixin, LamNIOpticsMixin, LamniGuiTools
|
||||
self._webpage_gen = LamniWebpageGenerator(
|
||||
bec_client=client,
|
||||
output_dir="~/data/raw/webpage/",
|
||||
upload_url=[
|
||||
"https://v1p0zyg2w9n2k9c1.myfritz.net/upload.php",
|
||||
# TEMP: mirroring to the test server while it's evaluated --
|
||||
# drop this line once omny-test.psi.ch is confirmed or the trial ends.
|
||||
"https://omny-test.psi.ch/upload.php",
|
||||
"https://omny.psi.ch/upload.php",
|
||||
],
|
||||
upload_url="https://omny.psi.ch/upload.php",
|
||||
local_port=8080,
|
||||
)
|
||||
self._webpage_gen.start()
|
||||
|
||||
@@ -347,8 +347,8 @@ class TomoIDManager:
|
||||
)
|
||||
"""
|
||||
|
||||
OMNY_URL = "https://v1p0zyg2w9n2k9c1.myfritz.net/samples/newmeasurement.php"
|
||||
TEST_OMNY_URL = "https://omny-test.psi.ch/samples/newmeasurement.php"
|
||||
OMNY_URL = "https://omny.psi.ch/samples/newmeasurement.php"
|
||||
TEST_OMNY_URL = "https://omny.psi.ch/samples/newmeasurement.php"
|
||||
FALLBACK_TOMO_ID = 0
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -392,12 +392,10 @@ class TomoQueueMixin:
|
||||
user=user,
|
||||
)
|
||||
|
||||
# Only omny-test.psi.ch, not v1p0zyg2w9n2k9c1.myfritz.net (the host
|
||||
# TomoIDManager.OMNY_URL registers measurements against, and the
|
||||
# webpage generators mirror their own content to): only
|
||||
# omny-test.psi.ch has the sample counter that actually matches
|
||||
# self.tomo_id.
|
||||
_SAMPLES_UPLOAD_HOSTS = ("https://omny-test.psi.ch",)
|
||||
# Must match whatever host TomoIDManager.OMNY_URL/TEST_OMNY_URL
|
||||
# registered against, since that host's sample counter is what
|
||||
# self.tomo_id came from.
|
||||
_SAMPLES_UPLOAD_HOSTS = ("https://omny.psi.ch",)
|
||||
|
||||
def _upload_pdf_report_to_samples(self, pdf_path: str) -> None:
|
||||
"""Upload a just-written PDF report to the OMNY samples web folder
|
||||
|
||||
@@ -1640,14 +1640,7 @@ class Flomni(
|
||||
self._webpage_gen = FlomniWebpageGenerator(
|
||||
bec_client=client,
|
||||
output_dir="~/data/raw/webpage/",
|
||||
# upload_url="http://s1090968537.online.de/upload.php", # optional
|
||||
upload_url=[
|
||||
"https://v1p0zyg2w9n2k9c1.myfritz.net/upload.php",
|
||||
# TEMP: mirroring to the test server while it's evaluated --
|
||||
# drop this line once omny-test.psi.ch is confirmed or the trial ends.
|
||||
"https://omny-test.psi.ch/upload.php",
|
||||
"https://omny.psi.ch/upload.php",
|
||||
],
|
||||
upload_url="https://omny.psi.ch/upload.php",
|
||||
local_port=8080,
|
||||
)
|
||||
self._webpage_gen.start()
|
||||
|
||||
Reference in new issue
Block a user