funcnodes-react-flow 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

funcnodes_react_flow/run.py

@@ -1,3 +1,4 @@
+from typing import Optional
 import http.server
 import socketserver
 import webbrowser
@@ -5,6 +6,7 @@ import os
 import time
 import threading
 import asyncio
+import funcnodes as fn
 
 PORT = 8029
 
@@ -25,15 +27,19 @@ class CustomHTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
             self.send_error(405, "Method Not Allowed")
 
     def get_worker_manager(self):
-        import funcnodes as fn
-
         # Implement custom GET handling logic here
-        asyncio.run(fn.worker.worker_manager.assert_worker_manager_running())
+        asyncio.run(
+            fn.worker.worker_manager.assert_worker_manager_running(
+                host=self.server.worker_manager_host,
+                port=self.server.worker_manager_port,
+                ssl=self.server.worker_manager_ssl,
+            )
+        )
         self.send_response(200)
         self.send_header("Content-type", "text/json")
         self.end_headers()
         self.wfile.write(
-            f"ws://{fn.config.CONFIG['worker_manager']['host']}:{fn.config.CONFIG['worker_manager']['port']}".encode(
+            f"w{'s' if self.server.worker_manager_ssl else ''}://{self.server.worker_manager_host}:{self.server.worker_manager_port}".encode(
                 "utf-8"
             )
         )
@@ -54,7 +60,27 @@ class GracefulHTTPServer(socketserver.TCPServer):
     allow_reuse_address = False
     timeout = 5
 
-    def __init__(self, server_address, RequestHandlerClass, bind_and_activate=True):
+    def __init__(
+        self,
+        server_address,
+        RequestHandlerClass,
+        bind_and_activate=True,
+        worker_manager_host: Optional[str] = None,
+        worker_manager_port: Optional[int] = None,
+        worker_manager_ssl: Optional[bool] = None,
+    ):
+        if worker_manager_host is None:
+            worker_manager_host = fn.config.CONFIG["worker_manager"]["host"]
+
+        if worker_manager_port is None:
+            worker_manager_port = fn.config.CONFIG["worker_manager"]["port"]
+
+        if worker_manager_ssl is None:
+            worker_manager_ssl = fn.config.CONFIG["worker_manager"].get("ssl", False)
+
+        self.worker_manager_ssl = worker_manager_ssl
+        self.worker_manager_host = worker_manager_host
+        self.worker_manager_port = worker_manager_port
         super().__init__(server_address, RequestHandlerClass, bind_and_activate)
         self._is_serving = True
 
@@ -71,14 +97,32 @@ def _open_browser(port, delay=1.0):
     webbrowser.open(f"http://localhost:{port}")
 
 
-def run_server(port=PORT, open_browser=True):
+def run_server(
+    port=PORT,
+    open_browser=True,
+    worker_manager_host: Optional[str] = None,
+    worker_manager_port: Optional[int] = None,
+    worker_manager_ssl: Optional[bool] = None,
+):
     import funcnodes as fn
 
-    asyncio.run(fn.worker.worker_manager.assert_worker_manager_running())
+    asyncio.run(
+        fn.worker.worker_manager.assert_worker_manager_running(
+            host=worker_manager_host,
+            port=worker_manager_port,
+            ssl=worker_manager_ssl,
+        )
+    )
     try:
         script_directory = os.path.dirname(os.path.abspath(__file__))
         os.chdir(script_directory)
-        httpd = GracefulHTTPServer(("", port), CustomHTTPRequestHandler)
+        httpd = GracefulHTTPServer(
+            ("", port),
+            CustomHTTPRequestHandler,
+            worker_manager_host=worker_manager_host,
+            worker_manager_port=worker_manager_port,
+            worker_manager_ssl=worker_manager_ssl,
+        )
         print(f"Serving at port {port}")
         if open_browser:
             threading.Thread(target=_open_browser, args=(port,), daemon=True).start()

{funcnodes_react_flow-0.1.5.dist-info → funcnodes_react_flow-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes_react_flow
-Version: 0.1.5
+Version: 0.1.7
 Summary: funcnodes frontend for react flow
 Author: Julian Kimmig
 Author-email: julian.kimmig@linkdlab.de

{funcnodes_react_flow-0.1.5.dist-info → funcnodes_react_flow-0.1.7.dist-info}/RECORD

@@ -18,8 +18,8 @@ funcnodes_react_flow/logo192.png,sha256=XAIrH5_B6T77mW4eEP2emYcTkprrwuokSWKoy27v
 funcnodes_react_flow/logo512.png,sha256=9SEEPsgJusj_-fxvDf11ea2YpUKXOdLhSPT3DNRw9e8,65653
 funcnodes_react_flow/manifest.json,sha256=ULPYw5A68_eNhxuUVXqxT045yhkurKPSz6hjyGcnmhQ,492
 funcnodes_react_flow/robots.txt,sha256=kNJLw79pisHhc3OVAimMzKcq3x9WT6sF9IS4xI0crdI,67
-funcnodes_react_flow/run.py,sha256=8hLzKI0eIRwHMDfhg_uA_raRnA9XukB5-k_Bpdr__0M,2989
-funcnodes_react_flow-0.1.5.dist-info/METADATA,sha256=bjduSbFOI6U6qTrfXTqLmQEdPJHUIAMnFfBLQONu5Nk,433
-funcnodes_react_flow-0.1.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-funcnodes_react_flow-0.1.5.dist-info/entry_points.txt,sha256=FbrfqRLScFuNXaVpoyfz7lPcSjTlRf4G06ZUZhTgJMM,75
-funcnodes_react_flow-0.1.5.dist-info/RECORD,,
+funcnodes_react_flow/run.py,sha256=ZEdM3PhiXkJl1AaHOAacCEHnhhNJO0NdT7diTw0c_5M,4423
+funcnodes_react_flow-0.1.7.dist-info/METADATA,sha256=R7O6Yd5qCI3q1W_K5c3FC8Q9CG49cc0z8GyUMBR45AE,433
+funcnodes_react_flow-0.1.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+funcnodes_react_flow-0.1.7.dist-info/entry_points.txt,sha256=FbrfqRLScFuNXaVpoyfz7lPcSjTlRf4G06ZUZhTgJMM,75
+funcnodes_react_flow-0.1.7.dist-info/RECORD,,