set broadcast get timeout to higher

Author: CamDavidsonPilon

CHANGELOG.md

@@ -12,7 +12,7 @@ Some big changes internally
  - adding `/experiments/<exp>` to the end of endpoint `/api/workers/unit1/jobs/settings/job_name/stirring/`
  - removed `/api/workers/jobs/stop/experiments/<exp>`, use `/api/workers/$broadcast/jobs/stop/experiments/<exp>` instead.
  - removed `/api/experiments/<experiment>/jobs/settings/job_name/<job_name>`, use `/workers/$broadcast/jobs/settings/job_name/<job_name>/experiments/<experiment>`
- - external models in .pioreactor/models
+ - New external models in .pioreactor/models
 
 ### 25.7.2
 

core/setup.py

@@ -25,7 +25,7 @@
     "python-dotenv==1.0.1",
     "Werkzeug==3.1.0",
     "packaging==24.1",
-    "pydantic==2.0.0",
+    "pydantic==2.11.7",
     "mcp-utils==1.0.0",
 ]
 

requirements/requirements.txt

@@ -16,5 +16,5 @@ python-dotenv==1.0.1
 Werkzeug==3.1.0
 itsdangerous==2.2.0
 blinker==1.9.0
-pydantic==2.0.0
+pydantic==2.11.7
 mcp-utils==1.0.0

web/pioreactorui/api.py

@@ -69,7 +69,7 @@ def as_json_response(json: str) -> ResponseReturnValue:
     return Response(json, mimetype="application/json")
 
 
-def broadcast_get_across_cluster(endpoint: str, timeout: float = 1.0, return_raw=False) -> Result:
+def broadcast_get_across_cluster(endpoint: str, timeout: float = 5.0, return_raw=False) -> Result:
     assert endpoint.startswith("/unit_api")
     return tasks.multicast_get_across_cluster(
         endpoint=endpoint, workers=get_all_workers(), timeout=timeout, return_raw=return_raw
@@ -1163,7 +1163,7 @@ def uninstall_plugin_across_cluster(pioreactor_unit: str) -> DelayedResponseRetu
 
 @api.route("/units/<pioreactor_unit>/capabilities", methods=["GET"])
 @api.route("/workers/<pioreactor_unit>/capabilities", methods=["GET"])
-def get_capabilities(pioreactor_unit) -> ResponseReturnValue:
+def get_capabilities(pioreactor_unit: str) -> ResponseReturnValue:
     if pioreactor_unit == UNIVERSAL_IDENTIFIER:
         return create_task_response(broadcast_get_across_cluster("/unit_api/capabilities"))
     else:

web/pioreactorui/mcp.py

@@ -208,7 +208,7 @@ def get_unit_capabilties(unit: str, condensed: bool = False) -> list:
     the job name, automation name (if any), and lists of argument and option names.
     """
     caps = get_from_leader(f"/api/units/{unit}/capabilities")
-    return caps if not condensed else {unit: _condense_capabilities(_caps) for unit, _caps in caps.items()}
+    return caps if not condensed else {unit_: _condense_capabilities(caps_) for unit_, caps_ in caps.items()}
 
 
 @mcp.tool()
@@ -266,7 +266,7 @@ def stop_job(experiment: str, job: str | None, unit: str = UNIVERSAL_IDENTIFIER)
     """
     if job is None:
         return post_into_leader(f"/api/workers/{unit}/jobs/stop/experiments/{experiment}")
-    elif job is not None:
+    else:
         return post_into_leader(f"/api/workers/{unit}/jobs/stop/job_name/{job}/experiments/{experiment}")
 
 

web/pioreactorui/tasks.py

@@ -18,6 +18,7 @@
 from pioreactor.logging import create_logger
 from pioreactor.mureq import HTTPErrorStatus
 from pioreactor.mureq import HTTPException
+from pioreactor.mureq import Response
 from pioreactor.pubsub import delete_from
 from pioreactor.pubsub import get_from
 from pioreactor.pubsub import patch_into
@@ -61,16 +62,16 @@
 )
 
 
-def _process_delayed_json_response(worker: str, r: Any) -> tuple[str, Any]:
+def _process_delayed_json_response(worker: str, response: Response) -> tuple[str, Any]:
     """
     Handle delayed HTTP responses (202 with result_url_path) and immediate 200 responses.
     Returns the worker and the appropriate JSON data or result value.
     """
-    data = r.json()
-    if r.status_code == 202 and "result_url_path" in data:
+    data = response.json()
+    if response.status_code == 202 and "result_url_path" in data:
         sleep(0.1)
         return _get_from_worker(worker, data["result_url_path"])
-    if r.status_code == 200:
+    if response.status_code == 200:
         if "task_id" in data:
             return worker, data["result"]
         else:
@@ -462,7 +463,7 @@ def _get_from_worker(
 
     except (HTTPErrorStatus, HTTPException) as e:
         logger.error(
-            f"Could not get from {worker}'s {address=}/{endpoint=}, sent {json=} and returned {e}. Check connection? Check port?"
+            f"Could not get from {worker}'s {address=}, {endpoint=}, sent {json=} and returned {e}. Check connection? Check port?"
         )
         return worker, None
     except DecodeError: