checkin progress

js/sdk/src/r2rClient.ts

@@ -1444,13 +1444,11 @@ export class r2rClient extends BaseClient {
   @feature("getConversation")
   async getConversation(
     conversationId: string,
-    branchId?: string,
   ): Promise<Record<string, any>> {
     this._ensureAuthenticated();
-    const queryParams = branchId ? `?branch_id=${branchId}` : "";
     return this._makeRequest(
       "GET",
-      `get_conversation/${conversationId}${queryParams}`,
+      `get_conversation/${conversationId}`,
     );
   }
 
@@ -1974,7 +1972,6 @@ export class r2rClient extends BaseClient {
    * @param task_prompt_override Task prompt override.
    * @param include_title_if_available Include title if available.
    * @param conversation_id The ID of the conversation, if not a new conversation.
-   * @param branch_id The ID of the branch to use, if not a new branch.
    * @returns A promise that resolves to the response from the server.
    * @deprecated use `client.retrieval.agent` instead
    */
@@ -1987,7 +1984,6 @@ export class r2rClient extends BaseClient {
     task_prompt_override?: string,
     include_title_if_available?: boolean,
     conversation_id?: string,
-    branch_id?: string,
   ): Promise<any | AsyncGenerator<string, void, unknown>> {
     this._ensureAuthenticated();
 
@@ -1998,8 +1994,7 @@ export class r2rClient extends BaseClient {
       rag_generation_config,
       task_prompt_override,
       include_title_if_available,
-      conversation_id,
-      branch_id,
+      conversation_id
     };
 
     Object.keys(json_data).forEach(

js/sdk/src/types.ts

@@ -76,16 +76,6 @@ export interface MessageResponse {
   message: any;
   metadata: Record<string, any>;
 }
-
-export interface BranchResponse {
-  branch_id: string;
-  branch_point_id?: string;
-  content?: string;
-  created_at: string;
-  user_id?: string;
-  name?: string;
-}
-
 // Document types
 export interface DocumentResponse {
   id: string;
@@ -344,8 +334,6 @@ export type WrappedMessageResponse = ResultsWrapper<MessageResponse>;
 export type WrappedMessagesResponse = PaginatedResultsWrapper<
   MessageResponse[]
 >;
-export type WrappedBranchResponse = ResultsWrapper<BranchResponse>;
-export type WrappedBranchesResponse = PaginatedResultsWrapper<BranchResponse[]>;
 
 // Document Responses
 export type WrappedDocumentResponse = ResultsWrapper<DocumentResponse>;

js/sdk/src/v3/clients/conversations.ts

@@ -2,7 +2,6 @@ import { feature } from "../../feature";
 import { r2rClient } from "../../r2rClient";
 import {
   WrappedBooleanResponse,
-  WrappedBranchesResponse,
   WrappedConversationMessagesResponse,
   WrappedConversationResponse,
   WrappedConversationsResponse,
@@ -136,29 +135,4 @@ export class ConversationsClient {
       },
     );
   }
-
-  /**
-   * List all branches in a conversation.
-   * @param id The ID of the conversation to list branches for
-   * @returns
-   */
-  @feature("conversations.listBranches")
-  async listBranches(options: {
-    id: string;
-    offset?: number;
-    limit?: number;
-  }): Promise<WrappedBranchesResponse> {
-    const params: Record<string, any> = {
-      offset: options?.offset ?? 0,
-      limit: options?.limit ?? 100,
-    };
-
-    return this.client.makeRequest(
-      "GET",
-      `conversations/${options.id}/branches`,
-      {
-        params,
-      },
-    );
-  }
 }

py/core/__init__.py

@@ -3,6 +3,7 @@
 # Keep '*' imports for enhanced development velocity
 from .agent import *
 from .base import *
+from .database import *
 from .main import *
 from .parsers import *
 from .pipelines import *
@@ -105,13 +106,6 @@
     ## LOGGING
     # Basic types
     "RunType",
-    "AnalysisTypes",
-    "LogAnalytics",
-    "LogAnalyticsConfig",
-    "LogFilterCriteria",
-    "LogProcessor",
-    # Logging Providers
-    "PersistentLoggingConfig",
     # Run Manager
     "RunManager",
     "manage_run",
@@ -223,7 +217,7 @@
     "BCryptProvider",
     "BCryptConfig",
     # Database
-    "PostgresDBProvider",
+    "PostgresDatabaseProvider",
     # Embeddings
     "LiteLLMEmbeddingProvider",
     "OpenAIEmbeddingProvider",

py/core/agent/rag.py

@@ -12,13 +12,12 @@
     WebSearchResponse,
 )
 from core.base.agent import AgentConfig, Tool
-from core.base.providers import CompletionProvider
+from core.base.providers import CompletionProvider, DatabaseProvider
 from core.base.utils import to_async_generator
 from core.pipelines import SearchPipeline
-from core.providers import (
+from core.providers import (  # PostgresDatabaseProvider,
     LiteLLMCompletionProvider,
     OpenAICompletionProvider,
-    PostgresDBProvider,
 )
 
 
@@ -126,7 +125,7 @@ def format_search_results_for_llm(
 class R2RRAGAgent(RAGAgentMixin, R2RAgent):
     def __init__(
         self,
-        database_provider: PostgresDBProvider,
+        database_provider: DatabaseProvider,
         llm_provider: Union[
             LiteLLMCompletionProvider, OpenAICompletionProvider
         ],
@@ -144,7 +143,7 @@ def __init__(
 class R2RStreamingRAGAgent(RAGAgentMixin, R2RStreamingAgent):
     def __init__(
         self,
-        database_provider: PostgresDBProvider,
+        database_provider: DatabaseProvider,
         llm_provider: Union[
             LiteLLMCompletionProvider, OpenAICompletionProvider
         ],

py/core/base/__init__.py

@@ -79,12 +79,6 @@
     ## LOGGING
     # Basic types
     "RunType",
-    "AnalysisTypes",
-    "LogAnalytics",
-    "LogAnalyticsConfig",
-    "LogFilterCriteria",
-    "LogProcessor",
-    "PersistentLoggingConfig",
     # Run Manager
     "RunManager",
     "manage_run",
@@ -114,6 +108,7 @@
     # Database providers
     "DatabaseConfig",
     "DatabaseProvider",
+    "Handler",
     "PostgresConfigurationSettings",
     # Embedding provider
     "EmbeddingConfig",

py/core/base/agent/agent.py

@@ -79,7 +79,7 @@ def __init__(
         config: AgentConfig,
     ):
         self.llm_provider = llm_provider
-        self.database_provider = database_provider
+        self.database_provider: DatabaseProvider = database_provider
         self.config = config
         self.conversation = Conversation()
         self._completed = False
@@ -92,7 +92,7 @@ def _register_tools(self):
 
     async def _setup(self, system_instruction: Optional[str] = None):
         content = system_instruction or (
-            await self.database_provider.get_cached_prompt(
+            await self.database_provider.prompts_handler.get_cached_prompt(
                 self.config.system_instruction_name
             )
         )
@@ -101,7 +101,7 @@ async def _setup(self, system_instruction: Optional[str] = None):
                 role="system",
                 content=system_instruction
                 or (
-                    await self.database_provider.get_cached_prompt(
+                    await self.database_provider.prompts_handler.get_cached_prompt(
                         self.config.system_instruction_name
                     )
                 ),

py/core/base/api/models/__init__.py

@@ -5,8 +5,8 @@
 from shared.api.models.base import (
     GenericBooleanResponse,
     GenericMessageResponse,
-    PaginatedResultsWrapper,
-    ResultsWrapper,
+    PaginatedR2RResult,
+    R2RResults,
     WrappedBooleanResponse,
     WrappedGenericMessageResponse,
 )
@@ -43,8 +43,6 @@
     SettingsResponse,
     User,
     WrappedAnalyticsResponse,
-    WrappedBranchesResponse,
-    WrappedBranchResponse,
     WrappedChunkResponse,
     WrappedChunksResponse,
     WrappedCollectionResponse,
@@ -133,8 +131,6 @@
     # Conversation Responses
     "WrappedMessageResponse",
     "WrappedMessagesResponse",
-    "WrappedBranchResponse",
-    "WrappedBranchesResponse",
     # Chunk Responses
     "WrappedChunkResponse",
     "WrappedChunksResponse",
@@ -143,8 +139,8 @@
     "WrappedUserResponse",
     "WrappedUsersResponse",
     # Base Responses
-    "PaginatedResultsWrapper",
-    "ResultsWrapper",
+    "PaginatedR2RResult",
+    "R2RResults",
     "GenericBooleanResponse",
     "GenericMessageResponse",
     "WrappedBooleanResponse",

py/core/base/logger/__init__.py

@@ -1,23 +1,9 @@
-from .base import PersistentLoggingConfig, RunInfoLog, RunType
-from .log_processor import (
-    AnalysisTypes,
-    LogAnalytics,
-    LogAnalyticsConfig,
-    LogFilterCriteria,
-    LogProcessor,
-)
+from .base import RunInfoLog, RunType
 from .run_manager import RunManager, manage_run
 
 __all__ = [
     # Basic types
     "RunType",
-    "AnalysisTypes",
-    "LogAnalytics",
-    "LogAnalyticsConfig",
-    "LogFilterCriteria",
-    "LogProcessor",
-    # Logging Providers
-    "PersistentLoggingConfig",
     "RunInfoLog",
     # Run Manager
     "RunManager",

py/core/base/logger/base.py

@@ -21,20 +21,6 @@ class RunInfoLog(BaseModel):
     user_id: UUID
 
 
-class PersistentLoggingConfig(ProviderConfig):
-    provider: str = "local"
-    log_table: str = "logs"
-    log_info_table: str = "log_info"
-    logging_path: Optional[str] = None
-
-    def validate_config(self) -> None:
-        pass
-
-    @property
-    def supported_providers(self) -> list[str]:
-        return ["local", "postgres"]
-
-
 class RunType(str, Enum):
     """Enumeration of the different types of runs."""
 
@@ -44,45 +30,3 @@ class RunType(str, Enum):
     AUTH = "AUTH"
     UNSPECIFIED = "UNSPECIFIED"
     KG = "KG"
-
-
-class PersistentLoggingProvider(Provider):
-    @abstractmethod
-    async def close(self):
-        pass
-
-    @abstractmethod
-    async def log(
-        self,
-        run_id: UUID,
-        key: str,
-        value: str,
-    ):
-        pass
-
-    @abstractmethod
-    async def get_logs(
-        self,
-        run_ids: list[UUID],
-        limit_per_run: int,
-    ) -> list:
-        pass
-
-    @abstractmethod
-    async def info_log(
-        self,
-        run_id: UUID,
-        run_type: RunType,
-        user_id: UUID,
-    ):
-        pass
-
-    @abstractmethod
-    async def get_info_logs(
-        self,
-        offset: int = 0,
-        limit: int = 100,
-        run_type_filter: Optional[RunType] = None,
-        user_ids: Optional[list[UUID]] = None,
-    ) -> list[RunInfoLog]:
-        pass