Skip to content

Commit b0860c4

Browse files
committed
#None : v0.4.11 patch
1 parent 8416236 commit b0860c4

File tree

10 files changed

+22
-25
lines changed

10 files changed

+22
-25
lines changed

aware/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = ("0", "4", "10")
1+
__version__ = ("0", "4", "11")
22
__strversion__ = "{}.{}.{}".format(__version__)

aware/alert/crossmatch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def crossmatch_alerts_by_name(origin: str, event: str) -> list[dict]:
153153

154154
matched_alerts: list[Alert] = []
155155
with dbconnect() as session:
156-
alerts = session.query(Alert)
156+
alerts = session.query(Alert).yield_per(100)
157157
for alert in alerts:
158158
log.debug("\nMatching with:")
159159
log.debug("Event %s %s", alert.origin, alert.event)

aware/alert/plugins/gbm.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def parse_fermi_alert(
5050
error = float(pos2d.Error2Radius)
5151

5252
# Position uncertainty (radius): stat + sys (APPROXIMATE!)
53-
error_radius = (error ** 2 + fermi_gbm_sys_error.value**2) ** 0.5
53+
error_radius = (error**2 + fermi_gbm_sys_error.value**2) ** 0.5
5454

5555
# Trigger time
5656
isot = Time(astro_coords.Time.TimeInstant.ISOTime.text, format="isot").datetime
@@ -109,10 +109,7 @@ def parse_alert(
109109
"Trig_Dur": voevent.get_parameter_value("Trig_Dur", type_=float),
110110
}
111111

112-
descr = f"""
113-
{GBMAlertAlertParser.instrument} has registered candidate transient event.
114-
Wait for upcoming messages, which could reveal the nature of the event.
115-
"""
112+
descr = ""
116113
if lc_url:
117114
descr += f"Light Curve URL: {lc_url}\n"
118115

aware/alert/plugins/icecube.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
icecube.py (c) 2023
44
Desc: parsers of the alert messages by IceCube
55
Created: 2023-07-10
6-
Modified: !date!
6+
Modified: 2024-04-04
77
"""
88
from __future__ import annotations
99

@@ -20,6 +20,7 @@
2020
from ...voevent import VOEvent
2121
from ..parser import AlertParser
2222
from ..target_info import TargetInfo
23+
from aware.util import render_number_as_rich_utf8
2324

2425

2526
__all__ = ["ICECUBE_ASTROTRACK_BRONZE_Parser"]
@@ -108,17 +109,19 @@ def parse_icecube_astrotrack_voevent(
108109
else:
109110
sky_map = CircularSkyMap(ra_center=ra, dec_center=dec, radius=error_radius)
110111

111-
descr = sky_map.describe() if sky_map is not None else ""
112+
descr = ""
112113
if retraction:
113114
descr += "\nEVENT IS NOT A GRB"
114115
else:
115116
if FAR is not None:
116-
descr += f"\nFAR: {FAR:.2g} yr-1"
117+
far_str = render_number_as_rich_utf8(FAR, 3)
118+
descr += f"\nFAR: {far_str} yr\u207B\u2070"
117119

118120
if P_astro is not None:
119-
descr += f"\nP_Astro: {P_astro:.2g}"
121+
descr += f"\nP_Astro: {P_astro:.2f}"
120122

121123
if E_Nu is not None:
124+
e_nu_str = render_number_as_rich_utf8(E_Nu, 3)
122125
descr += f"\nE_Nu: {E_Nu:.2g} TeV"
123126

124127
info = TargetInfo(

aware/alert/plugins/integral.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
integral.py (c) 2023
44
Desc: parsers of the alert messages by INTEGRAL spacecraft
55
Created: 2023-07-10
6-
Modified: !date!
6+
Modified: 2024-04-04
77
"""
88
from __future__ import annotations
99

@@ -102,11 +102,7 @@ def parse_integral_voevent(
102102
else:
103103
sky_map = CircularSkyMap(ra_center=ra, dec_center=dec, radius=error_radius)
104104

105-
descr = (
106-
sky_map.describe()
107-
if sky_map is not None
108-
else ""
109-
)
105+
descr = ""
110106
if retraction:
111107
descr += "\nEVENT IS NOT A GRB"
112108

aware/alert/plugins/lat.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ def parse_fermi_alert(
6565

6666
# Description
6767
descr = ""
68-
if sky_map is not None:
69-
descr += sky_map.describe()
7068

7169
info = TargetInfo(
7270
sky_map,

aware/alert/plugins/maxi.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from ...voevent import VOEvent
1414
from ..parser import AlertParser
1515
from ..target_info import TargetInfo
16+
from aware.util import render_number_as_rich_utf8
1617

1718

1819
__all__ = ["MAXIKnownAlertParser"]
@@ -71,15 +72,14 @@ def parse_maxi_alert(
7172

7273
# Description
7374
descr = ""
74-
if sky_map is not None:
75-
descr += sky_map.describe()
76-
7775
if name := meta["Source_Name"]:
7876
descr += f"\nName: {name}\n"
7977

8078
if flux := meta["Source_Flux"]:
8179
flux_erg = flux * 2.4e-11
82-
descr += f"Flux: {flux:.3g} mCrab ({flux_erg:.3g} erg cm-2 s-1)"
80+
flux_str = render_number_as_rich_utf8(flux, precision=3)
81+
flux_erg_str = render_number_as_rich_utf8(flux_erg, precision=3)
82+
descr += f"Flux: {flux_str} mCrab ({flux_erg_str} erg cm\u207B\u00B2 s\u207B\u00B9)"
8383

8484
info = TargetInfo(
8585
sky_map,

aware/telegram/callbacks/startup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ def alert_message_to_rich_text(alert_message: AlertMessage):
4747
markdown.escape_md(f" Trigger ID or event name: {info.event}\n"),
4848
":date:",
4949
markdown.escape_md(f" Trigger date and time: {date} {time} UT\n"),
50+
":1st_place_medal:",
51+
markdown.escape_md(f" First mention: {alert_message.first_mention}\n"),
5052
"\n:point_down:" if locdescr else "",
5153
markdown.escape_md(f" Localization parameters below:") if locdescr else "",
5254
":point_down:\n\n" if locdescr else "",
@@ -170,6 +172,7 @@ async def inner():
170172
):
171173
msg = alert_message_to_rich_text(data)
172174
await asyncio.sleep(2)
175+
print(f"{msg!r}")
173176
await bot.send_message(
174177
sub["chat_id"],
175178
msg,

aware/telegram/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def select_subscribers():
134134
# else:
135135
sub_kwargs = []
136136
with dbconnect() as conn:
137-
subscribers = conn.query(Subscriber).all()
137+
subscribers = conn.query(Subscriber).yield_per(100)
138138
for i, sub in enumerate(subscribers):
139139
sub_kwargs.append(
140140
{

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "AWARE"
7-
version = "0.4.10"
7+
version = "0.4.11"
88
authors = [{name="Nicolai Pankov", email="colinsergesen@gmail.com"}]
99
requires-python = ">=3.9,<3.12"
1010
dependencies = [

0 commit comments

Comments
 (0)