fix: use host port as api port (#330)

#### Description of changes
- change `engine.serve` to use host port as api pot for unicorn
- change `sdk.docker_client` and `sdk.cli` to not use host/api port
- adapt multi-helloworld test and example

#### Testing done
- Tested serving locally

---------

Co-authored-by: Dion Häfner <dion.haefner@simulation.science>
Co-authored-by: Alessandro Angioi <alessandro.angioi@simulation.science>

Author: 3 people

…lti-tesseract/multi_helloworld/README.md …lti-tesseract/multi-helloworld/README.mdexamples/_multi-tesseract/multi_helloworld/README.md renamed to examples/_multi-tesseract/multi-helloworld/README.md examples/_multi-tesseract/multi_helloworld/README.md renamed to examples/_multi-tesseract/multi-helloworld/README.md

@@ -22,7 +22,7 @@ $ docker network create my_network
 This example can be executed using the Tesseract Python API or CLI. To run the example using the Python API, simply execute the Python script:
 
 ```bash
-$ cd ./examples/_multi-tesseract/multi_helloworld/
+$ cd ./examples/_multi-tesseract/multi-helloworld/
 $ python run_example.py
 ```
 

…esseract/multi_helloworld/run_example.py …esseract/multi-helloworld/run_example.pyexamples/_multi-tesseract/multi_helloworld/run_example.py renamed to examples/_multi-tesseract/multi-helloworld/run_example.py examples/_multi-tesseract/multi_helloworld/run_example.py renamed to examples/_multi-tesseract/multi-helloworld/run_example.py

@@ -6,6 +6,9 @@
     with Tesseract.from_image(
         "helloworld:latest", network="my_network", network_alias="helloworld"
     ) as helloworld_tess:
-        payload = {"name": "YOU", "helloworld_tesseract_url": "http://helloworld:8000"}
+        payload = {
+            "name": "YOU",
+            "helloworld_tesseract_url": f"http://helloworld:{helloworld_tess._serve_context['port']}",
+        }
         result = multi_helloworld_tess.apply(inputs=payload)
         print(result["greeting"])

…seract/multi_helloworld/tesseract_api.py …seract/multi-helloworld/tesseract_api.pyexamples/_multi-tesseract/multi_helloworld/tesseract_api.py renamed to examples/_multi-tesseract/multi-helloworld/tesseract_api.py examples/_multi-tesseract/multi_helloworld/tesseract_api.py renamed to examples/_multi-tesseract/multi-helloworld/tesseract_api.py

@@ -699,12 +699,13 @@ def _get_tesseract_env_vals(
 def _get_tesseract_network_meta(container: Container) -> dict:
     """Retrieve network addresses from container."""
     network_meta = {}
-    networks = container.attrs["NetworkSettings"].get("Networks", {})
-    for network_name, network_info in networks.items():
-        network_meta[network_name] = {
-            "ip": f"{network_info['IPAddress']}",
-            "port": 8000,
-        }
+    docker_network_ips = container.docker_network_ips
+    if docker_network_ips:
+        for network_name, ip in docker_network_ips.items():
+            network_meta[network_name] = {
+                "ip": ip,
+                "port": container.api_port,
+            }
     return network_meta
 
 

…t/multi_helloworld/tesseract_config.yaml …t/multi-helloworld/tesseract_config.yamlexamples/_multi-tesseract/multi_helloworld/tesseract_config.yaml renamed to examples/_multi-tesseract/multi-helloworld/tesseract_config.yaml examples/_multi-tesseract/multi_helloworld/tesseract_config.yaml renamed to examples/_multi-tesseract/multi-helloworld/tesseract_config.yaml

@@ -328,11 +328,28 @@ def host_port(self) -> str | None:
         if self.attrs.get("NetworkSettings", None):
             ports = self.attrs["NetworkSettings"].get("Ports", None)
             if ports:
-                api_port_key = "8000/tcp"
+                api_port_key = f"{self.api_port}/tcp"
                 if ports[api_port_key]:
                     return ports[api_port_key][0].get("HostPort")
         return None
 
+    @property
+    def api_port(self) -> str | None:
+        """Gets the api port of the container."""
+        return self.attrs["Config"]["Cmd"][2]
+
+    @property
+    def docker_network_ips(self) -> dict | None:
+        """Gets the host port of the container."""
+        if self.attrs.get("NetworkSettings", None):
+            networks = self.attrs["NetworkSettings"].get("Networks", None)
+            if networks:
+                network_ips = {}
+                for network_name, network_info in networks.items():
+                    network_ips[network_name] = f"{network_info['IPAddress']}"
+                return network_ips
+        return None
+
     @property
     def host_debugpy_port(self) -> str | None:
         """Gets the host port which maps to debugpy server in the container."""
@@ -350,7 +367,7 @@ def host_ip(self) -> str | None:
         if self.attrs.get("NetworkSettings", None):
             ports = self.attrs["NetworkSettings"].get("Ports", None)
             if ports:
-                api_port_key = "8000/tcp"
+                api_port_key = f"{self.api_port}/tcp"
                 if ports[api_port_key]:
                     return ports[api_port_key][0].get("HostIp")
         return None

…ti_helloworld/tesseract_requirements.txt …ti-helloworld/tesseract_requirements.txtexamples/_multi-tesseract/multi_helloworld/tesseract_requirements.txt renamed to examples/_multi-tesseract/multi-helloworld/tesseract_requirements.txt examples/_multi-tesseract/multi_helloworld/tesseract_requirements.txt renamed to examples/_multi-tesseract/multi-helloworld/tesseract_requirements.txt

@@ -564,12 +564,6 @@ def serve(
     if output_format:
         environment["TESSERACT_OUTPUT_FORMAT"] = output_format
 
-    args = []
-    container_api_port = "8000"
-    container_debugpy_port = "5678"
-
-    args.extend(["--port", container_api_port])
-
     if not port:
         port = str(get_free_port())
     else:
@@ -578,6 +572,12 @@ def serve(
             port_start, port_end = port.split("-")
             port = str(get_free_port(within_range=(int(port_start), int(port_end))))
 
+    args = []
+    container_api_port = port
+    container_debugpy_port = "5678"
+
+    args.extend(["--port", container_api_port])
+
     if num_workers > 1:
         args.extend(["--num-workers", str(num_workers)])
 

tesseract_core/sdk/cli.py

@@ -107,6 +107,5 @@ ENV TESSERACT_OUTPUT_PATH="/tesseract/output_data"
 RUN _TESSERACT_IS_BUILDING=1 tesseract-runtime check
 {% endif %}
 
-EXPOSE 8000
 ENTRYPOINT ["tesseract-runtime"]
 CMD ["--help"]

tesseract_core/sdk/docker_client.py

@@ -665,7 +665,7 @@ def serve_tesseract(alias: str):
         [
             "python",
             "-c",
-            'import requests; requests.get("http://tess_2:8000/health").raise_for_status()',
+            f'import requests; requests.get("http://tess_2:{tess_2.api_port}/health").raise_for_status()',
         ]
     )
     assert returncode == 0, stdout.decode()
@@ -674,7 +674,7 @@ def serve_tesseract(alias: str):
         [
             "python",
             "-c",
-            'import requests; requests.get("http://tess_1:8000/health").raise_for_status()',
+            f'import requests; requests.get("http://tess_1:{tess_1.api_port}/health").raise_for_status()',
         ]
     )
     assert returncode == 0, stdout.decode()
@@ -1079,12 +1079,12 @@ def test_multi_helloworld_endtoend(
     dummy_network_name,
     docker_cleanup,
 ):
-    """Test that multi_helloworld example can be built, served, and executed."""
+    """Test that multi-helloworld example can be built, served, and executed."""
     cli_runner = CliRunner(mix_stderr=False)
 
     # Build Tesseract images
     img_names = []
-    for tess_name in ("_multi-tesseract/multi_helloworld", "helloworld"):
+    for tess_name in ("_multi-tesseract/multi-helloworld", "helloworld"):
         img_name = build_tesseract(
             docker_client,
             unit_tesseracts_parent_dir / tess_name,
@@ -1123,17 +1123,19 @@ def test_multi_helloworld_endtoend(
     )
     assert result.exit_code == 0, result.output
     docker_cleanup["containers"].append(json.loads(result.output)["container_name"])
-
+    api_port = json.loads(result.output)["containers"][0]["networks"][
+        dummy_network_name
+    ]["port"]
     payload = json.dumps(
         {
             "inputs": {
                 "name": "you",
-                "helloworld_tesseract_url": "http://helloworld:8000",
+                "helloworld_tesseract_url": f"http://helloworld:{api_port}",
             }
         }
     )
 
-    # Run multi_helloworld Tesseract
+    # Run multi-helloworld Tesseract
     result = cli_runner.invoke(
         app,
         [