fixup 2

Author: Minkiu

ash/config.py

@@ -2,10 +2,12 @@
 import socket
 import sys
 from typing import Literal
+from urllib.parse import urlparse
+
+from .containers import PODMAN, get_container_client
 
-import docker
 import dotenv
-from nxtools import critical_error, logging
+from nxtools import critical_error, logging, log_traceback
 from pydantic import BaseModel, Field, ValidationError
 
 logging.user = "ash"
@@ -23,21 +25,41 @@ class Config(BaseModel):
 
 
 def get_local_info():
-    client = docker.DockerClient(base_url="unix://var/run/docker.sock")
-    api = docker.APIClient(base_url="unix://var/run/docker.sock")
+    """Infer info from ASH's container.
+
+    We get the "network" and "network_mode" from the current running
+    ASH (what runs this code) container.
+
+    These two can be provided via `AYON_NETWORK` and `AYON_NETWORK_MODE`.
+    """
+    client, api = get_container_client()
+
+    logging.info("Querying existing containers...")
     for container in client.containers.list():
-        insp = api.inspect_container(container.id)
+        if PODMAN:
+            insp = container.inspect()
+        else:
+            insp = api.inspect_container(container.id)
         if insp["Config"]["Hostname"] != socket.gethostname():
+            logging.debug(
+                f"Hostname for container {insp['Name']} doesn't match ash's, ignoring."
+            )
             continue
-        # print(json.dumps(insp, indent=4))
         break
     else:
         logging.error("Weird, no container found for this host")
         sys.exit(1)
 
-    networks = insp["NetworkSettings"]["Networks"]
+    try:
+        network = next(iter(insp["NetworkSettings"]["Networks"].keys()), None)
+        network_mode = insp["HostConfig"]["NetworkMode"]
+    except Exceptions as e:
+        logging.error(
+            "ASH is not running in a defined network... make sure it's in"
+            "the same network as ayon-docker containers.")
+        log_traceback(e)
 
-    return {"networks": list(networks.keys())}
+    return {"network": network, "network_mode": network_mode}
 
 
 def get_config() -> Config:
@@ -46,6 +68,21 @@ def get_config() -> Config:
         key = key.lower()
         if not key.startswith("ayon_"):
             continue
+        if key == "ayon_server_url":
+            # We won't be able to connect if we receive an `AYON_SERVER_URL`
+            # such as `http://localhost:5000` or `http://ayon-docker_server_1`
+            # So here we try to resolve it to an actual IP. If we fail, means
+            # we can't reach the backend at all.
+            try:
+                original_value = val
+                server_hostname = urlparse(val).hostname
+                server_ip = socket.gethostbyname(server_hostname)
+                val = val.replace(server_hostname, server_ip)
+            except Exception as e:
+                critical_error(
+                    "Unable to resolve `AYON_SERVER_URL` {original_value}"
+                )
+
         data[key.replace("ayon_", "", 1)] = val
     try:
         config = Config(**data)
@@ -57,11 +94,12 @@ def get_config() -> Config:
 
         critical_error("Unable to configure API")
 
-    local_info = get_local_info()
-
     if config.network is None and config.network_mode is None:
-        config.network = local_info["networks"][0]
+        local_info = get_local_info()
+        config.network = local_info["network"]
+        config.network_mode = local_info["network_mode"]
 
+    logging.debug(f"ASH Config is: {config}")
     return config
 
 

ash/services.py

@@ -1,36 +1,23 @@
 import os
 import socket
 
-PODMAN = os.getenv("AYON_USE_PODMAN")
-if PODMAN:
-    import podman
-else:
-    import docker
 
 from nxtools import logging, slugify
 
 from .config import config
+from .containers import PODMAN, get_container_client
 from .models import ServiceConfigModel
 from .service_logging import ServiceLogger
 
 
 class Services:
-    if PODMAN:
-        client: podman.PodmanClient | None = None
-    else:
-        client: docker.DockerClient | None = None
-
+    client = None
     prefix: str = "io.ayon.service"
 
     @classmethod
     def connect(cls):
-        if PODMAN:
-            logging.info("Using container client: 'Podman'")
-            cls.client = podman.PodmanClient(base_url="unix:///run/user/1000/podman/podman.sock")
-            logging.info("Done with client")
-        else:
-            logging.info("Using container client: 'Docker'")
-            cls.client = docker.DockerClient(base_url="unix://var/run/docker.sock")
+        client, _ = get_container_client()
+        cls.client = client
 
     @classmethod
     def get_running_services(cls) -> list[str]:
@@ -154,5 +141,4 @@ def ensure_running(
 
             container = cls.spawn(image, hostname, environment, labels)
 
-        # Ensure container logger is running
         ServiceLogger.add(service_name, container)