Merge branch 'main' into control-worker-timeout

Author: langdal

CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## [v3.5.4](https://github.com/BoostV/process-optimizer-api/tree/HEAD)
+## [v3.6.0](https://github.com/BoostV/process-optimizer-api/tree/v3.6.0) (2024-11-18)
+
+[Full Changelog](https://github.com/BoostV/process-optimizer-api/compare/v3.5.5...v3.6.0)
+
+**Merged pull requests:**
+
+- Update to ProcessOptimizer 1.0.2 [\#86](https://github.com/BoostV/process-optimizer-api/pull/86) ([langdal](https://github.com/langdal))
+
+## [v3.5.5](https://github.com/BoostV/process-optimizer-api/tree/v3.5.5) (2024-11-08)
+
+[Full Changelog](https://github.com/BoostV/process-optimizer-api/compare/v3.5.4...v3.5.5)
+
+**Merged pull requests:**
+
+- Update to ProcessOptimizer 1.0.0 [\#85](https://github.com/BoostV/process-optimizer-api/pull/85) ([langdal](https://github.com/langdal))
+
+## [v3.5.4](https://github.com/BoostV/process-optimizer-api/tree/v3.5.4) (2024-05-08)
 
 [Full Changelog](https://github.com/BoostV/process-optimizer-api/compare/v3.5.3...v3.5.4)
 

optimizerapi/optimizer.py

@@ -4,6 +4,7 @@
 The handler functions are mapped to the OpenAPI specification through the "operationId" field
 in the specification.yml file found in the folder "openapi" in the root of this project.
 """
+
 import os
 import platform
 import time
@@ -21,14 +22,18 @@
 from rq.command import send_stop_job_command
 from redis import Redis
 from ProcessOptimizer import Optimizer, expected_minimum
-from ProcessOptimizer.plots import plot_objective, plot_convergence, plot_Pareto
+from ProcessOptimizer.plots import (
+    plot_objective,
+    plot_convergence,
+    plot_Pareto,
+    plot_brownie_bee_frontend,
+)
 from ProcessOptimizer.space import Real
 from ProcessOptimizer.space.constraints import SumEquals
 import matplotlib.pyplot as plt
 import numpy
 import connexion
 
-from optimizerapi.plot_patch import plot_brownie_bee
 from .securepickle import pickleToString, get_crypto
 
 numpy.random.seed(42)
@@ -82,7 +87,7 @@ def disconnect_check():
         except NoSuchJobError:
             print("Creating new job")
             job = queue.enqueue(do_run_work, body, job_id=job_id, result_ttl=TTL, timeout=WORKER_TIMEOUT)
-        while job.return_value is None:
+        while job.return_value() is None:
             if disconnect_check():
                 try:
                     print(f"Client disconnected, cancelling job {job.id}")
@@ -93,7 +98,7 @@ def disconnect_check():
                     pass
                 return {}
             time.sleep(0.2)
-        return job.return_value
+        return job.return_value()
     return do_run_work(body)
 
 
@@ -124,11 +129,13 @@ def __handle_run(body) -> dict:
     )
     space = [
         (
-            convert_number_type(x["from"], x["type"]),
-            convert_number_type(x["to"], x["type"]),
+            (
+                convert_number_type(x["from"], x["type"]),
+                convert_number_type(x["to"], x["type"]),
+            )
+            if (x["type"] == "discrete" or x["type"] == "continuous")
+            else tuple(x["categories"])
         )
-        if (x["type"] == "discrete" or x["type"] == "continuous")
-        else tuple(x["categories"])
         for x in cfg["space"]
     ]
     dimensions = [x["name"] for x in cfg["space"]]
@@ -248,9 +255,10 @@ def process_result(result, optimizer, dimensions, cfg, extras, data, space):
     if "experimentSuggestionCount" in extras:
         experiment_suggestion_count = extras["experimentSuggestionCount"]
 
-
     if "constraints" in cfg and len(cfg["constraints"]) > 0:
-        next_exp = optimizer.ask(n_points=experiment_suggestion_count, strategy="cl_min")
+        next_exp = optimizer.ask(
+            n_points=experiment_suggestion_count, strategy="cl_min"
+        )
     else:
         next_exp = optimizer.ask(n_points=experiment_suggestion_count)
     if len(next_exp) > 0 and not any(isinstance(x, list) for x in next_exp):
@@ -264,7 +272,7 @@ def process_result(result, optimizer, dimensions, cfg, extras, data, space):
         if graph_format == "png":
             for idx, model in enumerate(result):
                 if "single" in graphs_to_return:
-                    bb_plots = plot_brownie_bee(model, max_quality=max_quality)
+                    bb_plots = plot_brownie_bee_frontend(model, max_quality=max_quality)
                     for i, plot in enumerate(bb_plots):
                         pic_io_bytes = io.BytesIO()
                         plot.savefig(pic_io_bytes, format="png")

optimizerapi/plot_patch.py

@@ -2,7 +2,7 @@
 Worker that will run all tasks published to redis using RQ
 """
 import os
-from rq import Connection, Queue, Worker
+from rq import Queue, Worker
 from redis import Redis
 
 
@@ -12,6 +12,6 @@
     REDIS_URL = "redis://localhost:6379"
 
 if __name__ == "__main__":
-    with Connection(Redis.from_url(REDIS_URL)):
-        queue = Queue()
-        Worker(queue).work()
+    redis = Redis.from_url(REDIS_URL)
+    queue = Queue(connection=redis)
+    Worker(queue).work()

optimizerapi/worker.py

@@ -1,3 +1,3 @@
 -r requirements.txt
-pytest==6.2.2
+pytest==8.3.3
 pytest-watch==4.2.0