OpenRAG 0.5.0__tar.gz → 0.5.0.dev1__tar.gz

{openrag-0.5.0/src/openrag.egg-info → openrag-0.5.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.5.0
+Version: 0.5.0.dev1
 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
@@ -39,11 +39,12 @@ Requires-Dist: textual-fspicker>=0.6.0
 Requires-Dist: structlog>=25.4.0
 Requires-Dist: zxcvbn>=4.5.0
 Requires-Dist: prometheus-fastapi-instrumentator>=7.1.0
-Requires-Dist: litellm==1.83.14
+Requires-Dist: litellm==1.83.3
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: tiktoken>=0.7.0
+Requires-Dist: prometheus-fastapi-instrumentator>=7.1.0
 Requires-Dist: fastmcp>=3.2.3
-Requires-Dist: openai==2.24.0
+Requires-Dist: openai>=2.30.0
 Requires-Dist: tenacity>=9.1.4
 Requires-Dist: pygments>=2.20.0
 Requires-Dist: pyasn1>=0.6.3

{openrag-0.5.0 → openrag-0.5.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openrag"
-version = "0.5.0"
+version = "0.5.0.dev1"
 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"
@@ -45,11 +45,12 @@ dependencies = [
     "structlog>=25.4.0",
     "zxcvbn>=4.5.0",
     "prometheus-fastapi-instrumentator>=7.1.0",
-    "litellm==1.83.14",
+    "litellm==1.83.3",
     "pyyaml>=6.0",
     "tiktoken>=0.7.0",
+    "prometheus-fastapi-instrumentator>=7.1.0",
     "fastmcp>=3.2.3",
-    "openai==2.24.0",
+    "openai>=2.30.0",
     "tenacity>=9.1.4",
     "pygments>=2.20.0",
     "pyasn1>=0.6.3",

{openrag-0.5.0 → openrag-0.5.0.dev1}/src/agent.py

@@ -515,24 +515,25 @@ async def async_chat_stream(
         yield chunk
 
     # Add the complete assistant response to message history with response_id and timestamp
-    assistant_message = {
-        "role": "assistant",
-        "content": full_response,
-        "response_id": response_id,
-        "timestamp": datetime.now(),
-    }
-    # Store usage data if available (from response.completed event)
-    if usage_data:
-        assistant_message["response_data"] = {"usage": usage_data}
-    conversation_state["messages"].append(assistant_message)
+    if full_response:
+        assistant_message = {
+            "role": "assistant",
+            "content": full_response,
+            "response_id": response_id,
+            "timestamp": datetime.now(),
+        }
+        # Store usage data if available (from response.completed event)
+        if usage_data:
+            assistant_message["response_data"] = {"usage": usage_data}
+        conversation_state["messages"].append(assistant_message)
 
-    # Store the conversation thread with its response_id
-    if response_id:
-        conversation_state["last_activity"] = datetime.now()
-        await store_conversation_thread(user_id, response_id, conversation_state)
-        logger.debug(
-            f"Stored conversation thread for user {user_id} with response_id: {response_id}"
-        )
+        # Store the conversation thread with its response_id
+        if response_id:
+            conversation_state["last_activity"] = datetime.now()
+            await store_conversation_thread(user_id, response_id, conversation_state)
+            logger.debug(
+                f"Stored conversation thread for user {user_id} with response_id: {response_id}"
+            )
 
 
 # Async langflow function with conversation storage (non-streaming)
@@ -788,15 +789,16 @@ async def async_langflow_chat_stream(
             yield chunk
 
         # Add the complete assistant response to message history with response_id, timestamp, and function call data
-        assistant_message = {
-            "role": "assistant",
-            "content": full_response,
-            "response_id": response_id,
-            "timestamp": datetime.now(),
-            "chunks": collected_chunks,  # Store complete chunk data for function calls
-            "error": error_occurred,  # Mark if this was an error response
-        }
-        # Store usage data if available (from response.completed event)
+        if full_response:
+            assistant_message = {
+                "role": "assistant",
+                "content": full_response,
+                "response_id": response_id,
+                "timestamp": datetime.now(),
+                "chunks": collected_chunks,  # Store complete chunk data for function calls
+                "error": error_occurred,  # Mark if this was an error response
+            }
+            # Store usage data if available (from response.completed event)
         if usage_data:
             assistant_message["response_data"] = {"usage": usage_data}
         conversation_state["messages"].append(assistant_message)

openrag-0.5.0.dev1/src/api/connector_router.py

@@ -0,0 +1,82 @@
+"""Connector router that automatically routes based on configuration settings."""
+
+from config.settings import DISABLE_INGEST_WITH_LANGFLOW
+from utils.logging_config import get_logger
+
+logger = get_logger(__name__)
+
+
+class ConnectorRouter:
+    """
+    Router that automatically chooses between LangflowConnectorService and ConnectorService
+    based on the DISABLE_INGEST_WITH_LANGFLOW configuration.
+
+    - If DISABLE_INGEST_WITH_LANGFLOW is False (default): uses LangflowConnectorService
+    - If DISABLE_INGEST_WITH_LANGFLOW is True: uses traditional ConnectorService
+    """
+
+    def __init__(self, langflow_connector_service, openrag_connector_service):
+        self.langflow_connector_service = langflow_connector_service
+        self.openrag_connector_service = openrag_connector_service
+        logger.debug(
+            "ConnectorRouter initialized",
+            disable_langflow_ingest=DISABLE_INGEST_WITH_LANGFLOW,
+        )
+
+    def get_active_service(self):
+        """Get the currently active connector service based on configuration."""
+        if DISABLE_INGEST_WITH_LANGFLOW:
+            logger.debug("Using traditional OpenRAG connector service")
+            return self.openrag_connector_service
+        else:
+            logger.debug("Using Langflow connector service")
+            return self.langflow_connector_service
+
+    # Proxy all connector service methods to the active service
+
+    async def initialize(self):
+        """Initialize the active connector service."""
+        # Initialize OpenSearch index if using traditional OpenRAG connector service
+
+        return await self.get_active_service().initialize()
+
+    @property
+    def connection_manager(self):
+        """Get the connection manager from the active service."""
+        return self.get_active_service().connection_manager
+
+    async def get_connector(self, connection_id: str):
+        """Get a connector instance from the active service."""
+        return await self.get_active_service().get_connector(connection_id)
+
+    async def sync_specific_files(
+        self,
+        connection_id: str,
+        user_id: str,
+        file_list: list,
+        jwt_token: str = None,
+        file_infos: list = None,
+        ingest_settings: dict = None,
+    ):
+        """Sync specific files using the active service."""
+        return await self.get_active_service().sync_specific_files(
+            connection_id,
+            user_id,
+            file_list,
+            jwt_token,
+            file_infos=file_infos,
+            ingest_settings=ingest_settings,
+        )
+
+    def __getattr__(self, name):
+        """
+        Proxy any other method calls to the active service.
+        This ensures compatibility with any methods we might have missed.
+        """
+        active_service = self.get_active_service()
+        if hasattr(active_service, name):
+            return getattr(active_service, name)
+        else:
+            raise AttributeError(
+                f"'{type(active_service).__name__}' object has no attribute '{name}'"
+            )