openrag 0.6.0.dev20__tar.gz → 0.6.0.dev21__tar.gz

{openrag-0.6.0.dev20/src/openrag.egg-info → openrag-0.6.0.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.6.0.dev20
+Version: 0.6.0.dev21
 Summary: OpenRAG is a comprehensive Retrieval-Augmented Generation platform that enables intelligent document search and AI-powered conversations.
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console

{openrag-0.6.0.dev20 → openrag-0.6.0.dev21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openrag"
-version = "0.6.0.dev20"
+version = "0.6.0.dev21"
 description = "OpenRAG is a comprehensive Retrieval-Augmented Generation platform that enables intelligent document search and AI-powered conversations."
 readme = "README.md"
 requires-python = ">=3.13"

{openrag-0.6.0.dev20 → openrag-0.6.0.dev21/src/openrag.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.6.0.dev20
+Version: 0.6.0.dev21
 Summary: OpenRAG is a comprehensive Retrieval-Augmented Generation platform that enables intelligent document search and AI-powered conversations.
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console

{openrag-0.6.0.dev20 → openrag-0.6.0.dev21}/src/tui/cli.py

@@ -227,15 +227,18 @@ def _setup_walkthrough(
         _, _, already_running = _get_service_states(container_manager, docling_manager)
         if already_running:
             _stop_services_cli(container_manager, docling_manager)
-        _start_services_cli(container_manager, docling_manager)
+        fully_started = _start_services_cli(container_manager, docling_manager)
 
-        console.print()
-        frontend_url = f"http://localhost:{os.getenv('FRONTEND_PORT', '3000')}"
-        console.print(f"[bold green]OpenRAG is running at {frontend_url}[/bold green]")
-        try:
-            webbrowser.open(frontend_url)
-        except Exception:
-            pass
+        # Only announce the app URL / open the browser once everything is up;
+        # _start_services_cli already surfaced a warning for a partial startup.
+        if fully_started:
+            console.print()
+            frontend_url = f"http://localhost:{os.getenv('FRONTEND_PORT', '3000')}"
+            console.print(f"[bold green]OpenRAG is running at {frontend_url}[/bold green]")
+            try:
+                webbrowser.open(frontend_url)
+            except Exception:
+                pass
 
 
 def _collect_config(
@@ -345,11 +348,14 @@ def _start_services_cli(
     console.print("Starting OpenRAG services...", style="bold")
 
     async def _inner():
+        containers_ok = True
+        docling_ok = docling_manager.is_running()
+
         # Start container services
         if container_manager.is_available():
             async for item in container_manager.start_services():
                 # start_services yields (success, message) or (success, message, replace_last)
-                success = item[0]
+                containers_ok = item[0]
                 message = item[1]
                 replace_last = item[2] if len(item) > 2 else False
                 if replace_last:
@@ -358,24 +364,40 @@ def _start_services_cli(
                 else:
                     console.print(f"  {message}")
 
-                if not success and "error" in message.lower():
-                    console.print(f"  [red]✗ {message}[/red]")
+            if not containers_ok:
+                statuses = await container_manager.get_service_status(force_refresh=True)
+                containers_ok = bool(statuses) and all(
+                    s.status == ServiceStatus.RUNNING for s in statuses.values()
+                )
         else:
             console.print("  [yellow]No container runtime available[/yellow]")
+            containers_ok = False
 
-        # Start docling
-        if not docling_manager.is_running():
-            success, message = await docling_manager.start()
-            if success:
+        if not docling_ok:
+            docling_ok, message = await docling_manager.start()
+            if docling_ok:
                 console.print(f"  {message}")
             else:
                 console.print(f"  [yellow]{message}[/yellow]")
 
+        return containers_ok, docling_ok
+
     try:
-        asyncio.run(_inner())
-        console.print("[green]✓ All services started[/green]")
+        containers_ok, docling_ok = asyncio.run(_inner())
+
+        # On full success the menu header already reports "Services are running",
+        # so only surface partial/failed startup here to avoid a duplicate message.
+        results = {"containers": containers_ok, "docling-serve": docling_ok}
+        failed = [name for name, ok in results.items() if not ok]
+        if failed:
+            console.print(
+                f"[yellow]⚠ Startup incomplete: {', '.join(failed)} did not start "
+                "(run Show status for details)[/yellow]"
+            )
+        return not failed
     except Exception as e:
         console.print(f"[red]✗ Error starting services: {e}[/red]")
+        return False
 
 
 def _stop_services_cli(
@@ -393,7 +415,7 @@ def _stop_services_cli(
                 console.print(f"  {message}")
         # Stop docling
         if docling_manager.is_running():
-            success, message = await docling_manager.stop()
+            _success, message = await docling_manager.stop()
             console.print(f"  {message}")
 
     try:

{openrag-0.6.0.dev20 → openrag-0.6.0.dev21}/src/tui/managers/container_manager.py

@@ -644,6 +644,13 @@ class ContainerManager:
 
         return True, images, ""
 
+    def _resolve_service_name(self, compose_service: str | None, container_name: str) -> str | None:
+        """Resolve a container to its canonical OpenRAG service name"""
+        if compose_service and compose_service in self.expected_services:
+            return compose_service
+
+        return self.container_name_map.get(container_name)
+
     def _process_service_json(self, service: dict, services: dict[str, ServiceInfo]) -> None:
         """Process a service JSON object and add it to the services dict."""
         # Debug print to see the actual service data
@@ -651,8 +658,8 @@ class ContainerManager:
 
         container_name = service.get("Name", "")
 
-        # Map container name to service name
-        service_name = self.container_name_map.get(container_name)
+        # Resolve to canonical service name (compose 'Service' field first, then name map)
+        service_name = self._resolve_service_name(service.get("Service"), container_name)
         if not service_name:
             return
 
@@ -802,7 +809,10 @@ class ContainerManager:
                             continue
 
                         container_name = names[0]
-                        service_name = self.container_name_map.get(container_name)
+                        labels = container.get("Labels") or {}
+                        service_name = self._resolve_service_name(
+                            labels.get("com.docker.compose.service"), container_name
+                        )
                         if not service_name:
                             continue