OpenRAG 0.6.0.dev19__py3-none-any.whl → 0.6.0.dev21__py3-none-any.whl

{openrag-0.6.0.dev19.dist-info → openrag-0.6.0.dev21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.6.0.dev19
+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.dev19.dist-info → openrag-0.6.0.dev21.dist-info}/RECORD

@@ -128,7 +128,7 @@ models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 models/processors.py,sha256=F0LOVNOOrDS9zCfb-piYf3uRYawiPbmNGO2Da4g6G4I,70039
 models/tasks.py,sha256=BByR2xDl4zqvbCbTGgBC3aChJ_uJoRpHy0TTJrvW5Dc,3152
 models/url.py,sha256=KMleXhlwd3W59axcubMJxIEtHpyBQTvfxkycc-o0kOY,5601
-openrag-0.6.0.dev19.dist-info/licenses/LICENSE,sha256=jWcnPXkUxEinX60Yn-_zjsY9i84vz2QSb0fi53djOkg,11334
+openrag-0.6.0.dev21.dist-info/licenses/LICENSE,sha256=jWcnPXkUxEinX60Yn-_zjsY9i84vz2QSb0fi53djOkg,11334
 services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 services/api_key_service.py,sha256=m04jVSJyDqIl-NgNROKLIfy4QYArZxlvz_WkjqQK7TA,13269
 services/auth_service.py,sha256=qxg5Mj1KvR23dBaZnwe2gjQia5DqvNNi7VQCkkKxq8k,23794
@@ -164,7 +164,7 @@ services/task_service.py,sha256=wnvmd9MEYl_BDWUqmEtjmN08Iik1ANaZrJYyp71lqNA,6455
 services/user_service.py,sha256=KsqQN0qPSwxQsBUBkIxE60TDJNveaDk-5rhQE9bN2Fs,11993
 services/workspace_config_service.py,sha256=Ij-fvy0zd3OSsML4ZwG4WG-QmOuxLWcCf9f3HvtD6iY,16544
 tui/__init__.py,sha256=RICZ8Cht-_36b6KVVCkwdNFQIOG40GnDe2NZJlkphd4,138
-tui/cli.py,sha256=utCk0OtchNNHG1CYTTAOeuIp17sHuB1NIn9-GuInZdc,17982
+tui/cli.py,sha256=YtDle-1hHQFoyL5PXAuMojo8SaBU2jd15W1nfAvR1i8,19011
 tui/config_fields.py,sha256=pzvzGdykIW4x7vr056Vydgy9sJpzK6BWarqYCf6-cAE,16595
 tui/main.py,sha256=fPfkw81ay4xJVO1HpwADqs-H8IsbECJdjwZHhkoIMms,31246
 tui/_assets/docker-compose.gpu.yml,sha256=tV8pkI3hTEk2yvpIS6m5ONavEQdmwhuqkGW8RIhQvhk,290
@@ -183,7 +183,7 @@ tui/_assets/openrag-documents/docling.pdf,sha256=gt1HBxLOg4nxnyDrkzBHXiFmooH4x5k
 tui/_assets/openrag-documents/ibm_anthropic.pdf,sha256=ZepdgkwiEzS3-J3nN04X2QpDofIg1Ek9mOwS-do_GqY,1969939
 tui/_assets/openrag-documents/warmup_ocr.pdf,sha256=gm-KtSjldMVcmRuldtxSBEUS8vZeF5fNQ1emxknATK4,9612
 tui/managers/__init__.py,sha256=NQFBkKkxOjEXoDSoMxN0byy-XjbwdsJJeT3p_foEERU,28
-tui/managers/container_manager.py,sha256=DbDYNdwD9WQnUlmIOeAjkYF_AttvLHGNMCID9-kjQ_s,65996
+tui/managers/container_manager.py,sha256=NAxicaVBkXCMCcFLjHnqWaSDZkf9_yl-xnqHU8YaJDE,66566
 tui/managers/docling_manager.py,sha256=5LwMsHMO5ph4hs3GsVpurk4U8rxp52pKPoreJU2kN2U,23766
 tui/managers/env_manager.py,sha256=EJyiRhbuBTWMmaHfwq2uacdPG0BvmLhbrFfJjUZ6Ly8,40837
 tui/screens/__init__.py,sha256=ZzB_lbAnSTwDqiG0ppafOE-sAiOUVaNy4V6x5AJvqyM,27
@@ -240,8 +240,8 @@ utils/telemetry/__init__.py,sha256=xoStY8hoYWnVe0B_jNthSdzRb7AxCT0rhM8ba9Q0Obg,2
 utils/telemetry/category.py,sha256=wei3V5WyUaiadYjEE5s0ys9PY0TjnebIvTykQU0P_2k,1114
 utils/telemetry/client.py,sha256=RhjW1a27w7W6gHt9X7AxdRPdZGmCEQDPskkxj5nsuiQ,12500
 utils/telemetry/message_id.py,sha256=05CvlKW_LaD00INxd3WV8uXBZ9f_5Cvy-jAyOPmpxTk,9600
-openrag-0.6.0.dev19.dist-info/METADATA,sha256=CF2Z-QYMINwAljaYaWpYsUO56NM-ILJqbMwPuzVT_YA,8728
-openrag-0.6.0.dev19.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-openrag-0.6.0.dev19.dist-info/entry_points.txt,sha256=ArKNHB63I3K8vynNkogvZOLmmQFpIsHDL7MvreCmju4,45
-openrag-0.6.0.dev19.dist-info/top_level.txt,sha256=TpFyXTBO-cpphRZHx7Vgwgzg4KmPXwNkkfOo93D5qOk,132
-openrag-0.6.0.dev19.dist-info/RECORD,,
+openrag-0.6.0.dev21.dist-info/METADATA,sha256=sPPCaC6QowkGR6FGO2_BJJKYtZyidl15RjsB-x7Yg5A,8728
+openrag-0.6.0.dev21.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+openrag-0.6.0.dev21.dist-info/entry_points.txt,sha256=ArKNHB63I3K8vynNkogvZOLmmQFpIsHDL7MvreCmju4,45
+openrag-0.6.0.dev21.dist-info/top_level.txt,sha256=TpFyXTBO-cpphRZHx7Vgwgzg4KmPXwNkkfOo93D5qOk,132
+openrag-0.6.0.dev21.dist-info/RECORD,,

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:

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