PikoAi 0.1.13__py3-none-any.whl → 0.1.14__py3-none-any.whl

Agents/Executor/executor.py

@@ -83,7 +83,8 @@ class executor:
 
                 # Streaming is handled within LiteLLMInterface.chat()
                 # and TerminalInterface.process_markdown_chunk()
-                self.message.append({"role": "assistant", "content": response})
+                if response.strip():
+                    self.message.append({"role": "assistant", "content": response})
                 return response
 
             except Exception as e: # Catching generic Exception as LiteLLM maps to OpenAI exceptions

OpenCopilot.py

@@ -206,12 +206,12 @@ Examples:
         
         try:
             # Get initial prompt
-            user_input = self.session.prompt(HTML("<b>Please enter your prompt: </b>"))
+            user_input = self.session.prompt(HTML("<b>Piko></b>"))
             
             # Handle special commands
             if user_input.lower() == 'help':
                 self.display_help()
-                user_input = self.session.prompt(HTML("<b>Please enter your prompt: </b>"))
+                user_input = self.session.prompt(HTML("<b>Piko></b>"))
             elif user_input.lower() == 'quit':
                 print("Goodbye!")
                 return
@@ -227,7 +227,7 @@ Examples:
             # Continue conversation loop
             while True:
                 try:
-                    user_input = self.session.prompt(HTML("<b>\nPlease enter your prompt (or 'quit' to exit): </b>"))
+                    user_input = self.session.prompt(HTML("<b>\nPiko></b>"))
                     
                     # Handle special commands
                     if user_input.lower() == 'quit':

Tools/web_search.py

@@ -1,8 +1,11 @@
+import os
 from duckduckgo_search import DDGS
+from serpapi import SerpApiClient
 
 def web_search(max_results: int = 10, **kwargs) -> str:
     """
     Performs a DuckDuckGo web search based on your query (think a Google search) then returns the top search results.
+    If DuckDuckGo search fails, it falls back to SerpAPI.
 
     Args:
         query (str): The search query to perform.
@@ -13,18 +16,52 @@ def web_search(max_results: int = 10, **kwargs) -> str:
         str: Formatted string containing search results.
 
     Raises:
-        ImportError: If the duckduckgo_search package is not installed.
-        Exception: If no results are found for the given query.
+        ImportError: If the duckduckgo_search or serpapi package is not installed.
+        Exception: If no results are found for the given query via both DuckDuckGo and SerpAPI, or if the SerpAPI key is not found.
+
+    Note:
+        For SerpAPI fallback, the SERPAPI_API_KEY environment variable must be set.
     """
     try:
-        ddgs = DDGS()
+        ddgs_instance = DDGS()
     except ImportError as e:
-        raise ImportError("You must install package `duckduckgo_search` to run this function: for instance run `pip install duckduckgo-search`."
-        ) from e
-    query = kwargs['query']
-    results = ddgs.text(query, max_results=max_results)
-    if len(results) == 0:
-        raise Exception("No results found! Try a less restrictive/shorter query.")
-
-    postprocessed_results = [f"[{result['title']}]({result['href']})\n{result['body']}" for result in results]
-    return "## Search Results\n\n" + "\n\n".join(postprocessed_results)
+        raise ImportError("You must install package `duckduckgo_search` to run this function: for instance run `pip install duckduckgo-search`.") from e
+
+    try:
+        query = kwargs['query']
+        results = ddgs_instance.text(query, max_results=max_results)
+        if len(results) == 0:
+            raise Exception("No results found via DuckDuckGo.")
+
+        postprocessed_results = [f"[{result['title']}]({result['href']})\n{result['body']}" for result in results]
+        
+        return "## Search Results (via DuckDuckGo)\n\n" + "\n\n".join(postprocessed_results)
+        
+    except Exception as e:
+        # print(f"DuckDuckGo search failed: {e}. Falling back to SerpAPI.")
+        # If the exception was the specific DDGS ImportError, we re-raise it directly if it wasn't caught above.
+        # However, the structure above should prevent it from reaching here.
+        # The primary purpose of this block is to catch runtime errors from ddgs.text or the "No results" exception.
+
+        api_key = os.environ.get("SERPAPI_API_KEY")
+        if not api_key:
+            raise Exception("SerpAPI key not found. Please set the SERPAPI_API_KEY environment variable.")
+
+        try:
+            client = SerpApiClient({"api_key": api_key})
+        except ImportError as serp_e:
+            raise ImportError("You must install package `serpapi` to run this function: for instance run `pip install google-search-results`.") from serp_e
+        
+        search_params = {
+            "engine": "google",
+            "q": query,
+            "num": max_results  # SerpAPI uses 'num' for number of results
+        }
+        serp_results = client.search(search_params)
+
+        if "organic_results" in serp_results and serp_results["organic_results"]:
+            organic_results = serp_results["organic_results"]
+            postprocessed_results = [f"[{result['title']}]({result['link']})\n{result.get('snippet', '')}" for result in organic_results]
+            return "## Search Results (via SerpAPI)\n\n" + "\n\n".join(postprocessed_results)
+        else:
+            raise Exception(f"No results found via DuckDuckGo or SerpAPI! Original error: {e}")

{pikoai-0.1.13.dist-info → pikoai-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PikoAi
-Version: 0.1.13
+Version: 0.1.14
 Summary: An AI-powered task automation tool
 Home-page: https://github.com/nihaaaar22/OS-Assistant
 Author: Nihar S

{pikoai-0.1.13.dist-info → pikoai-0.1.14.dist-info}/RECORD

@@ -1,8 +1,8 @@
-OpenCopilot.py,sha256=vBAuU6MNhYdnyIIrDWOBSlxa0iyjADJLq5eCxUhlffw,12240
+OpenCopilot.py,sha256=kPTs0-ly84h4dM7AmBlK4uwst5Sj2AM6UAlE3okkD8U,12157
 cli.py,sha256=hY6KUxvKvJOFThZT--r6m2nzOEMIOVtiVptewsi9Z9w,13868
 Agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Agents/Executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Agents/Executor/executor.py,sha256=-HvywqfroHd0QYNt5AN8vV7wjR-91hWPbSuvNzIVMMU,8191
+Agents/Executor/executor.py,sha256=NHdPXL_jhSHqgXxbkCfvkxI-M2I-cRcv_y77i_szpow,8232
 Agents/Executor/prompts.py,sha256=dWmUiAloNN_NKwWgaG_IqHDhCX1O-VhwbadUL-16gZw,2903
 Env/__init__.py,sha256=KLe7UcNV5L395SxhMwbYGyu7KPrSNaoV_9QJo3mLop0,196
 Env/base_env.py,sha256=K4PoWwPXn3pKeu7_-JOlUuyNbyYQ9itMhQybFOm-3K4,1563
@@ -21,15 +21,15 @@ Tools/tool_dir.json,sha256=pEqI-1rKud-VEWHYLF2Pbv6xwQZWy62HUF_1hjcdhCY,3128
 Tools/tool_manager.py,sha256=86qwREw5an12dweIGCS1NNgINwHikyTxUpbjPWoLbt0,4118
 Tools/userinp.py,sha256=vUhEj3y1W1_ZFHqo2xQwvqDyeOg3VsisSKTI0EurUH8,1205
 Tools/web_loader.py,sha256=PyZk2g7WngZT0tCLs9Danx20dYspnaZwy4rlVE9Sx_4,5054
-Tools/web_search.py,sha256=4EGq1VZqfDgG-_yXTd4_Ha1iEUcR-szdlgRV7oFPru4,1259
+Tools/web_search.py,sha256=mdbqWSJgMjxedrdFocHGfvOGsAq4R1H13yVev71UHkM,3164
 Utils/__init__.py,sha256=oukU0ufroPRd8_N8d2xiFes9CTxSaw4NA6p2nS1kkSg,16
 Utils/executor_utils.py,sha256=WwK3TKgw_hG_crg7ijRaqfidYnnNXYbbs37vKZRYK-0,491
 Utils/ter_interface.py,sha256=2k32kVxcxVBewXnjSGSPbx25ZLhKindEMtL6wSC_wL4,3829
 llm_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_interface/llm.py,sha256=tI_KDOW14QLWowA7bB3GPe2qjlk0sjS5fBavs9XD1fo,5185
-pikoai-0.1.13.dist-info/licenses/LICENSE,sha256=cELUVOboOAderKFp8bdtcM5VyJi61YH1oDbRhOuoQZw,1067
-pikoai-0.1.13.dist-info/METADATA,sha256=mjc1I8aWnP9tMaG0Mlvme1AX-dgDIul3ugC5C5yxbXc,2962
-pikoai-0.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pikoai-0.1.13.dist-info/entry_points.txt,sha256=xjZnheDymNDnQ0o84R0jZKEITrhNbzQWN-AhqfA_d6s,50
-pikoai-0.1.13.dist-info/top_level.txt,sha256=hWzBNE7UQsuNcENIOksGcJED08k3ZGRRn2X5jnStICU,53
-pikoai-0.1.13.dist-info/RECORD,,
+pikoai-0.1.14.dist-info/licenses/LICENSE,sha256=cELUVOboOAderKFp8bdtcM5VyJi61YH1oDbRhOuoQZw,1067
+pikoai-0.1.14.dist-info/METADATA,sha256=ayjtfHmfey5-P8lvSPW0p-q7jrV_p3nxd-r9dzNHwrU,2962
+pikoai-0.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pikoai-0.1.14.dist-info/entry_points.txt,sha256=xjZnheDymNDnQ0o84R0jZKEITrhNbzQWN-AhqfA_d6s,50
+pikoai-0.1.14.dist-info/top_level.txt,sha256=hWzBNE7UQsuNcENIOksGcJED08k3ZGRRn2X5jnStICU,53
+pikoai-0.1.14.dist-info/RECORD,,