Skip to content

Commit 92cde04

Browse files
ric-evanswipacdevbot
ric-evans
and
wipacdevbot
authored
More Configurable Logging: SKYSCAN_EWMS_PILOT_LOG, SKYSCAN_MQ_CLIENT_LOG (#245)
Co-authored-by: wipacdevbot <developers@icecube.wisc.edu>
1 parent 3c7fdec commit 92cde04

File tree

9 files changed

+55
-61
lines changed

9 files changed

+55
-61
lines changed

‎dependencies-from-Dockerfile.log‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ decorator==4.4.2
3434
defusedxml==0.7.1
3535
docutils==0.20.1
3636
et-xmlfile==1.0.1
37-
ewms-pilot==0.17.5
37+
ewms-pilot==0.17.6
3838
fonttools==4.29.1
3939
fs==2.4.12
4040
gast==0.5.2
@@ -138,7 +138,7 @@ urllib3==2.1.0
138138
urwid==2.1.2
139139
wcwidth==0.2.5
140140
webencodings==0.5.1
141-
wipac-dev-tools==1.8.1
141+
wipac-dev-tools==1.8.2
142142
wipac-rest-tools==1.6.0
143143
xlwt==1.3.0
144144
zipp==1.0.0
@@ -248,11 +248,11 @@ scipy==1.8.0
248248
setuptools==59.6.0
249249
six==1.16.0
250250
skymap-scanner
251-
├── ewms-pilot [required: Any, installed: 0.17.5]
251+
├── ewms-pilot [required: Any, installed: 0.17.6]
252252
│ ├── htchirp [required: Any, installed: 3.0]
253253
│ ├── htcondor [required: Any, installed: 23.2.0]
254254
│ └── oms-mqclient [required: Any, installed: 2.4.9]
255-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
255+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
256256
│ ├── requests [required: Any, installed: 2.25.1]
257257
│ └── typing-extensions [required: Any, installed: 4.8.0]
258258
├── healpy [required: Any, installed: 1.15.0]
@@ -263,17 +263,17 @@ skymap-scanner
263263
│ ├── meander [required: Any, installed: 0.0.3]
264264
│ ├── numpy [required: Any, installed: 1.21.5]
265265
│ ├── pandas [required: Any, installed: 1.3.5]
266-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
266+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
267267
│ ├── requests [required: Any, installed: 2.25.1]
268268
│ └── typing-extensions [required: Any, installed: 4.8.0]
269269
├── iminuit [required: Any, installed: 2.24.0]
270270
│ └── numpy [required: >=1.21, installed: 1.21.5]
271271
├── numpy [required: Any, installed: 1.21.5]
272272
├── oms-mqclient [required: Any, installed: 2.4.9]
273-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
273+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
274274
│ ├── requests [required: Any, installed: 2.25.1]
275275
│ └── typing-extensions [required: Any, installed: 4.8.0]
276-
├── wipac-dev-tools [required: Any, installed: 1.8.1]
276+
├── wipac-dev-tools [required: Any, installed: 1.8.2]
277277
│ ├── requests [required: Any, installed: 2.25.1]
278278
│ └── typing-extensions [required: Any, installed: 4.8.0]
279279
└── wipac-rest-tools [required: Any, installed: 1.6.0]
@@ -287,7 +287,7 @@ skymap-scanner
287287
│ └── requests [required: >=1.2.0, installed: 2.25.1]
288288
├── tornado [required: Any, installed: 6.4]
289289
├── urllib3 [required: >=2.0.4, installed: 2.1.0]
290-
└── wipac-dev-tools [required: Any, installed: 1.8.1]
290+
└── wipac-dev-tools [required: Any, installed: 1.8.2]
291291
├── requests [required: Any, installed: 2.25.1]
292292
└── typing-extensions [required: Any, installed: 4.8.0]
293293
sortedcontainers==2.1.0

‎dependencies-from-Dockerfile_no_cvmfs.log‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ decorator==4.4.2
3434
defusedxml==0.7.1
3535
docutils==0.20.1
3636
et-xmlfile==1.0.1
37-
ewms-pilot==0.17.5
37+
ewms-pilot==0.17.6
3838
fonttools==4.29.1
3939
fs==2.4.12
4040
gast==0.5.2
@@ -138,7 +138,7 @@ urllib3==2.1.0
138138
urwid==2.1.2
139139
wcwidth==0.2.5
140140
webencodings==0.5.1
141-
wipac-dev-tools==1.8.1
141+
wipac-dev-tools==1.8.2
142142
wipac-rest-tools==1.6.0
143143
xlwt==1.3.0
144144
zipp==1.0.0
@@ -248,11 +248,11 @@ scipy==1.8.0
248248
setuptools==59.6.0
249249
six==1.16.0
250250
skymap-scanner
251-
├── ewms-pilot [required: Any, installed: 0.17.5]
251+
├── ewms-pilot [required: Any, installed: 0.17.6]
252252
│ ├── htchirp [required: Any, installed: 3.0]
253253
│ ├── htcondor [required: Any, installed: 23.2.0]
254254
│ └── oms-mqclient [required: Any, installed: 2.4.9]
255-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
255+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
256256
│ ├── requests [required: Any, installed: 2.25.1]
257257
│ └── typing-extensions [required: Any, installed: 4.8.0]
258258
├── healpy [required: Any, installed: 1.15.0]
@@ -263,17 +263,17 @@ skymap-scanner
263263
│ ├── meander [required: Any, installed: 0.0.3]
264264
│ ├── numpy [required: Any, installed: 1.21.5]
265265
│ ├── pandas [required: Any, installed: 1.3.5]
266-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
266+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
267267
│ ├── requests [required: Any, installed: 2.25.1]
268268
│ └── typing-extensions [required: Any, installed: 4.8.0]
269269
├── iminuit [required: Any, installed: 2.24.0]
270270
│ └── numpy [required: >=1.21, installed: 1.21.5]
271271
├── numpy [required: Any, installed: 1.21.5]
272272
├── oms-mqclient [required: Any, installed: 2.4.9]
273-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
273+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
274274
│ ├── requests [required: Any, installed: 2.25.1]
275275
│ └── typing-extensions [required: Any, installed: 4.8.0]
276-
├── wipac-dev-tools [required: Any, installed: 1.8.1]
276+
├── wipac-dev-tools [required: Any, installed: 1.8.2]
277277
│ ├── requests [required: Any, installed: 2.25.1]
278278
│ └── typing-extensions [required: Any, installed: 4.8.0]
279279
└── wipac-rest-tools [required: Any, installed: 1.6.0]
@@ -287,7 +287,7 @@ skymap-scanner
287287
│ └── requests [required: >=1.2.0, installed: 2.25.1]
288288
├── tornado [required: Any, installed: 6.4]
289289
├── urllib3 [required: >=2.0.4, installed: 2.1.0]
290-
└── wipac-dev-tools [required: Any, installed: 1.8.1]
290+
└── wipac-dev-tools [required: Any, installed: 1.8.2]
291291
├── requests [required: Any, installed: 2.25.1]
292292
└── typing-extensions [required: Any, installed: 4.8.0]
293293
sortedcontainers==2.1.0

‎dependencies-from-Dockerfile_pulsar.log‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ decorator==4.4.2
3434
defusedxml==0.7.1
3535
docutils==0.20.1
3636
et-xmlfile==1.0.1
37-
ewms-pilot==0.17.5
37+
ewms-pilot==0.17.6
3838
fonttools==4.29.1
3939
fs==2.4.12
4040
gast==0.5.2
@@ -139,7 +139,7 @@ urllib3==2.1.0
139139
urwid==2.1.2
140140
wcwidth==0.2.5
141141
webencodings==0.5.1
142-
wipac-dev-tools==1.8.1
142+
wipac-dev-tools==1.8.2
143143
wipac-rest-tools==1.6.0
144144
xlwt==1.3.0
145145
zipp==1.0.0
@@ -250,11 +250,11 @@ scipy==1.8.0
250250
setuptools==59.6.0
251251
six==1.16.0
252252
skymap-scanner
253-
├── ewms-pilot [required: Any, installed: 0.17.5]
253+
├── ewms-pilot [required: Any, installed: 0.17.6]
254254
│ ├── htchirp [required: Any, installed: 3.0]
255255
│ ├── htcondor [required: Any, installed: 23.2.0]
256256
│ └── oms-mqclient [required: Any, installed: 2.4.9]
257-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
257+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
258258
│ ├── requests [required: Any, installed: 2.25.1]
259259
│ └── typing-extensions [required: Any, installed: 4.8.0]
260260
├── healpy [required: Any, installed: 1.15.0]
@@ -265,17 +265,17 @@ skymap-scanner
265265
│ ├── meander [required: Any, installed: 0.0.3]
266266
│ ├── numpy [required: Any, installed: 1.21.5]
267267
│ ├── pandas [required: Any, installed: 1.3.5]
268-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
268+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
269269
│ ├── requests [required: Any, installed: 2.25.1]
270270
│ └── typing-extensions [required: Any, installed: 4.8.0]
271271
├── iminuit [required: Any, installed: 2.24.0]
272272
│ └── numpy [required: >=1.21, installed: 1.21.5]
273273
├── numpy [required: Any, installed: 1.21.5]
274274
├── oms-mqclient [required: Any, installed: 2.4.9]
275-
│ └── wipac-dev-tools [required: Any, installed: 1.8.1]
275+
│ └── wipac-dev-tools [required: Any, installed: 1.8.2]
276276
│ ├── requests [required: Any, installed: 2.25.1]
277277
│ └── typing-extensions [required: Any, installed: 4.8.0]
278-
├── wipac-dev-tools [required: Any, installed: 1.8.1]
278+
├── wipac-dev-tools [required: Any, installed: 1.8.2]
279279
│ ├── requests [required: Any, installed: 2.25.1]
280280
│ └── typing-extensions [required: Any, installed: 4.8.0]
281281
└── wipac-rest-tools [required: Any, installed: 1.6.0]
@@ -289,7 +289,7 @@ skymap-scanner
289289
│ └── requests [required: >=1.2.0, installed: 2.25.1]
290290
├── tornado [required: Any, installed: 6.4]
291291
├── urllib3 [required: >=2.0.4, installed: 2.1.0]
292-
└── wipac-dev-tools [required: Any, installed: 1.8.1]
292+
└── wipac-dev-tools [required: Any, installed: 1.8.2]
293293
├── requests [required: Any, installed: 2.25.1]
294294
└── typing-extensions [required: Any, installed: 4.8.0]
295295
sortedcontainers==2.1.0

‎resources/utils/save_scan_result.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def main():
2727
parser.add_argument("-o", "--output_path", help="Output path", required=False)
2828
parser.add_argument(
2929
"--reco-algo",
30-
choices=[en.name.lower() for en in cfg.RecoAlgo],
3130
help="The reconstruction algorithm to use",
3231
)
3332
args = parser.parse_args()

‎skymap_scanner/client/client.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,7 @@ def main() -> None:
4949
)
5050

5151
args = parser.parse_args()
52-
logging_tools.set_level(
53-
cfg.ENV.SKYSCAN_LOG, # type: ignore[arg-type]
54-
first_party_loggers=["skyscan", ewms_pilot.pilot.LOGGER],
55-
third_party_level=cfg.ENV.SKYSCAN_LOG_THIRD_PARTY, # type: ignore[arg-type]
56-
use_coloredlogs=True,
57-
future_third_parties=["google", "pika"], # at most only one will be used
58-
)
52+
cfg.configure_loggers()
5953
logging_tools.log_argparse_args(args, logger=LOGGER, level="WARNING")
6054

6155
# read startup.json

‎skymap_scanner/client/reco_icetray.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
from pathlib import Path
1212
from typing import Any, List, Union
1313

14-
from icecube.icetray import I3Tray # type: ignore[import]
15-
from icecube import ( # type: ignore[import] # noqa: F401
14+
from icecube import ( # type: ignore[import-not-found] # noqa: F401
1615
dataio,
1716
frame_object_diff,
1817
full_event_followup,
1918
icetray,
2019
photonics_service,
2120
)
22-
from icecube.frame_object_diff.segments import uncompress # type: ignore[import]
21+
from icecube.frame_object_diff.segments import ( # type: ignore[import-not-found]
22+
uncompress,
23+
)
24+
from icecube.icetray import I3Tray # type: ignore[import-not-found]
2325
from wipac_dev_tools import argparse_tools, logging_tools
2426

2527
from .. import config as cfg
@@ -266,12 +268,7 @@ def main() -> None:
266268
)
267269

268270
args = parser.parse_args()
269-
logging_tools.set_level(
270-
cfg.ENV.SKYSCAN_LOG, # type: ignore[arg-type]
271-
first_party_loggers="skyscan",
272-
third_party_level=cfg.ENV.SKYSCAN_LOG_THIRD_PARTY, # type: ignore[arg-type]
273-
use_coloredlogs=True,
274-
)
271+
cfg.configure_loggers()
275272
logging_tools.log_argparse_args(args, logger=LOGGER, level="WARNING")
276273

277274
# get PFrame

‎skymap_scanner/config.py‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
"""Configuration constants."""
22

33
import dataclasses as dc
4-
import enum
54
from pathlib import Path
65
from typing import Final, List
76

8-
from wipac_dev_tools import from_environment_as_dataclass
7+
import ewms_pilot
8+
import mqclient
9+
from wipac_dev_tools import from_environment_as_dataclass, logging_tools
910

1011
# pylint:disable=invalid-name
1112

@@ -74,14 +75,6 @@
7475
COLLECTOR_BASE_THRESHOLDS = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0]
7576

7677

77-
class RecoAlgo(enum.Enum):
78-
"""The supported reconstruction algorithms."""
79-
80-
MILLIPEDE_ORIGINAL = enum.auto()
81-
MILLIPEDE_WILKS = enum.auto()
82-
DUMMY = enum.auto()
83-
84-
8578
#
8679
# Env var constants: set as constants & typecast
8780
#
@@ -130,6 +123,8 @@ class EnvConfig:
130123
# LOGGING VARS
131124
SKYSCAN_LOG: str = "INFO"
132125
SKYSCAN_LOG_THIRD_PARTY: str = "WARNING"
126+
SKYSCAN_EWMS_PILOT_LOG: str = "INFO"
127+
SKYSCAN_MQ_CLIENT_LOG: str = "INFO"
133128

134129
# TESTING/DEBUG VARS
135130
SKYSCAN_MINI_TEST: bool = False # run minimal variations for testing (mini-scale)
@@ -148,3 +143,18 @@ def __post_init__(self) -> None:
148143

149144

150145
ENV = from_environment_as_dataclass(EnvConfig)
146+
147+
148+
def configure_loggers() -> None:
149+
"""Set up loggers with common configurations."""
150+
logging_tools.set_level(
151+
ENV.SKYSCAN_LOG, # type: ignore[arg-type]
152+
first_party_loggers="skyscan",
153+
third_party_level=ENV.SKYSCAN_LOG_THIRD_PARTY, # type: ignore[arg-type]
154+
use_coloredlogs=True,
155+
future_third_parties=["google", "pika"],
156+
specialty_loggers={
157+
ewms_pilot.pilot.LOGGER: ENV.SKYSCAN_EWMS_PILOT_LOG, # type: ignore[attr-defined, dict-item]
158+
mqclient.queue.LOGGER: ENV.SKYSCAN_MQ_CLIENT_LOG, # type: ignore[dict-item]
159+
},
160+
)

‎skymap_scanner/recos/splinempe.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def extract_seed(frame):
264264
def get_vertex_variations(self):
265265
return VertexGenerator.cylinder()
266266

267-
def setup_reco(self):
267+
def setup_reco(self) -> None:
268268
datastager = self.get_datastager()
269269

270270
datastager.stage_files(self.SPLINE_REQUIREMENTS)

‎skymap_scanner/server/start_scan.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
from pathlib import Path
1414
from typing import Any, Dict, Iterator, List, Optional, Set, Tuple
1515

16-
import healpy # type: ignore[import]
16+
import healpy # type: ignore[import-untyped]
1717
import mqclient as mq
1818
import numpy
19-
from icecube import ( # type: ignore[import]
19+
from icecube import ( # type: ignore[import-not-found]
2020
astro,
2121
dataclasses,
2222
full_event_followup,
@@ -666,13 +666,7 @@ def _nside_and_pixelextension(val: str) -> Tuple[int, int]:
666666
)
667667

668668
args = parser.parse_args()
669-
logging_tools.set_level(
670-
cfg.ENV.SKYSCAN_LOG, # type: ignore[arg-type]
671-
first_party_loggers="skyscan",
672-
third_party_level=cfg.ENV.SKYSCAN_LOG_THIRD_PARTY, # type: ignore[arg-type]
673-
use_coloredlogs=True,
674-
future_third_parties=["google", "pika"], # at most only one will be used
675-
)
669+
cfg.configure_loggers()
676670
logging_tools.log_argparse_args(args, logger=LOGGER, level="WARNING")
677671

678672
# nsides

0 commit comments

Comments
 (0)