update to work with new fair client

text_to_image.py

@@ -13,8 +13,8 @@ from fair import FairClient
 logger = logging.getLogger()
 
 SERVER_ADDRESS = "https://faircompute.com:8000"
-INFERENCE_NODE = "119eccba-2388-43c1-bdb9-02133049604c"
-TUNNEL_NODE = "c312e6c4788b00c73c287ab0445d3655"
+INFERENCE_NODE = "magnus"
+TUNNEL_NODE = "gcs-e2-micro"
 # SERVER_ADDRESS = "http://localhost:8000"
 # INFERENCE_NODE = "ef09913249aa40ecba7d0097f7622855"
 # TUNNEL_NODE = "c312e6c4788b00c73c287ab0445d3655"
@@ -68,7 +68,8 @@ def create_fair_client():
 
 
 def create_endpoint_client(fc, retries, timeout=1.0, delay=2.0):
-    server_address = next(info['host_address'] for info in fc.get_nodes() if info['node_id'] == TUNNEL_NODE)
+    nodes = fc.cluster().nodes.list()
+    server_address = next(info['host_address'] for info in nodes if info['name'] == TUNNEL_NODE)
     for i in range(retries):
         try:
             return EndpointClient(server_address, timeout=timeout)
@@ -94,14 +95,15 @@ bind_addr = "0.0.0.0:5000"  # port that exposes service to the Internet
 """
     with open('server.toml', 'w') as file:
         file.write(server_config)
-    fc.run(node=TUNNEL_NODE,
+    fc.run(node_name=TUNNEL_NODE,
            image=TUNNEL_DOCKER_IMAGE,
            command=["--server", "/app/config.toml"],
            volumes=[("./server.toml", "/app/config.toml")],
            network="host",
            detach=True)
 
-    server_address = next(info['host_address'] for info in fc.get_nodes() if info['node_id'] == TUNNEL_NODE)
+    nodes = fc.cluster().nodes.list()
+    server_address = next(info['host_address'] for info in nodes if info['name'] == TUNNEL_NODE)
     client_config = f"""
 [client]
 remote_addr = "{server_address}:2333"       # address of the rathole server
@@ -112,7 +114,7 @@ local_addr = "127.0.0.1:5001"               # address of the service that needs
 """
     with open('client.toml', 'w') as file:
         file.write(client_config)
-    fc.run(node=INFERENCE_NODE,
+    fc.run(node_name=INFERENCE_NODE,
            image=TUNNEL_DOCKER_IMAGE,
            command=["--client", "/app/config.toml"],
            volumes=[("./client.toml", "/app/config.toml")],
@@ -121,7 +123,7 @@ local_addr = "127.0.0.1:5001"               # address of the service that needs
 
 
 def start_inference_server(fc: FairClient):
-    fc.run(node=INFERENCE_NODE,
+    fc.run(node_name=INFERENCE_NODE,
            image=INFERENCE_DOCKER_IMAGE,
            runtime="nvidia",
            ports=[(5001, 8000)],
@@ -141,7 +143,7 @@ def text_to_image(text):
         # client is not configured, try connecting to the inference server, maybe it is running
         else:
             endpoint_client = create_endpoint_client(fair_client, 1)
-    except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError, requests.exceptions.Timeout):
+    except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError, requests.exceptions.Timeout, ServerNotReadyException):
         # inference server is not ready, start inference server and open the tunnel
         start_inference_server(fair_client)
         start_tunnel(fair_client)