Improve first start

- try to connect to comfyui desktop version on port 8000
- don't show error for failed server discovery attempts

Author: Acly

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           cache: 'pip'
       - name: Dependencies
         run: pip install -r requirements.txt          
@@ -35,9 +35,9 @@ jobs:
         with:
           submodules: true
       - name: Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           cache: 'pip'
       - name: Dependencies
         run: pip install -r requirements.txt

ai_diffusion/connection.py

@@ -76,7 +76,7 @@ def sign_in(self):
     async def _connect(self, url: str, mode: ServerMode, access_token=""):
         if self.state is ConnectionState.connected:
             await self.disconnect()
-        self.error = None
+        self.error = ""
         self.state = ConnectionState.connecting
         try:
             if mode is ServerMode.cloud:
@@ -121,7 +121,7 @@ async def disconnect(self):  # type: ignore (hides QObject.disconnect)
             self._task = None
 
         self._client = None
-        self.error = None
+        self.error = ""
         self.missing_resources = None
         self.state = ConnectionState.disconnected
         self._update_state()

ai_diffusion/root.py

@@ -119,11 +119,21 @@ async def autostart(self, signal_server_change: Callable):
                     settings.server_url, ServerMode.cloud, settings.access_token
                 )
             elif settings.server_mode in [ServerMode.undefined, ServerMode.external]:
-                await connection._connect(settings.server_url, ServerMode.external)
+                urls = [settings.server_url]
+                if settings.server_mode is ServerMode.undefined:
+                    urls.append("127.0.0.1:8000")  # ComfyUI Desktop default port
+                for url in urls:
+                    await connection._connect(url, ServerMode.external)
+                    if connection.state is ConnectionState.connected:
+                        settings.server_url = url
+                        break
                 if settings.server_mode is ServerMode.undefined:
                     if connection.state is ConnectionState.connected:
                         settings.server_mode = ServerMode.external
+                        settings.save()
                     else:
+                        connection.state = ConnectionState.disconnected
+                        connection.error = ""
                         settings.server_mode = ServerMode.cloud
         except Exception as e:
             log.warning(f"Failed to launch/connect server at startup: {e}")

ai_diffusion/ui/custom_workflow.py

@@ -14,7 +14,7 @@
 from ..custom_workflow import CustomGenerationMode
 from ..client import TextOutput
 from ..jobs import JobKind
-from ..model import Model, ApplyBehavior
+from ..model import Model
 from ..properties import Binding, Bind, bind, bind_combo
 from ..style import Styles
 from ..root import root

ai_diffusion/ui/settings.py

@@ -186,6 +186,8 @@ def update_connection_state(self, state: ConnectionState):
             can_connect = state in [ConnectionState.disconnected, ConnectionState.error]
             self.connect_button.setEnabled(can_connect)
             self.connect_button.setText(_("Connect") if can_connect else _("Connected"))
+            self._connection_status.setText(_("Disconnected"))
+            self._connection_status.setStyleSheet(f"color: {grey}; font-style:italic")
 
         if state in [ConnectionState.error, ConnectionState.auth_error]:
             error = root.connection.error or "Unknown error"
@@ -279,6 +281,7 @@ def __init__(self, server: Server):
         self._layout.addWidget(self._server_stack)
 
         root.connection.state_changed.connect(self.update_server_status)
+        root.connection.error_changed.connect(self.update_server_status)
         self.update_server_status()
 
     @property
@@ -302,6 +305,7 @@ def server_mode(self, mode: ServerMode):
             ServerMode.cloud: self._cloud_widget,
             ServerMode.managed: self._server_widget,
             ServerMode.external: self._connection_widget,
+            ServerMode.undefined: self._connection_widget,
         }[mode]
         self._server_stack.setCurrentWidget(widget)