add webserver address definition (#62)

Author: FelixKuhnAnsys

configs/config.yaml

@@ -1,5 +1,5 @@
-FLOWKIT_PYTHON_API_KEY: flowkit-python-api-key
-FLOWKIT_PYTHON_ENDPOINT: http://0.0.0.0:50052
+FLOWKIT_PYTHON_API_KEY: "flowkit-python-api-key"
+FLOWKIT_PYTHON_ADDRESS: "0.0.0.0:50052"
 FLOWKIT_PYTHON_WORKERS: 2
 USE_SSL: False
 #SSL_CERT_PUBLIC_KEY_FILE:

src/aali/flowkit/__main__.py

@@ -44,10 +44,19 @@ def parse_cli_args():
     return args
 
 
+def handle_legacy_port_config():
+    """Handle legacy port configuration."""
+    if CONFIG.flowkit_python_address != "":
+        return CONFIG.flowkit_python_address
+    if CONFIG.flowkit_python_endpoint != "":
+        return CONFIG.flowkit_python_endpoint
+
+
 def substitute_empty_values(args):
     """Substitute the empty values with configuration values."""
-    port = args.port or urlparse(CONFIG.flowkit_python_endpoint).port
-    CONFIG.flowkit_python_endpoint = f"http://0.0.0.0:{port}"
+    CONFIG.flowkit_python_address = (
+        f"{args.host}:{args.port}" if args.host is not None and args.port is not None else CONFIG.flowkit_python_address
+    )
     CONFIG.flowkit_python_workers = args.workers or CONFIG.flowkit_python_workers
     CONFIG.use_ssl = (args.use_ssl.lower() == "true") if args.use_ssl is not None else CONFIG.use_ssl
     CONFIG.ssl_cert_private_key_file = args.ssl_keyfile or CONFIG.ssl_cert_private_key_file
@@ -64,12 +73,17 @@ def main():
         # Substitute the empty values with configuration values
         substitute_empty_values(args)
 
-    port = urlparse(CONFIG.flowkit_python_endpoint).port
+    address = handle_legacy_port_config()
+    # Add scheme if missing
+    if not address.startswith(("http://", "https://")):
+        address = "http://" + address
+    host = urlparse(address).hostname
+    port = urlparse(address).port
 
     # Run the service
     uvicorn.run(
         "aali.flowkit.flowkit_service:flowkit_service",
-        host="0.0.0.0",
+        host=host,
         port=port,
         workers=CONFIG.flowkit_python_workers,
         ssl_keyfile=CONFIG.ssl_cert_private_key_file if CONFIG.use_ssl else None,

src/aali/flowkit/config/_config.py

@@ -65,6 +65,7 @@ def __init__(self):
 
         # Define the configuration variables to be parsed from the YAML file
         self.flowkit_python_api_key = str(self._yaml.get("FLOWKIT_PYTHON_API_KEY", ""))
+        self.flowkit_python_address = str(self._yaml.get("FLOWKIT_PYTHON_ADDRESS"))
         self.flowkit_python_endpoint = str(self._yaml.get("FLOWKIT_PYTHON_ENDPOINT", "http://localhost:50052"))
         self.flowkit_python_workers = int(self._yaml.get("FLOWKIT_PYTHON_WORKERS", 4))
         self.use_ssl = bool(self._yaml.get("USE_SSL", False))