praisonai-code 0.0.35__tar.gz → 0.0.37__tar.gz

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonai-code
-Version: 0.0.35
+Version: 0.0.37
 Summary: Agentic terminal CLI for PraisonAI — the terminal-native agent (run, chat, code, runtime, cli backends) extracted from the praisonai wrapper.
 Author: Mervin Praison
 License: MIT

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code/__init__.py

@@ -12,6 +12,6 @@ the remaining terminal-agent modules, with PEP 562 shims left behind at the
 old ``praisonai.*`` paths for backward compatibility.
 """
 
-__version__ = "0.0.35"
+__version__ = "0.0.37"
 
 __all__ = ["__version__"]

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code/_version.py

@@ -18,17 +18,25 @@ def get_package_version() -> str:
 
 
 def get_wrapper_version() -> Optional[str]:
-    """Return the installed ``praisonai`` wrapper version, if present."""
+    """Return the installed ``praisonai`` wrapper version, if present.
+
+    Prefer the source ``praisonai.version.__version__`` (resolved lazily via the
+    wrapper bridge) so that editable installs report the same version as
+    ``praisonai --version`` even when the installed package metadata is stale.
+    Fall back to package metadata when the source module is unavailable.
+    """
+    try:
+        from praisonai_code._wrapper_bridge import import_wrapper_module
+
+        wrapper_version = getattr(import_wrapper_module("praisonai.version"), "__version__")
+
+        return str(wrapper_version)
+    except Exception:
+        pass
+
     try:
         from importlib.metadata import version
 
         return str(version("praisonai"))
     except Exception:
-        try:
-            from praisonai_code._wrapper_bridge import import_wrapper_module
-            _mod = import_wrapper_module('praisonai.version')
-            wrapper_version = getattr(_mod, '__version__')
-
-            return str(wrapper_version)
-        except Exception:
-            return None
+        return None

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code/cli/commands/retrieval.py

@@ -221,17 +221,38 @@ def query_command(
                             if hasattr(retrieval_config, key):
                                 setattr(retrieval_config, key, value)
             
-            agent = Agent(
-                name="QueryAgent",
-                instructions="You are a helpful assistant that answers questions based on the provided knowledge.",
-                knowledge=[],  # Empty - we'll use existing indexed knowledge
-                retrieval_config=retrieval_config,
-                verbose=verbose,
-            )
-            
+            # Build Agent using only constructor params the installed
+            # praisonaiagents version actually supports. The Agent-first API
+            # consolidates RAG under knowledge=/_retrieval_config; it does not
+            # accept a retrieval_config= kwarg (see issue #2774).
+            import inspect
+            agent_kwargs = {
+                "name": "QueryAgent",
+                "instructions": "You are a helpful assistant that answers questions based on the provided knowledge.",
+                "knowledge": [],  # Empty - we'll use existing indexed knowledge
+            }
+            try:
+                agent_params = inspect.signature(Agent.__init__).parameters
+            except (TypeError, ValueError):
+                agent_params = {}
+                if verbose:
+                    console.print("[dim]Warning: could not inspect Agent signature; verbose flag may be ignored.[/dim]")
+            if "verbose" in agent_params:
+                agent_kwargs["verbose"] = verbose
+            elif "output" in agent_params:
+                agent_kwargs["output"] = "verbose" if verbose else None
+
+            agent = Agent(**agent_kwargs)
+
             agent._ensure_knowledge_processed = lambda: None
             from praisonaiagents.knowledge import Knowledge
-            agent.knowledge = Knowledge(config=retrieval_config.to_knowledge_config(), verbose=verbose)
+            try:
+                agent.knowledge = Knowledge(config=retrieval_config.to_knowledge_config(), verbose=verbose)
+            except TypeError as e:
+                if "verbose" not in str(e):
+                    raise
+                agent.knowledge = Knowledge(config=retrieval_config.to_knowledge_config())
+            agent._retrieval_config = retrieval_config
             agent._knowledge_processed = True
             
             if verbose:
@@ -331,16 +352,23 @@ def search_command(
         
         results = knowledge.search(query)
         
-        if not results:
-            console.print("[yellow]No results found.[/yellow]")
-            return
-        
-        if isinstance(results, dict) and 'results' in results:
+        # Normalize search results to a list of dicts.
+        # Knowledge.search() may return a typed SearchResult dataclass,
+        # a legacy dict with a "results" key, or a plain list.
+        if hasattr(results, "to_legacy_format"):
+            result_list = results.to_legacy_format().get("results", [])
+        elif isinstance(results, dict) and 'results' in results:
             result_list = results['results']
         elif isinstance(results, list):
             result_list = results
-        else:
+        elif results:
             result_list = [results]
+        else:
+            result_list = []
+        
+        if not result_list:
+            console.print("[yellow]No results found.[/yellow]")
+            return
         
         table = Table(title=f"Search Results ({len(result_list[:top_k])} of {len(result_list)})")
         table.add_column("#", style="dim", width=3)

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code/cli/features/capabilities.py

@@ -1234,7 +1234,36 @@ class CapabilitiesHandler:
     
     @staticmethod
     def handle_search(args, unknown_args):
-        """Handle search operations."""
+        """Handle search operations.
+
+        By default this performs an OpenAI-style web search. If knowledge-base
+        retrieval flags (``--collection``/``-c``, ``--top-k``/``-k`` or
+        ``--hybrid``) are supplied, the command is delegated to the Typer
+        retrieval CLI (``retrieval.search_command``) so that RAG queries work
+        from the top-level ``praisonai search`` command.
+        """
+        retrieval_flags = {"--collection", "-c", "--top-k", "-k", "--hybrid"}
+        if any(arg.split("=", 1)[0] in retrieval_flags for arg in unknown_args):
+            try:
+                from ..commands.retrieval import register_commands
+                import typer as _typer
+            except ImportError as e:
+                print(f"ERROR: {e}")
+                return 1
+
+            retrieval_app = _typer.Typer()
+            register_commands(retrieval_app)
+            try:
+                retrieval_app(["search", *list(unknown_args)], standalone_mode=False)
+            except SystemExit as e:
+                return e.code if e.code else 0
+            except _typer.Exit as e:
+                return e.exit_code if e.exit_code else 0
+            except Exception as e:
+                print(f"Error: {e}")
+                return 1
+            return 0
+
         parser = argparse.ArgumentParser(prog="praisonai search")
         parser.add_argument("query", help="Search query")
         parser.add_argument("--max-results", "-n", type=int, default=5, help="Max results")

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code/cli/features/knowledge_cli.py

@@ -179,7 +179,17 @@ def create_knowledge_app():
             limit=top_k * 3 if rerank or compress else top_k,  # Fetch more for reranking
         )
         
-        items = results.get("results", []) if isinstance(results, dict) else results
+        # Normalize search results to a list of dicts.
+        # Knowledge.search() may return a typed SearchResult dataclass,
+        # a legacy dict with a "results" key, or a plain list.
+        if hasattr(results, "to_legacy_format"):
+            items = results.to_legacy_format().get("results", [])
+        elif isinstance(results, dict):
+            items = results.get("results", [])
+        elif isinstance(results, list):
+            items = results
+        else:
+            items = []
         
         # Apply path filter
         if path_filter and items:

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code/cli/legacy/praison_ai.py

@@ -1641,6 +1641,13 @@ class PraisonAI:
             and not os.path.isfile(args.command)
             and not (args.command or "").lower().endswith((".yaml", ".yml"))
         ):
+            # Guard: a lone command-like token (e.g. `praisonai show`) that is a
+            # reserved verb or an obvious typo must NOT silently become a paid
+            # one-shot LLM prompt. Fail fast with a hint instead.
+            hint = _ab.classify_unknown_command(args.command, special_commands)
+            if hint is not None:
+                print(hint, file=sys.stderr)
+                sys.exit(2)
             args.direct_prompt = args.command
             args.command = None
 

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/praisonai_code.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonai-code
-Version: 0.0.35
+Version: 0.0.37
 Summary: Agentic terminal CLI for PraisonAI — the terminal-native agent (run, chat, code, runtime, cli backends) extracted from the praisonai wrapper.
 Author: Mervin Praison
 License: MIT

{praisonai_code-0.0.35 → praisonai_code-0.0.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "praisonai-code"
-version = "0.0.35"
+version = "0.0.37"
 description = "Agentic terminal CLI for PraisonAI — the terminal-native agent (run, chat, code, runtime, cli backends) extracted from the praisonai wrapper."
 readme = "README.md"
 license = {text = "MIT"}