OpenRAG 0.4.1.dev8__py3-none-any.whl → 0.4.1.dev9__py3-none-any.whl

api/settings.py

@@ -1664,8 +1664,6 @@ async def rollback_onboarding(
                 {"error": "No onboarding configuration to rollback"}, status_code=400
             )
 
-            jwt_token = user.jwt_token
-
         logger.info("Rolling back onboarding configuration due to file failures")
 
         # Get all tasks for the user
@@ -1728,7 +1726,7 @@ async def rollback_onboarding(
                         if filename:
                             try:
                                 opensearch_client = session_manager.get_user_opensearch_client(
-                                    user.user_id, jwt_token
+                                    user.user_id, user.jwt_token
                                 )
                                 from utils.opensearch_queries import build_filename_delete_body
                                 from config.settings import get_index_name

main.py

@@ -1890,6 +1890,16 @@ async def create_app():
         await TelemetryClient.send_event(
             Category.APPLICATION_SHUTDOWN, MessageId.ORB_APP_SHUTDOWN
         )
+        logger.info("Application shutdown initiated")
+        
+        # Gracefully shutdown OpenSearch connection first
+        try:
+            from utils.opensearch_utils import graceful_opensearch_shutdown
+            await graceful_opensearch_shutdown(clients.opensearch)
+            clients.opensearch = None  # prevent double-close in clients.cleanup()
+        except Exception as e:
+            logger.error("Error during graceful OpenSearch shutdown", error=str(e))
+
         await cleanup_subscriptions_proper(services)
         # Cleanup task service (cancels background tasks and process pool)
         await services["task_service"].shutdown()
@@ -1899,6 +1909,7 @@ async def create_app():
         from utils.telemetry.client import cleanup_telemetry_client
 
         await cleanup_telemetry_client()
+        logger.info("Application shutdown completed")
 
     return app
 

{openrag-0.4.1.dev8.dist-info → openrag-0.4.1.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.4.1.dev8
+Version: 0.4.1.dev9
 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.4.1.dev8.dist-info → openrag-0.4.1.dev9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 agent.py,sha256=-qMzG7qKnJKGQgpndvyouNrO-PHLKE-DM8inX4K9UTA,38828
 auth_context.py,sha256=jonB-u3o-yj_s8TeV_FGFRminOZkwd6OcQm1G6WOHAk,2246
 dependencies.py,sha256=AjysWtYBXfqf6H_JZqvLKtZZlBuoTnMWBUfCzA9Rbr8,7107
-main.py,sha256=-JwyzTqkf1jZ9rgxM1FmC5R4vriIjyDKaTHV5BSTGDw,70719
+main.py,sha256=JOqzQ5o7eerqBfNvbN8oyiVrRfsTjg7WQDKk6e5OXZ0,71249
 session_manager.py,sha256=DOVwx7J2ZqlGLA4Jm1bdM42sDYi8lvzeW1kpRWUgQl4,10485
 api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api/auth.py,sha256=nuwzZPW0b270ZS0UDS1Lfbqr7H3VCCgy0d9LpCAGg7g,3625
@@ -21,7 +21,7 @@ api/provider_health.py,sha256=u4gNGhEAqsQY1ml6xWzWWAOfLHDrSVYPkw1NAmBCMsI,9690
 api/provider_validation.py,sha256=54w-2qQQS9MHrgsLghpsDkCs5EQxFoUZrp_31GPK7JM,31421
 api/router.py,sha256=nOusNdc-eOMRZo6a5eqNb91oOoleYNomHTGcKuPsMmU,6229
 api/search.py,sha256=PFL2-ReVCCzJmT31IDZlFhQm3eXSPgb9LS4mnnsc_58,2010
-api/settings.py,sha256=E6xIWQTi5jc7m212c3-JA5sy8mjPcw8pRw9Pu7VbtnA,83691
+api/settings.py,sha256=EFfjxO-aofcOFVzG7WlYvR7O4cTCNEm7gBDGe4KidXo,83656
 api/tasks.py,sha256=j3tAfpE_X4UxhiGPrgea5jkxILF6HZK9Hoy3QTFGG0g,1524
 api/upload.py,sha256=gl47Ue_d6q-YgI019lspnmPQ22PMmFch7Z9E0tsgb6U,6649
 api/v1/__init__.py,sha256=A7dLY63RcJv6ii-Xh7WgREcwXixjzOXz2w5C0LGWTCc,190
@@ -66,7 +66,7 @@ models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 models/processors.py,sha256=a-f1joalfx21YhWmJS4vIRmKoLVBj1a78r5Q08nJb9k,32591
 models/tasks.py,sha256=9iINXQZxA9-hcYzG8xC_baBfLa2w6gcRPJdQHsx_Kms,1643
 models/url.py,sha256=92rsrLLyIqUErYipYz5QwUNTdHwJ2jBRV7PIVpncTyo,5764
-openrag-0.4.1.dev8.dist-info/licenses/LICENSE,sha256=jWcnPXkUxEinX60Yn-_zjsY9i84vz2QSb0fi53djOkg,11334
+openrag-0.4.1.dev9.dist-info/licenses/LICENSE,sha256=jWcnPXkUxEinX60Yn-_zjsY9i84vz2QSb0fi53djOkg,11334
 services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 services/api_key_service.py,sha256=B3yNdBBtvLjx3W3r1_CVrLktihZ4vdR_Xx8T2CbaALM,11541
 services/auth_service.py,sha256=7DTB92R_H8x4BL0x6ngvZHt5-WF4PXd2PWsWaRShqMw,22346
@@ -88,7 +88,7 @@ tui/cli.py,sha256=utCk0OtchNNHG1CYTTAOeuIp17sHuB1NIn9-GuInZdc,17982
 tui/config_fields.py,sha256=eQCVDfRQbOnTI5c6PzOZLFNYkDvb6jOL3OXGPGyPi3U,12411
 tui/main.py,sha256=CTAMzHvU_vQ5W9Qai3fUrUO82uVHInAWqAE1azOC5hc,28237
 tui/_assets/docker-compose.gpu.yml,sha256=tV8pkI3hTEk2yvpIS6m5ONavEQdmwhuqkGW8RIhQvhk,290
-tui/_assets/docker-compose.yml,sha256=-KFsYBNglIkJz1nI5j4HhABawO35yhiowRUHwTRnT8g,8007
+tui/_assets/docker-compose.yml,sha256=V1IPmy8XobB4Sm4MEuQioGrwQ-gw3GwserTDbspd1do,7809
 tui/_assets/flows/ingestion_flow.json,sha256=mklpOLzC4TgDmK9K8W47BG8YQyazzNa6Mvkf91UC31s,495465
 tui/_assets/flows/openrag_agent.json,sha256=J9B46HAS21pRNbatgDpDtvZjhbm-OJ4FNcc5GI_7ex4,424762
 tui/_assets/flows/openrag_nudges.json,sha256=8kDz-UAfVNo0iqKCTH64Oq0v8h0bwKZsXI6Btx1nDuE,374114
@@ -144,15 +144,15 @@ utils/langflow_headers.py,sha256=GpmOiK5AS01QCDd1Pz7fxmjdTCzWtg2js_OTUQbGlak,329
 utils/langflow_utils.py,sha256=-qxpK514H0IVMLZOkyFkxm20ZQW6y-Ds_73naCoQBFQ,2942
 utils/logging_config.py,sha256=c4ejF_kA9OkUYXd2I2u7Y1I02cDqFdKylkmco8kHGmA,5270
 utils/opensearch_queries.py,sha256=rfEZL-fZiPE22oi0cON1XBIkrtSUvVV70OYuml4ewt4,1408
-utils/opensearch_utils.py,sha256=stllpbE0Jt7UN1sVk0CrTeKDYRyNBnEiPCke7IOrqKI,4045
+utils/opensearch_utils.py,sha256=5RX01XoZvUm9HSW7H3FDMaDUHoreC86HWxncZ-2kdtM,5378
 utils/paths.py,sha256=SdNmEy15oeq2v5sgGChPLZ_MQpqlyAtpJNrrI_N8D3w,2263
 utils/version_utils.py,sha256=6Webhqo1TQV8B2vzWUlMb_nI28i1Hd5FqE-MGijYx_I,1488
 utils/telemetry/__init__.py,sha256=xoStY8hoYWnVe0B_jNthSdzRb7AxCT0rhM8ba9Q0Obg,203
 utils/telemetry/category.py,sha256=wei3V5WyUaiadYjEE5s0ys9PY0TjnebIvTykQU0P_2k,1114
 utils/telemetry/client.py,sha256=RhjW1a27w7W6gHt9X7AxdRPdZGmCEQDPskkxj5nsuiQ,12500
 utils/telemetry/message_id.py,sha256=IAu0wBVNOGPcSlQ0bAzvqIYr1Ac_n8wSTSxXzq_tiV0,9634
-openrag-0.4.1.dev8.dist-info/METADATA,sha256=yf9f1D85drv81h_9Ff5bg3avweo2dSVMWgOwq7oH4ws,7514
-openrag-0.4.1.dev8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-openrag-0.4.1.dev8.dist-info/entry_points.txt,sha256=ArKNHB63I3K8vynNkogvZOLmmQFpIsHDL7MvreCmju4,45
-openrag-0.4.1.dev8.dist-info/top_level.txt,sha256=uOXDYvPnDHWjAKsqgz_7wX5PGLxkDN6k3g8dNZ7Nuv0,101
-openrag-0.4.1.dev8.dist-info/RECORD,,
+openrag-0.4.1.dev9.dist-info/METADATA,sha256=COOqKVqhmyK8bJjvWzmZkyDgV2n6n4WfDH6CAgze0J0,7514
+openrag-0.4.1.dev9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+openrag-0.4.1.dev9.dist-info/entry_points.txt,sha256=ArKNHB63I3K8vynNkogvZOLmmQFpIsHDL7MvreCmju4,45
+openrag-0.4.1.dev9.dist-info/top_level.txt,sha256=uOXDYvPnDHWjAKsqgz_7wX5PGLxkDN6k3g8dNZ7Nuv0,101
+openrag-0.4.1.dev9.dist-info/RECORD,,

tui/_assets/docker-compose.yml

@@ -10,26 +10,20 @@ services:
     environment:
       - discovery.type=single-node
       - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD}
-    # Run security setup in background after OpenSearch starts
-    command: >
-      bash -c "
-        # Ensure data directory has correct permissions
-        sudo chown -R opensearch:opensearch /usr/share/opensearch/data || true
-
-        # Start OpenSearch in background
-        /usr/share/opensearch/opensearch-docker-entrypoint.sh opensearch &
-
-        # Wait a bit for OpenSearch to start, then apply security config
-        sleep 10 && /usr/share/opensearch/setup-security.sh &
-
-        # Wait for background processes
-        wait
-      "
+      - OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g
     ports:
       - "9200:9200"
       - "9600:9600"
     volumes:
-      - ${OPENSEARCH_DATA_PATH:-./opensearch-data}:/usr/share/opensearch/data:U,z
+      - opensearch-data:/usr/share/opensearch/data
+    stop_grace_period: 2m
+    healthcheck:
+      test: ["CMD-SHELL", "curl -ku admin:$$OPENSEARCH_PASSWORD 'https://localhost:9200/_cluster/health' -s | grep -qE '\"status\":\"(green|yellow)\"'"]
+      interval: 15s
+      timeout: 10s
+      retries: 20
+      start_period: 60s
+    restart: unless-stopped
 
   dashboards:
     image: opensearchproject/opensearch-dashboards:3.0.0
@@ -186,3 +180,6 @@ services:
       - LANGFLOW_ENABLE_SUPERUSER_CLI=${LANGFLOW_ENABLE_SUPERUSER_CLI}
       # - DEFAULT_FOLDER_NAME=OpenRAG
       - HIDE_GETTING_STARTED_PROGRESS=true
+
+volumes:
+  opensearch-data:

utils/opensearch_utils.py

@@ -121,3 +121,40 @@ async def wait_for_opensearch(
     message: str = "Failed to verify whether OpenSearch is ready."
     logger.error(message)
     raise OpenSearchNotReadyError(message)
+
+
+async def graceful_opensearch_shutdown(opensearch_client: AsyncOpenSearch) -> None:
+    """Gracefully shutdown OpenSearch client connection.
+    
+    This ensures that all pending operations are completed and connections
+    are properly closed before the application exits.
+    
+    Args:
+        opensearch_client: The OpenSearch client to shutdown.
+    """
+    if opensearch_client is None:
+        logger.debug("OpenSearch client is None, skipping graceful shutdown")
+        return
+    
+    try:
+        logger.info("Initiating graceful OpenSearch shutdown...")
+        
+        # Flush any pending write operations before closing
+        try:
+            await asyncio.wait_for(
+                opensearch_client.indices.flush(index="_all", wait_if_ongoing=True),
+                timeout=10.0
+            )
+            logger.debug("Index flush completed")
+        except asyncio.TimeoutError:
+            logger.warning("Timeout during index flush")
+        except Exception as e:
+            logger.warning("Error during index flush", error=str(e))
+        
+        # Close the client connection
+        await opensearch_client.close()
+        logger.info("OpenSearch client connection closed gracefully")
+        
+    except Exception as e:
+        logger.error("Error during graceful OpenSearch shutdown", error=str(e))
+