PikoAi 0.1.15__py3-none-any.whl → 0.1.16__py3-none-any.whl

Agents/Executor/executor.py

@@ -130,7 +130,7 @@ class executor:
                     tool_output_result = tool_manager.call_tool(tool_name, tool_input)
                     if tool_name not in ['execute_python_code', 'execute_shell_command']:
                         self.terminal.tool_output_log(tool_output_result, tool_name)
-                    self.message.append({"role": "user", "content": tool_output_result})
+                    self.message.append({"role": "user", "content": "Tool Output: " + str(tool_output_result)})
                 except ValueError as e:
                     error_msg = str(e)
                     print(f"Tool Error: {error_msg}")

Tools/system_details.py

@@ -1,49 +1,64 @@
 import platform
 import psutil
 import datetime
-import json
 
 def get_os_details():
     """Get operating system details"""
-    return {
+    os_info = {
         "system": platform.system(),
         "release": platform.release(),
         "version": platform.version(),
         "machine": platform.machine(),
         "processor": platform.processor()
     }
+    
+    return f"""Operating System Details:
+System: {os_info['system']}
+Release: {os_info['release']}
+Version: {os_info['version']}
+Machine: {os_info['machine']}
+Processor: {os_info['processor']}"""
 
 def get_datetime():
     """Get current date and time"""
     now = datetime.datetime.now()
-    return {
-        "date": now.strftime("%Y-%m-%d"),
-        "time": now.strftime("%H:%M:%S"),
-        "timezone": datetime.datetime.now().astimezone().tzname()
-    }
+    date = now.strftime("%Y-%m-%d")
+    time = now.strftime("%H:%M:%S")
+    timezone = datetime.datetime.now().astimezone().tzname()
+    
+    return f"""Date and Time:
+Date: {date}
+Time: {time}
+Timezone: {timezone}"""
 
 def get_memory_usage():
     """Get memory usage details"""
     memory = psutil.virtual_memory()
-    return {
-        "total": f"{memory.total / (1024**3):.2f} GB",
-        "available": f"{memory.available / (1024**3):.2f} GB",
-        "used": f"{memory.used / (1024**3):.2f} GB",
-        "percent": f"{memory.percent}%"
-    }
+    total = f"{memory.total / (1024**3):.2f} GB"
+    available = f"{memory.available / (1024**3):.2f} GB"
+    used = f"{memory.used / (1024**3):.2f} GB"
+    percent = f"{memory.percent}%"
+    
+    return f"""Memory Usage:
+Total: {total}
+Available: {available}
+Used: {used}
+Usage Percent: {percent}"""
 
 def get_cpu_info():
     """Get CPU information"""
-    return {
-        "physical_cores": psutil.cpu_count(logical=False),
-        "total_cores": psutil.cpu_count(logical=True),
-        "cpu_freq": {
-            "current": f"{psutil.cpu_freq().current:.2f} MHz",
-            "min": f"{psutil.cpu_freq().min:.2f} MHz",
-            "max": f"{psutil.cpu_freq().max:.2f} MHz"
-        },
-        "cpu_usage": f"{psutil.cpu_percent()}%"
-    }
+    cpu_freq = psutil.cpu_freq()
+    current_freq = f"{cpu_freq.current:.2f} MHz" if cpu_freq else "N/A"
+    min_freq = f"{cpu_freq.min:.2f} MHz" if cpu_freq and cpu_freq.min else "N/A"
+    max_freq = f"{cpu_freq.max:.2f} MHz" if cpu_freq and cpu_freq.max else "N/A"
+    
+    return f"""CPU Information:
+Physical Cores: {psutil.cpu_count(logical=False)}
+Total Cores: {psutil.cpu_count(logical=True)}
+Current Frequency: {current_freq}
+Min Frequency: {min_freq}
+Max Frequency: {max_freq}
+CPU Usage: {psutil.cpu_percent()}%"""
 
 def system_details(detail_type="all"):
     """
@@ -53,17 +68,18 @@ def system_details(detail_type="all"):
         detail_type (str): Type of system detail to retrieve (os, datetime, memory, cpu, all)
     
     Returns:
-        dict: Requested system details
+        str: Requested system details as formatted string
     """
     detail_type = detail_type.lower()
     
     if detail_type == "all":
-        return {
-            "os": get_os_details(),
-            "datetime": get_datetime(),
-            "memory": get_memory_usage(),
-            "cpu": get_cpu_info()
-        }
+        return f"""{get_os_details()}
+
+{get_datetime()}
+
+{get_memory_usage()}
+
+{get_cpu_info()}"""
     elif detail_type == "os":
         return get_os_details()
     elif detail_type == "datetime":

Tools/tool_dir.json

@@ -68,7 +68,7 @@
         "summary": "Prompts the user for input and returns their response",
         "arguments": {
             "prompt": "The message to display to the user",
-            "input_type": "Type of input to validate (text, number, boolean, optional, defaults to text)"
+            "input_type": "Type of input to validate (text, number, optional, defaults to text)"
         }
     },
     {

Tools/userinp.py

@@ -17,15 +17,7 @@ def get_user_input(prompt="Enter input: ", input_type="text"):
                 return user_input
             elif input_type == "number":
                 return float(user_input)
-            elif input_type == "boolean":
-                user_input = user_input.lower()
-                if user_input in ["true", "yes", "y", "1"]:
-                    return True
-                elif user_input in ["false", "no", "n", "0"]:
-                    return False
-                else:
-                    print("Please enter 'yes' or 'no'")
-                    continue
+            
             else:
                 raise ValueError(f"Invalid input type: {input_type}")
                 

Tools/web_loader.py

@@ -123,7 +123,6 @@ def load_data(**kwargs):
     headers = {
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML like Gecko) Chrome/52.0.2743.116 Safari/537.36"
     }
-    web_data = {}
     content = ""
     try:
         response = session.get(url, headers=headers, timeout=30)
@@ -139,28 +138,11 @@ def load_data(**kwargs):
                 # Extract text from each page and combine it
                 content = "\n".join([page.extract_text() for page in pdf.pages if page.extract_text()])
 
-        meta_data = {"url": url}
-        doc_id = hashlib.sha256((content + url).encode()).hexdigest()
-        web_data = {
-            "doc_id": doc_id,
-            "data": [
-                {
-                    "content": content,
-                    "meta_data": meta_data,
-                }
-            ],
-        }
     except Exception as e:
         logging.error(f"Error loading data from {url}: {e}")
-        web_data = {
-            "data": [
-                {
-                    "content": "",
-                    "meta_data": "",
-                }
-            ],
-        }
-    return web_data
+        content = ""
+    
+    return content
 
 
 def close_session(session):

Tools/web_search.py

@@ -1,11 +1,8 @@
-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.
@@ -16,52 +13,18 @@ def web_search(max_results: int = 10, **kwargs) -> str:
         str: Formatted string containing search results.
 
     Raises:
-        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.
+        ImportError: If the duckduckgo_search package is not installed.
+        Exception: If no results are found for the given query.
     """
     try:
-        ddgs_instance = DDGS()
+        ddgs = 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
-
-    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}")
+        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)

{pikoai-0.1.15.dist-info → pikoai-0.1.16.dist-info}/METADATA

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

{pikoai-0.1.15.dist-info → pikoai-0.1.16.dist-info}/RECORD

@@ -2,7 +2,7 @@ OpenCopilot.py,sha256=kPTs0-ly84h4dM7AmBlK4uwst5Sj2AM6UAlE3okkD8U,12157
 cli.py,sha256=qDWlKyOUkhDHSBxQ2wjy1e6KGRsDxE7pjxUZKjQFC3k,13959
 Agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Agents/Executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Agents/Executor/executor.py,sha256=NHdPXL_jhSHqgXxbkCfvkxI-M2I-cRcv_y77i_szpow,8232
+Agents/Executor/executor.py,sha256=OAqrDdjO62Gy4UKEVF0yYYJjkvVJo_mQy_OMJSibl58,8255
 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
@@ -16,20 +16,20 @@ Env/tests/test_python_executor.py,sha256=5kfs0cOf-RgWTOers_1wB0yvYSF-HrHPsraJ-Px
 Env/tests/test_shell_executor.py,sha256=-RcCdSUMoRAXHISIh0IR5MCutco80fX2S3sQBcinc_Q,1034
 Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Tools/file_task.py,sha256=VUhWq_G-SWvGahQo8PG7TOpElHUW3BGLUabrTdJS89o,12151
-Tools/system_details.py,sha256=7-mTm3CG4NoatHcvcosalEgEcpWlNsCsZ7kuS3y_EmY,2262
-Tools/tool_dir.json,sha256=pEqI-1rKud-VEWHYLF2Pbv6xwQZWy62HUF_1hjcdhCY,3128
+Tools/system_details.py,sha256=RScVnhTpUOlNG0g5bGnwmtNr5nSJzOec8HJSFpbicds,2651
+Tools/tool_dir.json,sha256=RTawcanxIkJaUys6Y3yftXAT5uxMH0xPZYTtD1ilJl0,3119
 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=mdbqWSJgMjxedrdFocHGfvOGsAq4R1H13yVev71UHkM,3164
+Tools/userinp.py,sha256=SK69fMEdUvNQor9V3BVckeDMJcq71g6H6EHPmNfsZD4,834
+Tools/web_loader.py,sha256=_oP48uwveTaCKU7G5ju2zsJGTcZd1ScXTKOvHDFtZJU,4564
+Tools/web_search.py,sha256=4EGq1VZqfDgG-_yXTd4_Ha1iEUcR-szdlgRV7oFPru4,1259
 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.15.dist-info/licenses/LICENSE,sha256=cELUVOboOAderKFp8bdtcM5VyJi61YH1oDbRhOuoQZw,1067
-pikoai-0.1.15.dist-info/METADATA,sha256=kWctaTcc3FCoOqkr-bS_lRCy4OK4HsIYvzd_dOqt9Jc,2962
-pikoai-0.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pikoai-0.1.15.dist-info/entry_points.txt,sha256=xjZnheDymNDnQ0o84R0jZKEITrhNbzQWN-AhqfA_d6s,50
-pikoai-0.1.15.dist-info/top_level.txt,sha256=hWzBNE7UQsuNcENIOksGcJED08k3ZGRRn2X5jnStICU,53
-pikoai-0.1.15.dist-info/RECORD,,
+pikoai-0.1.16.dist-info/licenses/LICENSE,sha256=cELUVOboOAderKFp8bdtcM5VyJi61YH1oDbRhOuoQZw,1067
+pikoai-0.1.16.dist-info/METADATA,sha256=218K7ggeGVwRAv1lubC0_rATLNEpMWUVBP8eFYmenb0,2962
+pikoai-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pikoai-0.1.16.dist-info/entry_points.txt,sha256=xjZnheDymNDnQ0o84R0jZKEITrhNbzQWN-AhqfA_d6s,50
+pikoai-0.1.16.dist-info/top_level.txt,sha256=hWzBNE7UQsuNcENIOksGcJED08k3ZGRRn2X5jnStICU,53
+pikoai-0.1.16.dist-info/RECORD,,