aboutsummaryrefslogtreecommitdiff
path: root/jb/flow
diff options
context:
space:
mode:
authorMax Nanis2026-09-09 20:32:17 -0700
committerMax Nanis2026-09-09 20:32:17 -0700
commit832aecaddce80e312095ecdb572d7756eb9df5e9 (patch)
tree3f9b27bf285ef0648e22a1480ab213255d2cfee6 /jb/flow
parente7e5b5f8bf81e78e417ecdb9dd6ab1616e722fa0 (diff)
downloadamt-jb-832aecaddce80e312095ecdb572d7756eb9df5e9.tar.gz
amt-jb-832aecaddce80e312095ecdb572d7756eb9df5e9.zip
Ruff auto fix, and requirements bump
Diffstat (limited to 'jb/flow')
-rw-r--r--jb/flow/maintenance.py4
-rw-r--r--jb/flow/monitoring.py23
-rw-r--r--jb/flow/setup_tasks.py5
-rw-r--r--jb/flow/tasks.py6
4 files changed, 10 insertions, 28 deletions
diff --git a/jb/flow/maintenance.py b/jb/flow/maintenance.py
index f8ca971..4a2fe81 100644
--- a/jb/flow/maintenance.py
+++ b/jb/flow/maintenance.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
from jb.decorators import HM
from jb.flow.monitoring import emit_hit_event
from jb.managers.amt import AMTManager
@@ -10,7 +8,7 @@ def check_hit_status(
amtm: AMTManager,
amt_hit_id: str,
amt_hit_type_id: str,
- reason: Optional[str] = None,
+ reason: str | None = None,
) -> HitStatus:
"""
(this used to be called "process_hit")
diff --git a/jb/flow/monitoring.py b/jb/flow/monitoring.py
index 334eab3..22e9e93 100644
--- a/jb/flow/monitoring.py
+++ b/jb/flow/monitoring.py
@@ -1,12 +1,11 @@
import socket
-from typing import Optional
+from generalresearch.currency import USDCent
from mypy_boto3_mturk.literals import EventTypeType
from jb.config import settings
from jb.decorators import influx_client
-from generalresearch.currency import USDCent
-from jb.models.definitions import HitStatus, AssignmentStatus
+from jb.models.definitions import AssignmentStatus, HitStatus
def write_hit_gauge(status: HitStatus, amt_hit_type_id: str, cnt: int) -> None:
@@ -26,8 +25,6 @@ def write_hit_gauge(status: HitStatus, amt_hit_type_id: str, cnt: int) -> None:
if influx_client:
influx_client.write_points(points=[point])
- return None
-
def write_assignment_gauge(
status: AssignmentStatus, amt_hit_type_id: str, cnt: int
@@ -47,11 +44,9 @@ def write_assignment_gauge(
if influx_client:
influx_client.write_points(points=[point])
- return None
-
def emit_hit_event(
- status: HitStatus, amt_hit_type_id: str, reason: Optional[str] = None
+ status: HitStatus, amt_hit_type_id: str, reason: str | None = None
) -> None:
"""
e.g. a HIT was created, Reviewable, etc. We don't have a "created"
@@ -77,11 +72,9 @@ def emit_hit_event(
if influx_client:
influx_client.write_points([point])
- return None
-
def emit_assignment_event(
- status: AssignmentStatus, amt_hit_type_id: str, reason: Optional[str] = None
+ status: AssignmentStatus, amt_hit_type_id: str, reason: str | None = None
) -> None:
"""
e.g. an Assignment was accepted/approved/reject
@@ -106,8 +99,6 @@ def emit_assignment_event(
if influx_client:
influx_client.write_points([point])
- return None
-
def emit_mturk_notification_event(
event_type: EventTypeType, amt_hit_type_id: str
@@ -133,8 +124,6 @@ def emit_mturk_notification_event(
if influx_client:
influx_client.write_points([point])
- return None
-
def emit_error_event(event_type: str, amt_hit_type_id: str) -> None:
"""
@@ -157,8 +146,6 @@ def emit_error_event(event_type: str, amt_hit_type_id: str) -> None:
if influx_client:
influx_client.write_points([point])
- return None
-
def emit_bonus_event(amount: USDCent, amt_hit_type_id: str) -> None:
"""
@@ -179,5 +166,3 @@ def emit_bonus_event(amount: USDCent, amt_hit_type_id: str) -> None:
if influx_client:
influx_client.write_points([point])
-
- return None
diff --git a/jb/flow/setup_tasks.py b/jb/flow/setup_tasks.py
index 4664374..f5cda48 100644
--- a/jb/flow/setup_tasks.py
+++ b/jb/flow/setup_tasks.py
@@ -1,6 +1,5 @@
-from jb.config import TOPIC_ARN, SUBSCRIPTION
-from jb.decorators import SNS_CLIENT, AMT_CLIENT
-from jb.config import settings
+from jb.config import SUBSCRIPTION, TOPIC_ARN, settings
+from jb.decorators import AMT_CLIENT, SNS_CLIENT
def initial_setup():
diff --git a/jb/flow/tasks.py b/jb/flow/tasks.py
index 6c5d6bb..24e96d4 100644
--- a/jb/flow/tasks.py
+++ b/jb/flow/tasks.py
@@ -4,11 +4,11 @@ from typing import TypedDict, cast
from generalresearch.config import is_debug
-from jb.decorators import AMTM, HTM, HM, HQM, pg_config
+from jb.decorators import AMTM, HM, HQM, HTM, pg_config
from jb.flow.maintenance import check_hit_status
-from jb.flow.monitoring import write_hit_gauge, emit_hit_event
+from jb.flow.monitoring import emit_hit_event, write_hit_gauge
from jb.models.definitions import HitStatus
-from jb.models.hit import HitType, HitQuestion, Hit
+from jb.models.hit import Hit, HitQuestion, HitType
logging.basicConfig()
logger = logging.getLogger()