openrag 0.4.1.dev19__tar.gz → 0.4.1.dev20__tar.gz

{openrag-0.4.1.dev19/src/openrag.egg-info → openrag-0.4.1.dev20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.4.1.dev19
+Version: 0.4.1.dev20
 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.dev19 → openrag-0.4.1.dev20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openrag"
-version = "0.4.1.dev19"
+version = "0.4.1.dev20"
 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.4.1.dev19 → openrag-0.4.1.dev20/src/openrag.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrag
-Version: 0.4.1.dev19
+Version: 0.4.1.dev20
 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.dev19 → openrag-0.4.1.dev20}/src/tui/config_fields.py

@@ -66,12 +66,6 @@ CONFIG_SECTIONS: list[ConfigSection] = [
             placeholder="9200", default="9200",
             helper_text="Override for remote OpenSearch instances (default: 9200)",
         ),
-        ConfigField(
-            "opensearch_data_path", "OPENSEARCH_DATA_PATH", "Data Path",
-            placeholder="~/.openrag/data/opensearch-data",
-            default="$HOME/.openrag/data/opensearch-data",
-            helper_text="Directory to persist OpenSearch indices across upgrades",
-        ),
         ConfigField(
             "opensearch_index_name", "OPENSEARCH_INDEX_NAME", "Index Name",
             placeholder="documents", default="documents",

{openrag-0.4.1.dev19 → openrag-0.4.1.dev20}/src/tui/main.py

@@ -562,7 +562,7 @@ def migrate_legacy_data_directories():
     """Migrate data from CWD-based directories to ~/.openrag/.
 
     This is a one-time migration for users upgrading from the old layout.
-    Migrates: documents, flows, keys, config, opensearch-data, langflow-data
+    Migrates: documents, flows, keys, config, langflow-data
 
     Prompts user for confirmation before migrating. If user declines,
     exits with a message to downgrade to v1.52 or earlier.
@@ -584,7 +584,8 @@ def migrate_legacy_data_directories():
         (cwd / "flows", target_base / "flows", "flows"),
         (cwd / "keys", target_base / "keys", "keys"),
         (cwd / "config", target_base / "config", "config"),
-        (cwd / "opensearch-data", target_base / "data" / "opensearch-data", "OpenSearch data"),
+        # opensearch-data intentionally omitted: OpenSearch now uses a Docker named
+        # volume; old index data is not portable and must be re-ingested.
         (cwd / "langflow-data", target_base / "data" / "langflow-data", "Langflow data"),
     ]
 
@@ -608,7 +609,6 @@ def migrate_legacy_data_directories():
             env_manager.config.openrag_flows_path = f"{home}/.openrag/flows"
             env_manager.config.openrag_config_path = f"{home}/.openrag/config"
             env_manager.config.openrag_data_path = f"{home}/.openrag/data"
-            env_manager.config.opensearch_data_path = f"{home}/.openrag/data/opensearch-data"
             env_manager.config.langflow_data_path = f"{home}/.openrag/data/langflow-data"
             env_manager.save_env_file()
             logger.info("Updated .env file with centralized paths")
@@ -688,7 +688,6 @@ def migrate_legacy_data_directories():
         env_manager.config.openrag_flows_path = f"{home}/.openrag/flows"
         env_manager.config.openrag_config_path = f"{home}/.openrag/config"
         env_manager.config.openrag_data_path = f"{home}/.openrag/data"
-        env_manager.config.opensearch_data_path = f"{home}/.openrag/data/opensearch-data"
         env_manager.config.langflow_data_path = f"{home}/.openrag/data/langflow-data"
         env_manager.save_env_file()
         print("  Updated .env with centralized paths")
@@ -755,7 +754,6 @@ def setup_host_directories():
     - ~/.openrag/keys/ (for JWT keys)
     - ~/.openrag/config/ (for configuration)
     - ~/.openrag/data/ (for backend data: conversations, OAuth tokens, etc.)
-    - ~/.openrag/data/opensearch-data/ (for OpenSearch index)
     - LANGFLOW_DATA_PATH (for Langflow database and state)
     """
     base_dir = Path.home() / ".openrag"
@@ -765,7 +763,6 @@ def setup_host_directories():
         base_dir / "keys",
         base_dir / "config",
         base_dir / "data",
-        base_dir / "data" / "opensearch-data",
     ]
 
     for directory in directories:

{openrag-0.4.1.dev19 → openrag-0.4.1.dev20}/src/tui/managers/container_manager.py

@@ -1278,23 +1278,37 @@ class ContainerManager:
 
         yield False, "Clearing OpenSearch data volume..."
 
-        # Get opensearch data path from env config
-        from .env_manager import EnvManager
-        env_manager = EnvManager()
-        env_manager.load_existing_env()
-        opensearch_data_path = Path(env_manager.config.opensearch_data_path.replace("$HOME", str(Path.home()))).expanduser().absolute()
-
-        if not opensearch_data_path.exists():
-            yield True, "OpenSearch data directory does not exist, skipping"
+        # The volume name is 'opensearch-data' as defined in docker-compose.yml.
+        # Docker Compose usually prefixes it with the project name (defaulting to the directory name).
+        volume_name = "opensearch-data"
+        
+        possible_names = list(dict.fromkeys([
+            volume_name,
+            f"{Path.cwd().name.lower()}_{volume_name}",              # e.g. openrag_opensearch-data
+            f"{Path.cwd().name.lower().replace('-', '')}_{volume_name}",  # e.g. openrag_opensearch-data (dashes stripped)
+        ]))
+
+        # List volumes and find the correct one
+        list_success, stdout, _ = await self._run_runtime_command(["volume", "ls", "--format", "{{.Name}}"])
+        if not list_success:
+            yield False, "Could not list Docker volumes"
             return
 
-        # Use alpine with root to clear container-owned files
-        success, msg = await self.clear_directory_with_container(opensearch_data_path)
+        existing_volumes = set(stdout.splitlines())
+        found_name = next((n for n in possible_names if n in existing_volumes), None)
 
-        if success:
-            yield True, "OpenSearch data cleared successfully"
+        if found_name is None:
+            yield True, "OpenSearch data volume not found — already removed or never created"
+            return
+
+        # Only clear the volume we know exists
+        cmd = ["run", "--rm", "-v", f"{found_name}:/work:Z", "alpine", "sh", "-c",
+            "rm -rf /work/* /work/.[!.]* 2>/dev/null; echo done"]
+        success, stdout, stderr = await self._run_runtime_command(cmd)
+        if success and "done" in stdout:
+            yield True, f"OpenSearch data volume '{found_name}' cleared successfully"
         else:
-            yield False, f"Failed to clear OpenSearch data: {msg}"
+            yield False, f"Failed to clear OpenSearch data volume '{found_name}': {stderr}"
 
     async def reset_services(self) -> AsyncIterator[tuple[bool, str]]:
         """Reset all services (stop, remove containers/volumes, clear data) and yield progress updates."""

{openrag-0.4.1.dev19 → openrag-0.4.1.dev20}/src/tui/managers/env_manager.py

@@ -94,7 +94,6 @@ class EnvConfig:
     openrag_flows_path: str = "$HOME/.openrag/flows"
     openrag_config_path: str = "$HOME/.openrag/config"
     openrag_data_path: str = "$HOME/.openrag/data"  # Backend data (conversations, tokens, etc.)
-    opensearch_data_path: str = "$HOME/.openrag/data/opensearch-data"
     langflow_data_path: str = "$HOME/.openrag/data/langflow-data"
     openrag_tui_config_path_legacy: str = "$HOME/.openrag/tui/config"
 
@@ -212,7 +211,6 @@ class EnvManager:
             "OPENRAG_FLOWS_PATH": "openrag_flows_path",
             "OPENRAG_CONFIG_PATH": "openrag_config_path",
             "OPENRAG_DATA_PATH": "openrag_data_path",
-            "OPENSEARCH_DATA_PATH": "opensearch_data_path",
             "LANGFLOW_DATA_PATH": "langflow_data_path",
             "LANGFLOW_AUTO_LOGIN": "langflow_auto_login",
             "LANGFLOW_NEW_USER_IS_ACTIVE": "langflow_new_user_is_active",
@@ -491,9 +489,6 @@ class EnvManager:
                 f.write(
                     f"OPENRAG_DATA_PATH={self._quote_env_value(expand_path(self.config.openrag_data_path))}\n"
                 )
-                f.write(
-                    f"OPENSEARCH_DATA_PATH={self._quote_env_value(expand_path(self.config.opensearch_data_path))}\n"
-                )
                 f.write(
                     f"LANGFLOW_DATA_PATH={self._quote_env_value(expand_path(self.config.langflow_data_path))}\n"
                 )
@@ -762,11 +757,11 @@ class EnvManager:
                     else:
                         new_lines.append(line)
 
-                # If not found, add it after OPENSEARCH_DATA_PATH or at the end
+                # If not found, add it after LANGFLOW_DATA_PATH or at the end
                 if not updated:
                     insert_pos = len(new_lines)
                     for i, line in enumerate(new_lines):
-                        if "OPENSEARCH_DATA_PATH" in line:
+                        if "LANGFLOW_DATA_PATH" in line:
                             insert_pos = i + 1
                             break
                     new_lines.insert(insert_pos, f"OPENRAG_VERSION={self._quote_env_value(current_version)}")

{openrag-0.4.1.dev19 → openrag-0.4.1.dev20}/src/tui/screens/config.py

@@ -201,7 +201,6 @@ class ConfigScreen(Screen):
     # Fields that need custom rendering beyond the standard pattern
     SPECIAL_FIELDS = {
         "opensearch_password",
-        "opensearch_data_path",
         "langflow_superuser_password",
         "langflow_superuser",
         "langflow_data_path",
@@ -289,25 +288,6 @@ class ConfigScreen(Screen):
             yield Button("👁", id=f"toggle-{field.name}", variant="default")
         yield Static(" ")
 
-    def _render_opensearch_data_path(self, field: ConfigField) -> ComposeResult:
-        """OpenSearch data path with file picker."""
-        yield Label(field.label)
-        yield Static(field.helper_text, classes="helper-text")
-        current_value = getattr(self.env_manager.config, field.name, field.default)
-        input_widget = Input(
-            placeholder=field.placeholder,
-            value=current_value,
-            id=f"input-{field.name}",
-        )
-        yield input_widget
-        yield Horizontal(
-            Button("Pick…", id="pick-opensearch-data-btn"),
-            id="opensearch-data-path-actions",
-            classes="controls-row",
-        )
-        self.inputs[field.name] = input_widget
-        yield Static(" ")
-
     def _render_langflow_data_path(self, field: ConfigField) -> ComposeResult:
         """Langflow data path with file picker."""
         yield Label(field.label)
@@ -475,8 +455,6 @@ class ConfigScreen(Screen):
             self.action_back()
         elif event.button.id == "pick-docs-btn":
             self.action_pick_documents_path()
-        elif event.button.id == "pick-opensearch-data-btn":
-            self.action_pick_opensearch_data_path()
         elif event.button.id == "pick-langflow-data-btn":
             self.action_pick_langflow_data_path()
         elif event.button.id and event.button.id.startswith("toggle-"):
@@ -622,62 +600,6 @@ class ConfigScreen(Screen):
             self._docs_pick_callback = _append_path  # type: ignore[attr-defined]
             self.app.push_screen(picker)
 
-    def action_pick_opensearch_data_path(self) -> None:
-        """Open textual-fspicker to select OpenSearch data directory."""
-        try:
-            import importlib
-
-            fsp = importlib.import_module("textual_fspicker")
-        except Exception:
-            self.notify("textual-fspicker not available", severity="warning")
-            return
-
-        # Determine starting path from current input if possible
-        input_widget = self.inputs.get("opensearch_data_path")
-        start = Path.home()
-        if input_widget and input_widget.value:
-            path_str = input_widget.value.strip()
-            if path_str:
-                candidate = Path(path_str).expanduser()
-                # If path doesn't exist, use parent or fallback to home
-                if candidate.exists():
-                    start = candidate
-                elif candidate.parent.exists():
-                    start = candidate.parent
-
-        # Prefer SelectDirectory for directories; fallback to FileOpen
-        PickerClass = getattr(fsp, "SelectDirectory", None) or getattr(
-            fsp, "FileOpen", None
-        )
-        if PickerClass is None:
-            self.notify(
-                "No compatible picker found in textual-fspicker", severity="warning"
-            )
-            return
-        try:
-            picker = PickerClass(location=start)
-        except Exception:
-            try:
-                picker = PickerClass(start)
-            except Exception:
-                self.notify("Could not initialize textual-fspicker", severity="warning")
-                return
-
-        def _set_path(result) -> None:
-            if not result:
-                return
-            path_str = str(result)
-            if input_widget is None:
-                return
-            input_widget.value = path_str
-
-        # Push with callback when supported; otherwise, use on_screen_dismissed fallback
-        try:
-            self.app.push_screen(picker, _set_path)  # type: ignore[arg-type]
-        except TypeError:
-            self._opensearch_data_pick_callback = _set_path  # type: ignore[attr-defined]
-            self.app.push_screen(picker)
-
     def action_pick_langflow_data_path(self) -> None:
         """Open textual-fspicker to select Langflow data directory."""
         try:

{openrag-0.4.1.dev19 → openrag-0.4.1.dev20}/src/tui/screens/monitor.py

@@ -551,23 +551,6 @@ class MonitorScreen(Screen):
         env_manager = EnvManager()
         env_manager.load_existing_env()
 
-        # Clear opensearch-data using container
-        yield False, "Clearing OpenSearch data..."
-        opensearch_data_path = Path(env_manager.config.opensearch_data_path.replace("$HOME", str(Path.home()))).expanduser()
-        if opensearch_data_path.exists():
-            async for success, message in self.container_manager.clear_opensearch_data_volume():
-                yield success, message
-                if not success and "failed" in message.lower():
-                    return
-
-            # Recreate empty opensearch-data directory
-            try:
-                opensearch_data_path.mkdir(parents=True, exist_ok=True)
-                yield True, "OpenSearch data directory recreated"
-            except Exception as e:
-                yield False, f"Error recreating opensearch-data directory: {e}"
-                return
-
         # Delete langflow-data directory (mirrors Makefile factory-reset behaviour)
         yield False, "Clearing Langflow data..."
         from tui.main import _resolve_langflow_data_path